From owner-p4-projects@FreeBSD.ORG Sun Jul 25 03:14:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1CF416A4D0; Sun, 25 Jul 2004 03:14:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C08DC16A4CE for ; Sun, 25 Jul 2004 03:14:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A150443D1F for ; Sun, 25 Jul 2004 03:14:07 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6P3E7Ih018364 for ; Sun, 25 Jul 2004 03:14:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6P3E72P018361 for perforce@freebsd.org; Sun, 25 Jul 2004 03:14:07 GMT (envelope-from marcel@freebsd.org) Date: Sun, 25 Jul 2004 03:14:07 GMT Message-Id: <200407250314.i6P3E72P018361@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 58088 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, 25 Jul 2004 03:14:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=58088 Change 58088 by marcel@marcel_nfs on 2004/07/25 03:13:34 Add support for sparc64. Doesn't work though. GDB doesn't know which ABI to pick when given the kernel, so it picks the wrong one. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 25 04:47:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A601916A4D0; Sun, 25 Jul 2004 04:47:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8273D16A4CE for ; Sun, 25 Jul 2004 04:47:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62B4843D45 for ; Sun, 25 Jul 2004 04:47:40 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6P4le5B020691 for ; Sun, 25 Jul 2004 04:47:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6P4lelW020688 for perforce@freebsd.org; Sun, 25 Jul 2004 04:47:40 GMT (envelope-from marcel@freebsd.org) Date: Sun, 25 Jul 2004 04:47:40 GMT Message-Id: <200407250447.i6P4lelW020688@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 58096 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, 25 Jul 2004 04:47:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=58096 Change 58096 by marcel@marcel_nfs on 2004/07/25 04:47:01 Add support for alpha. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 25 07:16:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32D8D16A4D0; Sun, 25 Jul 2004 07:16:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01CF116A4CE for ; Sun, 25 Jul 2004 07:16:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA0FD43D1D for ; Sun, 25 Jul 2004 07:16:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6P7GjRQ024982 for ; Sun, 25 Jul 2004 07:16:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6P7GjM4024979 for perforce@freebsd.org; Sun, 25 Jul 2004 07:16:45 GMT (envelope-from marcel@freebsd.org) Date: Sun, 25 Jul 2004 07:16:45 GMT Message-Id: <200407250716.i6P7GjM4024979@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 58109 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, 25 Jul 2004 07:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=58109 Change 58109 by marcel@marcel_nfs on 2004/07/25 07:16:27 IFC @58107 Affected files ... .. //depot/projects/gdb/Makefile#9 integrate .. //depot/projects/gdb/UPDATING#23 integrate .. //depot/projects/gdb/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/gdb/etc/rc#5 integrate .. //depot/projects/gdb/etc/rc.d/localpkg#2 integrate .. //depot/projects/gdb/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/gdb/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#10 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/gdb/include/string.h#2 integrate .. //depot/projects/gdb/include/strings.h#3 integrate .. //depot/projects/gdb/include/wchar.h#6 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#11 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#13 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#18 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#23 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#16 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/gdb/lib/libc/gen/ftw.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/wcsnrtombs.c#2 integrate .. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#7 integrate .. //depot/projects/gdb/sbin/init/init.8#6 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/gdb/sbin/vinum/commands.c#5 integrate .. //depot/projects/gdb/share/dict/freebsd#4 integrate .. //depot/projects/gdb/share/man/man4/Makefile#15 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#11 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/snc.4#1 branch .. //depot/projects/gdb/share/man/man4/pccbb.4#2 integrate .. //depot/projects/gdb/share/man/man4/snc.4#2 delete .. //depot/projects/gdb/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/gdb/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/gdb/sys/arm/include/pcb.h#3 integrate .. //depot/projects/gdb/sys/arm/include/pmap.h#3 integrate .. //depot/projects/gdb/sys/conf/NOTES#37 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#12 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#22 integrate .. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/gdb/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#7 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/gdb/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_event.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_exec.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_lock.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_prot.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_switch.c#8 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#21 integrate .. //depot/projects/gdb/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/gdb/sys/kern/sys_socket.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/gdb/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/gdb/sys/net/bpf.c#9 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#11 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/gdb/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#19 integrate .. //depot/projects/gdb/sys/powerpc/include/db_machdep.h#4 integrate .. //depot/projects/gdb/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/locore.S#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#8 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/trap_subr.S#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/gdb/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/gdb/sys/sys/cdefs.h#4 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#16 integrate .. //depot/projects/gdb/sys/sys/param.h#21 integrate .. //depot/projects/gdb/sys/sys/proc.h#23 integrate .. //depot/projects/gdb/sys/vm/swap_pager.c#9 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#13 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#14 integrate .. //depot/projects/gdb/sys/vm/vm_map.h#7 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#8 integrate .. //depot/projects/gdb/sys/vm/vm_object.h#3 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#14 integrate .. //depot/projects/gdb/tools/regression/pipe/pipe-reverse.c#1 branch .. //depot/projects/gdb/tools/regression/pipe/pipe-wraparound.c#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/gdb/usr.bin/hexdump/Makefile#4 integrate .. //depot/projects/gdb/usr.bin/hexdump/display.c#3 integrate .. //depot/projects/gdb/usr.bin/hexdump/odsyntax.c#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/parse.c#2 integrate .. //depot/projects/gdb/usr.bin/locate/locate/locate.1#4 integrate .. //depot/projects/gdb/usr.bin/make/parse.c#6 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#12 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#25 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#13 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/gdb/usr.bin/tar/fts.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/matching.c#7 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#12 integrate .. //depot/projects/gdb/usr.bin/tar/util.c#7 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#14 integrate .. //depot/projects/gdb/usr.bin/tr/tr.1#5 integrate .. //depot/projects/gdb/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/gdb/usr.bin/truncate/truncate.c#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/arlib/Makefile#2 delete .. //depot/projects/gdb/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpq/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pwd_mkdb/pwd_mkdb.8#3 integrate .. //depot/projects/gdb/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.c#5 integrate Differences ... ==== //depot/projects/gdb/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.304 2004/07/18 18:55:31 markm Exp $ +# $FreeBSD: src/Makefile,v 1.305 2004/07/23 21:21:34 kensmith Exp $ # # The user-driven targets are: # @@ -186,7 +186,7 @@ @echo "WARNING: make world will overwrite your existing FreeBSD" @echo "installation without also building and installing a new" @echo "kernel. This can be dangerous. Please read the handbook," - @echo "'Using make world', for how to upgrade your system." + @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." @echo "You may get the historical 'make world' behavior by defining" ==== //depot/projects/gdb/UPDATING#23 (text+ko) ==== @@ -17,6 +17,19 @@ developers choose to disable these features on build machines to maximize performance. +20040724: + The rc.d/loclpkg script now "does the right thing" with respect + to ports rc.d scripts. The most disruptive change is that scripts + ending in *.sh are sourced in the same shell as rc.d/localpkg (as + opposed to a subshell) and may cause the script to end prematurely + if a script calls exit. Some broken scripts may not recognize the + 'fast' prefix to a command. The first problem can be fixed by simply + renaming the script so that it doesn't have a '.sh' ending. Another + temporary work-arround is to completely remove the 'PROVIDE' line + from the script. If you notice a broken ports rc.d script please + notify the maintainer. Legacy scripts should not be affected. + __FreeBSD_version bumped to 502124. + 20040716: The sound device drivers are renamed. `sound' is always required, while `snd_*' should be configured accordingly to your hardware. @@ -44,7 +57,7 @@ been renamed to WITNESS_KDB, KDB_TRACE and KDB_UNATTENDED respectively. This is in line with the first bullet. o The remote GDB support has been untangled from DDB and needs - to be enabled seperately now. Use the GDB option for this. + to be enabled separately now. Use the GDB option for this. o The GDB_REMOTE_CHAT option has been removed. Support for this homegrown feature is discontinued. The GDB remote protocol supports console output and it makes sense to use that. @@ -58,9 +71,9 @@ 20040702: The native preemption has been added to the kernel scheduler. - There is some report that ULE scheduler was broken in some - machines and we encourage users using ULE scheduler either - stick with an known good kernel, or temporary switch to 4BSD + There is some report that the ULE scheduler was broken in some + machines and we encourage users using the ULE scheduler either + stick with a known good kernel, or temporarily switch to the 4BSD scheduler as a workaround. 20040630: @@ -77,14 +90,14 @@ 20040630: ACPI has been updated to disable known-bad BIOS revisions. A message - will be printed on console indicating that ACPI has been disabled + will be printed on the console indicating that ACPI has been disabled automatically and that the user should use a newer BIOS, if possible. If you think ACPI does work on your system and want to override this (i.e., for testing), set hint.acpi.0.disabled="0" at the loader prompt. 20040623: - pf was updated to OpenBSD-stable 3.5 and pflogd(8) is priviledge + pf was updated to OpenBSD-stable 3.5 and pflogd(8) is privilege separated now. It uses the newly created "_pflogd" user/group combination. If you plan to use pflogd(8) make sure to run mergemaster -p or install the "_pflogd" user and group manually. @@ -225,7 +238,7 @@ 20040224: The tcpcb structure has changed and makes a recompile of libkvm - and related userland network utilities neccessary. + and related userland network utilities necessary. 20040222: The cdevsw structure has changed in two externally visible ways. @@ -335,7 +348,7 @@ 20030928: Changes to the cdevsw default functions have been made to remove the need to specify nullopen() and nullclose() explicitly. - __FreeBSD_version bumpted to 501110. + __FreeBSD_version bumped to 501110. 20030926: kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and @@ -686,7 +699,7 @@ sys/i4b/driver/i4b_ispppsubr.c has been retired. This file started out its life in the ISDN4BSD project as an offspring from sys/net/if_spppsubr.c, which eventually got a life of its - own. All the accumulated features and bugfixes of the i4b + own. All the accumulated features and bug fixes of the i4b version have now been merged back into the base system's version now. The only user-visible change resulting from this is that i4b's sppp(4) interfaces are to be managed with @@ -1719,4 +1732,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.326 2004/07/16 04:04:29 tanimura Exp $ +$FreeBSD: src/UPDATING,v 1.328 2004/07/24 14:56:20 mtm Exp $ ==== //depot/projects/gdb/contrib/ntp/util/ntp-keygen.c#2 (text+ko) ==== @@ -159,7 +159,9 @@ extern char *optarg; /* command line argument */ int debug = 0; /* debug, not de bug */ int rval; /* return status */ +#ifdef OPENSSL u_int modulus = PLEN; /* prime modulus size (bits) */ +#endif int nkeys = 0; /* MV keys */ time_t epoch; /* Unix epoch (seconds) since 1970 */ char *hostname; /* host name (subject name) */ @@ -221,7 +223,9 @@ EVP_PKEY *pkey_iff = NULL; /* IFF parameters */ EVP_PKEY *pkey_gq = NULL; /* GQ parameters */ EVP_PKEY *pkey_mv = NULL; /* MV parameters */ +#endif int md5key = 0; /* generate MD5 keys */ +#ifdef OPENSSL int hostkey = 0; /* generate RSA keys */ int iffkey = 0; /* generate IFF parameters */ int gqpar = 0; /* generate GQ parameters */ @@ -231,7 +235,6 @@ char *sign = NULL; /* sign key */ EVP_PKEY *pkey = NULL; /* temp key */ const EVP_MD *ectx; /* EVP digest */ - char hostbuf[MAXHOSTNAME + 1]; char pathbuf[MAXFILENAME + 1]; const char *scheme = NULL; /* digest/signature scheme */ char *exten = NULL; /* private extension */ @@ -240,6 +243,7 @@ FILE *fstr = NULL; /* file handle */ int iffsw = 0; /* IFF key switch */ #endif /* OPENSSL */ + char hostbuf[MAXHOSTNAME + 1]; u_int temp; #ifdef SYS_WINNT @@ -267,8 +271,10 @@ */ gethostname(hostbuf, MAXHOSTNAME); hostname = hostbuf; +#ifdef OPENSSL trustname = hostbuf; passwd1 = hostbuf; +#endif #ifndef SYS_WINNT gettimeofday(&tv, 0); #else @@ -277,15 +283,22 @@ epoch = tv.tv_sec; rval = 0; while ((temp = getopt(argc, argv, - "c:deGgHIi:Mm:nPp:q:S:s:TV:v:")) != -1) { +#ifdef OPENSSL + "c:deGgHIi:Mm:nPp:q:S:s:TV:v:" +#else + "dM" +#endif + )) != -1) { switch(temp) { +#ifdef OPENSSL /* * -c select public certificate type */ case 'c': scheme = optarg; continue; +#endif /* * -d debug @@ -294,47 +307,59 @@ debug++; continue; +#ifdef OPENSSL /* * -e write identity keys */ case 'e': iffsw++; continue; +#endif +#ifdef OPENSSL /* * -G generate GQ parameters and keys */ case 'G': gqpar++; continue; +#endif +#ifdef OPENSSL /* * -g update GQ keys */ case 'g': gqkey++; continue; +#endif +#ifdef OPENSSL /* * -H generate host key (RSA) */ case 'H': hostkey++; continue; +#endif +#ifdef OPENSSL /* * -I generate IFF parameters */ case 'I': iffkey++; continue; +#endif +#ifdef OPENSSL /* * -i set issuer name */ case 'i': trustname = optarg; continue; +#endif /* * -M generate MD5 keys @@ -343,7 +368,7 @@ md5key++; continue; - +#ifdef OPENSSL /* * -m select modulus (256-2048) */ @@ -352,49 +377,63 @@ fprintf(stderr, "invalid option -m %s\n", optarg); continue; - +#endif + +#ifdef OPENSSL /* * -P generate PC private certificate */ case 'P': exten = EXT_KEY_PRIVATE; continue; +#endif +#ifdef OPENSSL /* * -p output private key password */ case 'p': passwd2 = optarg; continue; +#endif +#ifdef OPENSSL /* * -q input private key password */ case 'q': passwd1 = optarg; continue; +#endif +#ifdef OPENSSL /* * -S generate sign key (RSA or DSA) */ case 'S': sign = optarg; continue; +#endif +#ifdef OPENSSL /* * -s set subject name */ case 's': hostname = optarg; continue; - +#endif + +#ifdef OPENSSL /* * -T trusted certificate (TC scheme) */ case 'T': exten = EXT_KEY_TRUST; continue; +#endif +#ifdef OPENSSL /* * -V generate MV parameters */ @@ -404,7 +443,9 @@ fprintf(stderr, "invalid option -V %s\n", optarg); continue; +#endif +#ifdef OPENSSL /* * -v update MV keys */ @@ -414,6 +455,7 @@ fprintf(stderr, "invalid option -v %s\n", optarg); continue; +#endif /* * None of the above. @@ -446,6 +488,7 @@ fprintf(stderr, "Random seed file %s %u bytes\n", pathbuf, temp); RAND_add(&epoch, sizeof(epoch), 4.0); +#endif /* * Generate new parameters and keys as requested. These replace @@ -453,6 +496,7 @@ */ if (md5key) gen_md5("MD5"); +#ifdef OPENSSL if (hostkey) pkey_host = genkey("RSA", "host"); if (sign != NULL) @@ -714,7 +758,7 @@ } md5key[j] = (u_char)temp; } - md5key[16] = '\0'; + md5key[15] = '\0'; fprintf(str, "%2d MD5 %16s # MD5 key\n", i, md5key); } @@ -1245,7 +1289,7 @@ char *id /* file name id */ ) { - EVP_PKEY *pkey; /* private key */ + EVP_PKEY *pkey, *pkey1; /* private key */ DSA *dsa; /* DSA parameters */ DSA *sdsa; /* DSA parameters */ BN_CTX *ctx; /* BN working space */ @@ -1284,7 +1328,7 @@ modulus / n); ctx = BN_CTX_new(); u = BN_new(); v = BN_new(); w = BN_new(); b = BN_new(); b1 = BN_new(); - dsa = malloc(sizeof(DSA)); + dsa = DSA_new(); dsa->p = BN_new(); dsa->q = BN_new(); dsa->g = BN_new(); @@ -1589,7 +1633,7 @@ * the designated recipient(s) who pay a suitably outrageous fee * for its use. */ - sdsa = malloc(sizeof(DSA)); + sdsa = DSA_new(); sdsa->p = BN_dup(dsa->p); sdsa->q = BN_dup(BN_value_one()); sdsa->g = BN_dup(BN_value_one()); @@ -1622,15 +1666,16 @@ */ sprintf(ident, "MVkey%d", j); str = fheader(ident, trustname); - pkey = EVP_PKEY_new(); - EVP_PKEY_assign_DSA(pkey, sdsa); - PEM_write_PrivateKey(str, pkey, passwd2 ? + pkey1 = EVP_PKEY_new(); + EVP_PKEY_set1_DSA(pkey1, sdsa); + PEM_write_PrivateKey(str, pkey1, passwd2 ? EVP_des_cbc() : NULL, NULL, 0, NULL, passwd2); fclose(str); fprintf(stderr, "ntpkey_%s_%s.%lu\n", ident, trustname, epoch + JAN_1970); if (debug) DSA_print_fp(stdout, sdsa, 0); + EVP_PKEY_free(pkey1); } /* @@ -1643,7 +1688,7 @@ BN_free(u); BN_free(v); BN_free(w); BN_CTX_free(ctx); BN_free(b); BN_free(b1); BN_free(biga); BN_free(bige); BN_free(ss); BN_free(gbar); BN_free(ghat); - DSA_free(dsa); DSA_free(sdsa); + DSA_free(sdsa); /* * Free the world. @@ -1883,7 +1928,6 @@ break; } } -#endif /* OPENSSL */ /* @@ -1907,6 +1951,7 @@ rval = -1; return (NULL); } +#endif /* OPENSSL */ /* ==== //depot/projects/gdb/etc/rc#5 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.332 2004/06/06 18:06:09 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.333 2004/07/24 16:30:31 mtm Exp $ # # System startup script run by init on autoboot @@ -53,7 +53,7 @@ . /etc/rc.subr # Note: the system configuration files are loaded as part of -# the RCNG system (rc.d/rccond). Do not load them here as it may +# the RCNG system (rc.d/rcconf.sh). Do not load them here as it may # interfere with diskless booting. # if [ "$1" = autoboot ]; then ==== //depot/projects/gdb/etc/rc.d/localpkg#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localpkg,v 1.1 2003/08/06 00:35:13 mtm Exp $ +# $FreeBSD: src/etc/rc.d/localpkg,v 1.2 2004/07/24 14:56:20 mtm Exp $ # # PROVIDE: localpkg @@ -11,31 +11,120 @@ . /etc/rc.subr name="localpkg" -start_cmd="pkg_start" -stop_cmd="pkg_stop" +_arg1="$1" + +# script_is_rcd script +# Checks that script is an rc.d style script. +# Returns 0 if it is, otherwise, it returns 1. +# +script_is_rcd() +{ + local _s match + _s="$1" + + [ -z "$_s" ] && return 1 + match=`grep -c -m1 '^# PROVIDE:' "$_s" 2> /dev/null` + [ "$match" = "1" ] && return 0 + return 1 +} + +# cooked_scriptlist type +# Uses values from rc.conf(5) to prepare a list of scripts to +# execute. It assumes the global variable script_name_sep and IFS are set +# properly. If type is set to the string "rcd" the list will contain only +# rc.d style scripts and they will be ordered according to thier +# dependencies. If it is set to "rcOG" then it will contain +# only old style ports startup scripts. The list is echoed on stdout. +# +cooked_scriptlist() +{ + local _type slist fpattern skip + + slist="" + _type="$1" + case "$_type" in + rcd) + fpattern="*" + ;; + rcOG) + fpattern="*.sh" + ;; + *) + return + ;; + esac + for dir in ${local_startup}; do + if [ -d "${dir}" ]; then + for script in ${dir}/${fpattern}; do + + # Weed out scripts that don't belong in the + # category that we are preparing. + # + if [ "$_type" = "rcd" ]; then + case "$script" in + *.sample|*-dist) + continue;; + esac + script_is_rcd "$script" || continue + else + script_is_rcd "$script" && continue + fi + + slist="${slist}${script_name_sep}${script}" + done + fi + done + + # If this is an rc.d list put the scripts in the right order. + # + if [ "$_type" = "rcd" ]; then + skip="-s nostart" + [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && \ + skip="$skip -s nojail" + + # Some scripts do not define a FreeBSD keyword, so we can't + # specify it in a keep list. + slist=`/sbin/rcorder ${skip} ${slist} 2>/dev/null` + + # Substitute the newlines used by rcorder(8) with the + # script separator. + slist=`echo $slist | /usr/bin/tr "\n" "$script_name_sep"` + fi + + echo -n $slist +} pkg_start() { - # For each dir in $local_startup, search for init scripts matching *.sh - # + local slist + case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Local package initialization:' slist="" if [ -z "${script_name_sep}" ]; then script_name_sep=" " fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi + + # Do rc.d style scripts. + # + script_save_sep="$IFS" + IFS="${script_name_sep}" + slist=`cooked_scriptlist rcd` + debug "localpkg rc.d scripts: $slist" + for script in ${slist}; do + run_rc_script "$script" "$_arg1" done + IFS="${script_save_sep}" + + # Do old-style ports startup scripts. + # + echo -n 'Local package initialization:' script_save_sep="$IFS" IFS="${script_name_sep}" + slist=`cooked_scriptlist rcOG` + debug "localpkg rcOG scripts: $slist" for script in ${slist}; do if [ -x "${script}" ]; then (set -T @@ -53,26 +142,24 @@ pkg_stop() { - echo -n 'Shutting down daemon processes:' + local slist # For each dir in $local_startup, search for init scripts matching *.sh case ${local_startup} in [Nn][Oo] | '') ;; *) - slist="" if [ -z "${script_name_sep}" ]; then script_name_sep=" " fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi - done + + # Do old-style scripts + # script_save_sep="$IFS" IFS="${script_name_sep}" + slist=`cooked_scriptlist rcOG` + debug "localpkg rcOG scripts: $slist" + echo -n 'Shutting down local packages:' for script in `reverse_list ${slist}`; do if [ -x "${script}" ]; then (set -T @@ -82,9 +169,35 @@ done IFS="${script_save_sep}" echo '.' + + # Do rc.d style scripts + # + script_save_sep="$IFS" + IFS="${script_name_sep}" + slist=`cooked_scriptlist rcd` + debug "localpkg rc.d scripts: $slist" + for script in `reverse_list ${slist}`; do + run_rc_script "$script" $_arg1 + done ;; esac } load_rc_config $name -run_rc_command "$1" + +# We can't use the normal rc.subr(8) start/stop plumbing +# because we call run_rc_script(), which unsets all the +# global variables that said plumbing needs. +# +case "$1" in +start|faststart) + pkg_start + ;; +stop|faststop) + pkg_stop + ;; +restart|fastrestart) + pkg_stop + pkg_start + ;; +esac ==== //depot/projects/gdb/games/fortune/strfile/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.5 2003/12/07 17:34:52 des Exp $ +# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.6 2004/07/23 11:36:35 le Exp $ PROG= strfile MAN= strfile.8 MLINKS= strfile.8 unstr.8 -WARNS?= 2 +WARNS?= 3 .include ==== //depot/projects/gdb/games/fortune/strfile/strfile.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.25 2003/12/07 17:35:41 des Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.26 2004/07/23 11:36:35 le Exp $"); # include # include @@ -146,13 +146,12 @@ * CHUNKSIZE blocks; if the latter, we just write each pointer, * and then seek back to the beginning to write in the table. */ -int main(ac, av) -int ac; -char **av; +int main(int ac, char *av[]) { char *sp, dc; FILE *inf, *outf; - long last_off, length, pos, *p; + long last_off, pos, *p; + unsigned long length; int first, cnt; char *nsp; STR *fp; ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.8 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.9 2004/07/25 05:32:50 marcel Exp $ SUBDIR= doc libgdb gdb gdbtui kgdb ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 (text+ko) ==== ==== //depot/projects/gdb/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.19 2003/12/07 21:10:06 marcel Exp $ + * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ */ #ifndef _STRING_H_ @@ -58,21 +58,21 @@ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif -void *memchr(const void *, int, size_t); -int memcmp(const void *, const void *, size_t); +void *memchr(const void *, int, size_t) __pure; +int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); void *memmove(void *, const void *, size_t); void *memset(void *, int, size_t); #if __BSD_VISIBLE char *stpcpy(char *, const char *); -char *strcasestr(const char *, const char *); +char *strcasestr(const char *, const char *) __pure; #endif char *strcat(char * __restrict, const char * __restrict); -char *strchr(const char *, int); -int strcmp(const char *, const char *); +char *strchr(const char *, int) __pure; +int strcmp(const char *, const char *) __pure; int strcoll(const char *, const char *); char *strcpy(char * __restrict, const char * __restrict); -size_t strcspn(const char *, const char *); +size_t strcspn(const char *, const char *) __pure; #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE char *strdup(const char *); #endif @@ -84,24 +84,24 @@ size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); #endif -size_t strlen(const char *); +size_t strlen(const char *) __pure; #if __BSD_VISIBLE void strmode(int, char *); #endif char *strncat(char * __restrict, const char * __restrict, size_t); -int strncmp(const char *, const char *, size_t); +int strncmp(const char *, const char *, size_t) __pure; char *strncpy(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -char *strnstr(const char *, const char *, size_t); +char *strnstr(const char *, const char *, size_t) __pure; #endif -char *strpbrk(const char *, const char *); -char *strrchr(const char *, int); +char *strpbrk(const char *, const char *) __pure; +char *strrchr(const char *, int) __pure; #if __BSD_VISIBLE char *strsep(char **, const char *); char *strsignal(int); #endif -size_t strspn(const char *, const char *); -char *strstr(const char *, const char *); +size_t strspn(const char *, const char *) __pure; +char *strstr(const char *, const char *) __pure; char *strtok(char * __restrict, const char * __restrict); #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 char *strtok_r(char *, const char *, char **); ==== //depot/projects/gdb/include/strings.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/include/strings.h,v 1.5 2004/07/09 13:52:42 des Exp $ + * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $ */ #ifndef _STRINGS_H_ @@ -38,19 +38,19 @@ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 25 10:50:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43E3916A4D0; Sun, 25 Jul 2004 10:50:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FCA716A4CE for ; Sun, 25 Jul 2004 10:50:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16EB243D2D for ; Sun, 25 Jul 2004 10:50:51 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6PAoprU033905 for ; Sun, 25 Jul 2004 10:50:51 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6PAooJ0033902 for perforce@freebsd.org; Sun, 25 Jul 2004 10:50:50 GMT (envelope-from dfr@freebsd.org) Date: Sun, 25 Jul 2004 10:50:50 GMT Message-Id: <200407251050.i6PAooJ0033902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 58124 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, 25 Jul 2004 10:50:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=58124 Change 58124 by dfr@dfr_home on 2004/07/25 10:49:58 Add code to migrate values from the bootstrap TLS segment created by rtld to the main thread's TLS segment when the thread library initialises. While we are here, make sure we properly initialise the static TLS blocks for all modules, not just those in the initial exec group. Also fix a bug which mis-sized the static TLS block when there were non-TLS-using modules present in the initial exec group. Affected files ... .. //depot/projects/kse/lib/libpthread/arch/alpha/alpha/pthread_md.c#2 edit .. //depot/projects/kse/lib/libpthread/arch/alpha/include/pthread_md.h#3 edit .. //depot/projects/kse/lib/libpthread/arch/amd64/amd64/pthread_md.c#3 edit .. //depot/projects/kse/lib/libpthread/arch/amd64/include/pthread_md.h#4 edit .. //depot/projects/kse/lib/libpthread/arch/arm/arm/pthread_md.c#2 edit .. //depot/projects/kse/lib/libpthread/arch/arm/include/pthread_md.h#3 edit .. //depot/projects/kse/lib/libpthread/arch/i386/i386/pthread_md.c#3 edit .. //depot/projects/kse/lib/libpthread/arch/i386/include/pthread_md.h#4 edit .. //depot/projects/kse/lib/libpthread/arch/ia64/ia64/pthread_md.c#3 edit .. //depot/projects/kse/lib/libpthread/arch/ia64/include/pthread_md.h#4 edit .. //depot/projects/kse/lib/libpthread/arch/powerpc/include/pthread_md.h#2 edit .. //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 edit .. //depot/projects/kse/lib/libpthread/arch/sparc64/include/pthread_md.h#3 edit .. //depot/projects/kse/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 edit .. //depot/projects/kse/lib/libpthread/thread/thr_kern.c#4 edit .. //depot/projects/kse/lib/libthr/arch/i386/i386/_setcurthread.c#3 edit .. //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#8 edit .. //depot/projects/kse/libexec/rtld-elf/rtld.c#12 edit .. //depot/projects/kse/libexec/rtld-elf/rtld.h#7 edit .. //depot/projects/kse/libexec/rtld-elf/rtld_tls.h#2 edit Differences ... ==== //depot/projects/kse/lib/libpthread/arch/alpha/alpha/pthread_md.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * The constructors. */ struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; ==== //depot/projects/kse/lib/libpthread/arch/alpha/include/pthread_md.h#3 (text+ko) ==== @@ -80,7 +80,7 @@ /* * The kcb and tcb constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); struct kcb *_kcb_ctor(struct kse *kse); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/amd64/amd64/pthread_md.c#3 (text+ko) ==== @@ -35,11 +35,18 @@ * The constructors. */ struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; + void *oldtls; - tcb = _rtld_allocate_tls(sizeof(struct tcb), 16); + if (initial) { + __asm __volatile("movq %%fs:0, %0" : "=r" (oldtls)); + } else { + oldtls = NULL; + } + + tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); if (tcb) { tcb->tcb_thread = thread; bzero(&tcb->tcb_tmbx, sizeof(tcb->tcb_tmbx)); ==== //depot/projects/kse/lib/libpthread/arch/amd64/include/pthread_md.h#4 (text+ko) ==== @@ -140,7 +140,7 @@ /* * The constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *tcb); struct kcb *_kcb_ctor(struct kse *); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/arm/arm/pthread_md.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include "pthread_md.h" struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; void *addr; ==== //depot/projects/kse/lib/libpthread/arch/arm/include/pthread_md.h#3 (text+ko) ==== @@ -91,7 +91,7 @@ /* * The kcb and tcb constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); struct kcb *_kcb_ctor(struct kse *kse); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/i386/i386/pthread_md.c#3 (text+ko) ==== @@ -43,11 +43,18 @@ #include "pthread_md.h" struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; + void *oldtls; - tcb = _rtld_allocate_tls(sizeof(struct tcb), 16); + if (initial) { + __asm __volatile("movl %%gs:0, %0" : "=r" (oldtls)); + } else { + oldtls = NULL; + } + + tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); if (tcb) { tcb->tcb_thread = thread; tcb->tcb_spare = 0; ==== //depot/projects/kse/lib/libpthread/arch/i386/include/pthread_md.h#4 (text+ko) ==== @@ -139,7 +139,7 @@ /* * The constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *tcb); struct kcb *_kcb_ctor(struct kse *); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/ia64/ia64/pthread_md.c#3 (text+ko) ==== @@ -35,11 +35,12 @@ * The constructors. */ struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct ia64_tp *tp; - tp = _rtld_allocate_tls(sizeof(struct ia64_tp), 16); + tp = _rtld_allocate_tls(initial ? _tp : NULL, + sizeof(struct ia64_tp), 16); if (tp == NULL) return (NULL); ==== //depot/projects/kse/lib/libpthread/arch/ia64/include/pthread_md.h#4 (text+ko) ==== @@ -75,7 +75,7 @@ /* * The kcb and tcb constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); struct kcb *_kcb_ctor(struct kse *kse); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/powerpc/include/pthread_md.h#2 (text+ko) ==== @@ -92,7 +92,7 @@ /* * The kcb and tcb constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); struct kcb *_kcb_ctor(struct kse *kse); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * The constructors. */ struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; ==== //depot/projects/kse/lib/libpthread/arch/sparc64/include/pthread_md.h#3 (text+ko) ==== @@ -91,7 +91,7 @@ /* * The kcb and tcb constructors. */ -struct tcb *_tcb_ctor(struct pthread *); +struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); struct kcb *_kcb_ctor(struct kse *kse); void _kcb_dtor(struct kcb *); ==== //depot/projects/kse/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include "pthread_md.h" struct tcb * -_tcb_ctor(struct pthread *thread) +_tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; void *addr; ==== //depot/projects/kse/lib/libpthread/thread/thr_kern.c#4 (text+ko) ==== @@ -2384,7 +2384,7 @@ if ((thread == NULL) && ((thread = malloc(sizeof(struct pthread))) != NULL)) { bzero(thread, sizeof(struct pthread)); - if ((thread->tcb = _tcb_ctor(thread)) == NULL) { + if ((thread->tcb = _tcb_ctor(thread, curthread == NULL)) == NULL) { free(thread); thread = NULL; } else { ==== //depot/projects/kse/lib/libthr/arch/i386/i386/_setcurthread.c#3 (text+ko) ==== @@ -61,15 +61,22 @@ { union descriptor desc; struct tcb *tcb; + void *oldtls; int ldt_index; *err = 0; + if (uc == NULL) { + __asm __volatile("movl %%gs:0, %0" : "=r" (oldtls)); + } else { + oldtls = NULL; + } + /* * Allocate and initialise a new TLS block with enough extra * space for our self pointer. */ - tcb = _rtld_allocate_tls(sizeof(struct tcb), 16); + tcb = _rtld_allocate_tls(oldtls, sizeof(struct tcb), 16); /* * Cache the address of the thread structure here, after ==== //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#8 (text+ko) ==== @@ -349,14 +349,14 @@ } void * -allocate_tls(Objlist* list, size_t tcbsize, size_t tcbalign) +allocate_tls(Obj_Entry *objs, void *oldtls, size_t tcbsize, size_t tcbalign) { - Objlist_Entry *entry; Obj_Entry *obj; size_t size; char *tls; - Elf_Addr *dtv; - Elf_Addr segbase, addr; + Elf_Addr *dtv, *olddtv; + Elf_Addr segbase, oldsegbase, addr; + int i; size = round(tls_static_space, tcbalign); @@ -370,17 +370,45 @@ dtv[0] = tls_dtv_generation; dtv[1] = tls_max_index; - STAILQ_FOREACH(entry, list, link) { - obj = entry->obj; - if (obj->tlsoffset) { - addr = segbase - obj->tlsoffset; - memset((void*) (addr + obj->tlsinitsize), - 0, obj->tlssize - obj->tlsinitsize); - if (obj->tlsinit) - memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); - dtv[obj->tlsindex + 1] = addr; - } else if (obj->tlsindex) { - dtv[obj->tlsindex + 1] = 0; + + if (oldtls) { + /* + * Copy the static TLS block over whole. + */ + oldsegbase = (Elf_Addr) oldtls; + memcpy((void *)(segbase - tls_static_space), + (const void *)(oldsegbase - tls_static_space), + tls_static_space); + + /* + * If any dynamic TLS blocks have been created tls_get_addr(), + * move them over. + */ + olddtv = ((Elf_Addr**)oldsegbase)[1]; + for (i = 0; i < olddtv[1]; i++) { + if (olddtv[i+2] < oldsegbase - size || olddtv[i+2] > oldsegbase) { + dtv[i+2] = olddtv[i+2]; + olddtv[i+2] = 0; + } + } + + /* + * We assume that this block was the one we created below with + * allocate_initial_tls(). + */ + free_tls(oldtls, 2*sizeof(Elf_Addr), 4); + } else { + for (obj = objs; obj; obj = obj->next) { + if (obj->tlsoffset) { + addr = segbase - obj->tlsoffset; + memset((void*) (addr + obj->tlsinitsize), + 0, obj->tlssize - obj->tlsinitsize); + if (obj->tlsinit) + memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); + dtv[obj->tlsindex + 1] = addr; + } else if (obj->tlsindex) { + dtv[obj->tlsindex + 1] = 0; + } } } @@ -388,7 +416,7 @@ } void -free_tls(Objlist *list, void *tls, size_t tcbsize, size_t tcbalign) +free_tls(void *tls, size_t tcbsize, size_t tcbalign) { size_t size; Elf_Addr* dtv; @@ -415,7 +443,7 @@ } void -allocate_initial_tls(Objlist *list) +allocate_initial_tls(Obj_Entry *objs) { void* tls; union descriptor ldt; @@ -427,7 +455,7 @@ * use. */ tls_static_space = tls_last_offset + 64; - tls = allocate_tls(list, 2*sizeof(Elf_Addr), 4); + tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), 4); memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ==== //depot/projects/kse/libexec/rtld-elf/rtld.c#12 (text+ko) ==== @@ -419,7 +419,7 @@ */ allocate_tls_offset(entry->obj); } - allocate_initial_tls(&list_main); + allocate_initial_tls(obj_list); /* Make a list of init functions to call. */ objlist_init(&initlist); @@ -2538,6 +2538,14 @@ { size_t off; + if (obj->tls_done) + return true; + + if (obj->tlssize == 0) { + obj->tls_done = true; + return true; + } + if (obj->tlsindex == 1) off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign); else @@ -2563,13 +2571,13 @@ } void * -_rtld_allocate_tls(size_t tcbsize, size_t tcbalign) +_rtld_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign) { - return allocate_tls(&list_main, tcbsize, tcbalign); + return allocate_tls(obj_list, oldtls, tcbsize, tcbalign); } void _rtld_free_tls(void *tcb, size_t tcbsize, size_t tcbalign) { - free_tls(&list_main, tcb, tcbsize, tcbalign); + free_tls(tcb, tcbsize, tcbalign); } ==== //depot/projects/kse/libexec/rtld-elf/rtld.h#7 (text+ko) ==== @@ -242,8 +242,8 @@ int reloc_non_plt(Obj_Entry *, Obj_Entry *); int reloc_plt(Obj_Entry *); int reloc_jmpslots(Obj_Entry *); -void *allocate_tls(Objlist *, size_t, size_t); -void free_tls(Objlist *, void *, size_t, size_t); -void allocate_initial_tls(Objlist *); +void *allocate_tls(Obj_Entry *, void *, size_t, size_t); +void free_tls(void *, size_t, size_t); +void allocate_initial_tls(Obj_Entry *); #endif /* } */ ==== //depot/projects/kse/libexec/rtld-elf/rtld_tls.h#2 (text+ko) ==== @@ -42,14 +42,22 @@ * 'Variant I' TLS, the thread local storage follows the TCB, and for * 'Variant II', the thread local storage precedes it. For * architectures using the 'Variant II' model (e.g. i386, amd64, - * sparc64), the TCB begin with two pointer fields which are used by - * rtld for its TLS implementation. For the 'Variant I' model, the TCB - * must begin with a single pointer field for rtld's implementation. + * sparc64), the TCB must begin with two pointer fields which are used + * by rtld for its TLS implementation. For the 'Variant I' model, the + * TCB must begin with a single pointer field for rtld's + * implementation. + * + * If the value of 'oldtls' is non-NULL, the new TLS block will be + * initialised using the values contained in 'oldtls' and 'oldtls' + * will be freed. This is typically used when initialising a thread + * library to migrate from using the initial bootstrap TLS block + * created by rtld to one which contains suitable thread library + * private data. * * The value returned from this function is suitable for installing * directly into the thread pointer register. */ -extern void *_rtld_allocate_tls(size_t tcbsize, size_t tcbalign); +extern void *_rtld_allocate_tls(void* oldtls, size_t tcbsize, size_t tcbalign); /* * Free a TLS block allocated using _rtld_allocate_tls(). The tcbsize From owner-p4-projects@FreeBSD.ORG Sun Jul 25 11:03:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EB6D16A4D0; Sun, 25 Jul 2004 11:03:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F76C16A4CE for ; Sun, 25 Jul 2004 11:03:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10FBD43D2F for ; Sun, 25 Jul 2004 11:03:07 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6PB36vx034184 for ; Sun, 25 Jul 2004 11:03:06 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6PB36kA034181 for perforce@freebsd.org; Sun, 25 Jul 2004 11:03:06 GMT (envelope-from dfr@freebsd.org) Date: Sun, 25 Jul 2004 11:03:06 GMT Message-Id: <200407251103.i6PB36kA034181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 58126 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, 25 Jul 2004 11:03:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=58126 Change 58126 by dfr@dfr_home on 2004/07/25 11:02:54 Track the changed definition of _rtld_allocate_tls(). Affected files ... .. //depot/projects/kse/lib/libc/gen/tls.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc/gen/tls.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ #pragma weak _rtld_allocate_tls void * -_rtld_allocate_tls(size_t tcbsize, size_t tcbalign) +_rtld_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign) { return (0); } From owner-p4-projects@FreeBSD.ORG Sun Jul 25 19:30:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F92E16A4D0; Sun, 25 Jul 2004 19:30:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E882316A4CE for ; Sun, 25 Jul 2004 19:30:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD7E543D39 for ; Sun, 25 Jul 2004 19:30:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6PJUX22050862 for ; Sun, 25 Jul 2004 19:30:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6PJUXpg050857 for perforce@freebsd.org; Sun, 25 Jul 2004 19:30:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jul 2004 19:30:33 GMT Message-Id: <200407251930.i6PJUXpg050857@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 58164 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, 25 Jul 2004 19:30:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=58164 Change 58164 by rwatson@rwatson_tislabs on 2004/07/25 19:30:10 Integrate netperf_socket from FreeBSD CVS: More ACPI video, etc changes. Various GEOM, Vinum fixes. Affected files ... .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/netperf_socket/sys/geom/geom_slice.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#19 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#14 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.h#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $Id: acpi_vid.c,v 1.4 2003/10/13 10:07:36 taku Exp $ - * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.6 2004/07/22 05:18:05 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.7 2004/07/24 17:51:22 njl Exp $ */ #include @@ -214,7 +214,9 @@ sc = device_get_softc(dev); acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); - if (acpi_video_sysctl_tree == NULL && acpi_sc != NULL) { + if (acpi_sc == NULL) + return (ENXIO); + if (acpi_video_sysctl_tree == NULL) { acpi_video_sysctl_tree = SYSCTL_ADD_NODE(&acpi_video_sysctl_ctx, SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "video", CTLFLAG_RD, 0, @@ -275,7 +277,7 @@ void *context) { struct acpi_video_softc *sc; - struct acpi_video_output *vo; + struct acpi_video_output *vo, *vo_tmp; ACPI_HANDLE lasthand = NULL; UINT32 dcs, dss, dss_p = 0; @@ -303,7 +305,7 @@ STAILQ_FOREACH(vo, &sc->vid_outputs, vo_next) vo->handle = NULL; acpi_video_bind_outputs(sc); - STAILQ_FOREACH(vo, &sc->vid_outputs, vo_next) { + STAILQ_FOREACH_SAFE(vo, &sc->vid_outputs, vo_next, vo_tmp) { if (vo->handle == NULL) { STAILQ_REMOVE(&sc->vid_outputs, vo, acpi_video_output, vo_next); @@ -689,29 +691,28 @@ void (*callback)(ACPI_HANDLE, UINT32, void *); void *context; ACPI_OBJECT *dod_pkg; + int count; }; static ACPI_STATUS vid_enum_outputs_subr(ACPI_HANDLE handle, UINT32 level __unused, - void *context, void **retp) + void *context, void **retp __unused) { ACPI_STATUS status; - ACPI_OBJECT *tmp; - UINT32 adr; + UINT32 adr, val; struct enum_callback_arg *argset; size_t i; argset = context; status = acpi_GetInteger(handle, "_ADR", &adr); - if (ACPI_SUCCESS(status)) { - for (i = 0; i < argset->dod_pkg->Package.Count; i++) { - tmp = &argset->dod_pkg->Package.Elements[i]; - if (tmp != NULL && tmp->Type == ACPI_TYPE_INTEGER && - (tmp->Integer.Value & DOD_DEVID_MASK) == adr) { - argset->callback(handle, tmp->Integer.Value, - argset->context); - (**(int**)retp)++; - } + if (ACPI_FAILURE(status)) + return (AE_OK); + + for (i = 0; i < argset->dod_pkg->Package.Count; i++) { + if (acpi_PkgInt32(argset->dod_pkg, i, &val) == 0 && + (val & DOD_DEVID_MASK) == adr) { + argset->callback(handle, val, argset->context); + argset->count++; } } @@ -725,8 +726,6 @@ ACPI_STATUS status; ACPI_BUFFER dod_buf; ACPI_OBJECT *res; - int num = 0; - void *pnum; struct enum_callback_arg argset; dod_buf.Length = ACPI_ALLOCATE_BUFFER; @@ -736,34 +735,33 @@ if (status != AE_NOT_FOUND) printf("can't evaluate %s._DOD - %s\n", acpi_name(handle), AcpiFormatException(status)); - num = -1; + argset.count = -1; goto out; } res = (ACPI_OBJECT *)dod_buf.Pointer; - if (res == NULL || res->Type != ACPI_TYPE_PACKAGE) { + if (!ACPI_PKG_VALID(res, 1)) { printf("evaluation of %s._DOD makes no sense\n", acpi_name(handle)); - num = -1; + argset.count = -1; goto out; } if (callback == NULL) { - num = res->Package.Count; + argset.count = res->Package.Count; goto out; } argset.callback = callback; argset.context = context; argset.dod_pkg = res; - pnum = # + argset.count = 0; status = AcpiWalkNamespace(ACPI_TYPE_DEVICE, handle, 1, - vid_enum_outputs_subr, &argset, - &pnum); + vid_enum_outputs_subr, &argset, NULL); if (ACPI_FAILURE(status)) printf("failed walking down %s - %s\n", acpi_name(handle), AcpiFormatException(status)); out: if (dod_buf.Pointer != NULL) AcpiOsFree(dod_buf.Pointer); - return (num); + return (argset.count); } static int @@ -771,7 +769,7 @@ { ACPI_STATUS status; ACPI_BUFFER bcl_buf; - ACPI_OBJECT *res, *tmp; + ACPI_OBJECT *res; int num = 0, i, n, *levels; bcl_buf.Length = ACPI_ALLOCATE_BUFFER; @@ -785,8 +783,7 @@ goto out; } res = (ACPI_OBJECT *)bcl_buf.Pointer; - if (res == NULL || res->Type != ACPI_TYPE_PACKAGE || - res->Package.Count < 2) { + if (!ACPI_PKG_VALID(res, 2)) { printf("evaluation of %s._BCL makes no sense\n", acpi_name(handle)); num = -1; @@ -795,16 +792,14 @@ num = res->Package.Count; if (levelp == NULL) goto out; - levels = AcpiOsAllocate(num * sizeof *levels); + levels = AcpiOsAllocate(num * sizeof(*levels)); if (levels == NULL) { num = -1; goto out; } - for (i = 0, n = 0; i < num; i++) { - tmp = &res->Package.Elements[i]; - if (tmp != NULL && tmp->Type == ACPI_TYPE_INTEGER) - levels[n++] = tmp->Integer.Value; - } + for (i = 0, n = 0; i < num; i++) + if (acpi_PkgInt32(res, i, &levels[n]) == 0) + n++; if (n < 2) { num = -1; AcpiOsFree(levels); ==== //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.39 2004/07/23 17:01:47 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.40 2004/07/24 19:03:28 sos Exp $"); #include "opt_ata.h" #include @@ -110,8 +110,16 @@ /* device reset doesn't interrupt */ if (request->u.ata.command == ATA_ATAPI_RESET) { - DELAY(10); - request->status = ATA_IDX_INB(ch, ATA_STATUS); + int timeout = 1000000; + do { + DELAY(10); + request->status = ATA_IDX_INB(ch, ATA_STATUS); + } while (request->status & ATA_S_BUSY && timeout--); + if (timeout) + printf("ATAPI_RESET time = %dus\n", (1000000-timeout)*10); + else + printf("ATAPI_RESET timeout\n"); + if (request->status & ATA_S_ERROR) { request->error = ATA_IDX_INB(ch, ATA_ERROR); //request->result = EIO; ==== //depot/projects/netperf_socket/sys/geom/geom_slice.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.54 2004/07/04 13:44:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.55 2004/07/25 09:41:31 le Exp $"); #include #include @@ -76,6 +76,8 @@ g_slice_free(struct g_slicer *gsp) { + if (gsp == NULL) /* XXX: phk thinks about this */ + return; g_free(gsp->slices); if (gsp->hotspot != NULL) g_free(gsp->hotspot); ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.5 2004/07/05 13:24:22 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.7 2004/07/24 22:26:40 le Exp $"); #include #include @@ -540,6 +540,7 @@ gv_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp) { struct g_geom *gp2; + struct g_consumer *cp; struct gv_softc *sc; struct gv_drive *d, *d2; struct gv_plex *p, *p2; @@ -560,6 +561,9 @@ */ LIST_FOREACH(d, &sc->drives, drive) { gp2 = d->geom; + cp = LIST_FIRST(&gp2->consumer); + if (cp != NULL) + g_access(cp, -1, -1, -1); if (gv_is_open(gp2)) return (EBUSY); } @@ -618,7 +622,7 @@ static struct g_class g_vinum_class = { .name = VINUM_CLASS_NAME, .taste = gv_taste, - .destroy_geom = gv_destroy_geom, + /*.destroy_geom = gv_destroy_geom,*/ .ctlreq = gv_config, }; ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.5 2004/06/22 18:13:43 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.6 2004/07/24 22:26:40 le Exp $"); #include #include @@ -181,12 +181,14 @@ } } +#if 0 /* On first open, grab an extra "exclusive" bit */ if (cp->acr == 0 && cp->acw == 0 && cp->ace == 0) de++; /* ... and let go of it on last close */ if ((cp->acr + dr) == 0 && (cp->acw + dw) == 0 && (cp->ace + de) == 1) de--; +#endif error = g_access(cp, dr, dw, de); if (error) { printf("FOOO: g_access failed: %d\n", error); @@ -294,6 +296,12 @@ g_wither_geom(gp, error); } +static void +gv_drive_taste_orphan(struct g_consumer *cp) +{ + KASSERT(1 == 0, ("gv_drive_taste_orphan called: %s", cp->geom->name)); +} + static struct g_geom * gv_drive_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) { @@ -323,11 +331,7 @@ sc = gp2->softc; gp = g_new_geomf(mp, "%s.vinumdrive", pp->name); - gp->start = gv_drive_start; - gp->spoiled = gv_drive_orphan; - gp->orphan = gv_drive_orphan; - gp->access = gv_drive_access; - gp->start = gv_drive_start; + gp->orphan = gv_drive_taste_orphan; cp = g_new_consumer(gp); g_attach(cp, pp); @@ -357,6 +361,9 @@ */ g_topology_lock(); g_access(cp, -1, 0, 0); + g_detach(cp); + g_wither_geom(gp, ENXIO); + gp = NULL; d = gv_find_drive(sc, vhdr->label.name); @@ -387,6 +394,23 @@ LIST_INSERT_HEAD(&sc->drives, d, drive); } + gp = g_new_geomf(mp, "%s.vinumdrive", pp->name); + gp->start = gv_drive_start; + gp->orphan = gv_drive_orphan; + gp->access = gv_drive_access; + gp->start = gv_drive_start; + + cp = g_new_consumer(gp); + g_attach(cp, pp); + error = g_access(cp, 1, 1, 1); + if (error) { + g_free(vhdr); + g_detach(cp); + g_destroy_consumer(cp); + g_destroy_geom(gp); + return (NULL); + } + gp->softc = d; d->geom = gp; strncpy(d->device, pp->name, GV_MAXDRIVENAME); ==== //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_asus.c,v 1.6 2004/06/29 19:05:20 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_asus.c,v 1.7 2004/07/24 20:39:25 njl Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -291,9 +291,8 @@ sc->s_wled = led_create((led_t *)acpi_asus_wled, dev, "wled"); /* Attach brightness for GPLV/SPLV models */ - if (sc->model->brn_get && - ACPI_SUCCESS(acpi_GetInteger(sc->handle, - sc->model->brn_get, &sc->s_brn))) + if (sc->model->brn_get && ACPI_SUCCESS(acpi_GetInteger(sc->handle, + sc->model->brn_get, &sc->s_brn))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_brightness", CTLTYPE_INT | CTLFLAG_RW, sc, 0, @@ -301,29 +300,27 @@ /* Attach brightness for other models */ if (sc->model->brn_up && - ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, - sc->model->brn_up, NULL, NULL)) && - ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, - sc->model->brn_dn, NULL, NULL))) + ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->brn_up, + NULL, NULL)) && + ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->brn_dn, + NULL, NULL))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_brightness", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_brn, "I", "brightness of the lcd panel"); /* Attach display switching */ - if (sc->model->disp_get && - ACPI_SUCCESS(acpi_GetInteger(sc->handle, - sc->model->disp_get, &sc->s_disp))) + if (sc->model->disp_get && ACPI_SUCCESS(acpi_GetInteger(sc->handle, + sc->model->disp_get, &sc->s_disp))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "video_output", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_disp, "I", "display output state"); /* Attach LCD state, easy for most models... */ - if (sc->model->lcd_get && - strncmp(sc->model->name, "L3H", 3) != 0 && - ACPI_SUCCESS(acpi_GetInteger(sc->handle, - sc->model->lcd_get, &sc->s_lcd))) + if (sc->model->lcd_get && strncmp(sc->model->name, "L3H", 3) != 0 && + ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->lcd_get, + &sc->s_lcd))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, @@ -347,7 +344,7 @@ Buf.Pointer = &Obj; if (ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, - sc->model->lcd_get, &Args, &Buf)) && + sc->model->lcd_get, &Args, &Buf)) && Obj.Type == ACPI_TYPE_INTEGER) { sc->s_lcd = Obj.Integer.Value >> 8; @@ -363,8 +360,8 @@ AcpiEvaluateObject(sc->handle, "BSTS", NULL, NULL); /* Handle notifies */ - AcpiInstallNotifyHandler(sc->handle, - ACPI_SYSTEM_NOTIFY, acpi_asus_notify, dev); + AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, + acpi_asus_notify, dev); return (0); } @@ -389,8 +386,8 @@ led_destroy(sc->s_wled); /* Remove notify handler */ - AcpiRemoveNotifyHandler(sc->handle, - ACPI_SYSTEM_NOTIFY, acpi_asus_notify); + AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, + acpi_asus_notify); /* Free sysctl tree */ sysctl_ctx_free(&sc->sysctl_ctx); @@ -474,10 +471,10 @@ brn = sc->s_brn; err = sysctl_handle_int(oidp, &brn, 0, req); - if ((err != 0) || (req->newptr == NULL)) + if (err != 0 || req->newptr == NULL) return (err); - if ((brn < 0) || (brn > 15)) + if (brn < 0 || brn > 15) return (EINVAL); /* Keep track and update */ @@ -490,13 +487,12 @@ Args.Pointer = &Arg; if (sc->model->brn_set) - AcpiEvaluateObject(sc->handle, - sc->model->brn_set, &Args, NULL); + AcpiEvaluateObject(sc->handle, sc->model->brn_set, &Args, NULL); else { brn -= sc->s_brn; while (brn != 0) { - AcpiEvaluateObject(sc->handle,(brn > 0) ? + AcpiEvaluateObject(sc->handle, (brn > 0) ? sc->model->brn_up : sc->model->brn_dn, NULL, NULL); @@ -521,10 +517,10 @@ lcd = sc->s_lcd; err = sysctl_handle_int(oidp, &lcd, 0, req); - if ((err != 0) || (req->newptr == NULL)) + if (err != 0 || req->newptr == NULL) return (err); - if ((lcd < 0) || (lcd > 1)) + if (lcd < 0 || lcd > 1) return (EINVAL); /* Keep track and update */ @@ -532,8 +528,7 @@ /* Most models just need a lcd_set evaluated, the L3H is trickier */ if (strncmp(sc->model->name, "L3H", 3) != 0) - AcpiEvaluateObject(sc->handle, - sc->model->lcd_set, NULL, NULL); + AcpiEvaluateObject(sc->handle, sc->model->lcd_set, NULL, NULL); else { ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; @@ -544,8 +539,7 @@ Args.Count = 1; Args.Pointer = &Arg; - AcpiEvaluateObject(sc->handle, - sc->model->lcd_set, &Args, NULL); + AcpiEvaluateObject(sc->handle, sc->model->lcd_set, &Args, NULL); } return (0); @@ -567,10 +561,10 @@ disp = sc->s_disp; err = sysctl_handle_int(oidp, &disp, 0, req); - if ((err != 0) || (req->newptr == NULL)) + if (err != 0 || req->newptr == NULL) return (err); - if ((disp < 0) || (disp > 7)) + if (disp < 0 || disp > 7) return (EINVAL); /* Keep track and update */ @@ -582,8 +576,7 @@ Args.Count = 1; Args.Pointer = &Arg; - AcpiEvaluateObject(sc->handle, - sc->model->disp_set, &Args, NULL); + AcpiEvaluateObject(sc->handle, sc->model->disp_set, &Args, NULL); return (0); } @@ -600,10 +593,10 @@ acpi_sc = acpi_device_get_parent_softc(sc->dev); if ((notify & ~0x10) <= 15) { - sc->s_brn = (notify & ~0x10); + sc->s_brn = notify & ~0x10; ACPI_VPRINT(sc->dev, acpi_sc, "Brightness increased\n"); } else if ((notify & ~0x20) <= 15) { - sc->s_brn = (notify & ~0x20); + sc->s_brn = notify & ~0x20; ACPI_VPRINT(sc->dev, acpi_sc, "Brightness decreased\n"); } else if (notify == 0x33) { sc->s_lcd = 1; ==== //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.24 2004/06/30 04:42:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.25 2004/07/24 22:41:30 njl Exp $"); #include #include @@ -41,8 +41,6 @@ #include #include -static device_t acpi_dev; - /* * APM driver emulation */ @@ -58,7 +56,7 @@ TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); static int intr_model = ACPI_INTR_PIC; -static struct apm_softc apm_softc; +static int apm_active; static d_open_t apmopen; static d_close_t apmclose; @@ -138,7 +136,7 @@ aip->ai_infoversion = 1; aip->ai_major = 1; aip->ai_minor = 2; - aip->ai_status = apm_softc.active; + aip->ai_status = apm_active; aip->ai_capabilities= 0xff00; /* unknown */ if (acpi_acad_get_acline(&acline)) @@ -213,13 +211,13 @@ struct apm_info info; apm_info_old_t aiop; - acpi_sc = device_get_softc(acpi_dev); + acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); switch (cmd) { case APMIO_SUSPEND: if ((flag & FWRITE) == 0) return (EPERM); - if (apm_softc.active) + if (apm_active) acpi_SetSleepState(acpi_sc, acpi_sc->acpi_suspend_sx); else error = EINVAL; @@ -227,7 +225,7 @@ case APMIO_STANDBY: if ((flag & FWRITE) == 0) return (EPERM); - if (apm_softc.active) + if (apm_active) acpi_SetSleepState(acpi_sc, acpi_sc->acpi_standby_sx); else error = EINVAL; @@ -254,12 +252,12 @@ case APMIO_ENABLE: if ((flag & FWRITE) == 0) return (EPERM); - apm_softc.active = 1; + apm_active = 1; break; case APMIO_DISABLE: if ((flag & FWRITE) == 0) return (EPERM); - apm_softc.active = 0; + apm_active = 0; break; case APMIO_HALTCPU: break; @@ -305,9 +303,7 @@ { struct acpi_softc *sc; - acpi_dev = dev; - sc = device_get_softc(acpi_dev); - + sc = devclass_get_softc(devclass_find("acpi"), 0); acpi_capm_init(sc); acpi_install_wakeup_handler(sc); ==== //depot/projects/netperf_socket/sys/i386/acpica/acpi_panasonic.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_panasonic.c,v 1.1 2004/07/21 14:47:53 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_panasonic.c,v 1.2 2004/07/24 20:40:02 njl Exp $"); #include "opt_acpi.h" #include @@ -47,8 +47,8 @@ #define HKEY_GET 1 /* Functions */ -#define HKEY_REG_LCD_BRIGHTNESS 0x04 -#define HKEY_REG_SOUND_MUTE 0x08 +#define HKEY_REG_LCD_BRIGHTNESS 0x04 +#define HKEY_REG_SOUND_MUTE 0x08 /* Field definitions */ #define HKEY_LCD_BRIGHTNESS_BITS 4 @@ -69,18 +69,20 @@ static int acpi_panasonic_attach(device_t dev); static int acpi_panasonic_detach(device_t dev); static int acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS); -static ACPI_INTEGER acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index); +static ACPI_INTEGER acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index); static void acpi_panasonic_sset(ACPI_HANDLE h, ACPI_INTEGER index, - ACPI_INTEGER val); + ACPI_INTEGER val); +static int acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc, + ACPI_HANDLE h, UINT32 *arg); +static void acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, + ACPI_HANDLE h, UINT32 key); +static void acpi_panasonic_notify(ACPI_HANDLE h, UINT32 notify, + void *context); + static hkey_fn_t hkey_lcd_brightness_max; static hkey_fn_t hkey_lcd_brightness; static hkey_fn_t hkey_sound_mute; -static int acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc, - ACPI_HANDLE h, UINT32 *arg); -static void acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, - ACPI_HANDLE h, UINT32 key); -static void acpi_panasonic_notify(ACPI_HANDLE h, UINT32 notify, - void *context); +static int lcd_brightness_max = 255; /* Table of sysctl names and HKEY functions to call. */ static struct { @@ -111,11 +113,9 @@ static devclass_t acpi_panasonic_devclass; DRIVER_MODULE(acpi_panasonic, acpi, acpi_panasonic_driver, - acpi_panasonic_devclass, 0, 0); + acpi_panasonic_devclass, 0, 0); MODULE_DEPEND(acpi_panasonic, acpi, 1, 1, 1); -static int lcd_brightness_max = 255; - static int acpi_panasonic_probe(device_t dev) { @@ -151,10 +151,10 @@ "panasonic", CTLFLAG_RD, 0, ""); for (i = 0; sysctl_table[i].name != NULL; i++) { SYSCTL_ADD_PROC(&sc->sysctl_ctx, - SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, - sysctl_table[i].name, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY, - sc, i, acpi_panasonic_sysctl, "I", ""); + SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, + sysctl_table[i].name, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY, + sc, i, acpi_panasonic_sysctl, "I", ""); } #if 0 @@ -169,10 +169,10 @@ /* Handle notifies */ status = AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, - acpi_panasonic_notify, sc); + acpi_panasonic_notify, sc); if (ACPI_FAILURE(status)) { device_printf(dev, "couldn't install notify handler - %s\n", - AcpiFormatException(status)); + AcpiFormatException(status)); sysctl_ctx_free(&sc->sysctl_ctx); return (ENXIO); } @@ -189,7 +189,7 @@ /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, - acpi_panasonic_notify); + acpi_panasonic_notify); /* Free sysctl tree */ sysctl_ctx_free(&sc->sysctl_ctx); @@ -315,7 +315,7 @@ static int acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc, ACPI_HANDLE h, - UINT32 *arg) + UINT32 *arg) { ACPI_BUFFER buf; ACPI_OBJECT *res; @@ -351,7 +351,7 @@ static void acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, ACPI_HANDLE h, - UINT32 key) + UINT32 key) { int arg; @@ -404,7 +404,7 @@ } break; default: - device_printf(sc->dev, "unknown Notify: 0x%x\n", notify); + device_printf(sc->dev, "unknown notify: %#x\n", notify); break; } } ==== //depot/projects/netperf_socket/sys/ia64/ia64/sal.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/sal.c,v 1.12 2003/02/01 22:50:09 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/sal.c,v 1.13 2004/07/25 07:07:09 marcel Exp $ */ #include @@ -112,6 +112,7 @@ struct sal_ap_wakeup_descriptor *dp; #ifdef SMP struct ia64_sal_result result; + struct ia64_fdesc *fd; #endif dp = (struct sal_ap_wakeup_descriptor*)p; @@ -153,11 +154,10 @@ setup_ipi_vectors(dp->sale_vector & 0xf0); #ifdef SMP + fd = (struct ia64_fdesc *) os_boot_rendez; result = ia64_sal_entry(SAL_SET_VECTORS, - SAL_OS_BOOT_RENDEZ, - ia64_tpa(FDESC_FUNC(os_boot_rendez)), - ia64_tpa(FDESC_GP(os_boot_rendez)), - 0, 0, 0, 0); + SAL_OS_BOOT_RENDEZ, ia64_tpa(fd->func), + ia64_tpa(fd->gp), 0, 0, 0, 0); #endif break; ==== //depot/projects/netperf_socket/sys/kern/vfs_bio.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.442 2004/07/18 04:57:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.443 2004/07/25 08:09:21 phk Exp $"); #include #include @@ -2571,8 +2571,9 @@ bsize = size; if (vp->v_bsize != bsize) { +#if 0 printf("WARNING: Wrong block size on vnode: %d should be %d\n", vp->v_bsize, bsize); - vprint("Please email phk@FreeBSD.org this info\n", vp); +#endif vp->v_bsize = bsize; } ==== //depot/projects/netperf_socket/sys/sys/proc.h#19 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.387 2004/07/16 21:04:55 jhb Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.389 2004/07/25 00:47:11 rwatson Exp $ */ #ifndef _SYS_PROC_H_ @@ -161,7 +161,7 @@ /* * Here we define the four structures used for process information. * - * The first is the thread. It might be though of as a "Kernel + * The first is the thread. It might be thought of as a "Kernel * Schedulable Entity Context". * This structure contains all the information as to where a thread of * execution is now, or was when it was suspended, why it was suspended, @@ -216,7 +216,7 @@ * A process is the owner of all system resources allocated to a task * except CPU quanta. * All KSEGs under one process see, and have the same access to, these - * resources (e.g. files, memory, sockets, permissions kqueues). + * resources (e.g. files, memory, sockets, credential, kqueues). * A process may compete for CPU cycles on the same basis as a * forked process cluster by spawning several KSEGRPs. */ ==== //depot/projects/netperf_socket/sys/vm/vm_map.c#14 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.345 2004/07/24 07:40:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.346 2004/07/25 07:48:47 alc Exp $"); #include #include @@ -806,7 +806,7 @@ (prev_entry->wired_count == 0) && ((prev_entry->object.vm_object == NULL) || vm_object_coalesce(prev_entry->object.vm_object, - OFF_TO_IDX(prev_entry->offset), + prev_entry->offset, (vm_size_t)(prev_entry->end - prev_entry->start), (vm_size_t)(end - prev_entry->end)))) { /* @@ -2781,7 +2781,7 @@ /* Grow the underlying object if applicable. */ if (stack_entry->object.vm_object == NULL || vm_object_coalesce(stack_entry->object.vm_object, - OFF_TO_IDX(stack_entry->offset), + stack_entry->offset, (vm_size_t)(stack_entry->end - stack_entry->start), (vm_size_t)grow_amount)) { map->size += (addr - stack_entry->end); ==== //depot/projects/netperf_socket/sys/vm/vm_object.c#8 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.326 2004/07/22 19:44:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.327 2004/07/25 07:48:47 alc Exp $"); #include #include @@ -1824,17 +1824,14 @@ * Parameters: * prev_object First object to coalesce * prev_offset Offset into prev_object - * next_object Second object into coalesce - * next_offset Offset into next_object - * * prev_size Size of reference to prev_object - * next_size Size of reference to next_object + * next_size Size of reference to the second object * * Conditions: * The object must *not* be locked. */ boolean_t -vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, +vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, vm_size_t prev_size, vm_size_t next_size) { vm_pindex_t next_pindex; @@ -1865,7 +1862,7 @@ prev_size >>= PAGE_SHIFT; next_size >>= PAGE_SHIFT; - next_pindex = prev_pindex + prev_size; + next_pindex = OFF_TO_IDX(prev_offset) + prev_size; if ((prev_object->ref_count > 1) && (prev_object->size != next_pindex)) { ==== //depot/projects/netperf_socket/sys/vm/vm_object.h#4 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.h,v 1.105 2004/07/22 19:44:49 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.h,v 1.106 2004/07/25 07:48:47 alc Exp $ */ /* @@ -200,7 +200,7 @@ vm_object_t vm_object_allocate (objtype_t, vm_pindex_t); vm_object_t vm_object_allocate_wait (objtype_t, vm_pindex_t, int); void _vm_object_allocate (objtype_t, vm_pindex_t, vm_object_t); -boolean_t vm_object_coalesce (vm_object_t, vm_pindex_t, vm_size_t, vm_size_t); +boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t); void vm_object_collapse (vm_object_t); void vm_object_deallocate (vm_object_t); void vm_object_terminate (vm_object_t); From owner-p4-projects@FreeBSD.ORG Mon Jul 26 02:11:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACAF316A4D0; Mon, 26 Jul 2004 02:11:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F0DB16A4CE for ; Mon, 26 Jul 2004 02:11:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5889B43D46 for ; Mon, 26 Jul 2004 02:11:43 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6Q2Bhbc063059 for ; Mon, 26 Jul 2004 02:11:43 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6Q2Bh47063056 for perforce@freebsd.org; Mon, 26 Jul 2004 02:11:43 GMT (envelope-from wsalamon@computer.org) Date: Mon, 26 Jul 2004 02:11:43 GMT Message-Id: <200407260211.i6Q2Bh47063056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 58196 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, 26 Jul 2004 02:11:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=58196 Change 58196 by wsalamon@wsalamon_epi on 2004/07/26 02:10:54 Hook auditing into the kernel initialization. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/sys/kernel.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#5 (text+ko) ==== @@ -617,6 +617,8 @@ panic("audit_init: kthread_create returned %d", error); } +SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, NULL) + static void audit_rotate_vnode(struct ucred *cred, struct vnode *vp) { ==== //depot/projects/trustedbsd/audit3/sys/sys/kernel.h#2 (text+ko) ==== @@ -127,6 +127,7 @@ SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ SI_SUB_KTRACE = 0x2480000, /* ktrace */ + SI_SUB_AUDIT = 0x24C0000, /* audit */ SI_SUB_CREATE_INIT = 0x2500000, /* create init process*/ SI_SUB_SCHED_IDLE = 0x2600000, /* required idle procs */ SI_SUB_MBUF = 0x2700000, /* mbuf subsystem */ From owner-p4-projects@FreeBSD.ORG Tue Jul 27 10:08:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9AB316A4D0; Tue, 27 Jul 2004 10:08:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9476C16A4CE for ; Tue, 27 Jul 2004 10:08:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CA8043D2F for ; Tue, 27 Jul 2004 10:08:13 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6RA8DUt030090 for ; Tue, 27 Jul 2004 10:08:13 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6RA8Duc030087 for perforce@freebsd.org; Tue, 27 Jul 2004 10:08:13 GMT (envelope-from des@freebsd.org) Date: Tue, 27 Jul 2004 10:08:13 GMT Message-Id: <200407271008.i6RA8Duc030087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 58290 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, 27 Jul 2004 10:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=58290 Change 58290 by des@des.at.des.thinksec.com on 2004/07/27 10:07:13 Remove an unnecessary cast, obviating the need for which apparently isn't present on some platforms (e.g. Solaris 8) Affected files ... .. //depot/projects/openpam/lib/pam_get_data.c#14 edit Differences ... ==== //depot/projects/openpam/lib/pam_get_data.c#14 (text+ko) ==== @@ -31,10 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_data.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#14 $ */ -#include #include #include @@ -60,7 +59,7 @@ RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) { if (strcmp(dp->name, module_data_name) == 0) { - *data = (void *)(intptr_t)dp->data; + *data = (void *)dp->data; RETURNC(PAM_SUCCESS); } } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 00:21:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65D9F16A4DC; Wed, 28 Jul 2004 00:21:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3817E16A4D5 for ; Wed, 28 Jul 2004 00:21:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1585743D39 for ; Wed, 28 Jul 2004 00:21:56 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6S0Lkh3066257 for ; Wed, 28 Jul 2004 00:21:46 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6S0LkdJ066254 for perforce@freebsd.org; Wed, 28 Jul 2004 00:21:46 GMT (envelope-from wsalamon@computer.org) Date: Wed, 28 Jul 2004 00:21:46 GMT Message-Id: <200407280021.i6S0LkdJ066254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 58336 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, 28 Jul 2004 00:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=58336 Change 58336 by wsalamon@wsalamon_epi on 2004/07/28 00:21:45 Add calls to allocate, clone, and free the audit structure for the proc. Clean up audit_kernel.h, removing Darwin-specific remnants, and updating the AUDIT_SYSCALL_EXIT macro. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#3 edit .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#3 (text+ko) ==== @@ -343,30 +343,13 @@ * auditing is enabled, or we have a audit record on the thread. It is * possible that an audit record was begun before auditing was turned off. */ -#define AUDIT_SYSCALL_EXIT(error, proc, uthread) do { \ - if (audit_enabled | (uthread->uu_ar != NULL)) { \ - audit_syscall_exit(error, proc, uthread); \ +#define AUDIT_SYSCALL_EXIT(error, td) do { \ + if (audit_enabled | (td->td_ar != NULL)) { \ + audit_syscall_exit(error, td); \ } \ } while (0) /* - * Wrap the audit_mach_syscall_enter() and audit_mach_syscall_exit() - * functions in a manner similar to other system call enter/exit functions. - */ -#define AUDIT_MACH_SYSCALL_ENTER(args...) do { \ - if (audit_enabled) { \ - audit_mach_syscall_enter(args); \ - } \ - } while (0) - -#define AUDIT_MACH_SYSCALL_EXIT(retval) do { \ - struct uthread *uthread = get_bsdthread_info(current_act()); \ - if (audit_enabled | (uthread->uu_ar != NULL)) { \ - audit_mach_syscall_exit(retval, uthread); \ - } \ - } while (0) - -/* * A Macro to wrap the audit_sysclose() function. */ #define AUDIT_SYSCLOSE(args...) do { \ @@ -378,13 +361,7 @@ #define AUDIT_SYSCALL_ENTER(args...) do { \ } while (0) -#define AUDIT_SYSCALL_EXIT(error, proc, uthread) do { \ - } while (0) - -#define AUDIT_MACH_SYSCALL_ENTER(args...) do { \ - } while (0) - -#define AUDIT_MACH_SYSCALL_EXIT(retval) do { \ +#define AUDIT_SYSCALL_EXIT(error, td) do { \ } while (0) #define AUDIT_SYSCLOSE(op, args...) do { \ ==== //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#2 (text+ko) ==== @@ -76,6 +76,8 @@ #include +#include + #include #include #include @@ -407,6 +409,10 @@ p->p_ucred->cr_uidinfo = uifind(0); p->p_ucred->cr_ruidinfo = uifind(0); p->p_ucred->cr_prison = NULL; /* Don't jail it. */ +#ifdef AUDIT + audit_proc_alloc(p); + audit_proc_kproc0(p); +#endif #ifdef MAC mac_create_proc0(p->p_ucred); #endif @@ -705,6 +711,9 @@ #ifdef MAC mac_create_proc1(newcred); #endif +#ifdef AUDIT + audit_proc_init(initproc); +#endif initproc->p_ucred = newcred; PROC_UNLOCK(initproc); crfree(oldcred); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#2 (text+ko) ==== @@ -69,6 +69,8 @@ #include #endif +#include + #include #include #include @@ -178,6 +180,10 @@ p->p_flag |= P_WEXIT; PROC_UNLOCK(p); +#ifdef AUDIT + AUDIT_SYSCALL_EXIT(0, td); +#endif + /* Are we a task leader? */ if (p == p->p_leader) { mtx_lock(&ppeers_lock); @@ -702,6 +708,9 @@ #ifdef MAC mac_destroy_proc(p); #endif +#ifdef AUDIT + audit_proc_free(p); +#endif KASSERT(FIRST_THREAD_IN_PROC(p), ("kern_wait: no residual thread!")); uma_zfree(proc_zone, p); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#2 (text+ko) ==== @@ -65,6 +65,8 @@ #include #include +#include + #include #include #include @@ -287,6 +289,9 @@ #ifdef MAC mac_init_proc(newproc); #endif +#ifdef AUDIT + audit_proc_alloc(newproc); +#endif /* We have to lock the process tree while we look for a pid. */ sx_slock(&proctree_lock); @@ -520,7 +525,9 @@ mtx_unlock_spin(&sched_lock); p2->p_ucred = crhold(td->td_ucred); td2->td_ucred = crhold(p2->p_ucred); /* XXXKSE */ - +#ifdef AUDIT + audit_proc_fork(p1, p2); +#endif pargs_hold(p2->p_args); if (flags & RFSIGSHARE) { @@ -758,6 +765,9 @@ #ifdef MAC mac_destroy_proc(newproc); #endif +#ifdef AUDIT + audit_proc_free(newproc); +#endif uma_zfree(proc_zone, newproc); if (p1->p_flag & P_SA) { PROC_LOCK(p1); From owner-p4-projects@FreeBSD.ORG Wed Jul 28 13:58:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84B5D16A4D0; Wed, 28 Jul 2004 13:58:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60A7316A4CE for ; Wed, 28 Jul 2004 13:58:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 597E543D46 for ; Wed, 28 Jul 2004 13:58:25 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6SDwPqJ096970 for ; Wed, 28 Jul 2004 13:58:25 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6SDwPFH096967 for perforce@freebsd.org; Wed, 28 Jul 2004 13:58:25 GMT (envelope-from des@freebsd.org) Date: Wed, 28 Jul 2004 13:58:25 GMT Message-Id: <200407281358.i6SDwPFH096967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 58378 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, 28 Jul 2004 13:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=58378 Change 58378 by des@des.at.des.thinksec.com on 2004/07/28 13:57:54 Don't build su(1) and pam_unix(8) by default; they're just examples. Affected files ... .. //depot/projects/openpam/configure.in#4 edit Differences ... ==== //depot/projects/openpam/configure.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $P4: //depot/projects/openpam/configure.in#3 $ +dnl $P4: //depot/projects/openpam/configure.in#4 $ AC_PREREQ(2.53) AC_INIT([OpenPAM],[YYYYMMDD],[des@freebsd.org]) @@ -50,7 +50,7 @@ AC_HELP_STRING([--with-pam-su], [compile example version of /bin/su]), , - [with_pam_su=yes]) + [with_pam_su=no]) AC_MSG_RESULT($with_pam_su) AC_MSG_CHECKING([whether to build example version of pam_unix.so]) @@ -58,7 +58,7 @@ AC_HELP_STRING([--with-pam-unix], [compile example version of pam_unix.so]), , - [with_pam_unix=yes]) + [with_pam_unix=no]) AC_MSG_RESULT($with_pam_unix) AM_CONDITIONAL(WITH_PAM_SU, test "x$with_pam_su" = "xyes") From owner-p4-projects@FreeBSD.ORG Wed Jul 28 18:26:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 527D916A4D0; Wed, 28 Jul 2004 18:26:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EE6716A4CE for ; Wed, 28 Jul 2004 18:26:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E22CA43D1F for ; Wed, 28 Jul 2004 18:26:30 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6SIQUCq006240 for ; Wed, 28 Jul 2004 18:26:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6SIQTOE006235 for perforce@freebsd.org; Wed, 28 Jul 2004 18:26:29 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jul 2004 18:26:29 GMT Message-Id: <200407281826.i6SIQTOE006235@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 58387 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, 28 Jul 2004 18:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=58387 Change 58387 by jhb@jhb_slimer on 2004/07/28 18:25:59 IFC @58385. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#30 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#60 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/alpha/include/critical.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#27 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#28 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/float.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#3 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/smpng/sys/arm/include/critical.h#2 integrate .. //depot/projects/smpng/sys/arm/include/float.h#2 integrate .. //depot/projects/smpng/sys/arm/include/pcb.h#3 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#3 integrate .. //depot/projects/smpng/sys/arm/include/profile.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#6 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#6 integrate .. //depot/projects/smpng/sys/boot/efi/loader/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#22 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#52 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#48 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#18 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#17 integrate .. //depot/projects/smpng/sys/conf/NOTES#75 integrate .. //depot/projects/smpng/sys/conf/files.i386#65 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#37 integrate .. //depot/projects/smpng/sys/conf/options#82 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#19 integrate .. //depot/projects/smpng/sys/ddb/db_main.c#2 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#11 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#41 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#69 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#38 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#16 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#44 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#34 integrate .. //depot/projects/smpng/sys/dev/ciss/cissio.h#3 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#9 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#7 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#35 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#33 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#30 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#15 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#23 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#34 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#45 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#12 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#26 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#9 integrate .. //depot/projects/smpng/sys/dev/si/si.c#16 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#48 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#21 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#41 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#57 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#17 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#33 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#17 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#6 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#29 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#18 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_panasonic.c#1 branch .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#27 integrate .. //depot/projects/smpng/sys/i386/acpica/genwakecode.sh#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#52 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#85 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#77 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#65 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#53 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#8 integrate .. //depot/projects/smpng/sys/i386/include/float.h#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#59 integrate .. //depot/projects/smpng/sys/ia64/ia64/sal.c#10 integrate .. //depot/projects/smpng/sys/ia64/include/critical.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/isa/psm.c#26 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#9 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#14 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#31 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#118 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#45 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#39 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#19 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#30 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#16 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#54 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#57 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#47 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#15 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#77 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#77 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#47 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#7 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#22 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_panasonic/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#37 integrate .. //depot/projects/smpng/sys/net/if.c#50 integrate .. //depot/projects/smpng/sys/net/if.h#19 integrate .. //depot/projects/smpng/sys/net/if_clone.c#2 integrate .. //depot/projects/smpng/sys/net/if_ef.c#17 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#52 integrate .. //depot/projects/smpng/sys/net/if_loop.c#32 integrate .. //depot/projects/smpng/sys/net/if_var.h#28 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#30 integrate .. //depot/projects/smpng/sys/net/netisr.c#7 integrate .. //depot/projects/smpng/sys/net/route.c#22 integrate .. //depot/projects/smpng/sys/net/route.h#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#11 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#8 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#7 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#9 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#47 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#35 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#30 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#41 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#51 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#32 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#31 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#29 integrate .. //depot/projects/smpng/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#12 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#39 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#20 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#22 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#13 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#45 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#9 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#68 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#36 integrate .. //depot/projects/smpng/sys/pc98/pc98/fdc_cbus.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/fdcvar.h#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#46 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC.hints#1 branch .. //depot/projects/smpng/sys/powerpc/include/critical.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/db_machdep.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/float.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/ucontext.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#52 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#43 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.S#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#37 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#29 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#23 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#28 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#42 integrate .. //depot/projects/smpng/sys/sparc64/include/critical.h#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#50 integrate .. //depot/projects/smpng/sys/sys/_task.h#2 integrate .. //depot/projects/smpng/sys/sys/buf.h#28 integrate .. //depot/projects/smpng/sys/sys/bus.h#16 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#25 integrate .. //depot/projects/smpng/sys/sys/kdb.h#2 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#6 integrate .. //depot/projects/smpng/sys/sys/malloc.h#19 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#40 integrate .. //depot/projects/smpng/sys/sys/mount.h#31 integrate .. //depot/projects/smpng/sys/sys/param.h#66 integrate .. //depot/projects/smpng/sys/sys/pipe.h#9 integrate .. //depot/projects/smpng/sys/sys/proc.h#121 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#21 integrate .. //depot/projects/smpng/sys/sys/sched.h#12 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#30 integrate .. //depot/projects/smpng/sys/sys/systm.h#53 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#28 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#17 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#38 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#34 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#56 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#30 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#17 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#26 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#36 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#47 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#46 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#46 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#64 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#30 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#55 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#54 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#49 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.19 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.20 2004/07/21 05:07:08 marcel Exp $"); #include #include @@ -324,20 +324,6 @@ } void -db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, - char *modif) -{ - struct thread *td; - - td = (have_addr) ? kdb_thr_lookup(addr) : kdb_thread; - if (td == NULL) { - db_printf("Thread %d not found\n", (int)addr); - return; - } - db_trace_thread(td, count); -} - -void db_trace_self(void) { register_t pc, sp; ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#30 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.80 2004/07/10 22:35:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.82 2004/07/20 06:32:32 alc Exp $"); #include #include @@ -435,6 +435,8 @@ if ((ih->ih_flags & IH_FAST) != 0) { critical_enter(); ih->ih_handler(ih->ih_argument); + /* XXX */ + curthread->td_pflags &= ~TDP_OWEPREEMPT; critical_exit(); return; } ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#60 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.158 2004/07/15 18:00:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.163 2004/07/21 03:38:46 alc Exp $"); #include #include @@ -335,7 +335,6 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static int pmap_release_free_page(pmap_t pmap, vm_page_t p); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP @@ -551,8 +550,6 @@ cputype = hwrpb->rpb_type; return (cputype == ST_DEC_21000 || ST_DEC_4100); - - return 0; } /* @@ -753,8 +750,8 @@ return (pa); PMAP_LOCK(pmap); pte = pmap_lev3pte(pmap, va); - if (pte != NULL) - pa = alpha_ptob(ALPHA_PTE_TO_PFN(*pte)); + if (pte != NULL && pmap_pte_v(pte)) + pa = pmap_pte_pa(pte); PMAP_UNLOCK(pmap); return (pa); } @@ -769,18 +766,22 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pt_entry_t *pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pte = pmap_lev3pte(pmap, va); + if (pte != NULL && pmap_pte_v(pte) && + (*pte & pte_prot(pmap, prot)) == pte_prot(pmap, prot)) { + m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); vm_page_hold(m); - vm_page_unlock_queues(); } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } @@ -1022,25 +1023,16 @@ PMAP_LOCK_INIT(pmap); /* - * allocate object for the ptes - */ - if (pmap->pm_pteobj == NULL) - pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUSERLEV3MAPS + NUSERLEV2MAPS + 1); - - /* * allocate the page directory page */ - VM_OBJECT_LOCK(pmap->pm_pteobj); - lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + while ((lev1pg = vm_page_alloc(NULL, NUSERLEV3MAPS + NUSERLEV2MAPS, VM_ALLOC_NOOBJ | + VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) + VM_WAIT; - vm_page_lock_queues(); - vm_page_flag_clear(lev1pg, PG_BUSY); - lev1pg->valid = VM_PAGE_BITS_ALL; - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(pmap->pm_pteobj); + pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); - pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); + if ((lev1pg->flags & PG_ZERO) == 0) + bzero(pmap->pm_lev1, PAGE_SIZE); /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) @@ -1060,74 +1052,6 @@ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } -static int -pmap_release_free_page(pmap_t pmap, vm_page_t p) -{ - pt_entry_t* pte; - pt_entry_t* l2map; - - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) - /* level 1 page table */ - pte = &pmap->pm_lev1[PTLEV1I]; - else if (p->pindex >= NUSERLEV3MAPS) - /* level 2 page table */ - pte = &pmap->pm_lev1[p->pindex - NUSERLEV3MAPS]; - else { - /* level 3 page table */ - pte = &pmap->pm_lev1[p->pindex >> ALPHA_PTSHIFT]; - l2map = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(pmap_pte_pa(pte)); - pte = &l2map[p->pindex & ((1 << ALPHA_PTSHIFT) - 1)]; - } - - /* - * This code optimizes the case of freeing non-busy - * page-table pages. Those pages are zero now, and - * might as well be placed directly into the zero queue. - */ - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(p, FALSE, "pmaprl")) - return 0; - - vm_page_busy(p); - - /* - * Remove the page table page from the processes address space. - */ - *pte = 0; - pmap->pm_stats.resident_count--; - -#ifdef PMAP_DEBUG - if (p->hold_count) { - panic("pmap_release: freeing held page table page"); - } -#endif - /* - * Level1 pages need to have the kernel - * stuff cleared, so they can go into the zero queue also. - */ - if (p->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS) - bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); - - if (pmap->pm_ptphint == p) - pmap->pm_ptphint = NULL; - -#ifdef PMAP_DEBUG - { - u_long *lp = (u_long*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(p)); - u_long *ep = (u_long*) ((char*) lp + PAGE_SIZE); - for (; lp < ep; lp++) - if (*lp != 0) - panic("pmap_release_free_page: page not zero"); - } -#endif - - p->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(p); - vm_page_unlock_queues(); - return 1; -} - /* * this routine is called if the page table page is not * mapped correctly. @@ -1140,15 +1064,22 @@ pt_entry_t* pte; vm_offset_t ptepa; vm_page_t m; - int is_object_locked; /* * Find or fabricate a new pagetable page */ - if (!(is_object_locked = VM_OBJECT_LOCKED(pmap->pm_pteobj))) - VM_OBJECT_LOCK(pmap->pm_pteobj); - m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); + if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + VM_WAIT; + + /* + * Indicate the need to retry. While waiting, the page table + * page may have been allocated. + */ + return (NULL); + } + if ((m->flags & PG_ZERO) == 0) + pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1174,9 +1105,15 @@ int l1index = ptepindex >> ALPHA_PTSHIFT; pt_entry_t* l1pte = &pmap->pm_lev1[l1index]; pt_entry_t* l2map; - if (!pmap_pte_v(l1pte)) - _pmap_allocpte(pmap, NUSERLEV3MAPS + l1index); - else { + if (!pmap_pte_v(l1pte)) { + if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { + vm_page_lock_queues(); + vm_page_unhold(m); + vm_page_free(m); + vm_page_unlock_queues(); + return (NULL); + } + } else { vm_page_t l2page; l2page = PHYS_TO_VM_PAGE(pmap_pte_pa(l1pte)); @@ -1193,13 +1130,6 @@ */ pmap->pm_ptphint = m; - vm_page_lock_queues(); - m->valid = VM_PAGE_BITS_ALL; - vm_page_wakeup(m); - vm_page_unlock_queues(); - if (!is_object_locked) - VM_OBJECT_UNLOCK(pmap->pm_pteobj); - return m; } @@ -1214,7 +1144,7 @@ * Calculate pagetable page index */ ptepindex = va >> (PAGE_SHIFT + ALPHA_PTSHIFT); - +retry: /* * Get the level2 entry */ @@ -1237,12 +1167,16 @@ pmap->pm_ptphint = m; } m->hold_count++; - return m; + } else { + /* + * Here if the pte page isn't mapped, or if it has been + * deallocated. + */ + m = _pmap_allocpte(pmap, ptepindex); + if (m == NULL) + goto retry; } - /* - * Here if the pte page isn't mapped, or if it has been deallocated. - */ - return _pmap_allocpte(pmap, ptepindex); + return (m); } @@ -1258,52 +1192,35 @@ void pmap_release(pmap_t pmap) { - vm_page_t p,n,lev1pg; - vm_object_t object = pmap->pm_pteobj; - int curgeneration; + vm_page_t lev1pg; + + KASSERT(pmap->pm_stats.resident_count == 0, + ("pmap_release: pmap resident count %ld != 0", + pmap->pm_stats.resident_count)); -#if defined(DIAGNOSTIC) - if (object->ref_count != 1) - panic("pmap_release: pteobj reference count != 1"); -#endif - - lev1pg = NULL; -retry: - curgeneration = object->generation; - for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { - n = TAILQ_NEXT(p, listq); - if (p->pindex >= NUSERLEV3MAPS) { - continue; - } - while (1) { - if (!pmap_release_free_page(pmap, p) && - (object->generation != curgeneration)) - goto retry; - } - } - for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { - n = TAILQ_NEXT(p, listq); - if (p->pindex < NUSERLEV3MAPS) { - /* can this happen? maybe panic */ - goto retry; - } - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) { - lev1pg = p; - continue; - } - while (1) { - if (!pmap_release_free_page(pmap, p) && - (object->generation != curgeneration)) - goto retry; - } - } + lev1pg = PHYS_TO_VM_PAGE(pmap_pte_pa(&pmap->pm_lev1[PTLEV1I])); + KASSERT(lev1pg->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS, + ("pmap_release: PTLEV1I page has unexpected pindex %ld", + lev1pg->pindex)); - if (lev1pg && !pmap_release_free_page(pmap, lev1pg)) - goto retry; mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); + + /* + * Level1 pages need to have the kernel + * stuff cleared, so they can go into the zero queue also. + */ + bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); + pmap->pm_lev1[PTLEV1I] = 0; + PMAP_LOCK_DESTROY(pmap); + + vm_page_lock_queues(); + lev1pg->wire_count--; + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(lev1pg); + vm_page_unlock_queues(); } /* @@ -1441,9 +1358,9 @@ { pv_entry_t pv; int rtval; - int s; - s = splvm(); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pmap == pv->pv_pmap && va == pv->pv_va) @@ -1468,7 +1385,6 @@ free_pv_entry(pv); } - splx(s); return rtval; } @@ -1479,11 +1395,8 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m) { - - int s; pv_entry_t pv; - s = splvm(); pv = get_pv_entry(); pv->pv_va = va; pv->pv_pmap = pmap; @@ -1494,7 +1407,6 @@ TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; vm_page_unlock_queues(); - splx(s); } /* @@ -1506,6 +1418,7 @@ pt_entry_t oldpte; vm_page_t m; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = *ptq; *ptq = 0; if (oldpte & PG_W) @@ -1524,8 +1437,6 @@ } else { return pmap_unuse_pt(pmap, va, NULL); } - - return 0; } /* @@ -1550,8 +1461,6 @@ */ (void) pmap_remove_pte(pmap, ptq, va); pmap_invalidate_page(pmap, va); - - return; } /* @@ -1624,7 +1533,6 @@ { register pv_entry_t pv; pt_entry_t *pte, tpte; - int s; #if defined(PMAP_DIAGNOSTIC) /* @@ -1636,7 +1544,6 @@ } #endif - s = splvm(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); @@ -1673,8 +1580,6 @@ } vm_page_flag_clear(m, PG_WRITEABLE); - - splx(s); } /* @@ -1858,7 +1763,9 @@ if (opa) { int err; vm_page_lock_queues(); + PMAP_LOCK(pmap); err = pmap_remove_pte(pmap, pte, va); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); @@ -1947,6 +1854,7 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->hold_count++; } else { + retry: /* * Get the level 2 entry */ @@ -1967,6 +1875,8 @@ mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); + if (mpte == NULL) + goto retry; } } } else { @@ -2164,26 +2074,21 @@ { pv_entry_t pv; int loops = 0; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) return FALSE; - s = splvm(); - /* * Not found, check current mappings returning immediately if found. */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pv->pv_pmap == pmap) { - splx(s); return TRUE; } loops++; if (loops >= 16) break; } - splx(s); return (FALSE); } @@ -2226,7 +2131,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_quick(pmap, pv->pv_va); #endif if (!pmap_pte_v(pte)) panic("pmap_remove_pages: page on pm_pvlist has no pte\n"); @@ -2244,22 +2149,21 @@ m = PHYS_TO_VM_PAGE(pmap_pte_pa(&tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; if ((tpte & PG_FOW) == 0) if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } pmap_invalidate_all(pmap); @@ -2276,14 +2180,12 @@ pv_entry_t pv; pt_entry_t *pte; int changed; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || (!setem && bit == (PG_UWE|PG_KWE) && (m->flags & PG_WRITEABLE) == 0)) return; - s = splvm(); changed = 0; /* @@ -2326,7 +2228,6 @@ } if (!setem && bit == (PG_UWE|PG_KWE)) vm_page_flag_clear(m, PG_WRITEABLE); - splx(s); } /* ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#38 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.171 2004/07/11 03:03:48 marcel Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.172 2004/07/18 09:03:11 maxim Exp $ machine alpha cpu EV4 @@ -170,7 +170,7 @@ device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -# Pseudo devices - the number indicates how many units to allocated. +# Pseudo devices. device random # Entropy device device loop # Network loopback device ether # Ethernet support ==== //depot/projects/smpng/sys/alpha/include/critical.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.4 2004/03/05 09:19:59 le Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -55,11 +55,9 @@ * of td_critnest, prior to it being incremented to 1. */ static __inline void -cpu_critical_enter(void) +cpu_critical_enter(struct thread *td) { - struct thread *td; - td = curthread; td->td_md.md_savecrit = intr_disable(); } @@ -71,18 +69,16 @@ * exiting the last critical section. */ static __inline void -cpu_critical_exit(void) +cpu_critical_exit(struct thread *td) { - struct thread *td; - td = curthread; intr_restore(td->td_md.md_savecrit); } #else /* !__GNUC__ */ -void cpu_critical_enter(void); -void cpu_critical_exit(void); +void cpu_critical_enter(struct thread *td); +void cpu_critical_exit(struct thread *td); #endif /* __GNUC__ */ ==== //depot/projects/smpng/sys/alpha/include/pmap.h#21 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.32 2004/07/05 16:59:56 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.33 2004/07/19 18:12:04 alc Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 18:27:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D47E216A4D0; Wed, 28 Jul 2004 18:27:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC8B316A4CE for ; Wed, 28 Jul 2004 18:27:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2A6243D5E for ; Wed, 28 Jul 2004 18:27:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6SIRW3Y006271 for ; Wed, 28 Jul 2004 18:27:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6SIRWsu006268 for perforce@freebsd.org; Wed, 28 Jul 2004 18:27:32 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jul 2004 18:27:32 GMT Message-Id: <200407281827.i6SIRWsu006268@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 58388 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, 28 Jul 2004 18:27:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=58388 Change 58388 by jhb@jhb_slimer on 2004/07/28 18:26:56 IFC @58386. Affected files ... .. //depot/projects/smpng/sys/vm/vm_object.c#56 integrate Differences ... ==== //depot/projects/smpng/sys/vm/vm_object.c#56 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.328 2004/07/25 19:28:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.329 2004/07/28 18:23:08 alc Exp $"); #include #include @@ -985,9 +985,9 @@ VM_OBJECT_LOCK(object); while ((backing_object = object->backing_object) != NULL) { VM_OBJECT_LOCK(backing_object); + offset += object->backing_object_offset; VM_OBJECT_UNLOCK(object); object = backing_object; - offset += object->backing_object_offset; if (object->size < OFF_TO_IDX(offset + size)) size = IDX_TO_OFF(object->size) - offset; } @@ -1096,9 +1096,9 @@ if (backing_object == NULL) goto unlock_tobject; VM_OBJECT_LOCK(backing_object); + tpindex += OFF_TO_IDX(tobject->backing_object_offset); VM_OBJECT_UNLOCK(tobject); tobject = backing_object; - tpindex += OFF_TO_IDX(tobject->backing_object_offset); goto shadowlookup; } /* From owner-p4-projects@FreeBSD.ORG Wed Jul 28 20:50:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C057916A4D0; Wed, 28 Jul 2004 20:50:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D32E16A4CE for ; Wed, 28 Jul 2004 20:50:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76F1943D3F for ; Wed, 28 Jul 2004 20:50:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6SKo9vt010598 for ; Wed, 28 Jul 2004 20:50:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6SKo9ci010595 for perforce@freebsd.org; Wed, 28 Jul 2004 20:50:09 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jul 2004 20:50:09 GMT Message-Id: <200407282050.i6SKo9ci010595@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 58403 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, 28 Jul 2004 20:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=58403 Change 58403 by jhb@jhb_slimer on 2004/07/28 20:49:40 Prompted by some questions on IRC from gibbs@, scottl@, and others: atomic_store_rel() on ia32 does not actually need a lock, just a simple store via mov will do. Specifically, in section 7.2.2 of Volume 3: System Programming Guide of the IA32 Intel Arch Manuals, it states: * Writes by a single processor are observed in the same order by all processors. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#13 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#13 (text+ko) ==== @@ -180,7 +180,7 @@ * XXX: This is _NOT_ safe on a P6 or higher because it does not guarantee * memory ordering. These should only be used on a 386. */ -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP, SCONS) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ @@ -197,7 +197,7 @@ #else /* !defined(I386_CPU) */ -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP, SCONS) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ @@ -211,16 +211,13 @@ return (res); \ } \ \ -/* \ - * The XCHG instruction asserts LOCK automagically. \ - */ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(SOP \ - : "+m" (*p), /* 0 */ \ - "+r" (v) /* 1 */ \ - : : "memory"); \ + : "=m" (*p), /* 0 */ \ + : SCONS (v) /* 1 */ \ + : "memory"); \ } \ struct __hack @@ -230,7 +227,7 @@ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP, SCONS) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -258,10 +255,10 @@ ATOMIC_ASM(add, long, "addl %1,%0", "ir", v); ATOMIC_ASM(subtract, long, "subl %1,%0", "ir", v); -ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1", "xchgb %b1,%0"); -ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1", "xchgw %w1,%0"); -ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1", "xchgl %1,%0"); -ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1", "xchgl %1,%0"); +ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1", "movb %b1,%0", "iq"); +ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1", "movw %w1,%0", "ir"); +ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1", "movl %1,%0", "ir"); +ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1", "movl %1,%0", "ir"); #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD From owner-p4-projects@FreeBSD.ORG Wed Jul 28 22:57:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076F916A4D0; Wed, 28 Jul 2004 22:57:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B091916A4CE; Wed, 28 Jul 2004 22:57:08 +0000 (GMT) Received: from aslan.scsiguy.com (aslan.scsiguy.com [63.229.232.106]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C99243D39; Wed, 28 Jul 2004 22:57:08 +0000 (GMT) (envelope-from gibbs@scsiguy.com) Received: from aslan.scsiguy.com (aslan.scsiguy.com [63.229.232.106]) by aslan.scsiguy.com (8.12.11/8.12.11) with ESMTP id i6SMv1CU027572; Wed, 28 Jul 2004 16:57:01 -0600 (MDT) (envelope-from gibbs@scsiguy.com) Date: Wed, 28 Jul 2004 16:57:01 -0600 From: "Justin T. Gibbs" To: John Baldwin , Perforce Change Reviews Message-ID: In-Reply-To: <200407282050.i6SKo9ci010595@repoman.freebsd.org> References: <200407282050.i6SKo9ci010595@repoman.freebsd.org> X-Mailer: Mulberry/3.1.6 (Linux/x86) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Subject: Re: PERFORCE change 58403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Justin T. Gibbs" List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2004 22:57:09 -0000 > http://perforce.freebsd.org/chv.cgi?CH=58403 > > Change 58403 by jhb@jhb_slimer on 2004/07/28 20:49:40 > > Prompted by some questions on IRC from gibbs@, scottl@, and others: > atomic_store_rel() on ia32 does not actually need a lock ... > Differences ... > > ==== //depot/projects/smpng/sys/i386/include/atomic.h#13 (text+ko) ==== > > @@ -180,7 +180,7 @@ > * XXX: This is _NOT_ safe on a P6 or higher because it does not guarantee > * memory ordering. These should only be used on a 386. > */ Is the above comment still accurate? -- Justin From owner-p4-projects@FreeBSD.ORG Thu Jul 29 01:38:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8505716A4D0; Thu, 29 Jul 2004 01:38:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E65816A4CE for ; Thu, 29 Jul 2004 01:38:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 351C743D41 for ; Thu, 29 Jul 2004 01:38:03 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6T1c08f019823 for ; Thu, 29 Jul 2004 01:38:00 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6T1bxQv019820 for perforce@freebsd.org; Thu, 29 Jul 2004 01:37:59 GMT (envelope-from wsalamon@computer.org) Date: Thu, 29 Jul 2004 01:37:59 GMT Message-Id: <200407290137.i6T1bxQv019820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 58414 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, 29 Jul 2004 01:38:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=58414 Change 58414 by wsalamon@wsalamon_epi on 2004/07/29 01:37:52 Unlock the proc struct after using the pfind() function in the audit system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#6 (text+ko) ==== @@ -902,6 +902,7 @@ udata.au_aupinfo.ap_termid.port = tp->p_au->ai_termid.port; udata.au_aupinfo.ap_asid = tp->p_au->ai_asid; + PROC_UNLOCK(tp); break; case A_SETPMASK: if (udata.au_aupinfo.ap_pid < 1) @@ -913,6 +914,7 @@ udata.au_aupinfo.ap_mask.am_success; tp->p_au->ai_mask.am_failure = udata.au_aupinfo.ap_mask.am_failure; + PROC_UNLOCK(tp); break; case A_SETFSIZE: if ((udata.au_fstat.af_filesz != 0) && From owner-p4-projects@FreeBSD.ORG Thu Jul 29 11:26:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F43816A4D0; Thu, 29 Jul 2004 11:26:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 319F516A4CE for ; Thu, 29 Jul 2004 11:26:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1212D43D45 for ; Thu, 29 Jul 2004 11:26:18 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TBPibV037795 for ; Thu, 29 Jul 2004 11:25:44 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TBPhBi037792 for perforce@freebsd.org; Thu, 29 Jul 2004 11:25:43 GMT (envelope-from dfr@freebsd.org) Date: Thu, 29 Jul 2004 11:25:43 GMT Message-Id: <200407291125.i6TBPhBi037792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 58440 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, 29 Jul 2004 11:26:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=58440 Change 58440 by dfr@dfr_home on 2004/07/29 11:25:13 IFC 58433 Affected files ... .. //depot/projects/kse/include/string.h#4 integrate .. //depot/projects/kse/include/strings.h#5 integrate .. //depot/projects/kse/include/wchar.h#14 integrate .. //depot/projects/kse/lib/libc/amd64/gen/signalcontext.c#3 integrate .. //depot/projects/kse/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/kse/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/kse/lib/libc/gen/ftw.c#2 integrate .. //depot/projects/kse/lib/libc/gen/getnetgrent.c#3 integrate .. //depot/projects/kse/lib/libc/gen/glob.3#4 integrate .. //depot/projects/kse/lib/libc/gen/glob.c#3 integrate .. //depot/projects/kse/lib/libc/gen/wordexp.3#4 integrate .. //depot/projects/kse/lib/libc/locale/mblen.c#6 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.c#7 integrate .. //depot/projects/kse/lib/libc/locale/rune.c#4 integrate .. //depot/projects/kse/lib/libc/locale/runetype.c#5 integrate .. //depot/projects/kse/lib/libc/locale/table.c#6 integrate .. //depot/projects/kse/lib/libc/locale/tolower.c#5 integrate .. //depot/projects/kse/lib/libc/locale/toupper.c#5 integrate .. //depot/projects/kse/lib/libc/locale/utf8.c#6 integrate .. //depot/projects/kse/lib/libc/locale/wctomb.c#6 integrate .. //depot/projects/kse/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#27 integrate .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#11 integrate .. //depot/projects/kse/sys/alpha/include/critical.h#3 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#16 integrate .. //depot/projects/kse/sys/amd64/amd64/autoconf.c#4 integrate .. //depot/projects/kse/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/kse/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/kse/sys/amd64/include/critical.h#2 integrate .. //depot/projects/kse/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/kse/sys/arm/include/critical.h#2 integrate .. //depot/projects/kse/sys/boot/i386/boot2/boot2.c#14 integrate .. //depot/projects/kse/sys/coda/coda_vnops.c#13 integrate .. //depot/projects/kse/sys/compat/linux/linux_file.c#19 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/kse/sys/compat/linux/linux_uid16.c#12 integrate .. //depot/projects/kse/sys/conf/NOTES#25 integrate .. //depot/projects/kse/sys/conf/kern.pre.mk#20 integrate .. //depot/projects/kse/sys/conf/options#34 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/kse/sys/ddb/db_main.c#2 integrate .. //depot/projects/kse/sys/dev/aac/aac.c#27 integrate .. //depot/projects/kse/sys/dev/aac/aac_disk.c#17 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#34 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/kse/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#19 integrate .. //depot/projects/kse/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/kse/sys/dev/ciss/cissio.h#3 integrate .. //depot/projects/kse/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/kse/sys/dev/digi/digi.c#16 integrate .. //depot/projects/kse/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/kse/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#27 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbbdevid.h#9 integrate .. //depot/projects/kse/sys/dev/scd/scd.c#4 integrate .. //depot/projects/kse/sys/dev/si/si.c#10 integrate .. //depot/projects/kse/sys/dev/sio/sio.c#24 integrate .. //depot/projects/kse/sys/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/kse/sys/dev/syscons/syscons.c#22 integrate .. //depot/projects/kse/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/kse/sys/dev/usb/uhub.c#15 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#15 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_subr.c#11 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_vfsops.c#16 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#15 integrate .. //depot/projects/kse/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/kse/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/kse/sys/geom/geom_slice.c#9 integrate .. //depot/projects/kse/sys/geom/nop/g_nop.c#4 integrate .. //depot/projects/kse/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/kse/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/kse/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vfsops.c#15 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#12 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#12 integrate .. //depot/projects/kse/sys/i386/acpica/genwakecode.sh#2 integrate .. //depot/projects/kse/sys/i386/i386/autoconf.c#15 integrate .. //depot/projects/kse/sys/i386/include/critical.h#4 integrate .. //depot/projects/kse/sys/ia64/ia64/autoconf.c#9 integrate .. //depot/projects/kse/sys/ia64/ia64/sal.c#10 integrate .. //depot/projects/kse/sys/ia64/include/critical.h#3 integrate .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vfsops.c#14 integrate .. //depot/projects/kse/sys/kern/init_main.c#53 integrate .. //depot/projects/kse/sys/kern/kern_acl.c#20 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#44 integrate .. //depot/projects/kse/sys/kern/kern_event.c#18 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#45 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#69 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#86 integrate .. //depot/projects/kse/sys/kern/kern_idle.c#21 integrate .. //depot/projects/kse/sys/kern/kern_ktr.c#11 integrate .. //depot/projects/kse/sys/kern/kern_ktrace.c#20 integrate .. //depot/projects/kse/sys/kern/kern_lock.c#17 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#39 integrate .. //depot/projects/kse/sys/kern/kern_prot.c#38 integrate .. //depot/projects/kse/sys/kern/kern_resource.c#30 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#72 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#85 integrate .. //depot/projects/kse/sys/kern/kern_sysctl.c#20 integrate .. //depot/projects/kse/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/kse/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/kse/sys/kern/sched_ule.c#6 integrate .. //depot/projects/kse/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#37 integrate .. //depot/projects/kse/sys/kern/sys_pipe.c#19 integrate .. //depot/projects/kse/sys/kern/sys_process.c#36 integrate .. //depot/projects/kse/sys/kern/sys_socket.c#15 integrate .. //depot/projects/kse/sys/kern/sysv_shm.c#17 integrate .. //depot/projects/kse/sys/kern/uipc_jumbo.c#5 integrate .. //depot/projects/kse/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/kse/sys/kern/uipc_usrreq.c#27 integrate .. //depot/projects/kse/sys/kern/vfs_aio.c#33 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#29 integrate .. //depot/projects/kse/sys/kern/vfs_cluster.c#14 integrate .. //depot/projects/kse/sys/kern/vfs_init.c#10 integrate .. //depot/projects/kse/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#51 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#43 integrate .. //depot/projects/kse/sys/kern/vfs_vnops.c#37 integrate .. //depot/projects/kse/sys/libkern/iconv.c#4 integrate .. //depot/projects/kse/sys/net/bpf.c#19 integrate .. //depot/projects/kse/sys/net/if.c#26 integrate .. //depot/projects/kse/sys/net/if.h#17 integrate .. //depot/projects/kse/sys/net/if_ef.c#9 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#25 integrate .. //depot/projects/kse/sys/net/if_loop.c#13 integrate .. //depot/projects/kse/sys/net/if_var.h#20 integrate .. //depot/projects/kse/sys/net/if_vlan.c#12 integrate .. //depot/projects/kse/sys/net/route.c#9 integrate .. //depot/projects/kse/sys/net/route.h#12 integrate .. //depot/projects/kse/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/kse/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.c#6 integrate .. //depot/projects/kse/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/kse/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/kse/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/kse/sys/netgraph/ng_ether.c#13 integrate .. //depot/projects/kse/sys/netgraph/ng_fec.c#5 integrate .. //depot/projects/kse/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/kse/sys/netgraph/ng_parse.c#12 integrate .. //depot/projects/kse/sys/netgraph/ng_pppoe.c#13 integrate .. //depot/projects/kse/sys/netgraph/ng_pppoe.h#6 integrate .. //depot/projects/kse/sys/netgraph/ng_sample.c#6 integrate .. //depot/projects/kse/sys/netgraph/ng_socket.c#16 integrate .. //depot/projects/kse/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/kse/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/kse/sys/netinet/tcp_output.c#19 integrate .. //depot/projects/kse/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/kse/sys/netinet/tcp_usrreq.c#18 integrate .. //depot/projects/kse/sys/netinet/udp_usrreq.c#24 integrate .. //depot/projects/kse/sys/netinet6/in6_pcb.c#21 integrate .. //depot/projects/kse/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/kse/sys/netinet6/udp6_usrreq.c#18 integrate .. //depot/projects/kse/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/kse/sys/netsmb/smb_conn.c#6 integrate .. //depot/projects/kse/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/kse/sys/nfsclient/bootp_subr.c#14 integrate .. //depot/projects/kse/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/kse/sys/nfsserver/nfs_srvsock.c#13 integrate .. //depot/projects/kse/sys/nfsserver/nfs_srvsubs.c#14 integrate .. //depot/projects/kse/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/kse/sys/pc98/pc98/sio.c#24 integrate .. //depot/projects/kse/sys/powerpc/include/critical.h#4 integrate .. //depot/projects/kse/sys/powerpc/include/db_machdep.h#7 integrate .. //depot/projects/kse/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/kse/sys/powerpc/powerpc/elf_machdep.c#9 integrate .. //depot/projects/kse/sys/powerpc/powerpc/locore.S#4 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#29 integrate .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#26 integrate .. //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#8 integrate .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/kse/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/kse/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/kse/sys/sparc64/include/critical.h#3 integrate .. //depot/projects/kse/sys/sparc64/sparc64/pmap.c#41 integrate .. //depot/projects/kse/sys/sys/_task.h#2 integrate .. //depot/projects/kse/sys/sys/buf.h#19 integrate .. //depot/projects/kse/sys/sys/cdefs.h#23 integrate .. //depot/projects/kse/sys/sys/linker_set.h#6 integrate .. //depot/projects/kse/sys/sys/mount.h#20 integrate .. //depot/projects/kse/sys/sys/param.h#31 integrate .. //depot/projects/kse/sys/sys/proc.h#141 integrate .. //depot/projects/kse/sys/sys/sysctl.h#16 integrate .. //depot/projects/kse/sys/sys/systm.h#36 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#19 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_inode.c#15 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#19 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_softdep.c#19 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#30 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/kse/sys/ufs/ufs/inode.h#8 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_acl.c#13 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_inode.c#13 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_lookup.c#16 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_quota.c#16 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/kse/sys/vm/swap_pager.c#17 integrate .. //depot/projects/kse/sys/vm/uma_core.c#20 integrate .. //depot/projects/kse/sys/vm/vm_extern.h#19 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#44 integrate .. //depot/projects/kse/sys/vm/vm_kern.c#16 integrate .. //depot/projects/kse/sys/vm/vm_map.c#32 integrate .. //depot/projects/kse/sys/vm/vm_map.h#22 integrate .. //depot/projects/kse/sys/vm/vm_object.c#22 integrate .. //depot/projects/kse/sys/vm/vm_object.h#12 integrate .. //depot/projects/kse/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/kse/tools/regression/geom_concat/test-1.sh#2 integrate .. //depot/projects/kse/tools/regression/geom_concat/test-2.sh#2 integrate .. //depot/projects/kse/tools/regression/geom_stripe/test-1.sh#2 integrate .. //depot/projects/kse/tools/regression/geom_stripe/test-2.sh#2 integrate .. //depot/projects/kse/tools/regression/sockets/accf_data_attach/Makefile#1 branch .. //depot/projects/kse/tools/regression/sockets/accf_data_attach/accf_data_attach.c#1 branch Differences ... ==== //depot/projects/kse/include/string.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.19 2003/12/07 21:10:06 marcel Exp $ + * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ */ #ifndef _STRING_H_ @@ -58,21 +58,21 @@ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif -void *memchr(const void *, int, size_t); -int memcmp(const void *, const void *, size_t); +void *memchr(const void *, int, size_t) __pure; +int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); void *memmove(void *, const void *, size_t); void *memset(void *, int, size_t); #if __BSD_VISIBLE char *stpcpy(char *, const char *); -char *strcasestr(const char *, const char *); +char *strcasestr(const char *, const char *) __pure; #endif char *strcat(char * __restrict, const char * __restrict); -char *strchr(const char *, int); -int strcmp(const char *, const char *); +char *strchr(const char *, int) __pure; +int strcmp(const char *, const char *) __pure; int strcoll(const char *, const char *); char *strcpy(char * __restrict, const char * __restrict); -size_t strcspn(const char *, const char *); +size_t strcspn(const char *, const char *) __pure; #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE char *strdup(const char *); #endif @@ -84,24 +84,24 @@ size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); #endif -size_t strlen(const char *); +size_t strlen(const char *) __pure; #if __BSD_VISIBLE void strmode(int, char *); #endif char *strncat(char * __restrict, const char * __restrict, size_t); -int strncmp(const char *, const char *, size_t); +int strncmp(const char *, const char *, size_t) __pure; char *strncpy(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -char *strnstr(const char *, const char *, size_t); +char *strnstr(const char *, const char *, size_t) __pure; #endif -char *strpbrk(const char *, const char *); -char *strrchr(const char *, int); +char *strpbrk(const char *, const char *) __pure; +char *strrchr(const char *, int) __pure; #if __BSD_VISIBLE char *strsep(char **, const char *); char *strsignal(int); #endif -size_t strspn(const char *, const char *); -char *strstr(const char *, const char *); +size_t strspn(const char *, const char *) __pure; +char *strstr(const char *, const char *) __pure; char *strtok(char * __restrict, const char * __restrict); #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 char *strtok_r(char *, const char *, char **); ==== //depot/projects/kse/include/strings.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/strings.h,v 1.5 2004/07/09 13:52:42 des Exp $ + * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $ */ #ifndef _STRINGS_H_ @@ -38,19 +38,19 @@ #endif __BEGIN_DECLS -int bcmp(const void *, const void *, size_t); /* LEGACY */ -void bcopy(const void *, void *, size_t); /* LEGACY */ -void bzero(void *, size_t); /* LEGACY */ -int ffs(int); +int bcmp(const void *, const void *, size_t) __pure; /* LEGACY */ +void bcopy(const void *, void *, size_t); /* LEGACY */ +void bzero(void *, size_t); /* LEGACY */ +int ffs(int) __pure2; #ifdef __BSD_VISIBLE -int ffsl(long); -int fls(int); -int flsl(long); +int ffsl(long) __pure2; +int fls(int) __pure2; +int flsl(long) __pure2; #endif -char *index(const char *, int); /* LEGACY */ -char *rindex(const char *, int); /* LEGACY */ -int strcasecmp(const char *, const char *); -int strncasecmp(const char *, const char *, size_t); +char *index(const char *, int) __pure; /* LEGACY */ +char *rindex(const char *, int) __pure; /* LEGACY */ +int strcasecmp(const char *, const char *) __pure; +int strncasecmp(const char *, const char *, size_t) __pure; __END_DECLS #endif /* _STRINGS_H_ */ ==== //depot/projects/kse/include/wchar.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.43 2004/07/21 10:54:57 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.44 2004/07/23 02:29:37 tjr Exp $ */ /*- @@ -137,24 +137,25 @@ int vwprintf(const wchar_t * __restrict, __va_list); size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); -wchar_t *wcschr(const wchar_t *, wchar_t); -int wcscmp(const wchar_t *, const wchar_t *); +wchar_t *wcschr(const wchar_t *, wchar_t) __pure; +int wcscmp(const wchar_t *, const wchar_t *) __pure; int wcscoll(const wchar_t *, const wchar_t *); wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict); -size_t wcscspn(const wchar_t *, const wchar_t *); +size_t wcscspn(const wchar_t *, const wchar_t *) __pure; size_t wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict, const struct tm * __restrict); -size_t wcslen(const wchar_t *); +size_t wcslen(const wchar_t *) __pure; wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t); -int wcsncmp(const wchar_t *, const wchar_t *, size_t); +int wcsncmp(const wchar_t *, const wchar_t *, size_t) __pure; wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t); -wchar_t *wcspbrk(const wchar_t *, const wchar_t *); -wchar_t *wcsrchr(const wchar_t *, wchar_t); +wchar_t *wcspbrk(const wchar_t *, const wchar_t *) __pure; +wchar_t *wcsrchr(const wchar_t *, wchar_t) __pure; size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t, mbstate_t * __restrict); -size_t wcsspn(const wchar_t *, const wchar_t *); -wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict); +size_t wcsspn(const wchar_t *, const wchar_t *) __pure; +wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict) + __pure; size_t wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t); int wctob(wint_t); double wcstod(const wchar_t * __restrict, wchar_t ** __restrict); @@ -163,8 +164,8 @@ long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); unsigned long wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int); -wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); -int wmemcmp(const wchar_t *, const wchar_t *, size_t); +wchar_t *wmemchr(const wchar_t *, wchar_t, size_t) __pure; +int wmemcmp(const wchar_t *, const wchar_t *, size_t) __pure; wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); wchar_t *wmemset(wchar_t *, wchar_t, size_t); ==== //depot/projects/kse/lib/libc/amd64/gen/signalcontext.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.4 2004/06/15 21:46:36 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.5 2004/07/28 13:08:24 davidxu Exp $"); #include #include @@ -76,6 +76,8 @@ * Setup the ucontext of the signal handler. */ bzero(&ucp->uc_mcontext, sizeof(ucp->uc_mcontext)); + ucp->uc_mcontext.mc_fpformat = _MC_FPFMT_NODEV; + ucp->uc_mcontext.mc_ownedfp = _MC_FPOWNED_NONE; ucp->uc_link = sig_uc; sigdelset(&ucp->uc_sigmask, sig); ==== //depot/projects/kse/lib/libc/gen/Makefile.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.114 2004/07/19 08:16:10 das Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.115 2004/07/25 11:17:54 tjr Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -80,6 +80,7 @@ fpclassify.3 isnormal.3 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \ fts.3 fts_read.3 fts.3 fts_set.3 +MLINKS+=ftw.3 nftw.3 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \ getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \ getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \ ==== //depot/projects/kse/lib/libc/gen/fnmatch.c#2 (text+ko) ==== @@ -38,17 +38,29 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.15 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.16 2004/07/29 03:13:10 tjr Exp $"); /* * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6. * Compares a filename or pathname to a pattern. */ -#include +/* + * Some notes on multibyte character support: + * 1. Patterns with illegal byte sequences match nothing. + * 2. Illegal byte sequences in the "string" argument are handled by treating + * them as single-byte characters with a value of the first byte of the + * sequence cast to wchar_t. + * 3. Multibyte conversion state objects (mbstate_t) are passed around and + * used for most, but not all, conversions. Further work will be required + * to support state-dependent encodings. + */ + #include +#include #include -#include +#include +#include #include "collate.h" @@ -58,33 +70,57 @@ #define RANGE_NOMATCH 0 #define RANGE_ERROR (-1) -static int rangematch(const char *, char, int, char **); +static int rangematch(const char *, wchar_t, int, char **, mbstate_t *); +static int fnmatch1(const char *, const char *, int, mbstate_t, mbstate_t); int fnmatch(pattern, string, flags) const char *pattern, *string; int flags; { + static const mbstate_t initial; + + return (fnmatch1(pattern, string, flags, initial, initial)); +} + +static int +fnmatch1(pattern, string, flags, patmbs, strmbs) + const char *pattern, *string; + int flags; + mbstate_t patmbs, strmbs; +{ const char *stringstart; char *newp; - char c, test; + char c; + wchar_t pc, sc; + size_t pclen, sclen; - for (stringstart = string;;) - switch (c = *pattern++) { + for (stringstart = string;;) { + pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs); + if (pclen == (size_t)-1 || pclen == (size_t)-2) + return (FNM_NOMATCH); + pattern += pclen; + sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs); + if (sclen == (size_t)-1 || sclen == (size_t)-2) { + sc = (unsigned char)*string; + sclen = 1; + memset(&strmbs, 0, sizeof(strmbs)); + } + switch (pc) { case EOS: - if ((flags & FNM_LEADING_DIR) && *string == '/') + if ((flags & FNM_LEADING_DIR) && sc == '/') return (0); - return (*string == EOS ? 0 : FNM_NOMATCH); + return (sc == EOS ? 0 : FNM_NOMATCH); case '?': - if (*string == EOS) + if (sc == EOS) return (FNM_NOMATCH); - if (*string == '/' && (flags & FNM_PATHNAME)) + if (sc == '/' && (flags & FNM_PATHNAME)) return (FNM_NOMATCH); - if (*string == '.' && (flags & FNM_PERIOD) && + if (sc == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) return (FNM_NOMATCH); - ++string; + string += sclen; break; case '*': c = *pattern; @@ -92,7 +128,7 @@ while (c == '*') c = *++pattern; - if (*string == '.' && (flags & FNM_PERIOD) && + if (sc == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) return (FNM_NOMATCH); @@ -112,25 +148,35 @@ } /* General case, use recursion. */ - while ((test = *string) != EOS) { - if (!fnmatch(pattern, string, flags & ~FNM_PERIOD)) + while (sc != EOS) { + if (!fnmatch1(pattern, string, + flags & ~FNM_PERIOD, patmbs, strmbs)) return (0); - if (test == '/' && flags & FNM_PATHNAME) + sclen = mbrtowc(&sc, string, MB_LEN_MAX, + &strmbs); + if (sclen == (size_t)-1 || + sclen == (size_t)-2) { + sc = (unsigned char)*string; + sclen = 1; + memset(&strmbs, 0, sizeof(strmbs)); + } + if (sc == '/' && flags & FNM_PATHNAME) break; - ++string; + string += sclen; } return (FNM_NOMATCH); case '[': - if (*string == EOS) + if (sc == EOS) return (FNM_NOMATCH); - if (*string == '/' && (flags & FNM_PATHNAME)) + if (sc == '/' && (flags & FNM_PATHNAME)) return (FNM_NOMATCH); - if (*string == '.' && (flags & FNM_PERIOD) && + if (sc == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) return (FNM_NOMATCH); - switch (rangematch(pattern, *string, flags, &newp)) { + switch (rangematch(pattern, sc, flags, &newp, + &patmbs)) { case RANGE_ERROR: goto norm; case RANGE_MATCH: @@ -139,41 +185,47 @@ case RANGE_NOMATCH: return (FNM_NOMATCH); } - ++string; + string += sclen; break; case '\\': if (!(flags & FNM_NOESCAPE)) { - if ((c = *pattern++) == EOS) { - c = '\\'; - --pattern; - } + pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, + &patmbs); + if (pclen == (size_t)-1 || pclen == (size_t)-2) + return (FNM_NOMATCH); + if (pclen == 0) + pc = '\\'; + pattern += pclen; } /* FALLTHROUGH */ default: norm: - if (c == *string) + if (pc == sc) ; else if ((flags & FNM_CASEFOLD) && - (tolower((unsigned char)c) == - tolower((unsigned char)*string))) + (towlower(pc) == towlower(sc))) ; else return (FNM_NOMATCH); - string++; + string += sclen; break; } + } /* NOTREACHED */ } static int -rangematch(pattern, test, flags, newp) +rangematch(pattern, test, flags, newp, patmbs) const char *pattern; - char test; + wchar_t test; int flags; char **newp; + mbstate_t *patmbs; { int negate, ok; - char c, c2; + wchar_t c, c2; + size_t pclen; + const char *origpat; /* * A bracket expression starting with an unquoted circumflex @@ -186,7 +238,7 @@ ++pattern; if (flags & FNM_CASEFOLD) - test = tolower((unsigned char)test); + test = towlower(test); /* * A right bracket shall lose its special meaning and represent @@ -194,29 +246,40 @@ * -- POSIX.2 2.8.3.2 */ ok = 0; - c = *pattern++; - do { - if (c == '\\' && !(flags & FNM_NOESCAPE)) - c = *pattern++; - if (c == EOS) + origpat = pattern; + for (;;) { + if (*pattern == ']' && pattern > origpat) { + pattern++; + break; + } else if (*pattern == '\0') { return (RANGE_ERROR); - - if (c == '/' && (flags & FNM_PATHNAME)) + } else if (*pattern == '/' && (flags & FNM_PATHNAME)) { + pattern++; + return (RANGE_NOMATCH); + } else if (*pattern == '\\' && !(flags & FNM_NOESCAPE)) + pattern++; + pclen = mbrtowc(&c, pattern, MB_LEN_MAX, patmbs); + if (pclen == (size_t)-1 || pclen == (size_t)-2) return (RANGE_NOMATCH); + pattern += pclen; if (flags & FNM_CASEFOLD) - c = tolower((unsigned char)c); + c = towlower(c); - if (*pattern == '-' - && (c2 = *(pattern+1)) != EOS && c2 != ']') { - pattern += 2; - if (c2 == '\\' && !(flags & FNM_NOESCAPE)) - c2 = *pattern++; + if (*pattern == '-' && *(pattern + 1) != EOS && + *(pattern + 1) != ']') { + if (*++pattern == '\\' && !(flags & FNM_NOESCAPE)) + if (*pattern != EOS) + pattern++; + pclen = mbrtowc(&c2, pattern, MB_LEN_MAX, patmbs); + if (pclen == (size_t)-1 || pclen == (size_t)-2) + return (RANGE_NOMATCH); + pattern += pclen; if (c2 == EOS) return (RANGE_ERROR); if (flags & FNM_CASEFOLD) - c2 = tolower((unsigned char)c2); + c2 = towlower(c2); if (__collate_load_error ? c <= test && test <= c2 : @@ -226,7 +289,7 @@ ok = 1; } else if (c == test) ok = 1; - } while ((c = *pattern++) != ']'); + } *newp = (char *)pattern; return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH); ==== //depot/projects/kse/lib/libc/gen/ftw.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/ftw.c,v 1.1 2004/07/05 23:13:16 das Exp $ + * $FreeBSD: src/lib/libc/gen/ftw.c,v 1.2 2004/07/23 06:01:00 das Exp $ */ #include /* Because fts(3) says so */ @@ -78,7 +78,6 @@ const char *paths[2]; int ftw_flag, func_ret; struct FTW ftw_st; - int skip_entry; __ftw_func_t ftw_func; __nftw_func_t nftw_func; int saved_errno; @@ -120,15 +119,11 @@ /* The main loop. Is it not nifty? Worship the loop. */ while ((entry = fts_read(hierarchy))) { - skip_entry = 0; - switch (entry->fts_info) { case FTS_D: if ((MODE_NFTW != mode) || !(flags & FTW_DEPTH)) { ftw_flag = FTW_D; - } else { - skip_entry = 1; } break; @@ -161,8 +156,6 @@ case FTS_DP: if ((MODE_NFTW == mode) && (flags & FTW_DEPTH)) { ftw_flag = FTW_D; - } else { - skip_entry = 1; } break; @@ -171,8 +164,7 @@ * type to call with, so cowardice seems the better part of * guessing. */ - - skip_entry = 1; + break; } if (MODE_FTW == mode) { ==== //depot/projects/kse/lib/libc/gen/getnetgrent.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.30 2003/01/03 23:55:58 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.31 2004/07/28 11:56:03 des Exp $"); #include #include @@ -136,10 +136,13 @@ (char *)0, }; static FILE *netf = (FILE *)0; -static int parse_netgrp(); -static struct linelist *read_for_group(); -void setnetgrent(), endnetgrent(); -int getnetgrent(), innetgr(); + +static int parse_netgrp(const char *); +static struct linelist *read_for_group(const char *); +void setnetgrent(const char *); +void endnetgrent(void); +int getnetgrent(char **, char **, char **); +int innetgr(const char *, const char *, const char *, const char *); #define LINSIZ 1024 /* Length of netgroup file line */ @@ -150,8 +153,7 @@ * most of the work. */ void -setnetgrent(group) - char *group; +setnetgrent(const char *group) { #ifdef YP struct stat _yp_statp; @@ -220,8 +222,7 @@ * Get the next netgroup off the list. */ int -getnetgrent(hostp, userp, domp) - char **hostp, **userp, **domp; +getnetgrent(char **hostp, char **userp, char **domp) { #ifdef YP _yp_innetgr = 0; @@ -241,7 +242,7 @@ * endnetgrent() - cleanup */ void -endnetgrent() +endnetgrent(void) { struct linelist *lp, *olp; struct netgrp *gp, *ogp; @@ -278,11 +279,11 @@ } #ifdef YP -static int _listmatch(list, group, len) - char *list, *group; - int len; +static int +_listmatch(const char *list, const char *group, int len) { - char *ptr = list, *cptr; + const char *ptr = list; + const char *cptr; int glen = strlen(group); /* skip possible leading whitespace */ @@ -302,9 +303,8 @@ return(0); } -static int _buildkey(key, str, dom, rotation) -char *key, *str, *dom; -int *rotation; +static int +_buildkey(char *key, const char *str, const char *dom, int *rotation) { (*rotation)++; if (*rotation > 4) @@ -327,8 +327,7 @@ * Search for a match in a netgroup. */ int -innetgr(group, host, user, dom) - const char *group, *host, *user, *dom; +innetgr(const char *group, const char *host, const char *user, const char *dom) { char *hst, *usr, *dm; #ifdef YP @@ -409,8 +408,7 @@ * Parse the netgroup file setting up the linked lists. */ static int -parse_netgrp(group) - char *group; +parse_netgrp(const char *group) { char *spos, *epos; int len, strpos; @@ -520,8 +518,7 @@ * is found. Return 1 if eof is encountered. */ static struct linelist * -read_for_group(group) - char *group; +read_for_group(const char *group) { char *pos, *spos, *linep, *olinep; int len, olen; ==== //depot/projects/kse/lib/libc/gen/glob.3#4 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)glob.3 8.3 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.26 2004/07/18 10:11:27 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.27 2004/07/29 03:41:24 tjr Exp $ .\" .Dd July 18, 2004 .Dt GLOB 3 @@ -431,6 +431,7 @@ .St -p1003.2 . Collating symbol expressions, equivalence class expressions and character class expressions are not supported. +.Pp The flags .Dv GLOB_ALTDIRFUNC , .Dv GLOB_BRACE , ==== //depot/projects/kse/lib/libc/gen/glob.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.21 2003/10/29 10:45:01 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.22 2004/07/29 03:48:52 tjr Exp $"); /* * glob(3) -- a superset of the one defined in POSIX 1003.2. @@ -65,6 +65,16 @@ * Number of matches in the current invocation of glob. */ +/* + * Some notes on multibyte character support: + * 1. Patterns with illegal byte sequences match nothing - even if + * GLOB_NOCHECK is specified. + * 2. Illegal byte sequences in filenames are handled by treating them as + * single-byte characters with a value of the first byte of the sequence + * cast to wchar_t. + * 3. State-dependent encodings are not currently supported. + */ + #include #include @@ -72,11 +82,14 @@ #include #include #include +#include #include +#include #include #include #include #include +#include #include "collate.h" @@ -100,26 +113,26 @@ #ifndef DEBUG -#define M_QUOTE 0x8000 -#define M_PROTECT 0x4000 -#define M_MASK 0xffff -#define M_ASCII 0x00ff +#define M_QUOTE 0x8000000000ULL +#define M_PROTECT 0x4000000000ULL +#define M_MASK 0xffffffffffULL +#define M_CHAR 0x00ffffffffULL -typedef u_short Char; +typedef uint_fast64_t Char; #else #define M_QUOTE 0x80 #define M_PROTECT 0x40 #define M_MASK 0xff -#define M_ASCII 0x7f +#define M_CHAR 0x7f >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 29 16:33:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E77216A4D5; Thu, 29 Jul 2004 16:33:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1320416A4D0 for ; Thu, 29 Jul 2004 16:33:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5E9D43D55 for ; Thu, 29 Jul 2004 16:33:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TGX3PZ046617 for ; Thu, 29 Jul 2004 16:33:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TGX2uO046614 for perforce@freebsd.org; Thu, 29 Jul 2004 16:33:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jul 2004 16:33:02 GMT Message-Id: <200407291633.i6TGX2uO046614@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 58460 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, 29 Jul 2004 16:33:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=58460 Change 58460 by rwatson@rwatson_tislabs on 2004/07/29 16:32:56 Trim unneeded comment. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#26 (text+ko) ==== @@ -603,7 +603,6 @@ } semakptr->u.sem_perm.mode = 0; #ifdef MAC - /* Reset the MAC label */ mac_cleanup_ipc_sema(semakptr); #endif SEMUNDO_LOCK(); From owner-p4-projects@FreeBSD.ORG Thu Jul 29 18:01:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 817AD16A4D1; Thu, 29 Jul 2004 18:01:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C06A16A4CE for ; Thu, 29 Jul 2004 18:01:39 +0000 (GMT) Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15EE443D67 for ; Thu, 29 Jul 2004 18:01:39 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 31622 invoked from network); 29 Jul 2004 18:01:38 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 29 Jul 2004 18:01:38 -0000 Received: from 10.50.40.208 (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i6TI1YFv089339; Thu, 29 Jul 2004 14:01:34 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: "Justin T. Gibbs" Date: Thu, 29 Jul 2004 14:01:33 -0400 User-Agent: KMail/1.6 References: <200407282050.i6SKo9ci010595@repoman.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200407291401.33538.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 58403 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, 29 Jul 2004 18:01:40 -0000 On Wednesday 28 July 2004 06:57 pm, Justin T. Gibbs wrote: > > http://perforce.freebsd.org/chv.cgi?CH=58403 > > > > Change 58403 by jhb@jhb_slimer on 2004/07/28 20:49:40 > > > > Prompted by some questions on IRC from gibbs@, scottl@, and others: > > atomic_store_rel() on ia32 does not actually need a lock > > ... > > > Differences ... > > > > ==== //depot/projects/smpng/sys/i386/include/atomic.h#13 (text+ko) ==== > > > > @@ -180,7 +180,7 @@ > > * XXX: This is _NOT_ safe on a P6 or higher because it does not > > guarantee * memory ordering. These should only be used on a 386. > > */ > > Is the above comment still accurate? For the load_acq, yes. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Jul 29 18:08:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F6DC16A4D0; Thu, 29 Jul 2004 18:08:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F4E416A4CF for ; Thu, 29 Jul 2004 18:08:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C92A43D49 for ; Thu, 29 Jul 2004 18:08:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TI82Ea049594 for ; Thu, 29 Jul 2004 18:08:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TI82sM049591 for perforce@freebsd.org; Thu, 29 Jul 2004 18:08:02 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 18:08:02 GMT Message-Id: <200407291808.i6TI82sM049591@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 58472 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, 29 Jul 2004 18:08:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=58472 Change 58472 by jhb@jhb_slimer on 2004/07/29 18:07:13 Simplifiy the store_rel() optimization by just writing it in C like the 80386 case. Also, adjust the comment above as far as PentiumPro + vs. 80386. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#14 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#14 (text+ko) ==== @@ -69,7 +69,7 @@ int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -175,12 +175,12 @@ #if defined(I386_CPU) /* - * We assume that a = b will do atomic loads and stores. - * - * XXX: This is _NOT_ safe on a P6 or higher because it does not guarantee - * memory ordering. These should only be used on a 386. + * We assume that a = b will do atomic loads and stores. However, on a + * PentiumPro or higher reads may pass writes, so for that case we have + * to use a serializing instruction (i.e. with LOCK) to do the load. For + * the 386 case, we can use a simple store since 386's don't support SMP. */ -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP, SCONS) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ @@ -197,7 +197,7 @@ #else /* !defined(I386_CPU) */ -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP, SCONS) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ @@ -214,10 +214,8 @@ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(SOP \ - : "=m" (*p), /* 0 */ \ - : SCONS (v) /* 1 */ \ - : "memory"); \ + *p = v; \ + __asm __volatile("" : : : "memory"); \ } \ struct __hack @@ -227,7 +225,7 @@ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP, SCONS) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -255,10 +253,10 @@ ATOMIC_ASM(add, long, "addl %1,%0", "ir", v); ATOMIC_ASM(subtract, long, "subl %1,%0", "ir", v); -ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1", "movb %b1,%0", "iq"); -ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1", "movw %w1,%0", "ir"); -ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1", "movl %1,%0", "ir"); -ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1", "movl %1,%0", "ir"); +ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1"); +ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1"); +ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1"); +ATOMIC_STORE_LOAD(long, "cmpxchgl %0,%1"); #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD From owner-p4-projects@FreeBSD.ORG Thu Jul 29 19:55:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4206F16A4D0; Thu, 29 Jul 2004 19:55:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E36DE16A4CE for ; Thu, 29 Jul 2004 19:55:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1F1C43D49 for ; Thu, 29 Jul 2004 19:55:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TJt1qJ053321 for ; Thu, 29 Jul 2004 19:55:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TJrWUX053208 for perforce@freebsd.org; Thu, 29 Jul 2004 19:53:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jul 2004 19:53:32 GMT Message-Id: <200407291953.i6TJrWUX053208@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 58478 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, 29 Jul 2004 19:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=58478 Change 58478 by rwatson@rwatson_tislabs on 2004/07/29 19:51:01 Integrate trustedbsd_base branch from FreeBSD CVS HEAD. More changes than you can shake a donkey at. I'll follow up with a summary of the changes in a second submit. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#25 integrate .. //depot/projects/trustedbsd/base/Makefile#34 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#52 integrate .. //depot/projects/trustedbsd/base/UPDATING#46 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.c#12 integrate .. //depot/projects/trustedbsd/base/bin/chio/chio.1#4 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#9 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#13 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#2 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#10 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#8 integrate .. //depot/projects/trustedbsd/base/bin/df/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#8 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#21 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.1#5 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.1#6 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.1#6 integrate .. //depot/projects/trustedbsd/base/bin/expr/expr.1#7 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.1#5 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.1#5 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#8 integrate .. //depot/projects/trustedbsd/base/bin/ln/symlink.7#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#25 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#23 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#22 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#9 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#9 integrate .. //depot/projects/trustedbsd/base/bin/ps/extern.h#14 integrate .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#11 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#19 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#18 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#20 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#19 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.h#9 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.1#10 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.1#6 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#8 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#8 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith.y#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.1#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#16 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.1#5 integrate .. //depot/projects/trustedbsd/base/bin/test/TEST.README#2 integrate .. //depot/projects/trustedbsd/base/bin/test/test.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/AUTHORS#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/BUGS#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/COPYING#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/MIRRORS#3 delete .. //depot/projects/trustedbsd/base/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/README.y2k#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_inherit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/map.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/bootstrap#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/commit#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/conf/transp/transp_sockets.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/config.guess#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/config.guess.long#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/config.sub#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/configure.in#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/depcomp#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/install-sh#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/util.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ltmain.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/missing#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/scripts/lostaltmail.in#3 delete .. //depot/projects/trustedbsd/base/contrib/amd/tasks#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/MAINTAINERS#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/Makefile.def#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/Makefile.tpl#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/README-maintainer-mode#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog#10 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog-0001#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog-0203#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/acinclude.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/aout-arm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/aout-encap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/aout-target.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/aoutf1.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/aoutx.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/archive.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/archive64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/archures.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfd-in.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfd-in2.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfd.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfdio.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfdwin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/binary.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bout.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cache.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-alpha.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-arm.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-aux.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-i386.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-ia64.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-ppc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-rs6000.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-sparc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff64-rs6000.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coffcode.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coffgen.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cofflink.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coffswap.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/config.bfd#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/config.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure.host#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/corefile.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-alpha.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-arc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-arm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-i386.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-ia64-opc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-ia64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-powerpc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-rs6000.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-s390.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-sparc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/dep-in.sed#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/ChangeLog-9103#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/aoutx.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/archive.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/archures.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/bfd.texinfo#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/bfdint.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/bfdio.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/bfdt.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/bfdwin.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/cache.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/chew.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/coffcode.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/core.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/format.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/hash.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/init.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/libbfd.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/linker.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/mmo.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/opncls.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/reloc.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/section.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/syms.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/targets.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/dwarf1.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/dwarf2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ecoff.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ecofflink.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ecoffswap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/efi-app-ia32.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/efi-app-ia64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf-bfd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf-eh-frame.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf-strtab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-arc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-arm.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-gen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-i386.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-ppc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-ppc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-s390.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-sparc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-alpha.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-gen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-ppc.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-ppc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-s390.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-sparc.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-x86-64.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfarm-nabi.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfarm-oabi.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfcode.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfcore.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elflink.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfxx-ia64.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfxx-target.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/format.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/freebsd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/gen-aout.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/genlink.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/hash.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/i386aout.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/i386linux.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ieee.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ihex.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/init.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libaout.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libbfd-in.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libbfd.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libbfd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libcoff-in.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libcoff.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libecoff.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libieee.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libpei.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libxcoff.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/linker.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/merge.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/netbsd-core.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/netbsd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/opncls.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/osf-core.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/pe-arm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/pe-i386.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/peXXigen.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/peicode.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/po/BLD-POTFILES.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/po/Make-in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/po/SRC-POTFILES.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/po/bfd.pot#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ppcboot.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ptrace-core.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/reloc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/reloc16.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/rs6000-core.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/sco5-core.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/section.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/simple.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/sparclinux.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/sparcnetbsd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/srec.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/stabs.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/sunos.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/syms.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/sysdep.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/targets.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/tekhex.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/trad-core.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/version.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/xcoff-target.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/xcofflink.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog-0001#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog-0203#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog-9197#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog-9899#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/NEWS#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/addr2line.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ar.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/arlex.l#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/arparse.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/arsup.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/arsup.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/binemul.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/binemul.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/bucomm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/bucomm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/budbg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/budemang.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/budemang.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/coffdump.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/coffgrok.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/coffgrok.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/config.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/cxxfilt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/debug.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/debug.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/deflex.l#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/dep-in.sed#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/dlltool.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/dlltool.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/dllwrap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/addr2line.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/ar.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/binutils.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/cxxfilt.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/dlltool.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/nm.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/objcopy.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/objdump.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/ranlib.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/readelf.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/size.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/strings.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/strip.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/filemode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ieee.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/nm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/objcopy.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/objdump.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/po/Make-in#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/po/POTFILES.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/po/binutils.pot#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/prdbg.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rclex.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rclex.l#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rdcoff.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rddbg.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/readelf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rename.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/resbin.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rescoff.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/resrc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/size.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/srconv.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/stabs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/strings.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/sysdump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/unwind-ia64.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/unwind-ia64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/version.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/wrstabs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/config-ml.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/config.guess#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/config.if#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/config.sub#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/CONTRIBUTORS#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ChangeLog-0203#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ChangeLog-9295#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/NEWS#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/app.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/as.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/as.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/atof-generic.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/bignum-copy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/bignum.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/bit_fix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/cgen.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/cgen.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/cond.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-aout.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-aout.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-coff.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-coff.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-ecoff.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-ecoff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-elf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-ieee.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-ieee.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-multi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-alpha.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-alpha.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-arc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-arc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-arm.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-arm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-i386.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-i386.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ia64.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ia64.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ppc.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ppc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-s390.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-s390.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-sparc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-sparc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/te-generic.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/te-pe.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/te-ppcnw.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/dep-in.sed#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/depend.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/all.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/as.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/as.texinfo#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-alpha.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-arm.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-i386.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-ia64.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-ppc.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-sh.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-sparc.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/gasver.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/h8.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/internals.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/dw2gencfi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/dw2gencfi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/dwarf2dbg.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/dwarf2dbg.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ecoff.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ecoff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ehopt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/emul.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/expr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/expr.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/flonum-copy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/flonum-mult.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/flonum.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/frags.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/frags.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/hash.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/hash.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/input-file.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/input-file.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/input-scrub.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/itbl-ops.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/itbl-ops.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/listing.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/listing.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/macro.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/macro.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/messages.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/obj.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/output-file.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/output-file.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/po/Make-in#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/po/POTFILES.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/po/gas.pot#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/read.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/read.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/sb.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/sb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/stabs.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/subsegs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/subsegs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/symbols.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/symbols.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/tc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/write.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/write.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/ansidecl.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/aout/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/aout/aout64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/aout/stab.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/bfdlink.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/arm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/ecoff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/internal.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/pe.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/sh.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/ti.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/coff/xcoff.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/demangle.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/dis-asm.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ChangeLog-9103#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/arm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/common.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/dwarf2.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/external.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/frv.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/h8.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/i370.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ia64.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/internal.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ip2k.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/iq2000.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/m32r.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/m68hc11.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/mips.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/mmix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/mn10300.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/msp430.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ppc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ppc64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/reloc-macros.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/s390.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/sh.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/sparc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/v850.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/x86-64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/xstormy16.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/xtensa.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/fibheap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/floatformat.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/hashtab.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/libiberty.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/obstack.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ChangeLog-9103#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/alpha.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/arc.h#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/cgen.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/convex.h#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/i386.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ia64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/np1.h#3 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/pn.h#3 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ppc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/s390.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/sparc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/partition.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/safe-ctype.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/splay-tree.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog#10 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog-0001#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog-0203#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog-9197#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/NEWS#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/config.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/configure.host#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/configure.tgt#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/deffile.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/deffilep.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/dep-in.sed#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/arcelf.sh#3 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/armelf.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/armelf_linux.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/armelf_oabi.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/armpe.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32_sparc.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32b4300.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bmipn32.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bsmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32ebmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32elmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32l4300.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32lmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32lsmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32ppc.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64_ia64.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64_s390.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64_sparc.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64alpha.sh#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64bmip.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64ppc.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf_i386.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf_s390.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf_x86_64.sh#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/sh.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shl.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shlelf.sh#4 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/vanilla.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/vsta.sh#3 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/alphaelf.em#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/armcoff.em#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/armelf.em#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/armelf_oabi.em#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/elf32.em#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/generic.em#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/ia64elf.em#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/linux.em#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/needrelax.em#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/netbsd.em#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/pe.em#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/ppc32elf.em#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/ppc64elf.em#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/sunos.em#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/ticoff.em#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/vanilla.em#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/fdl.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/gen-doc.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/genscripts.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/h8-doc.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.texinfo#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldcref.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldctor.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldctor.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldemul.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldemul.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldexp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldexp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldfile.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldfile.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldgram.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldint.texinfo#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlang.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlang.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlex.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlex.l#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldmain.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldmain.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldmisc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldmisc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldver.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldver.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldver.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldwrite.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldwrite.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/lexsup.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/mri.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/mri.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/pe-dll.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/pe-dll.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/scripttempl/armcoff.sc#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/scripttempl/elf.sc#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/scripttempl/pe.sc#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/sysdep.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/argv.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/asprintf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/calloc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/config.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/config.table#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/copysign.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/cp-demangle.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/cp-demangle.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/cp-demint.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/cplus-dem.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/fibheap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/floatformat.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/functions.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/getcwd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/getpwd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/hashtab.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/hex.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/lbasename.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/libiberty.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/lrealpath.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/maint-tool#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/make-relative-prefix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/md5.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/memchr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/memcmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/memcpy.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/memmove.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/memset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/physmem.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/regex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/rename.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/safe-ctype.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/sigsetmask.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/splay-tree.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strcasecmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strdup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strerror.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strncasecmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strncmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strsignal.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/strstr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/vasprintf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/vfprintf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/vprintf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/vsprintf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/xatexit.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/xmalloc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libtool.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ltcf-c.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ltcf-cxx.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ltcf-gcj.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ltconfig#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/missing#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ChangeLog-0001#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ChangeLog-0203#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/alpha-opc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/arc-opc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/arm-dis.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/arm-opc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen-asm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen-asm.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen-dis.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen-dis.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen-ibld.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen-opc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/cgen.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/config.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/dep-in.sed#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/dis-buf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/dis-init.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/disassemble.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/i386-dis.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-asmtab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-dis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-gen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-ic.tbl#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-a.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-b.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-d.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-f.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-i.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-m.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc-x.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-opc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-raw.tbl#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ia64-waw.tbl#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/po/Make-in#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/po/POTFILES.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/po/opcodes.pot#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-dis.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-opc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-dis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-mkopc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-opc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-opc.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/sh-dis.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/sh-opc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/sparc-dis.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/sparc-opc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/symlink-tree#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/BUGS#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/HACKING#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/INSTALL#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/NEWS#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/acinclude.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/config.h.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.1#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.man.footer#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.man.header#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.texinfo#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/mkman.in#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-1#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-vti#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version-client.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.am#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 29 19:56:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12C8E16A4D1; Thu, 29 Jul 2004 19:56:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD64616A4CE for ; Thu, 29 Jul 2004 19:56:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4F7343D68 for ; Thu, 29 Jul 2004 19:56:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TJu33C053414 for ; Thu, 29 Jul 2004 19:56:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TJu3Ux053411 for perforce@freebsd.org; Thu, 29 Jul 2004 19:56:03 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 19:56:03 GMT Message-Id: <200407291956.i6TJu3Ux053411@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 58479 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, 29 Jul 2004 19:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=58479 Change 58479 by jhb@jhb_slimer on 2004/07/29 19:55:07 Properly move gcc membar before the store. Submitted by: gibbs Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#15 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#15 (text+ko) ==== @@ -190,8 +190,8 @@ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ + __asm __volatile("" : : : "memory"); \ *p = v; \ - __asm __volatile("" : : : "memory"); \ } \ struct __hack @@ -214,8 +214,8 @@ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ + __asm __volatile("" : : : "memory"); \ *p = v; \ - __asm __volatile("" : : : "memory"); \ } \ struct __hack From owner-p4-projects@FreeBSD.ORG Thu Jul 29 20:05:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1504416A4D0; Thu, 29 Jul 2004 20:05:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDA1E16A4D1 for ; Thu, 29 Jul 2004 20:05:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C457C43D60 for ; Thu, 29 Jul 2004 20:05:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TK5EwC053599 for ; Thu, 29 Jul 2004 20:05:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TK5EWE053596 for perforce@freebsd.org; Thu, 29 Jul 2004 20:05:14 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 20:05:14 GMT Message-Id: <200407292005.i6TK5EWE053596@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 58480 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, 29 Jul 2004 20:05:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=58480 Change 58480 by jhb@jhb_slimer on 2004/07/29 20:04:55 Fix a possible deadlock on SMP by using the same mutex to protect the pmap_lazyfix IPI + spin as the other TLB IPI + spins. Affected files ... .. //depot/projects/smpng/sys/i386/i386/pmap.c#66 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/pmap.c#66 (text+ko) ==== @@ -185,9 +185,6 @@ LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; -#ifdef SMP -static struct mtx lazypmap_lock; -#endif vm_paddr_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ @@ -332,9 +329,6 @@ kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); -#ifdef SMP - mtx_init(&lazypmap_lock, "lazypmap", NULL, MTX_SPIN); -#endif mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN); mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); @@ -1307,7 +1301,7 @@ while ((mask = pmap->pm_active) != 0) { spins = 50000000; mask = mask & -mask; /* Find least significant set bit */ - mtx_lock_spin(&lazypmap_lock); + mtx_lock_spin(&smp_tlb_mtx); #ifdef PAE lazyptd = vtophys(pmap->pm_pdpt); #else @@ -1327,7 +1321,7 @@ break; } } - mtx_unlock_spin(&lazypmap_lock); + mtx_unlock_spin(&smp_tlb_mtx); if (spins == 0) printf("pmap_lazyfix: spun for 50000000\n"); } From owner-p4-projects@FreeBSD.ORG Thu Jul 29 20:06:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E412F16A4D0; Thu, 29 Jul 2004 20:06:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A443F16A4CE for ; Thu, 29 Jul 2004 20:06:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 846F843D39 for ; Thu, 29 Jul 2004 20:06:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TK6GK4053705 for ; Thu, 29 Jul 2004 20:06:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TK6Gjx053702 for perforce@freebsd.org; Thu, 29 Jul 2004 20:06:16 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 20:06:16 GMT Message-Id: <200407292006.i6TK6Gjx053702@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 58481 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, 29 Jul 2004 20:06:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=58481 Change 58481 by jhb@jhb_slimer on 2004/07/29 20:05:53 Hack around a deadlock due to an LOR for now on SMP at the cost of increasing latency of having a process swapped back in when one of its threads is made runnable. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#76 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#76 (text+ko) ==== @@ -402,7 +402,9 @@ if ((p->p_sflag & PS_INMEM) == 0) { if ((p->p_sflag & PS_SWAPPINGIN) == 0) { p->p_sflag |= PS_SWAPINREQ; +#ifndef SMP wakeup(&proc0); +#endif } } else sched_wakeup(td); From owner-p4-projects@FreeBSD.ORG Thu Jul 29 20:35:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 914CC16A4D0; Thu, 29 Jul 2004 20:35:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 407B216A4CE for ; Thu, 29 Jul 2004 20:35:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38BCF43D46 for ; Thu, 29 Jul 2004 20:35:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TKZrft054798 for ; Thu, 29 Jul 2004 20:35:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TKZqh2054795 for perforce@freebsd.org; Thu, 29 Jul 2004 20:35:52 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 20:35:52 GMT Message-Id: <200407292035.i6TKZqh2054795@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 58484 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, 29 Jul 2004 20:35:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=58484 Change 58484 by jhb@jhb_slimer on 2004/07/29 20:35:13 Try to optimize intr_disable/restore by avoiding cli/sti like the plague. Affected files ... .. //depot/projects/smpng/sys/i386/include/cpufunc.h#28 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/cpufunc.h#28 (text+ko) ==== @@ -611,14 +611,16 @@ register_t eflags; eflags = read_eflags(); - disable_intr(); + if (eflags & PSL_I) + disable_intr(); return (eflags); } static __inline void intr_restore(register_t eflags) { - write_eflags(eflags); + if (eflags & PSL_I) + enable_intr(); } #else /* !(__GNUC__ || __INTEL_COMPILER) */ From owner-p4-projects@FreeBSD.ORG Thu Jul 29 20:38:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6562A16A4CE; Thu, 29 Jul 2004 20:38:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 233A116A4CE; Thu, 29 Jul 2004 20:38:08 +0000 (GMT) Received: from mail.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEB0243D31; Thu, 29 Jul 2004 20:38:07 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (julian.vicor-nb.com [208.206.78.97]) by mail.vicor-nb.com (Postfix) with ESMTP id D15847A489; Thu, 29 Jul 2004 13:38:07 -0700 (PDT) Message-ID: <4109602F.9080108@elischer.org> Date: Thu, 29 Jul 2004 13:38:07 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3.1) Gecko/20030516 X-Accept-Language: en, hu MIME-Version: 1.0 To: John Baldwin References: <200407292035.i6TKZqh2054795@repoman.freebsd.org> In-Reply-To: <200407292035.i6TKZqh2054795@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 58484 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, 29 Jul 2004 20:38:09 -0000 John Baldwin wrote: >http://perforce.freebsd.org/chv.cgi?CH=58484 > >Change 58484 by jhb@jhb_slimer on 2004/07/29 20:35:13 > > Try to optimize intr_disable/restore by avoiding cli/sti like the > plague. > shouldn't one of these tests be reversed? > >Affected files ... > >.. //depot/projects/smpng/sys/i386/include/cpufunc.h#28 edit > >Differences ... > >==== //depot/projects/smpng/sys/i386/include/cpufunc.h#28 (text+ko) ==== > >@@ -611,14 +611,16 @@ > register_t eflags; > > eflags = read_eflags(); >- disable_intr(); >+ if (eflags & PSL_I) >+ disable_intr(); > return (eflags); > } > > static __inline void > intr_restore(register_t eflags) > { >- write_eflags(eflags); >+ if (eflags & PSL_I) >+ enable_intr(); > } > > #else /* !(__GNUC__ || __INTEL_COMPILER) */ > > From owner-p4-projects@FreeBSD.ORG Thu Jul 29 20:50:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90E2D16A4D0; Thu, 29 Jul 2004 20:50:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3774A16A4CF for ; Thu, 29 Jul 2004 20:50:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2996A43D39 for ; Thu, 29 Jul 2004 20:50:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TKoCmZ055265 for ; Thu, 29 Jul 2004 20:50:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TKoBfT055261 for perforce@freebsd.org; Thu, 29 Jul 2004 20:50:11 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 20:50:11 GMT Message-Id: <200407292050.i6TKoBfT055261@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 58488 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, 29 Jul 2004 20:50:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=58488 Change 58488 by jhb@jhb_slimer on 2004/07/29 20:49:29 Try to pass curthread around to avoid looking it up via PCPU as often when locking mutexes. Suggested by: rwatson Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#82 edit .. //depot/projects/smpng/sys/sys/mutex.h#43 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#82 (text+ko) ==== @@ -417,10 +417,10 @@ * sleep waiting for it), or if we need to recurse on it. */ void -_mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line) +_mtx_lock_sleep(struct mtx *m, struct thread *td, int opts, const char *file, + int line) { struct turnstile *ts; - struct thread *td = curthread; #if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) struct thread *owner; #endif @@ -568,7 +568,8 @@ * is handled inline. */ void -_mtx_lock_spin(struct mtx *m, int opts, const char *file, int line) +_mtx_lock_spin(struct mtx *m, struct thread *td, int opts, const char *file, + int line) { int i = 0; @@ -576,7 +577,7 @@ CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); for (;;) { - if (_obtain_lock(m, curthread)) + if (_obtain_lock(m, td)) break; /* Give interrupts a chance while we spin. */ ==== //depot/projects/smpng/sys/sys/mutex.h#43 (text+ko) ==== @@ -100,17 +100,19 @@ void mtx_destroy(struct mtx *m); void mtx_sysinit(void *arg); void mutex_init(void); -void _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line); +void _mtx_lock_sleep(struct mtx *m, struct thread *td, int opts, + const char *file, int line); void _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line); -void _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line); +void _mtx_lock_spin(struct mtx *m, struct thread *td, int opts, + const char *file, int line); void _mtx_unlock_spin(struct mtx *m, int opts, const char *file, int line); int _mtx_trylock(struct mtx *m, int opts, const char *file, int line); void _mtx_lock_flags(struct mtx *m, int opts, const char *file, int line); void _mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line); void _mtx_lock_spin_flags(struct mtx *m, int opts, const char *file, - int line); + int line); void _mtx_unlock_spin_flags(struct mtx *m, int opts, const char *file, - int line); + int line); #ifdef INVARIANT_SUPPORT void _mtx_assert(struct mtx *m, int what, const char *file, int line); #endif @@ -144,8 +146,10 @@ */ #ifndef _get_sleep_lock #define _get_sleep_lock(mp, tid, opts, file, line) do { \ - if (!_obtain_lock((mp), (tid))) \ - _mtx_lock_sleep((mp), (opts), (file), (line)); \ + struct thread *_tid = (tid); \ + \ + if (!_obtain_lock((mp), _tid)) \ + _mtx_lock_sleep((mp), _tid, (opts), (file), (line)); \ } while (0) #endif @@ -158,12 +162,14 @@ */ #ifndef _get_spin_lock #define _get_spin_lock(mp, tid, opts, file, line) do { \ + struct thread *_tid = (tid); \ + \ critical_enter(); \ - if (!_obtain_lock((mp), (tid))) { \ - if ((mp)->mtx_lock == (uintptr_t)(tid)) \ + if (!_obtain_lock((mp), _tid)) { \ + if ((mp)->mtx_lock == (uintptr_t)_tid) \ (mp)->mtx_recurse++; \ else \ - _mtx_lock_spin((mp), (opts), (file), (line)); \ + _mtx_lock_spin((mp), _tid, (opts), (file), (line)); \ } \ } while (0) #endif @@ -195,7 +201,7 @@ (mp)->mtx_recurse--; \ else \ _release_lock_quick((mp)); \ - critical_exit(); \ + critical_exit(); \ } while (0) #endif From owner-p4-projects@FreeBSD.ORG Thu Jul 29 21:07:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E6D016A4D1; Thu, 29 Jul 2004 21:07:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDCC816A4CF for ; Thu, 29 Jul 2004 21:06:59 +0000 (GMT) Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9A9A43D5D for ; Thu, 29 Jul 2004 21:06:59 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 8164 invoked from network); 29 Jul 2004 21:06:59 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 29 Jul 2004 21:06:59 -0000 Received: from 10.50.40.208 (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i6TL6rDI090569; Thu, 29 Jul 2004 17:06:55 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Julian Elischer Date: Thu, 29 Jul 2004 17:05:27 -0400 User-Agent: KMail/1.6 References: <200407292035.i6TKZqh2054795@repoman.freebsd.org> <4109602F.9080108@elischer.org> In-Reply-To: <4109602F.9080108@elischer.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200407291705.27004.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 58484 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, 29 Jul 2004 21:07:01 -0000 On Thursday 29 July 2004 04:38 pm, Julian Elischer wrote: > John Baldwin wrote: > >http://perforce.freebsd.org/chv.cgi?CH=58484 > > > >Change 58484 by jhb@jhb_slimer on 2004/07/29 20:35:13 > > > > Try to optimize intr_disable/restore by avoiding cli/sti like the > > plague. > > shouldn't one of these tests be reversed? Nope. If interrupts are enabled then we want to disable them in intr_disable(). If the saved state of interrupts is that they were enabled then we want to re-enable them in intr_restore(). If interrupts are disabled already, then we just leave everything alone. > >Affected files ... > > > >.. //depot/projects/smpng/sys/i386/include/cpufunc.h#28 edit > > > >Differences ... > > > >==== //depot/projects/smpng/sys/i386/include/cpufunc.h#28 (text+ko) ==== > > > >@@ -611,14 +611,16 @@ > > register_t eflags; > > > > eflags = read_eflags(); > >- disable_intr(); > >+ if (eflags & PSL_I) > >+ disable_intr(); > > return (eflags); > > } > > > > static __inline void > > intr_restore(register_t eflags) > > { > >- write_eflags(eflags); > >+ if (eflags & PSL_I) > >+ enable_intr(); > > } > > > > #else /* !(__GNUC__ || __INTEL_COMPILER) */ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Jul 29 22:40:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75E1516A4D0; Thu, 29 Jul 2004 22:40:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3816816A4CE for ; Thu, 29 Jul 2004 22:40:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1953243D1F for ; Thu, 29 Jul 2004 22:40:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TMetvp058743 for ; Thu, 29 Jul 2004 22:40:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TMetWQ058740 for perforce@freebsd.org; Thu, 29 Jul 2004 22:40:55 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jul 2004 22:40:55 GMT Message-Id: <200407292240.i6TMetWQ058740@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 58502 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, 29 Jul 2004 22:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=58502 Change 58502 by jhb@jhb_blue on 2004/07/29 22:40:40 Fix compile with evil nested include. Fixing all consumers of machine/cpufunc.h isn't very feasible since sys/system.h includes it directly. Affected files ... .. //depot/projects/smpng/sys/i386/include/cpufunc.h#29 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/cpufunc.h#29 (text+ko) ==== @@ -38,6 +38,8 @@ #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ +#include + struct region_descriptor; #define readb(va) (*(volatile u_int8_t *) (va)) From owner-p4-projects@FreeBSD.ORG Thu Jul 29 23:41:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2717516A4D0; Thu, 29 Jul 2004 23:41:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D979016A4CE for ; Thu, 29 Jul 2004 23:41:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD93643D1D for ; Thu, 29 Jul 2004 23:41:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TNfYRW060541 for ; Thu, 29 Jul 2004 23:41:34 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TNfY2d060538 for perforce@freebsd.org; Thu, 29 Jul 2004 23:41:34 GMT (envelope-from wsalamon@computer.org) Date: Thu, 29 Jul 2004 23:41:34 GMT Message-Id: <200407292341.i6TNfY2d060538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 58505 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, 29 Jul 2004 23:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=58505 Change 58505 by wsalamon@wsalamon_epi on 2004/07/29 23:41:28 Call the audit system call enter/exit routines when a system call is entered/exited. Fix the Makefile for the auditreduce and praudit commands, fix up the #includes in these source files. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/auditreduce.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/praudit.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/bsm/bin/Makefile#2 (text+ko) ==== @@ -1,28 +1,13 @@ -## Probably only works with GNU make +# +# Makefile for the praudit and auditreduce commands. +# -ifndef CFLAGS -CFLAGS = -g -Wall -pipe -fno-common -I/usr/include $(CCFLAGS) -endif -BINCFLAGS = $(CFLAGS) -I../lib -BSMLIBPATH = -L../lib -L/usr/lib -GCC=gcc +CFLAGS = -I. -lbsm +CFILES = praudit.c auditreduce.c auditreduce.h +DSTROOT = /usr/sbin -OUTFILES = praudit auditreduce +all: praudit auditreduce -all: ${OUTFILES} - -install: ${OUTFILES} - for bin in ${OUTFILES} ; do \ - install $$bin /usr/sbin ; \ - /usr/bin/strip -S /usr/sbin/$$bin ; \ - done - -praudit: praudit.c - $(GCC) $(BINCFLAGS) $(BSMLIBPATH) -lbsm praudit.c -o praudit - -auditreduce: auditreduce.c - $(GCC) $(BINCFLAGS) $(BSMLIBPATH) -lbsm auditreduce.c -o auditreduce - -clean: - rm -f *.o ${OUTFILES} - +install: + install -d $(DSTROOT) + install -c -m 544 auditreduce praudit $(DSTROOT) ==== //depot/projects/trustedbsd/audit3/contrib/bsm/bin/auditreduce.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include #include -#include +#include #include "auditreduce.h" ==== //depot/projects/trustedbsd/audit3/contrib/bsm/bin/praudit.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -#include +#include extern char *optarg; extern int optind, optopt, opterr,optreset; ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include #include -#include #include /* @@ -332,9 +331,9 @@ audit_arg_ ## op (args); \ } while (0) -#define AUDIT_SYSCALL_ENTER(args...) do { \ +#define AUDIT_SYSCALL_ENTER(code, td) do { \ if (audit_enabled) { \ - audit_syscall_enter(args); \ + audit_syscall_enter(code, td); \ } \ } while (0) @@ -358,7 +357,7 @@ } while (0) #else /* !AUDIT */ -#define AUDIT_SYSCALL_ENTER(args...) do { \ +#define AUDIT_SYSCALL_ENTER(code, td) do { \ } while (0) #define AUDIT_SYSCALL_EXIT(error, td) do { \ ==== //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#2 (text+ko) ==== @@ -72,6 +72,9 @@ #ifdef KTRACE #include #endif +#ifdef AUDIT +#include +#endif #include #include @@ -1001,7 +1004,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { From owner-p4-projects@FreeBSD.ORG Fri Jul 30 02:00:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B22316A4D0; Fri, 30 Jul 2004 02:00:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0531F16A4CE for ; Fri, 30 Jul 2004 02:00:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB16543D62 for ; Fri, 30 Jul 2004 02:00:23 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6U20N10065123 for ; Fri, 30 Jul 2004 02:00:23 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6U20NKC065120 for perforce@freebsd.org; Fri, 30 Jul 2004 02:00:23 GMT (envelope-from wsalamon@computer.org) Date: Fri, 30 Jul 2004 02:00:23 GMT Message-Id: <200407300200.i6U20NKC065120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 58510 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, 30 Jul 2004 02:00:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=58510 Change 58510 by wsalamon@wsalamon_epi on 2004/07/30 02:00:10 Fix up the audit daemon to run on FreeBSD; remove all references to Mach. The audit daemon needs to be completed once we decide on the kernel->auditd communication mechanism. However, this version of auditd can be used to populate the audit event -> audit class mapping within the kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#4 edit .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_warn.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#4 (text+ko) ==== @@ -2,11 +2,15 @@ # Makefile for the audit command. # -NAME = auditd +CC = gcc +CFILES = audit_warn.c auditd.c auditd.h +CFLAGS = -g -CFILES = auditd.c audit_warn.c auditd.h - -all: $(NAME) +all: audit_warn auditd +audit_warn: audit_warn.c + $(CC) -c audit_warn.c -o audit_warn +auditd: auditd.c + $(CC) -lbsm auditd.c audit_warn.o -o auditd install-man-page: install -d $(DSTROOT)/usr/share/man/man1 ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_warn.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -#include +#include "auditd.h" /* Write to the audit log. */ static int auditwarnlog(char *args[]) ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#2 (text+ko) ==== @@ -22,16 +22,12 @@ * @APPLE_LICENSE_HEADER_END@ */ -#include -#include -#include -#include -#include - +#include #include #include #include #include +#include #include #include @@ -43,15 +39,12 @@ #include #include #include -#include #include #include #include -#include -#include "auditd_control_server.h" -#include "audit_triggers_server.h" +#include "auditd.h" #define NA_EVENT_STR_SIZE 25 static int ret, minval; @@ -59,11 +52,6 @@ static int allhardcount = 0; -mach_port_t bp = MACH_PORT_NULL; -mach_port_t control_port = MACH_PORT_NULL; -mach_port_t signal_port = MACH_PORT_NULL; -mach_port_t port_set = MACH_PORT_NULL; - #ifndef __BSM_INTERNAL_NOTIFY_KEY #define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" #endif /* __BSM_INTERNAL_NOTIFY_KEY */ @@ -201,7 +189,8 @@ if (open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP) < 0) { perror("File open"); } - else if (auditctl(fn) != 0) { + /* else if (auditctl(fn) != 0) { */ + else if (syscall(SYS_auditctl, fn) != 0) { syslog(LOG_ERR, "auditctl failed! : %s\n", strerror(errno)); } @@ -228,7 +217,7 @@ */ int read_control_file() { - char cur_dir[MAX_DIR_SIZE]; + char cur_dir[MAXNAMLEN]; struct dir_ent *dirent; au_qctrl_t qctrl; @@ -236,19 +225,16 @@ free_dir_q(); endac(); // force a re-read of the file the next time - /* Post that the audit config changed */ - notify_post(__BSM_INTERNAL_NOTIFY_KEY); - /* Read the list of directories into a local linked list */ /* XXX We should use the reentrant interfaces once they are available */ - while(getacdir(cur_dir, MAX_DIR_SIZE) >= 0) { + while(getacdir(cur_dir, MAXNAMLEN) >= 0) { dirent = (struct dir_ent *) malloc (sizeof(struct dir_ent)); if(dirent == NULL) { return -1; } dirent->softlim = 0; - dirent->dirname = (char *) malloc (MAX_DIR_SIZE); + dirent->dirname = (char *) malloc (MAXNAMLEN); if(dirent->dirname == NULL) { free(dirent); return -1; @@ -279,13 +265,15 @@ syslog(LOG_INFO, "min free = %d\n", minval); - if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { + /* if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { */ + if (syscall(SYS_auditon, A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, "could not get audit queue settings\n"); return -1; } qctrl.aq_minfree = minval; - if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { + /* if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { */ + if (syscall(SYS_auditon, A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, "could not set audit queue settings\n"); return -1; @@ -320,7 +308,8 @@ } /* flush contents */ - err_ret = auditctl(NULL); + /* err_ret = auditctl(NULL); */ + err_ret = syscall(SYS_auditctl, NULL); if (err_ret != 0) { syslog(LOG_ERR, "auditctl failed! : %s\n", strerror(errno)); @@ -352,14 +341,6 @@ static void relay_signal(int signal) { - mach_msg_empty_send_t msg; - - msg.header.msgh_id = signal; - msg.header.msgh_remote_port = signal_port; - msg.header.msgh_local_port = MACH_PORT_NULL; - msg.header.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND, 0); - mach_msg(&(msg.header), MACH_SEND_MSG|MACH_SEND_TIMEOUT, sizeof(msg), - 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); } /* registering the daemon */ @@ -404,9 +385,7 @@ /* * React to input from the audit tool */ -kern_return_t auditd_control(auditd_port, flags) - mach_port_t auditd_port; - int flags; +int auditd_control(int flags) { int err_ret = 0; @@ -434,9 +413,12 @@ break; } - return KERN_SUCCESS; + return 0; } - +/* + * XXX This routine will eventually handle kernel messages to rotate the + * audit log, etc. + */ /* * Suppress duplicate messages within a 30 second interval. * This should be enough to time to rotate log files without @@ -444,19 +426,15 @@ * actually rotated. */ #define DUPLICATE_INTERVAL 30 -/* - * Implementation of the audit_triggers() MIG routine. - */ -kern_return_t audit_triggers(audit_port, flags) - mach_port_t audit_port; - int flags; +int audit_triggers(int flags) { static int last_flags; static time_t last_time; struct dir_ent *dirent; /* - * Suppres duplicate messages from the kernel within the specified interval + * Suppres duplicate messages from the kernel within the specified + * interval. */ struct timeval ts; struct timezone tzp; @@ -465,7 +443,7 @@ if(gettimeofday(&ts, &tzp) == 0) { tt = (time_t)ts.tv_sec; if ((flags == last_flags) && (tt < (last_time + DUPLICATE_INTERVAL))) { - return KERN_SUCCESS; + return 0; } last_flags = flags; last_time = tt; @@ -524,7 +502,7 @@ audit_warn_allhard(++allhardcount); } } - return KERN_SUCCESS; + return 0; } /* @@ -550,49 +528,6 @@ } /* - * Handle an RPC call - */ -boolean_t auditd_combined_server( - mach_msg_header_t *InHeadP, - mach_msg_header_t *OutHeadP) -{ - mach_port_t local_port = InHeadP->msgh_local_port; - - if (local_port == signal_port) { - int signo = InHeadP->msgh_id; - int ret; - - if (SIGTERM == signo) { - ret = close_all(); - exit (ret); - } else if (SIGCHLD == signo) { - reap_children(); - return TRUE; - } else { - syslog(LOG_INFO, "Recevied signal %d.\n", signo); - return TRUE; - } - } else if (local_port == control_port) { - boolean_t result; - - result = audit_triggers_server(InHeadP, OutHeadP); - if (!result) - result = auditd_control_server(InHeadP, OutHeadP); - return result; - } - syslog(LOG_INFO, "Recevied msg on bad port 0x%x.\n", local_port); - return FALSE; -} - -void wait_on_audit_trigger(port_set) - mach_port_t port_set; -{ - kern_return_t result; - result = mach_msg_server(auditd_combined_server, 4096, port_set, MACH_MSG_OPTION_NONE); - syslog(LOG_ERR, "abnormal exit\n"); -} - -/* * Configure the audit controls in the kernel: the event to class mapping, * kernel preselection mask, etc. */ @@ -616,7 +551,8 @@ while((ev = getauevent()) != NULL) { evc_map.ec_number = ev->ae_number; evc_map.ec_class = ev->ae_class; - if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { + /* if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { */ + if (syscall(SYS_auditon,A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { syslog(LOG_ERR, "Failed to register class mapping for event %s", ev->ae_name); @@ -639,7 +575,8 @@ if ((getacna(naeventstr, NA_EVENT_STR_SIZE) == 0) && ( getauditflagsbin(naeventstr, &aumask) == 0)) { - if (auditon(A_SETKMASK, &aumask, sizeof(au_mask_t))){ + /* if (auditon(A_SETKMASK, &aumask, sizeof(au_mask_t))){ */ + if (syscall(SYS_auditon,A_SETKMASK, &aumask, sizeof(au_mask_t))){ syslog(LOG_ERR, "Failed to register non-attributable event mask."); } else { @@ -653,7 +590,8 @@ /* * Set the audit policy flags based on passed in parameter values. */ - if (auditon(A_SETPOLICY, &flags, sizeof(flags))) { + /* if (auditon(A_SETPOLICY, &flags, sizeof(flags))) { */ + if (syscall(SYS_auditon,A_SETPOLICY, &flags, sizeof(flags))) { syslog(LOG_ERR, "Failed to set audit policy."); } @@ -663,55 +601,11 @@ void setup(long flags) { - mach_msg_type_name_t poly; int aufd; token_t *tok; - /* Allocate a port set */ - if (mach_port_allocate(mach_task_self(), - MACH_PORT_RIGHT_PORT_SET, - &port_set) != KERN_SUCCESS) { - syslog(LOG_ERR, "allocation of port set failed\n"); - fail_exit(); - } - - /* Allocate a signal reflection port */ - if (mach_port_allocate(mach_task_self(), - MACH_PORT_RIGHT_RECEIVE, - &signal_port) != KERN_SUCCESS || - mach_port_move_member(mach_task_self(), - signal_port, - port_set) != KERN_SUCCESS) { - syslog(LOG_ERR, "allocation of signal port failed\n"); - fail_exit(); - } - - /* Allocate a trigger port */ - if (mach_port_allocate(mach_task_self(), - MACH_PORT_RIGHT_RECEIVE, - &control_port) != KERN_SUCCESS || - mach_port_move_member(mach_task_self(), - control_port, - port_set) != KERN_SUCCESS) { - syslog(LOG_ERR, "allocation of trigger port failed\n"); - fail_exit(); - } - - /* create a send right on our trigger port */ - mach_port_extract_right(mach_task_self(), control_port, - MACH_MSG_TYPE_MAKE_SEND, &control_port, &poly); - TAILQ_INIT(&dir_q); - /* register the trigger port with the kernel */ - if(host_set_audit_control_port(mach_host_self(), control_port) != KERN_SUCCESS) { - syslog(LOG_ERR, "Cannot set Mach control port\n"); - fail_exit(); - } - else { - syslog(LOG_ERR, "Mach control port registered\n"); - } - if(read_control_file() == -1) { syslog(LOG_ERR, "Error reading control file\n"); fail_exit(); @@ -765,7 +659,7 @@ case '?': default: (void)fprintf(stderr, - "usage: auditd [-h | -s]\n"); + "usage: auditd [-h | -s] [-d] \n"); exit(1); } } @@ -784,7 +678,6 @@ } setup(flags); - wait_on_audit_trigger(port_set); syslog(LOG_INFO, "exiting.\n"); exit(1); From owner-p4-projects@FreeBSD.ORG Fri Jul 30 02:09:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E09D16A4D0; Fri, 30 Jul 2004 02:09:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A38D16A4CE for ; Fri, 30 Jul 2004 02:09:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FA8043D48 for ; Fri, 30 Jul 2004 02:09:51 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6U29ZfG065373 for ; Fri, 30 Jul 2004 02:09:35 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6U29YYB065370 for perforce@freebsd.org; Fri, 30 Jul 2004 02:09:34 GMT (envelope-from wsalamon@computer.org) Date: Fri, 30 Jul 2004 02:09:34 GMT Message-Id: <200407300209.i6U29YYB065370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 58511 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, 30 Jul 2004 02:09:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=58511 Change 58511 by wsalamon@wsalamon_epi on 2004/07/30 02:08:42 Makefile cleanup: add 'clean' and 'install' rules. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#5 (text+ko) ==== @@ -8,10 +8,14 @@ all: audit_warn auditd audit_warn: audit_warn.c - $(CC) -c audit_warn.c -o audit_warn + $(CC) -c audit_warn.c -o audit_warn.o auditd: auditd.c $(CC) -lbsm auditd.c audit_warn.o -o auditd -install-man-page: - install -d $(DSTROOT)/usr/share/man/man1 - install -c -m 444 auditd.8 $(DSTROOT)/usr/share/man/man1/auditd.8 +install: + install -d /usr/share/man/man8 + install -c -m 444 auditd.8 /usr/share/man/man8/auditd.8 + install -c -m 544 auditd /usr/sbin + +clean: + rm -f auditd audit_warn.o ==== //depot/projects/trustedbsd/audit3/contrib/bsm/bin/Makefile#3 (text+ko) ==== @@ -11,3 +11,6 @@ install: install -d $(DSTROOT) install -c -m 544 auditreduce praudit $(DSTROOT) + +clean: + rm -f praudit auditreduce From owner-p4-projects@FreeBSD.ORG Fri Jul 30 05:57:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DABD16A4D0; Fri, 30 Jul 2004 05:57:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 761A816A4CE; Fri, 30 Jul 2004 05:57:05 +0000 (GMT) Received: from darkness.comp.waw.pl (darkness.comp.waw.pl [195.117.238.236]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25D3543D46; Fri, 30 Jul 2004 05:57:05 +0000 (GMT) (envelope-from pjd@darkness.comp.waw.pl) Received: by darkness.comp.waw.pl (Postfix, from userid 1009) id BDD3FACAE0; Fri, 30 Jul 2004 07:56:51 +0200 (CEST) Date: Fri, 30 Jul 2004 07:56:51 +0200 From: Pawel Jakub Dawidek To: Wayne Salamon Message-ID: <20040730055651.GC57678@darkness.comp.waw.pl> References: <200407292341.i6TNfY2d060538@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XGa5gNSGTk93P04E" Content-Disposition: inline In-Reply-To: <200407292341.i6TNfY2d060538@repoman.freebsd.org> User-Agent: Mutt/1.4.2i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 5.2.1-RC2 i386 cc: Perforce Change Reviews Subject: Re: PERFORCE change 58505 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, 30 Jul 2004 05:57:06 -0000 --XGa5gNSGTk93P04E Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 29, 2004 at 11:41:34PM +0000, Wayne Salamon wrote: +> http://perforce.freebsd.org/chv.cgi?CH=3D58505 +>=20 +> Change 58505 by wsalamon@wsalamon_epi on 2004/07/29 23:41:28 +>=20 +> Call the audit system call enter/exit routines when a system call is +> entered/exited. Fix the Makefile for the auditreduce and praudit +> commands, fix up the #includes in these source files. AFAIK we don't use Makefiles from contrib/ directory. We create Makefile in other directories that use source files from contrib/ directory. I've made Makefiles in pjd_trustedbsd_audit3 branch for praudit(1) and auditreduce(1) in usr.sbin/(praudit|auditreduce)/Makefile. --=20 Pawel Jakub Dawidek http://www.FreeBSD.org pjd@FreeBSD.org http://garage.freebsd.pl FreeBSD committer Am I Evil? Yes, I Am! --XGa5gNSGTk93P04E Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFBCeMjForvXbEpPzQRApt4AJ4qMqa09dGV77bi3HyhT2IRox9CZQCcCuNR EQ0ZiaCDauRkcnNDTKcrMxs= =vO9r -----END PGP SIGNATURE----- --XGa5gNSGTk93P04E-- From owner-p4-projects@FreeBSD.ORG Fri Jul 30 11:03:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 531A316A4D0; Fri, 30 Jul 2004 11:03:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D03216A4CE for ; Fri, 30 Jul 2004 11:03:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25B2843D1F for ; Fri, 30 Jul 2004 11:03:59 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6UB3x8C081068 for ; Fri, 30 Jul 2004 11:03:59 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6UB3wi8081065 for perforce@freebsd.org; Fri, 30 Jul 2004 11:03:58 GMT (envelope-from dfr@freebsd.org) Date: Fri, 30 Jul 2004 11:03:58 GMT Message-Id: <200407301103.i6UB3wi8081065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 58538 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, 30 Jul 2004 11:04:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=58538 Change 58538 by dfr@dfr_home on 2004/07/30 11:03:12 Make the TLS bits compile with gcc-3.4.2 Affected files ... .. //depot/projects/kse/lib/libc/gen/tls.c#4 edit .. //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#9 edit Differences ... ==== //depot/projects/kse/lib/libc/gen/tls.c#4 (text+ko) ==== @@ -39,6 +39,7 @@ extern void *___tls_get_addr(void *ti) __attribute__((__regparm__(1))); #pragma weak ___tls_get_addr +__attribute__((__regparm__(1))) void * ___tls_get_addr(void *ti) { ==== //depot/projects/kse/libexec/rtld-elf/i386/reloc.c#9 (text+ko) ==== @@ -472,6 +472,7 @@ } /* GNU ABI */ +__attribute__((__regparm__(1))) void *___tls_get_addr(tls_index *ti) { Elf_Addr** segbase;