From owner-p4-projects@FreeBSD.ORG Sun Jun 12 06:49:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7BA816A420; Sun, 12 Jun 2005 06:49:39 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 81F3B16A41C for ; Sun, 12 Jun 2005 06:49:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A3E343D49 for ; Sun, 12 Jun 2005 06:49:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5C6ndx1051533 for ; Sun, 12 Jun 2005 06:49:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5C6ndum051530 for perforce@freebsd.org; Sun, 12 Jun 2005 06:49:39 GMT (envelope-from marcel@freebsd.org) Date: Sun, 12 Jun 2005 06:49:39 GMT Message-Id: <200506120649.j5C6ndum051530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 06:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=78428 Change 78428 by marcel@marcel_nfs on 2005/06/12 06:49:28 Add a sysinit for VTC. We need to wire-up the hardware drivers for input and output to the initial VT. We also need to kick the generic low-level console out and get the accelerated hardware driver involved. This latter may cause a graphics mode change and thus should not happen when we first come across the hardware during bus enumeration. This would only disturb the boot and thus needs to happen last before we run the scheduler. Affected files ... .. //depot/projects/tty/sys/sys/kernel.h#11 edit Differences ... ==== //depot/projects/tty/sys/sys/kernel.h#11 (text+ko) ==== @@ -166,6 +166,7 @@ SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ SI_SUB_SMP = 0xf000000, /* start the APs*/ + SI_SUB_VTC = 0xff00000, /* Setup VTs */ SI_SUB_RUN_SCHEDULER = 0xfffffff /* scheduler*/ }; From owner-p4-projects@FreeBSD.ORG Sun Jun 12 18:41:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E656D16A420; Sun, 12 Jun 2005 18:41:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B60C416A41C for ; Sun, 12 Jun 2005 18:41:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73D1A43D48 for ; Sun, 12 Jun 2005 18:41:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CIfW5Y002589 for ; Sun, 12 Jun 2005 18:41:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CIfWcX002586 for perforce@freebsd.org; Sun, 12 Jun 2005 18:41:32 GMT (envelope-from marcel@freebsd.org) Date: Sun, 12 Jun 2005 18:41:32 GMT Message-Id: <200506121841.j5CIfWcX002586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 18:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=78461 Change 78461 by marcel@marcel_nfs on 2005/06/12 18:41:23 IFC @78457 Affected files ... .. //depot/projects/tty/lib/libthr/Makefile#9 integrate .. //depot/projects/tty/lib/libthr/libthr.3#1 branch .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_mount.c#9 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/tty/sys/conf/files#33 integrate .. //depot/projects/tty/sys/conf/files.alpha#16 integrate .. //depot/projects/tty/sys/conf/files.amd64#19 integrate .. //depot/projects/tty/sys/conf/files.i386#25 integrate .. //depot/projects/tty/sys/conf/files.ia64#19 integrate .. //depot/projects/tty/sys/conf/files.pc98#20 integrate .. //depot/projects/tty/sys/conf/files.powerpc#10 integrate .. //depot/projects/tty/sys/conf/files.sparc64#17 integrate .. //depot/projects/tty/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/tty/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/tty/sys/dev/fe/if_fe_cbus.c#5 integrate .. //depot/projects/tty/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/tty/sys/dev/snc/dp83932.c#12 integrate .. //depot/projects/tty/sys/dev/snc/if_snc_pccard.c#6 integrate .. //depot/projects/tty/sys/kern/uipc_accf.c#7 integrate .. //depot/projects/tty/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/tty/sys/net/if.c#18 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/tty/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/tty/sys/powerpc/include/profile.h#5 integrate .. //depot/projects/tty/sys/sys/syscallsubr.h#11 integrate .. //depot/projects/tty/tools/regression/sockets/accf_data_attach/accf_data_attach.c#3 integrate Differences ... ==== //depot/projects/tty/lib/libthr/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.12 2005/04/23 02:48:58 davidxu Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.13 2005/06/11 15:27:56 rwatson Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -23,6 +23,8 @@ LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map +MAN= libthr.3 + # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -Wall CFLAGS+=-g ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.874 2005/06/08 12:57:47 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.876 2005/06/12 08:55:59 hrs Exp $ 2000 @@ -195,8 +195,27 @@ FreeBSD-SA-05:09.htt. &merged; - + A bug in the &man.tcpdump.1; utility which allows + a malicious remote user to cause a denial-of-service + by using specially crafted packets, has been fixed. + For more information, see security advisory + FreeBSD-SA-05:10.tcpdump. + &merged; + + Two problems in the &man.gzip.1; utility have been fixed. + These may allow a local user to modify permissions + of arbitrary files and overwrite arbitrary local + files when uncompressing a file. + For more information, see security advisory + FreeBSD-SA-05:11.gzip. + &merged; + A bug in BIND 9 DNSSEC has been fixed. + When DNSSEC is enabled, this bug may allow a remote attacker to inject + a specially crafted packet which will cause &man.named.8; to terminate. + For more information, see security advisory + FreeBSD-SA-05:12.bind9. + &merged; @@ -222,6 +241,43 @@ treated as an unprivileged user; if set to 1, then a jailed root user is treated the same as an unjailed root user. &merged; + A sysctl security.jail.getfsstatroot_only has been + renamed to security.jail.enforce_statfs and + now supports the following policies: + + + + + + Value + Policy + + + + + + 0 + show all mount-points without any restrictions + + + + 1 + show only mount-points below jail's chroot and show only part of the + mount-point's path (if jail's chroot directory is + /jails/foo and + mount-point is + /jails/foo/usr/home + only /usr/home will be shown) + + + + 2 + show only mount-point where jail's chroot directory is placed. + + + + + The loader tunable debug.mpsafevm has been enabled by default. &merged; @@ -231,6 +287,11 @@ DEBUG_MEMGUARD, plus small kernel modifications. It is generally intended for use by kernel developers. + struct ifnet and network interface API + have been changed. Due to ABI incompatibility, all drivers + not in the &os; base system need to be updated to use + the new API and recompiled. + A number of bugs have been fixed in the ULE scheduler. &merged; @@ -357,6 +418,10 @@ The &man.acpi.ibm.4; driver for IBM laptops has been added. + The &man.acpi.ibm.4; driver has been + improved to support hotkeys and reading fan status and thermal + sensors. + The &man.acpi.fujitsu.4; driver for handling &man.acpi.4;-controlled buttons Fujitsu laptops has been added. @@ -364,6 +429,23 @@ which supports the Sony Notebook Controller on various Sony laptops has been added. + The &man.atkbdc.4;, &man.atkbd.4;, and &man.psm.4; + drivers have been rewritten in more bus-independent way, + and now support EBus found on sparc64 platform. + + The following device drivers have been + added and enabled by default: + &man.atkbdc.4;, + &man.atkbd.4;, + creator(4), + machfb(4), + &man.syscons.4;, + &man.ohci.4;, + &man.psm.4;, + &man.ukbd.4;, + &man.ums.4;, + and &man.usb.4;. + The &man.auxio.4; driver has been to drive some auxiliary I/O functions found on various SBus/EBus &ultrasparc; models. &merged; @@ -382,7 +464,7 @@ in the &man.acpi.4; driver. These can individually be disabled by setting device hints such as hint.ichss.0.disabled="1". - The &man.hwpmc.4; hardware performance + The &man.hwpmc.4; hardware performance monitoring counter driver has been added. This driver virtualizes the hardware performance monitoring facilities in modern CPUs and provides support for using @@ -635,6 +717,9 @@ A new &man.ng.netflow.4; NetGraph node allows a router running &os; to do NetFlow version 5 exports. &merged; + A new &man.ng.tcpmss.4; NetGraph node has been added. + This supports altering MSS options of TCP packets. + The &man.sppp.4; driver now includes Frame Relay support. &merged; @@ -1070,6 +1155,11 @@ it behaving as if the option is always specified has been fixed. &merged; + The &man.rexecd.8; utility has been removed. + There are no rexec clients in the &os; tree, and the client + function &man.rexec.3; is present only in + libcompat. + The &man.rm.1; utility now supports an option that asks for confirmation (once) if recursively removing directories or if more than 3 files are listed in the ==== //depot/projects/tty/sys/alpha/osf1/osf1_mount.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.23 2005/06/09 17:44:45 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.25 2005/06/11 14:58:20 pjd Exp $"); #include "opt_mac.h" #include "opt_nfs.h" @@ -168,14 +168,10 @@ if (uap->flags & OSF1_MNT_NOWAIT) flags |= MNT_NOWAIT; - count = uap->bufsize / sizeof(struct ostatfs); + count = uap->bufsize / sizeof(struct osf1_statfs); size = count * sizeof(struct statfs); - if (size > 0) - buf = malloc(size, M_TEMP, M_WAITOK); - else - buf = NULL; - error = kern_getfsstat(td, buf, size, UIO_SYSSPACE, flags); - if (buf != NULL) { + error = kern_getfsstat(td, &buf, size, UIO_SYSSPACE, flags); + if (size > 0) { count = td->td_retval[0]; sp = buf; while (count > 0 && error == 0) { ==== //depot/projects/tty/sys/compat/freebsd32/freebsd32_misc.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.34 2005/06/09 17:44:46 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.35 2005/06/11 14:58:20 pjd Exp $"); #include "opt_compat.h" @@ -163,12 +163,8 @@ count = uap->bufsize / sizeof(struct statfs32); size = count * sizeof(struct statfs); - if (size > 0) - buf = malloc(size, M_TEMP, M_WAITOK); - else - buf = NULL; - error = kern_getfsstat(td, buf, size, UIO_SYSSPACE, uap->flags); - if (buf != NULL) { + error = kern_getfsstat(td, &buf, size, UIO_SYSSPACE, uap->flags); + if (size > 0) { count = td->td_retval[0]; sp = buf; while (count > 0 && error == 0) { ==== //depot/projects/tty/sys/conf/files#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1025 2005/06/10 08:05:12 glebius Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1026 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -291,8 +291,10 @@ crypto/blowfish/bf_skey.c optional ipsec ipsec_esp crypto/des/des_ecb.c optional crypto crypto/des/des_ecb.c optional ipsec ipsec_esp +crypto/des/des_ecb.c optional netsmbcrypto crypto/des/des_setkey.c optional crypto crypto/des/des_setkey.c optional ipsec ipsec_esp +crypto/des/des_setkey.c optional netsmbcrypto crypto/rc4/rc4.c optional netgraph_mppc_encryption crypto/rijndael/rijndael-alg-fst.c optional crypto crypto/rijndael/rijndael-alg-fst.c optional geom_bde ==== //depot/projects/tty/sys/conf/files.alpha#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.119 2005/06/10 20:56:36 marius Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.120 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -155,10 +155,11 @@ compat/linux/linux_sysctl.c optional compat_linux compat/linux/linux_stats.c optional compat_linux compat/linux/linux_util.c optional compat_linux +crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp -crypto/blowfish/bf_enc.c optional crypto -crypto/des/des_enc.c optional crypto +crypto/des/des_enc.c optional netsmbcrypto dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/tty/sys/conf/files.amd64#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.67 2005/06/10 20:56:36 marius Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.68 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -120,11 +120,9 @@ amd64/pci/pci_cfgreg.c optional pci crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto dev/acpica/acpi_if.m standard dev/arcmsr/arcmsr.c optional arcmsr pci dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/tty/sys/conf/files.i386#25 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.535 2005/06/10 20:56:36 marius Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.536 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -122,9 +122,7 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/arch/i386/des_enc.S optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto bf_enc.o optional crypto \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ ==== //depot/projects/tty/sys/conf/files.ia64#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.78 2005/06/10 20:56:36 marius Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.79 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -36,6 +36,7 @@ crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional netsmbcrypto dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/tty/sys/conf/files.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.325 2005/06/09 19:45:07 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.326 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -83,9 +83,7 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/arch/i386/des_enc.S optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto bf_enc.o optional crypto \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ ==== //depot/projects/tty/sys/conf/files.powerpc#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.43 2005/06/09 19:45:07 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.44 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -52,6 +52,7 @@ crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional netsmbcrypto dev/ofw/openfirm.c standard dev/ofw/ofw_bus_if.m standard ==== //depot/projects/tty/sys/conf/files.sparc64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.72 2005/06/10 20:58:59 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.73 2005/06/12 00:47:21 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -18,10 +18,11 @@ clean "ukbdmap.h" # # +crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp -crypto/blowfish/bf_enc.c optional crypto -crypto/des/des_enc.c optional crypto +crypto/des/des_enc.c optional netsmbcrypto dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc ==== //depot/projects/tty/sys/contrib/pf/net/if_pfsync.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.17 2005/06/10 17:23:49 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.18 2005/06/12 16:46:20 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ /* @@ -220,15 +220,10 @@ ifp->if_baudrate = IF_Mbps(100); ifp->if_softc = sc; pfsync_setmtu(sc, MCLBYTES); - /* - * XXX - * The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE - * if Gaint lock is removed from the network stack. - */ - callout_init(&sc->sc_tmo, 0); - callout_init(&sc->sc_bulk_tmo, 0); - callout_init(&sc->sc_bulkfail_tmo, 0); - callout_init(&sc->sc_send_tmo, 0); + callout_init(&sc->sc_tmo, NET_CALLOUT_MPSAFE); + callout_init(&sc->sc_bulk_tmo, NET_CALLOUT_MPSAFE); + callout_init(&sc->sc_bulkfail_tmo, NET_CALLOUT_MPSAFE); + callout_init(&sc->sc_send_tmo, NET_CALLOUT_MPSAFE); mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue", MTX_DEF); if_attach(ifp); ==== //depot/projects/tty/sys/contrib/pf/net/pf_ioctl.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.19 2005/05/03 16:43:32 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.20 2005/06/12 16:46:20 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* @@ -335,12 +335,7 @@ my_timeout[PFTM_SRC_NODE] = PFTM_SRC_NODE_VAL; my_timeout[PFTM_TS_DIFF] = PFTM_TS_DIFF_VAL; - /* - * XXX - * The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE - * if Gaint lock is removed from the network stack. - */ - callout_init(&pf_expire_to, 0); + callout_init(&pf_expire_to, NET_CALLOUT_MPSAFE); callout_reset(&pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, pf_purge_timeout, &pf_expire_to); ==== //depot/projects/tty/sys/dev/fe/if_fe_cbus.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.12 2005/02/20 19:33:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.13 2005/06/11 16:30:43 brooks Exp $"); #include #include @@ -317,16 +317,16 @@ return ENXIO; /* Get our station address from EEPROM. */ - fe_inblk(sc, 0x18, sc->sc_enaddr, ETHER_ADDR_LEN); + fe_inblk(sc, 0x18, sc->enaddr, ETHER_ADDR_LEN); /* Make sure it is Allied-Telesis's. */ - if (!fe_valid_Ether_p(sc->sc_enaddr, 0x0000F4)) + if (!fe_valid_Ether_p(sc->enaddr, 0x0000F4)) return ENXIO; #if 1 /* Calculate checksum. */ sum = fe_inb(sc, 0x1e); for (i = 0; i < ETHER_ADDR_LEN; i++) - sum ^= sc->sc_enaddr[i]; + sum ^= sc->enaddr[i]; if (sum != 0) return ENXIO; #endif @@ -370,8 +370,8 @@ /* Get our station address from EEPROM, and make sure the EEPROM contains Allied-Telesis's address. */ - bcopy(eeprom + 8, sc->sc_enaddr, ETHER_ADDR_LEN); - if (!fe_valid_Ether_p(sc->sc_enaddr, 0x0000F4)) + bcopy(eeprom + 8, sc->enaddr, ETHER_ADDR_LEN); + if (!fe_valid_Ether_p(sc->enaddr, 0x0000F4)) return NULL; /* I don't know any sub-model identification. */ @@ -541,14 +541,14 @@ return ENXIO; /* Get our station address from EEPROM. */ - fe_inblk(sc, 0x18, sc->sc_enaddr, ETHER_ADDR_LEN); + fe_inblk(sc, 0x18, sc->enaddr, ETHER_ADDR_LEN); /* Make sure it is Contec's. */ - if (!fe_valid_Ether_p(sc->sc_enaddr, 0x00804C)) + if (!fe_valid_Ether_p(sc->enaddr, 0x00804C)) return ENXIO; /* Determine the card type. */ - if (sc->sc_enaddr[3] == 0x06) { + if (sc->enaddr[3] == 0x06) { sc->typestr = "C-NET(9N)C"; /* We seems to need our own IDENT bits... FIXME. */ @@ -632,7 +632,7 @@ /* Make sure the Ethernet (MAC) station address is of Contec's. */ if (!fe_valid_Ether_p(eeprom + FE_SSI_EEP_ADDR, 0x00804C)) return ENXIO; - bcopy(eeprom + FE_SSI_EEP_ADDR, sc->sc_enaddr, ETHER_ADDR_LEN); + bcopy(eeprom + FE_SSI_EEP_ADDR, sc->enaddr, ETHER_ADDR_LEN); /* Setup the board type. */ sc->typestr = "C-NET(98)P2"; @@ -702,7 +702,7 @@ /* Make sure the Ethernet (MAC) station address is of TDK/LANX's. */ if (!fe_valid_Ether_p(eeprom, 0x008098)) return ENXIO; - bcopy(eeprom, sc->sc_enaddr, ETHER_ADDR_LEN); + bcopy(eeprom, sc->enaddr, ETHER_ADDR_LEN); /* Setup the board type. */ sc->typestr = "LAC-98012/98013"; @@ -767,13 +767,13 @@ return ENXIO; /* Get our station address from EEPROM. */ - fe_inblk(sc, 0x18, sc->sc_enaddr, ETHER_ADDR_LEN); - if (!fe_valid_Ether_p(sc->sc_enaddr, 0x000000)) + fe_inblk(sc, 0x18, sc->enaddr, ETHER_ADDR_LEN); + if (!fe_valid_Ether_p(sc->enaddr, 0x000000)) return ENXIO; /* Determine the card type. */ sc->typestr = "Generic MB86960 Ethernet"; - if (fe_valid_Ether_p(sc->sc_enaddr, 0x000061)) + if (fe_valid_Ether_p(sc->enaddr, 0x000061)) sc->typestr = "Gateway Ethernet (Fujitsu chipset)"; /* Gateway's board requires an explicit IRQ to work, since it @@ -833,14 +833,14 @@ sc->proto_dlcr7 | FE_D7_RBS_BMPR | FE_D7_POWER_UP); /* Get our station address form ID ROM and make sure it is UBN's. */ - fe_inblk(sc, 0x18, sc->sc_enaddr, ETHER_ADDR_LEN); - if (!fe_valid_Ether_p(sc->sc_enaddr, 0x00DD01)) + fe_inblk(sc, 0x18, sc->enaddr, ETHER_ADDR_LEN); + if (!fe_valid_Ether_p(sc->enaddr, 0x00DD01)) goto fail_ubn; #if 1 /* Calculate checksum. */ sum = fe_inb(sc, 0x1e); for (i = 0; i < ETHER_ADDR_LEN; i++) - sum ^= sc->sc_enaddr[i]; + sum ^= sc->enaddr[i]; if (sum != 0) goto fail_ubn; #endif @@ -972,11 +972,11 @@ are not yet sure we have a REX-9880 board here.) */ fe_read_eeprom_rex(sc, eeprom); for (i = 0; i < ETHER_ADDR_LEN; i++) - sc->sc_enaddr[i] = eeprom[7 - i]; + sc->enaddr[i] = eeprom[7 - i]; /* Make sure it is RATOC's. */ - if (!fe_valid_Ether_p(sc->sc_enaddr, 0x00C0D0) && - !fe_valid_Ether_p(sc->sc_enaddr, 0x00803D)) + if (!fe_valid_Ether_p(sc->enaddr, 0x00C0D0) && + !fe_valid_Ether_p(sc->enaddr, 0x00803D)) return 0; /* Setup the board type. */ ==== //depot/projects/tty/sys/dev/gem/if_gem.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.28 2005/06/10 16:49:09 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.29 2005/06/12 15:33:45 brooks Exp $"); /* * Driver for Sun GEM ethernet controllers. @@ -363,9 +363,9 @@ struct ifnet *ifp = sc->sc_ifp; int i; + gem_stop(ifp, 1); ether_ifdetach(ifp); if_free(ifp); - gem_stop(ifp, 1); device_delete_child(sc->sc_dev, sc->sc_miibus); for (i = 0; i < GEM_NRXDESC; i++) { ==== //depot/projects/tty/sys/dev/snc/dp83932.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.18 2005/06/10 16:49:14 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.19 2005/06/12 15:25:19 scottl Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ @@ -166,7 +166,8 @@ ifp = sc->sc_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) - panic("%s: can not if_alloc()\n", device_get_nameunit(dev)); + panic("%s: can not if_alloc()\n", + device_get_nameunit(sc->sc_dev)); #ifdef SNCDEBUG device_printf(sc->sc_dev, ==== //depot/projects/tty/sys/dev/snc/if_snc_pccard.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.7 2005/01/20 20:32:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.8 2005/06/12 16:21:44 brooks Exp $"); /* * National Semiconductor DP8393X SONIC Driver @@ -88,7 +88,7 @@ snc_pccard_detach(device_t dev) { struct snc_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->sc_if; + struct ifnet *ifp = sc->sc_ifp; if (sc->gone) { device_printf(dev, "already unloaded\n"); ==== //depot/projects/tty/sys/kern/uipc_accf.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.18 2005/03/12 12:57:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.19 2005/06/11 11:59:47 maxim Exp $"); #define ACCEPT_FILTER_MOD @@ -176,8 +176,10 @@ error = EINVAL; goto out; } - if ((so->so_options & SO_ACCEPTFILTER) == 0) + if ((so->so_options & SO_ACCEPTFILTER) == 0) { + error = EINVAL; goto out; + } strcpy(afap->af_name, so->so_accf->so_accept_filter->accf_name); if (so->so_accf->so_accept_filter_str != NULL) strcpy(afap->af_arg, so->so_accf->so_accept_filter_str); @@ -200,7 +202,7 @@ /* * Handle the simple delete case first. */ - if (sopt == NULL) { + if (sopt == NULL || sopt->sopt_val == NULL) { SOCK_LOCK(so); if ((so->so_options & SO_ACCEPTCONN) == 0) { SOCK_UNLOCK(so); ==== //depot/projects/tty/sys/kern/vfs_cache.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.99 2005/04/13 10:59:09 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.100 2005/06/11 08:47:30 jeff Exp $"); #include #include @@ -474,6 +474,9 @@ int zap; int len; + VNASSERT(vp == NULL || (vp->v_iflag & VI_DOOMED) == 0, vp, + ("cahe_enter: Adding a doomed vnode")); + if (!doingcache) return; ==== //depot/projects/tty/sys/kern/vfs_subr.c#20 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.627 2005/06/11 01:16:46 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.628 2005/06/11 08:48:09 jeff Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -723,6 +723,8 @@ VNASSERT(bo->bo_clean.bv_root == NULL, vp, ("cleanblkroot not NULL")); VNASSERT(bo->bo_dirty.bv_cnt == 0, vp, ("dirtybufcnt not 0")); VNASSERT(bo->bo_dirty.bv_root == NULL, vp, ("dirtyblkroot not NULL")); + VNASSERT(TAILQ_EMPTY(&vp->v_cache_dst), vp, ("vp has namecache dst")); + VNASSERT(LIST_EMPTY(&vp->v_cache_src), vp, ("vp has namecache src")); #ifdef MAC mac_destroy_vnode(vp); #endif ==== //depot/projects/tty/sys/kern/vfs_syscalls.c#17 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.388 2005/06/09 18:49:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.390 2005/06/12 07:03:23 pjd Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -390,12 +390,17 @@ } */ *uap; { - return (kern_getfsstat(td, uap->buf, uap->bufsize, UIO_USERSPACE, + return (kern_getfsstat(td, &uap->buf, uap->bufsize, UIO_USERSPACE, uap->flags)); } +/* + * If (bufsize > 0 && bufseg == UIO_SYSSPACE) + * The caller is responsible for freeing memory which will be allocated + * in '*buf'. + */ int -kern_getfsstat(struct thread *td, struct statfs *buf, size_t bufsize, +kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags) { struct mount *mp, *nmp; @@ -404,7 +409,22 @@ int error; maxcount = bufsize / sizeof(struct statfs); - sfsp = buf; + if (bufsize == 0) + sfsp = NULL; + else if (bufseg == UIO_USERSPACE) + sfsp = *buf; + else /* if (bufseg == UIO_SYSSPACE) */ { + count = 0; + mtx_lock(&mountlist_mtx); + TAILQ_FOREACH(mp, &mountlist, mnt_list) { + count++; + } + mtx_unlock(&mountlist_mtx); + if (maxcount > count) + maxcount = count; + sfsp = *buf = malloc(maxcount * sizeof(struct statfs), M_TEMP, + M_WAITOK); + } count = 0; mtx_lock(&Giant); mtx_lock(&mountlist_mtx); @@ -451,15 +471,16 @@ prison_enforce_statfs(td->td_ucred, mp, &sb); sp = &sb; } - if (bufseg == UIO_USERSPACE) { + if (bufseg == UIO_SYSSPACE) + bcopy(sp, sfsp, sizeof(*sp)); + else /* if (bufseg == UIO_USERSPACE) */ { error = copyout(sp, sfsp, sizeof(*sp)); if (error) { vfs_unbusy(mp, td); mtx_unlock(&Giant); return (error); } - } else - bcopy(sp, sfsp, sizeof(*sp)); + } sfsp++; } count++; @@ -561,12 +582,8 @@ count = uap->bufsize / sizeof(struct ostatfs); size = count * sizeof(struct statfs); - if (size > 0) - buf = malloc(size, M_TEMP, M_WAITOK); - else - buf = NULL; - error = kern_getfsstat(td, buf, size, UIO_SYSSPACE, uap->flags); - if (buf != NULL) { + error = kern_getfsstat(td, &buf, size, UIO_SYSSPACE, uap->flags); + if (size > 0) { count = td->td_retval[0]; sp = buf; while (count > 0 && error == 0) { ==== //depot/projects/tty/sys/net/if.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.231 2005/06/10 16:49:18 brooks Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.232 2005/06/12 00:53:03 brooks Exp $ */ #include "opt_compat.h" @@ -402,8 +402,10 @@ if (if_com_alloc[type] != NULL) { ifp->if_l2com = if_com_alloc[type](type, ifp); - if (ifp->if_l2com == NULL) + if (ifp->if_l2com == NULL) { free(ifp, M_IFNET); + return (NULL); + } } return (ifp); @@ -426,6 +428,12 @@ return; } + ifnet_byindex(ifp->if_index) = NULL; + + /* XXX: should be locked with if_findindex() */ + while (if_index > 0 && ifaddr_byindex(if_index) == NULL) + if_index--; + if (if_com_free[type] != NULL) if_com_free[type](ifp->if_l2com, type); @@ -678,15 +686,10 @@ * Remove address from ifindex_table[] and maybe decrement if_index. * Clean up all addresses. */ - ifnet_byindex(ifp->if_index) = NULL; ifaddr_byindex(ifp->if_index) = NULL; destroy_dev(ifdev_byindex(ifp->if_index)); ifdev_byindex(ifp->if_index) = NULL; - while (if_index > 0 && ifaddr_byindex(if_index) == NULL) - if_index--; - - /* We can now free link ifaddr. */ if (!TAILQ_EMPTY(&ifp->if_addrhead)) { ifa = TAILQ_FIRST(&ifp->if_addrhead); ==== //depot/projects/tty/sys/netinet/ip_fw2.c#18 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.101 2005/06/10 12:28:17 green Exp $ + * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.102 2005/06/12 16:27:10 mlaier Exp $ */ #define DEB(x) @@ -2332,14 +2332,14 @@ break; case O_IP_SRC: - match = (hlen > 0 && + match = is_ipv4 && (hlen > 0 && ((ipfw_insn_ip *)cmd)->addr.s_addr == src_ip.s_addr); break; case O_IP_SRC_LOOKUP: case O_IP_DST_LOOKUP: - if (hlen > 0) { + if (hlen > 0 && is_ipv4) { uint32_t a = (cmd->opcode == O_IP_DST_LOOKUP) ? dst_ip.s_addr : src_ip.s_addr; @@ -2356,7 +2356,7 @@ case O_IP_SRC_MASK: case O_IP_DST_MASK: - if (hlen > 0) { + if (hlen > 0 && is_ipv4) { uint32_t a = (cmd->opcode == O_IP_DST_MASK) ? dst_ip.s_addr : src_ip.s_addr; @@ -2369,7 +2369,7 @@ break; case O_IP_SRC_ME: - if (hlen > 0) { + if (hlen > 0 && is_ipv4) { struct ifnet *tif; INADDR_TO_IFP(src_ip, tif); @@ -2379,7 +2379,7 @@ case O_IP_DST_SET: case O_IP_SRC_SET: - if (hlen > 0) { + if (hlen > 0 && is_ipv4) { u_int32_t *d = (u_int32_t *)(cmd+1); u_int32_t addr = cmd->opcode == O_IP_DST_SET ? @@ -2396,13 +2396,13 @@ break; case O_IP_DST: - match = (hlen > 0 && + match = is_ipv4 && (hlen > 0 && ((ipfw_insn_ip *)cmd)->addr.s_addr == dst_ip.s_addr); break; case O_IP_DST_ME: - if (hlen > 0) { + if (hlen > 0 && is_ipv4) { struct ifnet *tif; INADDR_TO_IFP(dst_ip, tif); @@ -2605,14 +2605,16 @@ case O_VERSRCREACH: /* Outgoing packets automatically pass/match */ + /* XXX: IPv6 missing!?! */ match = (hlen > 0 && ((oif != NULL) || - verify_path(src_ip, NULL))); + (is_ipv4 && verify_path(src_ip, NULL)))); break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 12 21:27:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1566C16A420; Sun, 12 Jun 2005 21:27:54 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DFFB016A41C for ; Sun, 12 Jun 2005 21:27:53 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE89343D48 for ; Sun, 12 Jun 2005 21:27:53 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CLRr8M017425 for ; Sun, 12 Jun 2005 21:27:53 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CLRrm2017422 for perforce@freebsd.org; Sun, 12 Jun 2005 21:27:53 GMT (envelope-from wsalamon@computer.org) Date: Sun, 12 Jun 2005 21:27:53 GMT Message-Id: <200506122127.j5CLRrm2017422@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 Cc: Subject: PERFORCE change 78465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 21:27:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=78465 Change 78465 by wsalamon@rickenbacker on 2005/06/12 21:26:59 Install libbsm.h to /usr/include/bsm, same as Solaris/Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#7 (text+ko) ==== @@ -24,7 +24,8 @@ bsm_user.c \ bsm_wrappers.c -INCS= libbsm.h +INCS= libbsm.h +INCSDIR= ${INCLUDEDIR}/${LIB} MAN= libbsm.3 \ au_class.3 \ @@ -117,4 +118,7 @@ au_token.3 au_to_header64.3 \ au_token.3 au_to_trailer.3 +beforeinstall: + mkdir ${INCSDIR} + .include From owner-p4-projects@FreeBSD.ORG Sun Jun 12 22:09:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 259E416A44E; Sun, 12 Jun 2005 22:09:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 CB71E16A41F for ; Sun, 12 Jun 2005 22:09:13 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92F6F43D49 for ; Sun, 12 Jun 2005 22:09:13 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CM9Dq9018940 for ; Sun, 12 Jun 2005 22:09:13 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CM9D7l018937 for perforce@freebsd.org; Sun, 12 Jun 2005 22:09:13 GMT (envelope-from wsalamon@computer.org) Date: Sun, 12 Jun 2005 22:09:13 GMT Message-Id: <200506122209.j5CM9D7l018937@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 Cc: Subject: PERFORCE change 78468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 22:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=78468 Change 78468 by wsalamon@rickenbacker on 2005/06/12 22:08:12 Test for existence of /usr/include/bsm before making it. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#8 (text+ko) ==== @@ -119,6 +119,9 @@ au_token.3 au_to_trailer.3 beforeinstall: - mkdir ${INCSDIR} + if test -d ${INCSDIR}; then \ + else \ + mkdir ${INCSDIR}; \ + fi; .include From owner-p4-projects@FreeBSD.ORG Sun Jun 12 22:09:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92B6216A4C0; Sun, 12 Jun 2005 22:09:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3508716A44D for ; Sun, 12 Jun 2005 22:09:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 067FD43D48 for ; Sun, 12 Jun 2005 22:09:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CM9Dxs018946 for ; Sun, 12 Jun 2005 22:09:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CM9DR7018943 for perforce@freebsd.org; Sun, 12 Jun 2005 22:09:13 GMT (envelope-from marcel@freebsd.org) Date: Sun, 12 Jun 2005 22:09:13 GMT Message-Id: <200506122209.j5CM9DR7018943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 22:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=78469 Change 78469 by marcel@marcel_nfs on 2005/06/12 22:08:13 Rework the VT initialization. After bus enumeration we have a list of hardware devices (currently only output devices). During SI_SUB_INT_CONFIG_HOOKS we create the initial VT with a corresponding TE and TTY structure. During SI_SUB_VTC we wire up the hardware devices to the initial VT and allow a re-initialization. This allows accelerated graphics drivers to take over from the generic low-level console code and switch to higher resolution graphics modes. Initially all output devices (and input devices when I have a chance to work on that) will be hooked up to a single VT. Affected files ... .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#6 edit .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#8 edit .. //depot/projects/tty/sys/dev/vtc/vtc_te.c#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_vtout.h#1 add .. //depot/projects/tty/sys/dev/vtc/vtc_vtout_if.m#1 add Differences ... ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#6 (text+ko) ==== @@ -447,13 +447,25 @@ } static int -vga_bitblt(void *cookie, int op, uintptr_t src, uintptr_t dst, int width, +vga_clear(device_t dev) +{ + struct vga_softc *sc; + + sc = device_get_softc(dev); + + return (vga_bitblt_ctofb(sc, 0, 0, 640, 480)); +} + +static int +vga_bitblt(device_t dev, int op, uintptr_t src, uintptr_t dst, int width, int height, ...) { - struct vga_softc *sc = (struct vga_softc *)cookie; + struct vga_softc *sc; va_list ap; int error; + sc = device_get_softc(dev); + va_start(ap, height); error = vga_vbitblt(sc, op, src, dst, width, height, ap); va_end(ap); @@ -480,5 +492,5 @@ vtc_logo4_height); } - return (vtc_vtout_attach(sc, vga_bitblt, 640, 480)); + return (vtc_vtout_attach(dev, vga_clear, vga_bitblt, 640, 480)); } ==== //depot/projects/tty/sys/dev/vtc/vtc_core.c#8 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -171,24 +172,53 @@ } int -vtc_vtout_attach(void *cookie, vtout_bitblt_f bitblt, int width, int height) +vtc_vtout_attach(device_t dev, vtout_init_f init, vtout_bitblt_f bitblt, + int width, int height) { - struct vtc_te_softc *te; - struct tty *tp; struct vtc_vtout_softc *vo; vo = malloc(sizeof(*vo), M_VTC, M_WAITOK|M_ZERO); TAILQ_INSERT_TAIL(&vtc_vtout_devs, vo, vo_alldevs); - vo->vo_cookie = cookie; + vo->vo_dev = dev; + vo->vo_init = init; vo->vo_bitblt = bitblt; vo->vo_width = width; vo->vo_height = height; + return (0); +} + +int +vtc_vtout_console(device_t dev) +{ + struct vtc_conout *vc, **iter; + + SET_FOREACH(iter, vtc_conout_set) { + vc = *iter; + if (vc->vtc_busdev == dev) + return (1); + } + return (0); +} + +/* + * Create the initial VT. + */ +static void +vtc_initial(void *data __unused) +{ + struct tty *tp; + struct vtc_conout *vc, **iter; + struct vtc_te_softc *te; + + printf("%s: create initial VT\n", vtc_device_name); + if (TAILQ_EMPTY(&vtc_vtout_devs)) + return; + te = malloc(vt102_class.size, M_VTC, M_WAITOK|M_ZERO); kobj_init((kobj_t)te, (kobj_class_t)&vt102_class); TAILQ_INSERT_TAIL(&vtc_te_devs, te, te_alldevs); TAILQ_INIT(&te->te_vodevs); - TAILQ_INSERT_TAIL(&te->te_vodevs, vo, vo_tedevs); VTC_TE_RESET(te); @@ -203,29 +233,38 @@ tp->t_break = vtc_tty_break; tp->t_open = vtc_tty_open; tp->t_close = vtc_tty_close; - -/* - sprintf(((struct consdev *)sc->sc_sysdev->cookie)->cn_name, "ttyv%r", - unit); -*/ ttyconsolemode(tp, 0); + ttycreate(tp, NULL, 0, MINOR_CALLOUT, "V%r", 0); - ttycreate(tp, NULL, 0, MINOR_CALLOUT, "V%r", 0); - return (0); + SET_FOREACH(iter, vtc_conout_set) { + vc = *iter; + if (vc->vtc_consdev != NULL) + strcpy(vc->vtc_consdev->cn_name, "ttyV0"); + } } +SYSINIT(initial, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY, vtc_initial, NULL) -int -vtc_vtout_console(device_t dev) +/* + * Preempt the low-level console driver with the accelerated driver. + */ +static void +vtc_finalize(void *data __unused) { - struct vtc_conout *vc, **iter; + struct vtc_te_softc *te; + struct vtc_vtout_softc *vo; + + printf("%s: finalize initial VT\n", vtc_device_name); + + te = TAILQ_FIRST(&vtc_te_devs); + if (te == NULL) + return; - SET_FOREACH(iter, vtc_conout_set) { - vc = *iter; - if (vc->vtc_busdev == dev) - return (1); + TAILQ_FOREACH(vo, &vtc_vtout_devs, vo_alldevs) { + if (vo->vo_init == NULL || (*vo->vo_init)(vo->vo_dev) == 0) + TAILQ_INSERT_TAIL(&te->te_vodevs, vo, vo_tedevs); } - return (0); } +SYSINIT(finalize, SI_SUB_VTC, SI_ORDER_ANY, vtc_finalize, NULL) static int vtc_modevent(module_t mod, int type, void *data) @@ -245,5 +284,4 @@ return (EOPNOTSUPP); } - DEV_MODULE(vtc, vtc_modevent, NULL); ==== //depot/projects/tty/sys/dev/vtc/vtc_te.c#3 (text+ko) ==== @@ -63,7 +63,7 @@ } glyph = vo->vo_font + (wc - 0x20) * 16; - vo->vo_bitblt(vo->vo_cookie, BITBLT_H1TOFB, (uintptr_t)glyph, + vo->vo_bitblt(vo->vo_dev, BITBLT_H1TOFB, (uintptr_t)glyph, vo->vo_width * row * vo->vo_ch + col * vo->vo_cw, 8, 16, 0, 7); } @@ -88,12 +88,12 @@ ch = vo->vo_height / te->te_maxrow; cw = vo->vo_width / te->te_maxcol; - vo->vo_bitblt(vo->vo_cookie, BITBLT_FBTOFB, + vo->vo_bitblt(vo->vo_dev, BITBLT_FBTOFB, vo->vo_width * (ulr + hs) * ch + ulc * cw, vo->vo_width * ulr * ch + ulc * cw, (lrc - ulc) * cw, (lrr - ulr - hs) * ch); - vo->vo_bitblt(vo->vo_cookie, BITBLT_CTOFB, 0, + vo->vo_bitblt(vo->vo_dev, BITBLT_CTOFB, 0, (lrr - hs) * ch, (lrc - ulc) * cw, hs * ch); } return (0); From owner-p4-projects@FreeBSD.ORG Sun Jun 12 22:53:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 435C616A420; Sun, 12 Jun 2005 22:53:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1A63116A41C for ; Sun, 12 Jun 2005 22:53:08 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6FB743D1D for ; Sun, 12 Jun 2005 22:53:07 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CMr7NU020817 for ; Sun, 12 Jun 2005 22:53:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CMr7aH020814 for perforce@freebsd.org; Sun, 12 Jun 2005 22:53:07 GMT (envelope-from marcel@freebsd.org) Date: Sun, 12 Jun 2005 22:53:07 GMT Message-Id: <200506122253.j5CMr7aH020814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 22:53:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=78471 Change 78471 by marcel@marcel_nfs on 2005/06/12 22:52:13 Fix the frame-buffer offset calculation for the region that we need to clear as part of scrolling the screen. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_te.c#4 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/vtc_te.c#4 (text+ko) ==== @@ -94,7 +94,8 @@ (lrc - ulc) * cw, (lrr - ulr - hs) * ch); vo->vo_bitblt(vo->vo_dev, BITBLT_CTOFB, 0, - (lrr - hs) * ch, (lrc - ulc) * cw, hs * ch); + vo->vo_width * (lrr - hs) * ch + ulc * cw, + (lrc - ulc) * cw, hs * ch); } return (0); } From owner-p4-projects@FreeBSD.ORG Sun Jun 12 22:55:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3508916A420; Sun, 12 Jun 2005 22:55:11 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 EDB2116A41C for ; Sun, 12 Jun 2005 22:55:10 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6F4043D49 for ; Sun, 12 Jun 2005 22:55:10 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CMtARM020879 for ; Sun, 12 Jun 2005 22:55:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CMtAiq020876 for perforce@freebsd.org; Sun, 12 Jun 2005 22:55:10 GMT (envelope-from marcel@freebsd.org) Date: Sun, 12 Jun 2005 22:55:10 GMT Message-Id: <200506122255.j5CMtAiq020876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 22:55:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=78472 Change 78472 by marcel@marcel_nfs on 2005/06/12 22:54:54 Mute the low-level console when the VT has been wired up. Only allow low-level console output for debugger output. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_con.c#10 edit .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#9 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/vtc_con.c#10 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -46,8 +47,9 @@ static cn_putc_t vtc_cnputc; static cn_term_t vtc_cnterm; -static int cncol = 0; -static int cnrow = 0; +static int vtc_cncol = 0; +static int vtc_cnrow = 0; +static int vtc_cnmute = 0; CONS_DRIVER(vtc, vtc_cnprobe, vtc_cninit, vtc_cnterm, vtc_cngetc, vtc_cncheckc, vtc_cnputc, NULL); @@ -98,28 +100,32 @@ if (c <= 0 || c >= 0x7f) return; + /* Allow low-level console output to be surpressed. */ + if (vtc_cnmute && !kdb_active) + return; + width = vc->vtc_con_width; switch (c) { case 8: /* BS */ - if (cncol > 0) - cncol--; + if (vtc_cncol > 0) + vtc_cncol--; ch = ' '; break; case 9: /* HT */ - cncol = (cncol + 7) & 7; - if (cncol >= 80) - cncol = 79; + vtc_cncol = (vtc_cncol + 7) & 7; + if (vtc_cncol >= 80) + vtc_cncol = 79; ch = 0; break; case 10: /* LF */ case 11: /* VT (processed as LF) */ case 12: /* FF (processed as LF) */ - cncol = 0; - cnrow++; + vtc_cncol = 0; + vtc_cnrow++; ch = 0; break; case 13: /* CR */ - cncol = 0; + vtc_cncol = 0; ch = 0; break; default: @@ -130,21 +136,21 @@ if (ch != 0) { glyph = vtc_font_8x16 + ((ch - ' ') * 16); vc->vtc_con_bitblt(vc, BITBLT_H1TOFB, (uintptr_t)glyph, - width * cnrow * 16 + cncol * 8, 8, 16, 0, 7); + width * vtc_cnrow * 16 + vtc_cncol * 8, 8, 16, 0, 7); if (c != 8) - cncol++; + vtc_cncol++; } - if (cncol >= 80) { - cncol = 0; - cnrow++; + if (vtc_cncol >= 80) { + vtc_cncol = 0; + vtc_cnrow++; } - if (cnrow >= 30) { + if (vtc_cnrow >= 30) { vc->vtc_con_bitblt(vc, BITBLT_FBTOFB, width * 16, 0, width, 29 * 16); vc->vtc_con_bitblt(vc, BITBLT_CTOFB, 0, width * 29 * 16, width, 16); - cnrow = 29; + vtc_cnrow = 29; } } @@ -161,3 +167,12 @@ return (-1); } + +static void +vtc_cnfinalize(void *data __unused) +{ + + /* Shut the low-level console up. */ + vtc_cnmute = 1; +} +SYSINIT(cnfinalize, SI_SUB_VTC, SI_ORDER_ANY, vtc_cnfinalize, NULL) ==== //depot/projects/tty/sys/dev/vtc/vtc_core.c#9 (text+ko) ==== @@ -242,7 +242,7 @@ strcpy(vc->vtc_consdev->cn_name, "ttyV0"); } } -SYSINIT(initial, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY, vtc_initial, NULL) +SYSINIT(vtc_initial, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY, vtc_initial, NULL) /* * Preempt the low-level console driver with the accelerated driver. @@ -264,7 +264,7 @@ TAILQ_INSERT_TAIL(&te->te_vodevs, vo, vo_tedevs); } } -SYSINIT(finalize, SI_SUB_VTC, SI_ORDER_ANY, vtc_finalize, NULL) +SYSINIT(vtc_finalize, SI_SUB_VTC, SI_ORDER_FIRST, vtc_finalize, NULL) static int vtc_modevent(module_t mod, int type, void *data) From owner-p4-projects@FreeBSD.ORG Sun Jun 12 23:47:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C51416A420; Sun, 12 Jun 2005 23:47:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1180F16A41C for ; Sun, 12 Jun 2005 23:47:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C821243D1D for ; Sun, 12 Jun 2005 23:47:13 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5CNlDWI022684 for ; Sun, 12 Jun 2005 23:47:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5CNlDib022681 for perforce@freebsd.org; Sun, 12 Jun 2005 23:47:13 GMT (envelope-from marcel@freebsd.org) Date: Sun, 12 Jun 2005 23:47:13 GMT Message-Id: <200506122347.j5CNlDib022681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 23:47:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=78473 Change 78473 by marcel@marcel_nfs on 2005/06/12 23:47:02 Fix the tests that deal with scrolling. Improve the handling of wrap-around, although it's not completely fixed. This will be finished when vttest can be run, which requires input. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_te_vt102.c#4 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/vtc_te_vt102.c#4 (text+ko) ==== @@ -83,17 +83,20 @@ static __inline int vt102_repos(struct vt102_softc *vt102) { + int col; - vt102->wrap = 0; + col = vt102->col; + if (col == vt102->maxcol) + col--; return (vtc_te_repos(&vt102->base, vt102->row << vt102->dh, - vt102->col << vt102->dw)); + col << vt102->dw)); } static __inline int vt102_newline(struct vt102_softc *vt102) { - if (vt102->row == vt102->maxrow) + if (vt102->row == vt102->maxrow - 1) return (vtc_te_scroll(&vt102->base, 0, 0, vt102->maxrow << vt102->dh, vt102->maxcol << vt102->dw, 1 << vt102->dh)); @@ -113,16 +116,17 @@ if (vt102->autowrap && vt102->wrap) { vt102->col = 0; + vt102->wrap = 0; vt102_newline(vt102); } - vt102_putc(vt102, wc); - vt102->col++; - if (vt102->col > vt102->maxcol) { - vt102->col = vt102->maxcol; - if (vt102->autowrap) + if (vt102->col < vt102->maxcol) { + vt102_putc(vt102, wc); + vt102->col++; + if (vt102->col == vt102->maxcol && vt102->autowrap) vt102->wrap = 1; - } else - vt102_repos(vt102); + else + vt102_repos(vt102); + } return (0); } @@ -141,15 +145,23 @@ case 0x08: /* BS */ if (vt102->col > 0) { vt102->col--; + vt102->wrap = 0; vt102_putc(vt102, ' '); vt102_repos(vt102); } break; case 0x09: /* HT */ + if (vt102->autowrap && vt102->wrap) { + vt102->col = 0; + vt102->wrap = 0; + vt102_newline(vt102); + } if (vt102->col < vt102->maxcol) { vt102->col = (vt102->col + 8) & ~7; if (vt102->col > vt102->maxcol) vt102->col = vt102->maxcol; + if (vt102->col == vt102->maxcol && vt102->autowrap) + vt102->wrap = 1; vt102_repos(vt102); } break; @@ -161,6 +173,7 @@ case 0x0D: /* CR */ if (vt102->col > 0) { vt102->col = 0; + vt102->wrap = 0; vt102_repos(vt102); } break; From owner-p4-projects@FreeBSD.ORG Mon Jun 13 17:41:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6ACA16A420; Mon, 13 Jun 2005 17:41:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BA62D16A41C for ; Mon, 13 Jun 2005 17:41:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 800AA43D1D for ; Mon, 13 Jun 2005 17:41:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5DHfL6e002009 for ; Mon, 13 Jun 2005 17:41:21 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5DHesbL001985 for perforce@freebsd.org; Mon, 13 Jun 2005 17:40:54 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Jun 2005 17:40:54 GMT Message-Id: <200506131740.j5DHesbL001985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2005 17:41:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=78492 Change 78492 by peter@peter_daintree on 2005/06/13 17:40:34 IFC @78488 Affected files ... .. //depot/projects/hammer/LOCKS#1 branch .. //depot/projects/hammer/MAINTAINERS#34 integrate .. //depot/projects/hammer/Makefile.inc1#94 integrate .. //depot/projects/hammer/UPDATING#78 integrate .. //depot/projects/hammer/bin/ls/cmp.c#6 integrate .. //depot/projects/hammer/bin/ls/extern.h#7 integrate .. //depot/projects/hammer/bin/ls/ls.1#19 integrate .. //depot/projects/hammer/bin/ls/ls.c#14 integrate .. //depot/projects/hammer/bin/ls/util.c#9 integrate .. //depot/projects/hammer/bin/rmail/Makefile#6 integrate .. //depot/projects/hammer/contrib/diff/diff.c#2 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog#10 integrate .. //depot/projects/hammer/contrib/gcc/Makefile.in#10 integrate .. //depot/projects/hammer/contrib/gcc/attribs.c#5 integrate .. //depot/projects/hammer/contrib/gcc/builtins.c#7 integrate .. //depot/projects/hammer/contrib/gcc/c-common.c#6 integrate .. //depot/projects/hammer/contrib/gcc/c-decl.c#9 integrate .. //depot/projects/hammer/contrib/gcc/c-format.c#6 integrate .. //depot/projects/hammer/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-parse.in#6 integrate .. //depot/projects/hammer/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-semantics.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#8 integrate .. //depot/projects/hammer/contrib/gcc/c.opt#2 integrate .. //depot/projects/hammer/contrib/gcc/calls.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cfglayout.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cfgrtl.c#7 integrate .. //depot/projects/hammer/contrib/gcc/collect2.c#6 integrate .. //depot/projects/hammer/contrib/gcc/combine.c#7 integrate .. //depot/projects/hammer/contrib/gcc/common.opt#2 integrate .. //depot/projects/hammer/contrib/gcc/config.gcc#7 integrate .. //depot/projects/hammer/contrib/gcc/config.in#6 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.c#7 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.md#6 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/t-osf4#4 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.c#6 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.md#6 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-netbsd#4 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/hammer/contrib/gcc/config/darwin-protos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#12 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#12 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/gthr-win32.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-protos.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#13 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.h#9 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.md#7 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64.c#6 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/hammer/contrib/gcc/config/ia64/t-hpux#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/unwind-ia64.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix41.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix43.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/altivec.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/beos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/darwin.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabi.asm#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux64.h#7 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.c#9 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.md#9 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rtems.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4.h#9 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-linux64#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.c#8 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.md#6 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-elf#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/hammer/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/hammer/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-slibgcc-elf-ver#4 integrate .. //depot/projects/hammer/contrib/gcc/config/t-slibgcc-sld#3 integrate .. //depot/projects/hammer/contrib/gcc/configure#8 integrate .. //depot/projects/hammer/contrib/gcc/configure.ac#2 integrate .. //depot/projects/hammer/contrib/gcc/cp-demangle.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog#10 integrate .. //depot/projects/hammer/contrib/gcc/cp/Make-lang.in#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/call.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/class.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.h#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/cvt.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl.c#10 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl2.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/error.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/except.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/g++spec.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/init.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/mangle.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/method.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/pt.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/search.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/semantics.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/tree.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck2.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cppfiles.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cpplib.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cppmacro.c#6 integrate .. //depot/projects/hammer/contrib/gcc/crtstuff.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cse.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cselib.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cselib.h#4 integrate .. //depot/projects/hammer/contrib/gcc/dbxout.c#8 integrate .. //depot/projects/hammer/contrib/gcc/defaults.h#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/extend.texi#8 integrate .. //depot/projects/hammer/contrib/gcc/doc/include/gcc-common.texi#7 integrate .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#10 integrate .. //depot/projects/hammer/contrib/gcc/doc/md.texi#6 integrate .. //depot/projects/hammer/contrib/gcc/doc/tm.texi#8 integrate .. //depot/projects/hammer/contrib/gcc/doc/trouble.texi#6 integrate .. //depot/projects/hammer/contrib/gcc/dojump.c#2 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2out.c#7 integrate .. //depot/projects/hammer/contrib/gcc/emit-rtl.c#7 integrate .. //depot/projects/hammer/contrib/gcc/explow.c#5 integrate .. //depot/projects/hammer/contrib/gcc/expmed.c#6 integrate .. //depot/projects/hammer/contrib/gcc/expr.c#9 integrate .. //depot/projects/hammer/contrib/gcc/expr.h#7 integrate .. //depot/projects/hammer/contrib/gcc/f/ChangeLog#9 integrate .. //depot/projects/hammer/contrib/gcc/f/bld.c#4 integrate .. //depot/projects/hammer/contrib/gcc/f/malloc.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/news.texi#6 integrate .. //depot/projects/hammer/contrib/gcc/flow.c#7 integrate .. //depot/projects/hammer/contrib/gcc/fold-const.c#6 integrate .. //depot/projects/hammer/contrib/gcc/function.c#8 integrate .. //depot/projects/hammer/contrib/gcc/gcc.c#9 integrate .. //depot/projects/hammer/contrib/gcc/gcov-io.h#4 integrate .. //depot/projects/hammer/contrib/gcc/gcse.c#5 integrate .. //depot/projects/hammer/contrib/gcc/ginclude/stddef.h#4 integrate .. //depot/projects/hammer/contrib/gcc/gthr-win32.h#4 integrate .. //depot/projects/hammer/contrib/gcc/hooks.c#6 integrate .. //depot/projects/hammer/contrib/gcc/hooks.h#6 integrate .. //depot/projects/hammer/contrib/gcc/ifcvt.c#5 integrate .. //depot/projects/hammer/contrib/gcc/jump.c#6 integrate .. //depot/projects/hammer/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/hammer/contrib/gcc/libgcc-std.ver#6 integrate .. //depot/projects/hammer/contrib/gcc/libgcc2.c#7 integrate .. //depot/projects/hammer/contrib/gcc/libgcc2.h#4 integrate .. //depot/projects/hammer/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/hammer/contrib/gcc/loop.c#10 integrate .. //depot/projects/hammer/contrib/gcc/mkheaders.in#3 integrate .. //depot/projects/hammer/contrib/gcc/mklibgcc.in#7 integrate .. //depot/projects/hammer/contrib/gcc/objc/objc-act.c#4 integrate .. //depot/projects/hammer/contrib/gcc/params.def#4 integrate .. //depot/projects/hammer/contrib/gcc/params.h#4 integrate .. //depot/projects/hammer/contrib/gcc/postreload.c#2 integrate .. //depot/projects/hammer/contrib/gcc/predict.c#4 integrate .. //depot/projects/hammer/contrib/gcc/real.c#5 integrate .. //depot/projects/hammer/contrib/gcc/reg-stack.c#6 integrate .. //depot/projects/hammer/contrib/gcc/regclass.c#5 integrate .. //depot/projects/hammer/contrib/gcc/regrename.c#4 integrate .. //depot/projects/hammer/contrib/gcc/regs.h#4 integrate .. //depot/projects/hammer/contrib/gcc/reload.c#8 integrate .. //depot/projects/hammer/contrib/gcc/reload1.c#7 integrate .. //depot/projects/hammer/contrib/gcc/rtl.h#7 integrate .. //depot/projects/hammer/contrib/gcc/sibcall.c#5 integrate .. //depot/projects/hammer/contrib/gcc/simplify-rtx.c#4 integrate .. //depot/projects/hammer/contrib/gcc/target-def.h#4 integrate .. //depot/projects/hammer/contrib/gcc/target.h#4 integrate .. //depot/projects/hammer/contrib/gcc/toplev.c#10 integrate .. //depot/projects/hammer/contrib/gcc/tree-inline.c#7 integrate .. //depot/projects/hammer/contrib/gcc/tree.c#6 integrate .. //depot/projects/hammer/contrib/gcc/tree.h#7 integrate .. //depot/projects/hammer/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/hammer/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/hammer/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/hammer/contrib/gcc/unwind-dw2-fde-glibc.c#4 integrate .. //depot/projects/hammer/contrib/gcc/unwind-dw2.c#6 integrate .. //depot/projects/hammer/contrib/gcc/varasm.c#9 integrate .. //depot/projects/hammer/contrib/gcc/version.c#10 integrate .. //depot/projects/hammer/contrib/hostapd/COPYING#1 branch .. //depot/projects/hammer/contrib/hostapd/ChangeLog#1 branch .. //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/hostapd/Makefile#1 branch .. //depot/projects/hammer/contrib/hostapd/README#1 branch .. //depot/projects/hammer/contrib/hostapd/accounting.c#1 branch .. //depot/projects/hammer/contrib/hostapd/accounting.h#1 branch .. //depot/projects/hammer/contrib/hostapd/aes.c#1 branch .. //depot/projects/hammer/contrib/hostapd/aes_wrap.c#1 branch .. //depot/projects/hammer/contrib/hostapd/aes_wrap.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ap.h#1 branch .. //depot/projects/hammer/contrib/hostapd/common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/config.c#1 branch .. //depot/projects/hammer/contrib/hostapd/config.h#1 branch .. //depot/projects/hammer/contrib/hostapd/crypto.c#1 branch .. //depot/projects/hammer/contrib/hostapd/crypto.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.h#1 branch .. //depot/projects/hammer/contrib/hostapd/defconfig#1 branch .. //depot/projects/hammer/contrib/hostapd/defs.h#1 branch .. //depot/projects/hammer/contrib/hostapd/developer.txt#1 branch .. //depot/projects/hammer/contrib/hostapd/driver.h#1 branch .. //depot/projects/hammer/contrib/hostapd/driver_test.c#1 branch .. //depot/projects/hammer/contrib/hostapd/driver_wired.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_defs.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gtc.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_i.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_identity.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_md5.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_mschapv2.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_peap.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_tls.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_tlv.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_ttls.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_ttls.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eapol_sm.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eapol_sm.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eloop.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eloop.h#1 branch .. //depot/projects/hammer/contrib/hostapd/hostap_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.accept#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.conf#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.deny#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.eap_user#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.h#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.sim_db#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd_ctrl.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd_ctrl.h#1 branch .. //depot/projects/hammer/contrib/hostapd/iapp.c#1 branch .. //depot/projects/hammer/contrib/hostapd/iapp.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_11.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_11.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.h#1 branch .. //depot/projects/hammer/contrib/hostapd/l2_packet.h#1 branch .. //depot/projects/hammer/contrib/hostapd/madwifi.conf#1 branch .. //depot/projects/hammer/contrib/hostapd/md5.c#1 branch .. //depot/projects/hammer/contrib/hostapd/md5.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ms_funcs.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ms_funcs.h#1 branch .. //depot/projects/hammer/contrib/hostapd/radius.c#1 branch .. //depot/projects/hammer/contrib/hostapd/radius.h#1 branch .. //depot/projects/hammer/contrib/hostapd/radius_client.c#1 branch .. //depot/projects/hammer/contrib/hostapd/radius_client.h#1 branch .. //depot/projects/hammer/contrib/hostapd/radius_server.c#1 branch .. //depot/projects/hammer/contrib/hostapd/radius_server.h#1 branch .. //depot/projects/hammer/contrib/hostapd/rc4.c#1 branch .. //depot/projects/hammer/contrib/hostapd/rc4.h#1 branch .. //depot/projects/hammer/contrib/hostapd/sha1.c#1 branch .. //depot/projects/hammer/contrib/hostapd/sha1.h#1 branch .. //depot/projects/hammer/contrib/hostapd/sta_info.c#1 branch .. //depot/projects/hammer/contrib/hostapd/sta_info.h#1 branch .. //depot/projects/hammer/contrib/hostapd/tls.h#1 branch .. //depot/projects/hammer/contrib/hostapd/tls_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#1 branch .. //depot/projects/hammer/contrib/hostapd/version.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wired.conf#1 branch .. //depot/projects/hammer/contrib/hostapd/wpa.c#1 branch .. //depot/projects/hammer/contrib/hostapd/wpa.h#1 branch .. //depot/projects/hammer/contrib/libf2c/ChangeLog#9 integrate .. //depot/projects/hammer/contrib/libf2c/libI77/err.c#3 integrate .. //depot/projects/hammer/contrib/libobjc/ChangeLog#9 integrate .. //depot/projects/hammer/contrib/libobjc/gc.c#4 integrate .. //depot/projects/hammer/contrib/libstdc++/ChangeLog#10 integrate .. //depot/projects/hammer/contrib/libstdc++/ChangeLog-2004#1 branch .. //depot/projects/hammer/contrib/libstdc++/README#3 integrate .. //depot/projects/hammer/contrib/libstdc++/acconfig.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/acinclude.m4#8 integrate .. //depot/projects/hammer/contrib/libstdc++/aclocal.m4#8 integrate .. //depot/projects/hammer/contrib/libstdc++/config.h.in#6 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/io/basic_file_stdio.cc#4 integrate .. //depot/projects/hammer/contrib/libstdc++/config/io/c_io_stdio.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/linker-map.gnu#6 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/c_locale.cc#6 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/c_locale.h#6 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/time_members.cc#5 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/c_locale.h#6 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/monetary_members.cc#7 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/time_members.cc#7 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/configure#9 integrate .. //depot/projects/hammer/contrib/libstdc++/configure.ac#2 integrate .. //depot/projects/hammer/contrib/libstdc++/configure.host#4 integrate .. //depot/projects/hammer/contrib/libstdc++/crossconfig.m4#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/Makefile.am#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/basic_string.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/basic_string.tcc#6 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/boost_concept_check.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/c++config#10 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/fstream.tcc#6 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/ios_base.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/istream.tcc#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.h#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.tcc#10 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/sstream.tcc#5 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_algo.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_algobase.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_list.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_tree.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/vector.tcc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/debug/map.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/rope#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/ropeimpl.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_complex.h#4 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_fstream.h#6 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_memory.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_sstream.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/eh_globals.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/linkage.m4#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/allocator.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/debug.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/ios.cc#5 integrate .. //depot/projects/hammer/contrib/libstdc++/src/ios_init.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/locale_init.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/localename.cc#6 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#11 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#9 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#8 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#9 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#9 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#8 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#9 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/sem.h#1 branch .. //depot/projects/hammer/contrib/sendmail/include/sm/shm.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/Makefile.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/sem.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/shm.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/t-sem.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/t-shm.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/TRACEFLAGS#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/domain.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#9 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/COPYING#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/README#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/aes.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/common.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/config.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/config.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/crypto.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/crypto.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/defconfig#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/defs.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/developer.txt#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/driver.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/drivers.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_aka.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_defs.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_fast.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gtc.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_i.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_leap.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_md5.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_mschapv2.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_otp.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eloop.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eloop.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/hostap_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/l2_packet.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/md5.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/md5.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/rc4.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/rc4.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/sha1.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/sha1.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tls.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tls_none.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/todo.txt#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/version.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/hammer/crypto/openssh/ChangeLog#8 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-tricks#4 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#9 integrate .. //depot/projects/hammer/crypto/openssh/INSTALL#6 integrate .. //depot/projects/hammer/crypto/openssh/LICENCE#4 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#7 integrate .. //depot/projects/hammer/crypto/openssh/README#6 integrate .. //depot/projects/hammer/crypto/openssh/README.platform#3 integrate .. //depot/projects/hammer/crypto/openssh/README.privsep#6 integrate .. //depot/projects/hammer/crypto/openssh/TODO#6 integrate .. //depot/projects/hammer/crypto/openssh/WARNING.RNG#3 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#9 integrate .. //depot/projects/hammer/crypto/openssh/audit-bsm.c#1 branch .. //depot/projects/hammer/crypto/openssh/audit.c#1 branch .. //depot/projects/hammer/crypto/openssh/audit.h#1 branch .. //depot/projects/hammer/crypto/openssh/auth-bsdauth.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-chall.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-options.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#9 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-rsa.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-sia.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth-sia.h#5 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#8 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#9 integrate .. //depot/projects/hammer/crypto/openssh/auth2-chall.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-none.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pubkey.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#9 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#7 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.c#5 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.h#4 integrate .. //depot/projects/hammer/crypto/openssh/buffer.c#5 integrate .. //depot/projects/hammer/crypto/openssh/buffer.h#2 integrate .. //depot/projects/hammer/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#9 integrate .. //depot/projects/hammer/crypto/openssh/canohost.h#2 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#9 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#6 integrate .. //depot/projects/hammer/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#8 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#7 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.h#4 integrate .. //depot/projects/hammer/crypto/openssh/compat.c#6 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#8 integrate .. //depot/projects/hammer/crypto/openssh/config.guess#6 integrate .. //depot/projects/hammer/crypto/openssh/config.h#8 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#8 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#8 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.c#6 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.h#5 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#7 integrate .. //depot/projects/hammer/crypto/openssh/key.c#8 integrate .. //depot/projects/hammer/crypto/openssh/log.c#7 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#8 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/hammer/crypto/openssh/misc.c#7 integrate .. //depot/projects/hammer/crypto/openssh/misc.h#4 integrate .. //depot/projects/hammer/crypto/openssh/moduli#3 integrate .. //depot/projects/hammer/crypto/openssh/moduli.c#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor.c#10 integrate .. //depot/projects/hammer/crypto/openssh/monitor.h#5 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.c#5 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#8 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntop.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.c#4 integrate .. //depot/projects/hammer/crypto/openssh/packet.c#8 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#8 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#7 integrate .. //depot/projects/hammer/crypto/openssh/readpass.c#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/Makefile#7 integrate .. //depot/projects/hammer/crypto/openssh/regress/agent-ptrace.sh#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/brokenkeys.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/dynamic-forward.sh#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/envpass.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/multiplex.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/reexec.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/rekey.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/scp.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/sftp-glob.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#6 integrate .. //depot/projects/hammer/crypto/openssh/scp.1#7 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#8 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#8 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#6 integrate .. //depot/projects/hammer/crypto/openssh/session.c#11 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#8 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.h#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#8 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.1#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh.h#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#10 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#8 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#8 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#10 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#11 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#12 integrate .. //depot/projects/hammer/crypto/openssh/survey.sh.in#1 branch .. //depot/projects/hammer/crypto/openssh/uidswap.c#5 integrate .. //depot/projects/hammer/crypto/openssh/version.h#11 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#54 integrate .. //depot/projects/hammer/etc/devd.conf#21 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#9 integrate .. //depot/projects/hammer/etc/ftpusers#5 integrate .. //depot/projects/hammer/etc/group#6 integrate .. //depot/projects/hammer/etc/inetd.conf#8 integrate .. //depot/projects/hammer/etc/mail/aliases#7 integrate .. //depot/projects/hammer/etc/master.passwd#7 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#33 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#25 integrate .. //depot/projects/hammer/etc/network.subr#10 integrate .. //depot/projects/hammer/etc/pam.d/Makefile#7 integrate .. //depot/projects/hammer/etc/pam.d/rexecd#3 delete .. //depot/projects/hammer/etc/pccard_ether#13 integrate .. //depot/projects/hammer/etc/rc.d/altqd#2 delete .. //depot/projects/hammer/etc/rc.d/dhclient#14 integrate .. //depot/projects/hammer/etc/rc.d/dhcpd#2 delete .. //depot/projects/hammer/etc/rc.d/dhcrelay#2 delete .. //depot/projects/hammer/etc/rc.d/downinterfaces#2 delete .. //depot/projects/hammer/etc/rc.d/dumpon#9 integrate .. //depot/projects/hammer/etc/rc.d/gated#2 delete .. //depot/projects/hammer/etc/rc.d/ifwatchd#2 delete .. //depot/projects/hammer/etc/rc.d/kdc#2 delete .. //depot/projects/hammer/etc/rc.d/lkm1#2 delete .. //depot/projects/hammer/etc/rc.d/lkm2#2 delete .. //depot/projects/hammer/etc/rc.d/lkm3#2 delete .. //depot/projects/hammer/etc/rc.d/mixerctl#2 delete .. //depot/projects/hammer/etc/rc.d/mopd#2 delete .. //depot/projects/hammer/etc/rc.d/mountall#2 delete .. //depot/projects/hammer/etc/rc.d/ndbootd#2 delete .. //depot/projects/hammer/etc/rc.d/netif#11 integrate .. //depot/projects/hammer/etc/rc.d/network#4 delete .. //depot/projects/hammer/etc/rc.d/poffd#2 delete .. //depot/projects/hammer/etc/rc.d/postfix#2 delete .. //depot/projects/hammer/etc/rc.d/ppp#2 delete .. //depot/projects/hammer/etc/rc.d/racoon#2 delete .. //depot/projects/hammer/etc/rc.d/raidframe#2 delete .. //depot/projects/hammer/etc/rc.d/rbootd#2 delete .. //depot/projects/hammer/etc/rc.d/rtsold#2 delete .. //depot/projects/hammer/etc/rc.d/screenblank#2 delete .. //depot/projects/hammer/etc/rc.d/swap2#2 delete .. //depot/projects/hammer/etc/rc.d/sysdb#2 delete .. //depot/projects/hammer/etc/rc.d/wscons#3 delete .. //depot/projects/hammer/etc/rc.d/xdm#2 delete .. //depot/projects/hammer/etc/rc.d/xfs#2 delete .. //depot/projects/hammer/games/fortune/datfiles/fortunes#46 integrate .. //depot/projects/hammer/games/morse/morse.6#7 integrate .. //depot/projects/hammer/games/morse/morse.c#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#19 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#11 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/doc/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile.inc#5 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/man/Makefile.inc#4 integrate .. //depot/projects/hammer/gnu/usr.bin/rcs/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/Makefile.inc#2 integrate .. //depot/projects/hammer/include/Makefile#44 integrate .. //depot/projects/hammer/include/netdb.h#11 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#23 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#9 integrate .. //depot/projects/hammer/lib/libarchive/configure.ac.in#5 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#7 integrate .. //depot/projects/hammer/lib/libc/net/getnetbyht.c#5 integrate .. //depot/projects/hammer/lib/libc/net/getnetbynis.c#4 integrate .. //depot/projects/hammer/lib/libc/net/getnetent.3#5 integrate .. //depot/projects/hammer/lib/libc/net/getnetnamadr.c#5 integrate .. //depot/projects/hammer/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/kqueue.2#10 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ssh/Makefile#5 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#7 integrate .. //depot/projects/hammer/lib/libpmc/Makefile#3 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.h#3 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.3#1 branch .. //depot/projects/hammer/lib/libpmc/pmclog.c#1 branch .. //depot/projects/hammer/lib/libpmc/pmclog.h#1 branch .. //depot/projects/hammer/lib/librpcsvc/Makefile#8 integrate .. //depot/projects/hammer/lib/libsm/Makefile#8 integrate .. //depot/projects/hammer/lib/libstand/Makefile#15 integrate .. //depot/projects/hammer/lib/libthr/Makefile#11 integrate .. //depot/projects/hammer/lib/libthr/libthr.3#1 branch .. //depot/projects/hammer/lib/libusbhid/Makefile#4 integrate .. //depot/projects/hammer/lib/libz/Makefile#4 integrate .. //depot/projects/hammer/libexec/Makefile#30 integrate .. //depot/projects/hammer/libexec/mail.local/Makefile#3 integrate .. //depot/projects/hammer/libexec/rexecd/Makefile#3 delete .. //depot/projects/hammer/libexec/rexecd/rexecd.8#5 delete .. //depot/projects/hammer/libexec/rexecd/rexecd.c#9 delete .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#8 integrate .. //depot/projects/hammer/libexec/smrsh/Makefile#3 integrate .. //depot/projects/hammer/libexec/telnetd/Makefile#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#98 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#26 integrate .. //depot/projects/hammer/sbin/Makefile#36 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#16 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile#4 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile.inc#6 delete .. //depot/projects/hammer/sbin/dhclient/alloc.c#1 branch .. //depot/projects/hammer/sbin/dhclient/bpf.c#1 branch .. //depot/projects/hammer/sbin/dhclient/client/Makefile#3 delete .. //depot/projects/hammer/sbin/dhclient/clparse.c#1 branch .. //depot/projects/hammer/sbin/dhclient/common/Makefile#3 delete .. //depot/projects/hammer/sbin/dhclient/conflex.c#1 branch .. //depot/projects/hammer/sbin/dhclient/convert.c#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient-script#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient-script.8#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient-script.sh#2 delete .. //depot/projects/hammer/sbin/dhclient/dhclient.8#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient.c#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient.conf#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient.conf.5#1 branch .. //depot/projects/hammer/sbin/dhclient/dhclient.leases.5#1 branch .. //depot/projects/hammer/sbin/dhclient/dhcp-options.5#1 branch .. //depot/projects/hammer/sbin/dhclient/dhcp.h#1 branch .. //depot/projects/hammer/sbin/dhclient/dhcpctl/Makefile#4 delete .. //depot/projects/hammer/sbin/dhclient/dhcpd.h#1 branch .. //depot/projects/hammer/sbin/dhclient/dhctoken.h#1 branch .. //depot/projects/hammer/sbin/dhclient/dispatch.c#1 branch .. //depot/projects/hammer/sbin/dhclient/dst/Makefile#3 delete .. //depot/projects/hammer/sbin/dhclient/errwarn.c#1 branch .. //depot/projects/hammer/sbin/dhclient/hash.c#1 branch .. //depot/projects/hammer/sbin/dhclient/inet.c#1 branch .. //depot/projects/hammer/sbin/dhclient/minires/Makefile#3 delete .. //depot/projects/hammer/sbin/dhclient/omapip/Makefile#4 delete .. //depot/projects/hammer/sbin/dhclient/omshell/Makefile#3 delete .. //depot/projects/hammer/sbin/dhclient/options.c#1 branch .. //depot/projects/hammer/sbin/dhclient/packet.c#1 branch .. //depot/projects/hammer/sbin/dhclient/parse.c#1 branch .. //depot/projects/hammer/sbin/dhclient/privsep.c#1 branch .. //depot/projects/hammer/sbin/dhclient/privsep.h#1 branch .. //depot/projects/hammer/sbin/dhclient/tables.c#1 branch .. //depot/projects/hammer/sbin/dhclient/tree.c#1 branch .. //depot/projects/hammer/sbin/dhclient/tree.h#1 branch .. //depot/projects/hammer/sbin/ifconfig/Makefile#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifbridge.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#23 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#42 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#43 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#8 integrate .. //depot/projects/hammer/sbin/mount/mount_ufs.c#4 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#10 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/mount_ext2fs.c#7 integrate .. //depot/projects/hammer/sbin/mount_hpfs/mount_hpfs.c#4 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#9 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#10 integrate .. //depot/projects/hammer/sbin/mount_nfs4/mount_nfs4.c#6 integrate .. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.c#7 integrate .. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.c#6 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/mount_reiserfs.c#3 integrate .. //depot/projects/hammer/sbin/mount_std/mount_std.c#6 integrate .. //depot/projects/hammer/sbin/mount_udf/mount_udf.c#8 integrate .. //depot/projects/hammer/sbin/mount_ufs/mount_ufs.c#4 integrate .. //depot/projects/hammer/sbin/mount_umapfs/mount_umapfs.c#5 integrate .. //depot/projects/hammer/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#7 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#10 integrate .. //depot/projects/hammer/secure/libexec/sftp-server/Makefile#6 integrate .. //depot/projects/hammer/secure/libexec/ssh-keysign/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/scp/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/sftp/Makefile#5 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-add/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-agent/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-keygen/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-keyscan/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#9 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#11 integrate .. //depot/projects/hammer/share/examples/pppd/ppp.deny.sample#5 integrate .. //depot/projects/hammer/share/man/man4/Makefile#72 integrate .. //depot/projects/hammer/share/man/man4/ata.4#15 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#3 integrate .. //depot/projects/hammer/share/man/man4/dummynet.4#4 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#9 integrate .. //depot/projects/hammer/share/man/man4/gif.4#6 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_tcpmss.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_maestro3.4#3 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#56 integrate .. //depot/projects/hammer/share/man/man8/crash.8#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#53 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#19 integrate .. //depot/projects/hammer/share/man/man9/pmap_init.9#3 integrate .. //depot/projects/hammer/share/man/man9/pmap_page_init.9#1 branch .. //depot/projects/hammer/share/misc/bsd-family-tree#27 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#42 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#28 integrate .. //depot/projects/hammer/sys/alpha/include/pmc_mdep.h#2 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#12 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#12 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#12 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_mount.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#97 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#122 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#33 integrate .. //depot/projects/hammer/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#14 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#8 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#7 integrate .. //depot/projects/hammer/sys/arm/include/intr.h#5 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#10 integrate .. //depot/projects/hammer/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/hammer/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#11 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321.c#6 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/delay.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/getsecs.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#27 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#29 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#21 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#33 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#32 integrate .. //depot/projects/hammer/sys/conf/NOTES#91 integrate .. //depot/projects/hammer/sys/conf/files#114 integrate .. //depot/projects/hammer/sys/conf/files.alpha#21 integrate .. //depot/projects/hammer/sys/conf/files.amd64#69 integrate .. //depot/projects/hammer/sys/conf/files.arm#5 integrate .. //depot/projects/hammer/sys/conf/files.i386#60 integrate .. //depot/projects/hammer/sys/conf/files.ia64#27 integrate .. //depot/projects/hammer/sys/conf/files.pc98#46 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#13 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#31 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#32 integrate .. //depot/projects/hammer/sys/conf/options#75 integrate .. //depot/projects/hammer/sys/conf/options.arm#5 integrate .. //depot/projects/hammer/sys/conf/options.sparc64#10 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltrvar.h#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#12 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#14 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.h#5 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#18 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#62 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#22 integrate .. //depot/projects/hammer/sys/dev/an/if_anreg.h#8 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#16 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#8 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#57 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#32 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#32 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#15 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#32 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#16 integrate .. //depot/projects/hammer/sys/dev/atkbdc/atkbd.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbd_atkbdc.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc_ebus.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc_isa.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc_subr.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc_subr.h#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdcreg.h#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbdreg.h#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/psm.h#1 branch .. //depot/projects/hammer/sys/dev/auxio/auxio.c#3 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#15 integrate .. //depot/projects/hammer/sys/dev/awi/awivar.h#5 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#17 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#47 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#25 integrate .. //depot/projects/hammer/sys/dev/cm/if_cm_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#10 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#11 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#17 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#16 integrate .. //depot/projects/hammer/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#18 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#24 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#28 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#11 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#22 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#42 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#22 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#22 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#8 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#17 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#7 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#15 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#10 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatmvar.h#4 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#18 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_cbus.c#5 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/fe/if_fevar.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#22 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwevar.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwipvar.h#3 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#46 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#13 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#16 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/hammer/sys/dev/harp/if_harp.c#7 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#13 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#8 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_ioctl.c#5 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_rx.c#6 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_tx.c#8 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatmvar.h#7 integrate .. //depot/projects/hammer/sys/dev/hfa/fore_output.c#6 integrate .. //depot/projects/hammer/sys/dev/hfa/fore_receive.c#8 integrate .. //depot/projects/hammer/sys/dev/hfa/fore_transmit.c#4 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#17 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#19 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#11 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 13 19:29:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E11BF16A420; Mon, 13 Jun 2005 19:29:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9D37C16A41C for ; Mon, 13 Jun 2005 19:29:32 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 752AC43D48 for ; Mon, 13 Jun 2005 19:29:32 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5DJTW1n009002 for ; Mon, 13 Jun 2005 19:29:32 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5DJTWMf008999 for perforce@freebsd.org; Mon, 13 Jun 2005 19:29:32 GMT (envelope-from ps@freebsd.org) Date: Mon, 13 Jun 2005 19:29:32 GMT Message-Id: <200506131929.j5DJTWMf008999@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Cc: Subject: PERFORCE change 78494 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2005 19:29:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=78494 Change 78494 by ps@butter.corp on 2005/06/13 19:29:31 Wrap PT_IO for COMPAT_IA32 compatability. Reviewed by: peter Affected files ... .. //depot/projects/hammer/sys/kern/sys_process.c#28 edit .. //depot/projects/hammer/sys/sys/ptrace.h#9 edit Differences ... ==== //depot/projects/hammer/sys/kern/sys_process.c#28 (text+ko) ==== @@ -373,6 +373,7 @@ struct dbreg32 dbreg32; struct fpreg32 fpreg32; struct reg32 reg32; + struct ptrace_io_desc32 piod32; #endif } r; void *addr; @@ -400,7 +401,7 @@ error = COPYIN(uap->addr, &r.dbreg, sizeof r.dbreg); break; case PT_IO: - error = copyin(uap->addr, &r.piod, sizeof r.piod); + error = COPYIN(uap->addr, &r.piod, sizeof r.piod); break; default: addr = uap->addr; @@ -415,7 +416,7 @@ switch (uap->req) { case PT_IO: - (void)copyout(&r.piod, uap->addr, sizeof r.piod); + error = COPYOUT(&r.piod, uap->addr, sizeof r.piod); break; case PT_GETREGS: error = COPYOUT(&r.reg, uap->addr, sizeof r.reg); @@ -453,7 +454,7 @@ struct uio uio; struct proc *curp, *p, *pp; struct thread *td2 = NULL; - struct ptrace_io_desc *piod; + struct ptrace_io_desc *piod = NULL; struct ptrace_lwpinfo *pl; int error, write, tmp, num; int proctree_locked = 0; @@ -461,6 +462,7 @@ pid_t saved_pid = pid; #ifdef COMPAT_IA32 int wrap32 = 0, safe = 0; + struct ptrace_io_desc32 *piod32 = NULL; #endif curp = td->td_proc; @@ -818,16 +820,31 @@ case PT_IO: PROC_UNLOCK(p); - piod = addr; - iov.iov_base = piod->piod_addr; - iov.iov_len = piod->piod_len; +#ifdef COMPAT_IA32 + if (wrap32) { + piod32 = addr; + iov.iov_base = (void *)(uintptr_t)piod32->piod_addr; + iov.iov_len = piod32->piod_len; + uio.uio_offset = (off_t)(uintptr_t)piod32->piod_offs; + uio.uio_resid = piod32->piod_len; + } else +#endif + { + piod = addr; + iov.iov_base = piod->piod_addr; + iov.iov_len = piod->piod_len; + uio.uio_offset = (off_t)(uintptr_t)piod->piod_offs; + uio.uio_resid = piod->piod_len; + } uio.uio_iov = &iov; uio.uio_iovcnt = 1; - uio.uio_offset = (off_t)(uintptr_t)piod->piod_offs; - uio.uio_resid = piod->piod_len; uio.uio_segflg = UIO_USERSPACE; uio.uio_td = td; +#ifdef COMPAT_IA32 + switch (wrap32 ? piod32->piod_op : piod->piod_op) { +#else switch (piod->piod_op) { +#endif case PIOD_READ_D: case PIOD_READ_I: uio.uio_rw = UIO_READ; @@ -840,7 +857,14 @@ return (EINVAL); } error = proc_rwmem(p, &uio); - piod->piod_len -= uio.uio_resid; +#ifdef COMPAT_IA32 + if (wrap32) { + piod32->piod_len -= uio.uio_resid; + } else +#endif + { + piod->piod_len -= uio.uio_resid; + } return (error); case PT_KILL: ==== //depot/projects/hammer/sys/sys/ptrace.h#9 (text+ko) ==== @@ -75,6 +75,15 @@ size_t piod_len; /* request length */ }; +#ifdef COMPAT_IA32 +struct ptrace_io_desc32 { + int piod_op; + u_int32_t piod_offs; + u_int32_t piod_addr; + u_int32_t piod_len; +}; +#endif + /* * Operations in piod_op. */ From owner-p4-projects@FreeBSD.ORG Mon Jun 13 22:09:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C80C716A420; Mon, 13 Jun 2005 22:09:47 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9C9BA16A41C for ; Mon, 13 Jun 2005 22:09:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60D5E43D49 for ; Mon, 13 Jun 2005 22:09:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5DM9lpe026112 for ; Mon, 13 Jun 2005 22:09:47 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5DM9lhD026109 for perforce@freebsd.org; Mon, 13 Jun 2005 22:09:47 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Jun 2005 22:09:47 GMT Message-Id: <200506132209.j5DM9lhD026109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2005 22:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=78499 Change 78499 by peter@peter_overcee on 2005/06/13 22:09:36 IFC @78498 Affected files ... .. //depot/projects/hammer/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/hostapd/Makefile#2 integrate .. //depot/projects/hammer/contrib/hostapd/common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/config.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/version.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/radius.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/radius.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#10 integrate .. //depot/projects/hammer/sys/net/if_stf.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#19 integrate Differences ... ==== //depot/projects/hammer/contrib/hostapd/ChangeLog#2 (text+ko) ==== @@ -1,5 +1,19 @@ ChangeLog for hostapd +2005-06-10 - v0.3.9 + * fixed a bug which caused some RSN pre-authentication cases to use + freed memory and potentially crash hostapd + * fixed private key loading for cases where passphrase is not set + * fixed WPA2 to add PMKSA cache entry when using integrated EAP + authenticator + * driver_madwifi: fixed pairwise key removal to allow WPA reauth + without disassociation + * fixed RADIUS attribute Class processing to only use Access-Accept + packets to update Class; previously, other RADIUS authentication + packets could have cleared Class attribute + * fixed PMKSA caching (EAP authentication was not skipped correctly + with the new state machine changes from IEEE 802.1X draft) + 2005-02-12 - v0.3.7 (beginning of 0.3.x stable releases) 2005-01-23 - v0.3.5 ==== //depot/projects/hammer/contrib/hostapd/Makefile#2 (text+ko) ==== @@ -228,6 +228,6 @@ $(CC) -o hostapd_cli hostapd_cli.o hostapd_ctrl.o clean: - rm -f core *~ *.o hostapd *.d driver_conf.c + rm -f core *~ *.o hostapd hostapd_cli *.d driver_conf.c -include $(OBJS:%.o=%.d) ==== //depot/projects/hammer/contrib/hostapd/common.h#2 (text+ko) ==== @@ -8,8 +8,12 @@ #ifdef __FreeBSD__ #include #include +#define __BYTE_ORDER _BYTE_ORDER +#define __LITTLE_ENDIAN _LITTLE_ENDIAN +#define __BIG_ENDIAN _BIG_ENDIAN #define bswap_16 bswap16 #define bswap_32 bswap32 +#define bswap_64 bswap64 #endif #ifdef CONFIG_NATIVE_WINDOWS ==== //depot/projects/hammer/contrib/hostapd/config.c#2 (text+ko) ==== @@ -597,7 +597,8 @@ } if (conf->wpa && (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) && - conf->wpa_psk == NULL && conf->wpa_passphrase == NULL) { + conf->wpa_psk == NULL && conf->wpa_passphrase == NULL && + conf->wpa_psk_file == NULL) { printf("WPA-PSK enabled, but PSK or passphrase is not " "configured.\n"); return -1; ==== //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#2 (text+ko) ==== @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -383,7 +384,8 @@ unlink(fname); free(fname); - if (rmdir(hapd->conf->ctrl_interface) < 0) { + if (hapd->conf->ctrl_interface && + rmdir(hapd->conf->ctrl_interface) < 0) { if (errno == ENOTEMPTY) { wpa_printf(MSG_DEBUG, "Control interface " "directory not empty - leaving it " ==== //depot/projects/hammer/contrib/hostapd/eapol_sm.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/hostapd/eapol_sm.c,v 1.2 2005/06/05 22:41:14 sam Exp $ + * $FreeBSD: src/contrib/hostapd/eapol_sm.c,v 1.3 2005/06/13 17:07:31 sam Exp $ */ #include @@ -767,22 +767,22 @@ prev_ctrl_dir = sm->ctrl_dir.state; SM_STEP_RUN(AUTH_PAE); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(BE_AUTH); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(REAUTH_TIMER); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(AUTH_KEY_TX); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(KEY_RX); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(CTRL_DIR); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; } while (prev_auth_pae != sm->auth_pae.state || prev_be_auth != sm->be_auth.state || @@ -803,12 +803,14 @@ void eapol_sm_initialize(struct eapol_state_machine *sm) { + sm->initializing = TRUE; /* Initialize the state machines by asserting initialize and then * deasserting it after one step */ sm->initialize = TRUE; eapol_sm_step(sm); sm->initialize = FALSE; eapol_sm_step(sm); + sm->initializing = FALSE; /* Start one second tick for port timers state machine */ eloop_cancel_timeout(eapol_port_timers_tick, sm->hapd, sm); ==== //depot/projects/hammer/contrib/hostapd/eapol_sm.h#2 (text+ko) ==== @@ -195,6 +195,8 @@ */ u8 currentId; + Boolean initializing; /* in process of initializing state machines */ + /* Somewhat nasty pointers to global hostapd and STA data to avoid * passing these to every function */ struct hostapd_data *hapd; ==== //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.2 2005/06/05 22:41:14 sam Exp $ + * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.3 2005/06/13 17:07:31 sam Exp $ */ #include @@ -1157,6 +1157,7 @@ session_timeout_set ? session_timeout : -1); } + ieee802_1x_store_radius_class(hapd, sta, msg); break; case RADIUS_CODE_ACCESS_REJECT: sm->eapFail = TRUE; @@ -1180,7 +1181,6 @@ break; } - ieee802_1x_store_radius_class(hapd, sta, msg); ieee802_1x_decapsulate_radius(hapd, sta); if (override_eapReq) sm->be_auth.eapReq = FALSE; @@ -1669,6 +1669,7 @@ return len; } + void ieee802_1x_finished(struct hostapd_data *hapd, struct sta_info *sta, int success) { @@ -1682,4 +1683,3 @@ pmksa_cache_add(hapd, sta, key, dot11RSNAConfigPMKLifetime); } } - ==== //depot/projects/hammer/contrib/hostapd/ms_funcs.c#2 (text+ko) ==== @@ -158,12 +158,14 @@ }; const unsigned char *addr[3]; const size_t len[3] = { 16, 24, sizeof(magic1) }; + u8 hash[SHA1_MAC_LEN]; addr[0] = password_hash_hash; addr[1] = nt_response; addr[2] = magic1; - sha1_vector(3, addr, len, master_key); + sha1_vector(3, addr, len, hash); + memcpy(master_key, hash, 16); } ==== //depot/projects/hammer/contrib/hostapd/radius_client.c#2 (text+ko) ==== @@ -506,7 +506,7 @@ rconf = hapd->conf->auth_server; } - len = recv(sock, buf, sizeof(buf), 0); + len = recv(sock, buf, sizeof(buf), MSG_DONTWAIT); if (len < 0) { perror("recv[RADIUS]"); return; ==== //depot/projects/hammer/contrib/hostapd/radius_server.c#2 (text+ko) ==== @@ -325,6 +325,7 @@ { struct radius_msg *msg; int ret = 0; + struct eap_hdr eapfail; RADIUS_DEBUG("Reject invalid request from %s:%d", inet_ntoa(from->sin_addr), ntohs(from->sin_port)); @@ -335,6 +336,16 @@ return -1; } + memset(&eapfail, 0, sizeof(eapfail)); + eapfail.code = EAP_CODE_FAILURE; + eapfail.identifier = 0; + eapfail.length = htons(sizeof(eapfail)); + + if (!radius_msg_add_eap(msg, (u8 *) &eapfail, sizeof(eapfail))) { + RADIUS_DEBUG("Failed to add EAP-Message attribute"); + } + + if (radius_msg_finish_srv(msg, (u8 *) client->shared_secret, client->shared_secret_len, request->hdr->authenticator) < 0) { @@ -395,6 +406,7 @@ sess = radius_server_get_new_session(data, client, msg); if (sess == NULL) { RADIUS_DEBUG("Could not create a new session"); + radius_server_reject(data, client, msg, from); return -1; } } ==== //depot/projects/hammer/contrib/hostapd/tls_openssl.c#2 (text+ko) ==== @@ -489,9 +489,12 @@ if (private_key == NULL) return 0; - passwd = strdup(private_key_passwd); - if (passwd == NULL) - return -1; + if (private_key_passwd) { + passwd = strdup(private_key_passwd); + if (passwd == NULL) + return -1; + } else + passwd = NULL; SSL_CTX_set_default_passwd_cb(ssl_ctx, tls_passwd_cb); SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, passwd); ==== //depot/projects/hammer/contrib/hostapd/version.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION_STR "0.3.7" +#define VERSION_STR "0.3.9" #endif /* VERSION_H */ ==== //depot/projects/hammer/contrib/hostapd/wpa.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.2 2005/06/05 22:41:14 sam Exp $ + * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.3 2005/06/13 17:07:31 sam Exp $ */ #include @@ -1416,6 +1416,14 @@ key = (struct wpa_eapol_key *) (hdr + 1); key_info = ntohs(key->key_info); key_data_length = ntohs(key->key_data_length); + if (key_data_length > data_len - sizeof(*hdr) - sizeof(*key)) { + wpa_printf(MSG_INFO, "WPA: Invalid EAPOL-Key frame - " + "key_data overflow (%d > %lu)", + key_data_length, + (unsigned long) (data_len - sizeof(*hdr) - + sizeof(*key))); + return; + } /* FIX: verify that the EAPOL-Key frame was encrypted if pairwise keys * are set */ ==== //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#2 (text+ko) ==== @@ -1,5 +1,28 @@ ChangeLog for wpa_supplicant +2005-06-10 - v0.3.9 + * modified the EAP workaround that accepts EAP-Success with incorrect + Identifier to be even less strict about verification in order to + interoperate with some authentication servers + * fixed RSN IE in 4-Way Handshake message 2/4 for the case where + Authenticator rejects PMKSA caching attempt and the driver is not + using assoc_info events + * fixed a possible double free in EAP-TTLS fast-reauthentication when + identity or password is entered through control interface + * added -P argument for wpa_supplicant to write the current + process id into a file + * driver_madwifi: fixed association in plaintext mode + * driver_madwifi: added preliminary support for compiling against 'BSD' + branch of madwifi CVS tree + * added EAP workaround for PEAPv1 session resumption: allow outer, + i.e., not tunneled, EAP-Success to terminate session since; this can + be disabled with eap_workaround=0 + * driver_ipw: updated driver structures to match with ipw2200-1.0.4 + (note: ipw2100-1.1.0 is likely to require an update to work with + this) + * driver_broadcom: fixed couple of memory leaks in scan result + processing + 2005-02-13 - v0.3.8 * fixed EAPOL-Key validation to drop packets with invalid Key Data Length; such frames could have crashed wpa_supplicant due to buffer ==== //depot/projects/hammer/contrib/wpa_supplicant/README#2 (text+ko) ==== @@ -6,9 +6,7 @@ All Rights Reserved. This program is dual-licensed under both the GPL version 2 and BSD -license. Either license may be used at your option. Please note that -some of the driver interface implementations (driver_*.c) may be -licensed under a different license. +license. Either license may be used at your option. ==== //depot/projects/hammer/contrib/wpa_supplicant/config.c#2 (text+ko) ==== @@ -245,7 +245,7 @@ return -1; start = buf; - while (start != '\0') { + while (*start != '\0') { while (*start == ' ' || *start == '\t') start++; if (*start == '\0') @@ -295,7 +295,7 @@ return -1; start = buf; - while (start != '\0') { + while (*start != '\0') { while (*start == ' ' || *start == '\t') start++; if (*start == '\0') @@ -349,7 +349,7 @@ return -1; start = buf; - while (start != '\0') { + while (*start != '\0') { while (*start == ' ' || *start == '\t') start++; if (*start == '\0') @@ -441,7 +441,7 @@ return -1; start = buf; - while (start != '\0') { + while (*start != '\0') { while (*start == ' ' || *start == '\t') start++; if (*start == '\0') @@ -494,7 +494,7 @@ return -1; start = buf; - while (start != '\0') { + while (*start != '\0') { while (*start == ' ' || *start == '\t') start++; if (*start == '\0') ==== //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#2 (text+ko) ==== @@ -248,8 +248,9 @@ return -1; *pos++ = '\0'; id = atoi(id_pos); - wpa_printf(MSG_DEBUG, "CTRL_IFACE: field=%s id=%d value='%s'", - rsp, id, pos); + wpa_printf(MSG_DEBUG, "CTRL_IFACE: field=%s id=%d", rsp, id); + wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value", + (u8 *) pos, strlen(pos)); ssid = wpa_s->conf->ssid; while (ssid) { @@ -606,6 +607,16 @@ if (wpa_s->ctrl_sock > -1) { char *fname; eloop_unregister_read_sock(wpa_s->ctrl_sock); + if (wpa_s->ctrl_dst) { + /* + * Wait a second before closing the control socket if + * there are any attached monitors in order to allow + * them to receive any pending messages. + */ + wpa_printf(MSG_DEBUG, "CTRL_IFACE wait for attached " + "monitors to receive messages"); + sleep(1); + } close(wpa_s->ctrl_sock); wpa_s->ctrl_sock = -1; fname = wpa_supplicant_ctrl_iface_path(wpa_s); ==== //depot/projects/hammer/contrib/wpa_supplicant/eap.c#2 (text+ko) ==== @@ -458,19 +458,27 @@ static int eap_success_workaround(struct eap_sm *sm, int reqId, int lastId) { - /* At least Microsoft IAS and Meetinghouse Aegis seem to be sending + /* + * At least Microsoft IAS and Meetinghouse Aegis seem to be sending * EAP-Success/Failure with lastId + 1 even though RFC 3748 and * draft-ietf-eap-statemachine-05.pdf require that reqId == lastId. + * In addition, it looks like Ringmaster v2.1.2.0 would be using + * lastId + 2 in EAP-Success. + * * Accept this kind of Id if EAP workarounds are enabled. These are * unauthenticated plaintext messages, so this should have minimal - * security implications (bit easier to fake EAP-Success/Failure). */ - if (sm->workaround && reqId == ((lastId + 1) & 0xff)) { + * security implications (bit easier to fake EAP-Success/Failure). + */ + if (sm->workaround && (reqId == ((lastId + 1) & 0xff) || + reqId == ((lastId + 2) & 0xff))) { wpa_printf(MSG_DEBUG, "EAP: Workaround for unexpected " "identifier field in EAP Success: " "reqId=%d lastId=%d (these are supposed to be " "same)", reqId, lastId); return 1; } + wpa_printf(MSG_DEBUG, "EAP: EAP-Success Id mismatch - reqId=%d " + "lastId=%d", reqId, lastId); return 0; } ==== //depot/projects/hammer/contrib/wpa_supplicant/eap_mschapv2.c#2 (text+ko) ==== @@ -126,8 +126,8 @@ { struct wpa_ssid *config = eap_get_config(sm); u8 *challenge, *peer_challenge, *username, *pos; - int challenge_len, i, ms_len; - size_t len, username_len; + int i, ms_len; + size_t len, challenge_len, username_len; struct eap_mschapv2_hdr *resp; u8 password_hash[16], password_hash_hash[16]; @@ -155,10 +155,12 @@ return NULL; } - if (len - challenge_len - 10 < 0) { + if (len < 10 || len - 10 < challenge_len) { wpa_printf(MSG_INFO, "EAP-MSCHAPV2: Too short challenge" " packet: len=%lu challenge_len=%d", (unsigned long) len, challenge_len); + ret->ignore = TRUE; + return NULL; } challenge = pos; @@ -469,7 +471,8 @@ req = (struct eap_mschapv2_hdr *) reqData; len = be_to_host16(req->length); - if (len < sizeof(*req) + 2 || req->type != EAP_TYPE_MSCHAPV2) { + if (len < sizeof(*req) + 2 || req->type != EAP_TYPE_MSCHAPV2 || + len > reqDataLen) { wpa_printf(MSG_INFO, "EAP-MSCHAPV2: Invalid frame"); ret->ignore = TRUE; return NULL; ==== //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#2 (text+ko) ==== @@ -380,6 +380,12 @@ if (data->pending_phase2_req) { wpa_printf(MSG_DEBUG, "EAP-PEAP: Pending Phase 2 request - " "skip decryption and use old data"); + /* Clear TLS reassembly state. */ + free(data->ssl.tls_in); + data->ssl.tls_in = NULL; + data->ssl.tls_in_len = 0; + data->ssl.tls_in_left = 0; + data->ssl.tls_in_total = 0; in_decrypted = data->pending_phase2_req; data->pending_phase2_req = NULL; len_decrypted = data->pending_phase2_req_len; @@ -391,6 +397,19 @@ if (res < 0 || res == 1) return res; + if (in_len == 0 && sm->workaround && data->phase2_success) { + /* + * Cisco ACS seems to be using TLS ACK to terminate + * EAP-PEAPv0/GTC. Try to reply with TLS ACK. + */ + wpa_printf(MSG_DEBUG, "EAP-PEAP: Received TLS ACK, but " + "expected data - acknowledge with TLS ACK since " + "Phase 2 has been completed"); + ret->decision = DECISION_COND_SUCC; + ret->methodState = METHOD_DONE; + return 1; + } + buf_len = in_len; if (data->ssl.tls_in_total > buf_len) buf_len = data->ssl.tls_in_total; @@ -713,6 +732,25 @@ wpa_printf(MSG_DEBUG, "EAP-PEAP: Failed to " "derive key"); } + + if (sm->workaround && data->peap_version == 1 && + data->resuming) { + /* + * At least one RADIUS server (Aegis v1.1.6; + * but not v1.1.4) seems to be terminating + * PEAPv1 session resumption with outer + * EAP-Success. This does not seem to follow + * draft-josefsson-pppext-eap-tls-eap-05.txt + * section 4.2, so only allow this if EAP + * workarounds are enabled. + */ + wpa_printf(MSG_DEBUG, "EAP-PEAP: Workaround - " + "allow outer EAP-Success to " + "terminate PEAPv1 resumption"); + ret->decision = DECISION_COND_SUCC; + data->phase2_success = 1; + } + data->resuming = 0; } } ==== //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.c#2 (text+ko) ==== @@ -160,6 +160,17 @@ u8 *buf; if (data->tls_in_left > *in_len || data->tls_in) { + if (data->tls_in_len + *in_len == 0) { + free(data->tls_in); + data->tls_in = NULL; + data->tls_in_len = 0; + wpa_printf(MSG_WARNING, "SSL: Invalid reassembly " + "state: tls_in_left=%d tls_in_len=%d " + "*in_len=%d", + data->tls_in_left, data->tls_in_len, + *in_len); + return -1; + } buf = realloc(data->tls_in, data->tls_in_len + *in_len); if (buf == NULL) { free(data->tls_in); ==== //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.c#2 (text+ko) ==== @@ -194,7 +194,7 @@ * add TLS Message Length field, if the frame is fragmented. */ resp = malloc(sizeof(struct eap_hdr) + 2 + data->ssl.tls_out_limit); if (resp == NULL) - return 0; + return -1; resp->code = EAP_CODE_RESPONSE; resp->identifier = id; @@ -210,7 +210,7 @@ wpa_printf(MSG_INFO, "EAP-TTLS: Failed to encrypt Phase 2 " "data"); free(resp); - return 0; + return -1; } *out_len = sizeof(struct eap_hdr) + 2 + res; @@ -265,6 +265,7 @@ avp = malloc(sizeof(struct ttls_avp) + *resp_len + 4); if (avp == NULL) { free(*resp); + *resp = NULL; *resp_len = 0; return -1; } @@ -782,6 +783,13 @@ if (data->pending_phase2_req) { wpa_printf(MSG_DEBUG, "EAP-TTLS: Pending Phase 2 request - " "skip decryption and use old data"); + /* Clear TLS reassembly state. */ + free(data->ssl.tls_in); + data->ssl.tls_in = NULL; + data->ssl.tls_in_len = 0; + data->ssl.tls_in_left = 0; + data->ssl.tls_in_total = 0; + in_decrypted = data->pending_phase2_req; data->pending_phase2_req = NULL; len_decrypted = data->pending_phase2_req_len; ==== //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#2 (text+ko) ==== @@ -194,9 +194,8 @@ "heldWhile=%d startWhen=%d idleWhile=%d", sm->authWhile, sm->heldWhile, sm->startWhen, sm->idleWhile); + eloop_register_timeout(1, 0, eapol_port_timers_tick, eloop_ctx, sm); eapol_sm_step(sm); - - eloop_register_timeout(1, 0, eapol_port_timers_tick, eloop_ctx, sm); } ==== //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.c#2 (text+ko) ==== @@ -158,12 +158,14 @@ }; const unsigned char *addr[3]; const size_t len[3] = { 16, 24, sizeof(magic1) }; + u8 hash[SHA1_MAC_LEN]; addr[0] = password_hash_hash; addr[1] = nt_response; addr[2] = magic1; - sha1_vector(3, addr, len, master_key); + sha1_vector(3, addr, len, hash); + memcpy(master_key, hash, 16); } ==== //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#2 (text+ko) ==== @@ -489,9 +489,12 @@ if (private_key == NULL) return 0; - passwd = strdup(private_key_passwd); - if (passwd == NULL) - return -1; + if (private_key_passwd) { + passwd = strdup(private_key_passwd); + if (passwd == NULL) + return -1; + } else + passwd = NULL; SSL_CTX_set_default_passwd_cb(ssl_ctx, tls_passwd_cb); SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, passwd); ==== //depot/projects/hammer/contrib/wpa_supplicant/version.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION_STR "0.3.8" +#define VERSION_STR "0.3.9" #endif /* VERSION_H */ ==== //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#2 (text+ko) ==== @@ -1035,6 +1035,7 @@ if (hostapd_get_rand(wpa_s->snonce, WPA_NONCE_LEN)) { wpa_msg(wpa_s, MSG_WARNING, "WPA: Failed to get " "random data for SNonce"); + free(rbuf); return; } wpa_s->renew_snonce = 0; @@ -1100,6 +1101,7 @@ wpa_s->cur_pmksa = NULL; abort_cached = 1; } else { + free(rbuf); return; } } @@ -1110,6 +1112,7 @@ "been received from the external IEEE " "802.1X Supplicant - ignoring WPA " "EAPOL-Key frame"); + free(rbuf); return; #endif /* CONFIG_XSUPPLICANT_IFACE */ } @@ -1120,6 +1123,7 @@ "full EAP authenication"); wpa_eapol_send(wpa_s, IEEE802_1X_TYPE_EAPOL_START, (u8 *) "", 0); + free(rbuf); return; } @@ -1963,8 +1967,9 @@ if (be_to_host16(key->key_data_length) > extra_len) { wpa_msg(wpa_s, MSG_INFO, "WPA: Invalid EAPOL-Key frame - " - "key_data overflow (%d > %d)", - be_to_host16(key->key_data_length), extra_len); + "key_data overflow (%d > %lu)", + be_to_host16(key->key_data_length), + (unsigned long) extra_len); return; } @@ -2009,6 +2014,12 @@ wpa_printf(MSG_DEBUG, "RX EAPOL from " MACSTR, MAC2STR(src_addr)); wpa_hexdump(MSG_MSGDUMP, "RX EAPOL", buf, len); + if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE) { + wpa_printf(MSG_DEBUG, "Ignored received EAPOL frame since " + "no key management is configured"); + return; + } + if (wpa_s->eapol_received == 0) { /* Timeout for completing IEEE 802.1X and WPA authentication */ wpa_supplicant_req_auth_timeout( @@ -2252,6 +2263,7 @@ } memset(ctx, 0, sizeof(*ctx)); ctx->ctx = wpa_s; + ctx->msg_ctx = wpa_s; ctx->preauth = 1; ctx->cb = rsn_preauth_eapol_cb; ctx->cb_ctx = wpa_s; ==== //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/wpa_supplicant/wpa_ctrl.c,v 1.2 2005/06/05 21:13:08 sam Exp $ + * $FreeBSD: src/contrib/wpa_supplicant/wpa_ctrl.c,v 1.3 2005/06/13 16:54:21 sam Exp $ */ #include @@ -93,8 +93,7 @@ snprintf(ctrl->local.sun_path, sizeof(ctrl->local.sun_path) - 1, "/tmp/wpa_ctrl_%d-%d", getpid(), counter++); if (bind(ctrl->s, (struct sockaddr *) &ctrl->local, - sizeof(ctrl->local.sun_family) + - strlen(ctrl->local.sun_path)) < 0) { + sizeof(ctrl->local)) < 0) { close(ctrl->s); free(ctrl); return NULL; ==== //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#2 (text+ko) ==== @@ -360,18 +360,19 @@ } -static int wpa_blacklisted(struct wpa_supplicant *wpa_s, const u8 *bssid) +static struct wpa_blacklist * +wpa_blacklist_get(struct wpa_supplicant *wpa_s, const u8 *bssid) { struct wpa_blacklist *e; e = wpa_s->blacklist; while (e) { if (memcmp(e->bssid, bssid, ETH_ALEN) == 0) - return 1; + return e; e = e->next; } - return 0; + return NULL; } @@ -379,14 +380,21 @@ { struct wpa_blacklist *e; - if (wpa_blacklisted(wpa_s, bssid)) + e = wpa_blacklist_get(wpa_s, bssid); + if (e) { + e->count++; + wpa_printf(MSG_DEBUG, "BSSID " MACSTR " blacklist count " + "incremented to %d", + MAC2STR(bssid), e->count); return 0; + } e = malloc(sizeof(*e)); if (e == NULL) return -1; memset(e, 0, sizeof(*e)); memcpy(e->bssid, bssid, ETH_ALEN); + e->count = 1; e->next = wpa_s->blacklist; wpa_s->blacklist = e; wpa_printf(MSG_DEBUG, "Added BSSID " MACSTR " into blacklist", @@ -1341,6 +1349,18 @@ return -1; } wpa_hexdump(MSG_DEBUG, "WPA: Own WPA IE", wpa_ie, *wpa_ie_len); + if (wpa_s->assoc_wpa_ie == NULL) { + /* + * Make a copy of the WPA/RSN IE so that 4-Way Handshake gets + * the correct version of the IE even if PMKSA caching is + * aborted (which would remove PMKID from IE generation). + */ + wpa_s->assoc_wpa_ie = malloc(*wpa_ie_len); + if (wpa_s->assoc_wpa_ie) { + memcpy(wpa_s->assoc_wpa_ie, wpa_ie, *wpa_ie_len); + wpa_s->assoc_wpa_ie_len = *wpa_ie_len; + } + } if (ssid->key_mgmt & WPA_KEY_MGMT_PSK) { wpa_s->pmk_len = PMK_LEN; @@ -1651,6 +1671,7 @@ struct wpa_ssid *ssid; struct wpa_scan_result *bss, *selected = NULL; int i; + struct wpa_blacklist *e; wpa_printf(MSG_DEBUG, "Selecting BSS from priority group %d", group->priority); @@ -1666,7 +1687,8 @@ wpa_ssid_txt(bss->ssid, bss->ssid_len), (unsigned long) bss->wpa_ie_len, (unsigned long) bss->rsn_ie_len); - if (wpa_blacklisted(wpa_s, bss->bssid)) { + if ((e = wpa_blacklist_get(wpa_s, bss->bssid)) && + e->count > 1) { wpa_printf(MSG_DEBUG, " skip - blacklisted"); continue; } @@ -1733,7 +1755,8 @@ * allows this. */ for (i = 0; i < num && !selected; i++) { bss = &results[i]; - if (wpa_blacklisted(wpa_s, bss->bssid)) { + if ((e = wpa_blacklist_get(wpa_s, bss->bssid)) && + e->count > 1) { continue; } for (ssid = group; ssid; ssid = ssid->pnext) { @@ -2088,7 +2111,8 @@ "usage:\n" " wpa_supplicant [-BddehLqqvw] -i -c " "[-D] \\\n" - " [-N -i -c [-D] ...]\n" + " [-P] " + "[-N -i -c [-D] ...]\n" "\n" "drivers:\n", wpa_supplicant_version, wpa_supplicant_license); @@ -2135,6 +2159,7 @@ if (wpa_s == NULL) return NULL; memset(wpa_s, 0, sizeof(*wpa_s)); + wpa_s->ctrl_sock = -1; #ifdef CONFIG_XSUPPLICANT_IFACE wpa_s->dot1x_s = -1; #endif /* CONFIG_XSUPPLICANT_IFACE */ @@ -2279,6 +2304,7 @@ wpa_drv_set_drop_unencrypted(wpa_s, 0); wpa_drv_set_countermeasures(wpa_s, 0); + wpa_clear_keys(wpa_s, NULL); wpa_drv_deinit(wpa_s); } @@ -2291,6 +2317,7 @@ struct wpa_supplicant *head, *wpa_s; int c; const char *confname, *driver, *ifname; + char *pid_file = NULL; int daemonize = 0, wait_for_interface = 0, disable_eapol = 0, exitcode; #ifdef CONFIG_NATIVE_WINDOWS @@ -2312,7 +2339,7 @@ ifname = confname = driver = NULL; for (;;) { - c = getopt(argc, argv, "Bc:D:dehi:KLNqtvw"); + c = getopt(argc, argv, "Bc:D:dehi:KLNP:qtvw"); if (c < 0) break; switch (c) { @@ -2347,6 +2374,9 @@ case 'L': license(); return -1; + case 'P': + pid_file = rel2abs_path(optarg); + break; case 'q': wpa_debug_level++; break; @@ -2407,6 +2437,14 @@ } } + if (pid_file) { + FILE *f = fopen(pid_file, "w"); + if (f) { + fprintf(f, "%u\n", getpid()); + fclose(f); + } + } + eloop_register_signal(SIGINT, wpa_supplicant_terminate, NULL); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 14 00:50:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1EA716A420; Tue, 14 Jun 2005 00:50:25 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B2E9F16A41C for ; Tue, 14 Jun 2005 00:50:25 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FC5943D49 for ; Tue, 14 Jun 2005 00:50:25 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E0oPpP040131 for ; Tue, 14 Jun 2005 00:50:25 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E0oPVN040127 for perforce@freebsd.org; Tue, 14 Jun 2005 00:50:25 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 00:50:25 GMT Message-Id: <200506140050.j5E0oPVN040127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 00:50:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=78504 Change 78504 by peter@peter_daintree on 2005/06/14 00:49:24 Fix the syscons panic. Pointers to varargs functions are not interchangeable with pointers to non-varargs functions on amd64. Affected files ... .. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#6 edit Differences ... ==== //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#6 (text+ko) ==== @@ -92,7 +92,7 @@ static vr_draw_border_t vga_grborder; #endif -static void vga_nop(scr_stat *scp, ...); +static void vga_nop(scr_stat *scp); static sc_rndr_sw_t txtrndrsw = { (vr_init_t *)vga_nop, @@ -219,7 +219,7 @@ #endif static void -vga_nop(scr_stat *scp, ...) +vga_nop(scr_stat *scp) { } From owner-p4-projects@FreeBSD.ORG Tue Jun 14 01:00:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 843F516A420; Tue, 14 Jun 2005 01:00:39 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1963516A41F for ; Tue, 14 Jun 2005 01:00:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BEE643D55 for ; Tue, 14 Jun 2005 01:00:38 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E10cd1040725 for ; Tue, 14 Jun 2005 01:00:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E10b85040722 for perforce@freebsd.org; Tue, 14 Jun 2005 01:00:37 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 01:00:37 GMT Message-Id: <200506140100.j5E10b85040722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 01:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=78505 Change 78505 by peter@peter_daintree on 2005/06/14 00:59:40 Fix a second landmine Affected files ... .. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#6 edit Differences ... ==== //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#6 (text+ko) ==== @@ -62,7 +62,7 @@ #define gfb_mouse (vr_draw_mouse_t *)gfb_nop #endif -static void gfb_nop(scr_stat *scp, ...); +static void gfb_nop(scr_stat *scp); sc_rndr_sw_t txtrndrsw = { (vr_init_t *)gfb_nop, @@ -113,7 +113,7 @@ #endif static void -gfb_nop(scr_stat *scp, ...) +gfb_nop(scr_stat *scp) { } From owner-p4-projects@FreeBSD.ORG Tue Jun 14 02:09:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E27D16A420; Tue, 14 Jun 2005 02:09:01 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5673F16A41C for ; Tue, 14 Jun 2005 02:09:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DB8143D49 for ; Tue, 14 Jun 2005 02:09:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E290fI043085 for ; Tue, 14 Jun 2005 02:09:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E290NF043078 for perforce@freebsd.org; Tue, 14 Jun 2005 02:09:00 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 02:09:00 GMT Message-Id: <200506140209.j5E290NF043078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 02:09:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=78507 Change 78507 by peter@peter_melody on 2005/06/14 02:08:32 Clean up pthread segment goop. Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#7 edit .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#14 edit Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#7 (text+ko) ==== @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -88,36 +87,6 @@ bzero(kcb, sizeof(struct kcb)); kcb->kcb_self = kcb; kcb->kcb_kse = kse; - switch (_thr_using_setbase) { - case 1: /* use i386_set_gsbase() in _kcb_set */ - kcb->kcb_ldt = -1; - break; - case 0: /* Untested, try the get/set_gsbase routines once */ - error = i386_get_gsbase(&base); - if (error == 0) { - _thr_using_setbase = 1; - break; - } - /* fall through */ - case 2: /* Use the user_ldt code, we must have an old kernel */ - _thr_using_setbase = 2; - ldt.sd.sd_hibase = (unsigned int)kcb >> 24; - ldt.sd.sd_lobase = (unsigned int)kcb & 0xFFFFFF; - ldt.sd.sd_hilimit = (sizeof(struct kcb) >> 16) & 0xF; - ldt.sd.sd_lolimit = sizeof(struct kcb) & 0xFFFF; - ldt.sd.sd_type = SDT_MEMRWA; - ldt.sd.sd_dpl = SEL_UPL; - ldt.sd.sd_p = 1; - ldt.sd.sd_xx = 0; - ldt.sd.sd_def32 = 1; - ldt.sd.sd_gran = 0; /* no more than 1M */ - kcb->kcb_ldt = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1); - if (kcb->kcb_ldt < 0) { - free(kcb); - return (NULL); - } - break; - } } return (kcb); } @@ -125,9 +94,5 @@ void _kcb_dtor(struct kcb *kcb) { - if (kcb->kcb_ldt >= 0) { - i386_set_ldt(kcb->kcb_ldt, NULL, 1); - kcb->kcb_ldt = -1; /* just in case */ - } free(kcb); } ==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#14 (text+ko) ==== @@ -60,7 +60,6 @@ struct kcb { struct tcb *kcb_curtcb; struct kcb *kcb_self; /* self reference */ - int kcb_ldt; struct kse *kcb_kse; struct kse_mailbox kcb_kmbx; }; @@ -154,15 +153,7 @@ static __inline void _kcb_set(struct kcb *kcb) { - int val; - - if (_thr_using_setbase == 1) { - i386_set_gsbase(kcb); - } else { - val = (kcb->kcb_ldt << 3) | 7; - __asm __volatile("movl %0, %%gs" : : "r" (val)); - } - + i386_set_gsbase(kcb); } /* Get the current kcb. */ From owner-p4-projects@FreeBSD.ORG Tue Jun 14 02:11:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CDB716A420; Tue, 14 Jun 2005 02:11:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2741616A41C for ; Tue, 14 Jun 2005 02:11:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0377143D1F for ; Tue, 14 Jun 2005 02:11:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E2B3Xq043226 for ; Tue, 14 Jun 2005 02:11:03 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E2B3d8043223 for perforce@freebsd.org; Tue, 14 Jun 2005 02:11:03 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 02:11:03 GMT Message-Id: <200506140211.j5E2B3d8043223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 02:11:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=78508 Change 78508 by peter@peter_melody on 2005/06/14 02:10:43 clean up ldt goop Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#9 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#9 (text+ko) ==== @@ -327,8 +327,6 @@ allocate_initial_tls(Obj_Entry *objs) { void* tls; - union descriptor ldt; - int error, sel; /* * Fix the size of the static TLS block by using the maximum @@ -337,21 +335,7 @@ */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); - error = i386_set_gsbase(tls); - if (error < 0) { - memset(&ldt, 0, sizeof(ldt)); - ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ - ldt.sd.sd_lobase = ((Elf_Addr)tls) & 0xffffff; - ldt.sd.sd_type = SDT_MEMRWA; - ldt.sd.sd_dpl = SEL_UPL; - ldt.sd.sd_p = 1; /* present */ - ldt.sd.sd_hilimit = 0xf; /* 4G limit */ - ldt.sd.sd_def32 = 1; /* 32 bit */ - ldt.sd.sd_gran = 1; /* limit in pages */ - ldt.sd.sd_hibase = (((Elf_Addr)tls) >> 24) & 0xff; - sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1); - __asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7)); - } + i386_set_gsbase(tls); } /* GNU ABI */ From owner-p4-projects@FreeBSD.ORG Tue Jun 14 02:12:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D757316A420; Tue, 14 Jun 2005 02:12:06 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0B34C16A426 for ; Tue, 14 Jun 2005 02:12:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA6E343D1F for ; Tue, 14 Jun 2005 02:12:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E2C5Sd043252 for ; Tue, 14 Jun 2005 02:12:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E2C5jG043249 for perforce@freebsd.org; Tue, 14 Jun 2005 02:12:05 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 02:12:05 GMT Message-Id: <200506140212.j5E2C5jG043249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 02:12:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=78509 Change 78509 by peter@peter_melody on 2005/06/14 02:11:50 clean up tls goop Affected files ... .. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#7 edit Differences ... ==== //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#7 (text+ko) ==== @@ -28,28 +28,11 @@ #include #include -#include #include void _set_tp(void *tp) { - union descriptor ldt; - int error, sel; - error = i386_set_gsbase(tp); - if (error == 0) - return; - memset(&ldt, 0, sizeof(ldt)); - ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ - ldt.sd.sd_lobase = ((uintptr_t)tp) & 0xffffff; - ldt.sd.sd_type = SDT_MEMRWA; - ldt.sd.sd_dpl = SEL_UPL; - ldt.sd.sd_p = 1; /* present */ - ldt.sd.sd_hilimit = 0xf; /* 4G limit */ - ldt.sd.sd_def32 = 1; /* 32 bit */ - ldt.sd.sd_gran = 1; /* limit in pages */ - ldt.sd.sd_hibase = (((uintptr_t)tp) >> 24) & 0xff; - sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1); - __asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7)); + i386_set_gsbase(tp); } From owner-p4-projects@FreeBSD.ORG Tue Jun 14 02:17:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 447E616A420; Tue, 14 Jun 2005 02:17:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F0CD716A41C for ; Tue, 14 Jun 2005 02:17:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B820743D48 for ; Tue, 14 Jun 2005 02:17:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E2HCCa043546 for ; Tue, 14 Jun 2005 02:17:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E2HCQZ043543 for perforce@freebsd.org; Tue, 14 Jun 2005 02:17:12 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 02:17:12 GMT Message-Id: <200506140217.j5E2HCQZ043543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 02:17:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=78510 Change 78510 by peter@peter_melody on 2005/06/14 02:16:43 Try out davidxu's idea as a stopgap for libc.so.5 being updated in the compat5x port. Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#8 edit Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#8 (text+ko) ==== @@ -96,3 +96,10 @@ { free(kcb); } + +int +i386_set_gsbase(void *addr) +{ + + return (sysarch(I386_SET_GSBASE, &addr)); +} From owner-p4-projects@FreeBSD.ORG Tue Jun 14 02:25:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E19C716A46D; Tue, 14 Jun 2005 02:25:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 63C3A16A454 for ; Tue, 14 Jun 2005 02:25:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0699A43D55 for ; Tue, 14 Jun 2005 02:25:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E2PM1q043916 for ; Tue, 14 Jun 2005 02:25:22 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E2PMrJ043913 for perforce@freebsd.org; Tue, 14 Jun 2005 02:25:22 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 02:25:22 GMT Message-Id: <200506140225.j5E2PMrJ043913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 02:25:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=78511 Change 78511 by peter@peter_daintree on 2005/06/14 02:24:45 With apologies to ps, move the iodesc32 to sys_process.c. We don't want to expose this to userland apps #include namespace, so it isn't needed in the public interface file. Affected files ... .. //depot/projects/hammer/sys/kern/sys_process.c#29 edit .. //depot/projects/hammer/sys/sys/ptrace.h#10 edit Differences ... ==== //depot/projects/hammer/sys/kern/sys_process.c#29 (text+ko) ==== @@ -63,6 +63,13 @@ #include extern struct sysentvec ia32_freebsd_sysvec; + +struct ptrace_io_desc32 { + int piod_op; + u_int32_t piod_offs; + u_int32_t piod_addr; + u_int32_t piod_len; +}; #endif /* ==== //depot/projects/hammer/sys/sys/ptrace.h#10 (text+ko) ==== @@ -75,15 +75,6 @@ size_t piod_len; /* request length */ }; -#ifdef COMPAT_IA32 -struct ptrace_io_desc32 { - int piod_op; - u_int32_t piod_offs; - u_int32_t piod_addr; - u_int32_t piod_len; -}; -#endif - /* * Operations in piod_op. */ From owner-p4-projects@FreeBSD.ORG Tue Jun 14 15:30:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B03B16A420; Tue, 14 Jun 2005 15:30:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6BB4116A41C for ; Tue, 14 Jun 2005 15:30:22 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42A8343D1F for ; Tue, 14 Jun 2005 15:30:22 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EFUMUC003659 for ; Tue, 14 Jun 2005 15:30:22 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EFULM4003654 for perforce@freebsd.org; Tue, 14 Jun 2005 15:30:21 GMT (envelope-from areisse@nailabs.com) Date: Tue, 14 Jun 2005 15:30:21 GMT Message-Id: <200506141530.j5EFULM4003654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 78531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 15:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=78531 Change 78531 by areisse@areisse_ibook on 2005/06/14 15:29:49 Convert mach label handles to be real kernel ports, instead of just sharing the namespace. This will allow the interface to some of the security related calls to be simplified in the future, as well as removing the uglyness of IOT_LABELH from the system. Label handles should also be able to be passed among processes if desired. This submit doesn't change the policy-kernel interface, or the kernel-user interface. Some locking and memory issues remain (mostly because there were locking problems with label handles before). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_init.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_init.c#2 (text+ko) ==== @@ -165,12 +165,6 @@ /* make it exhaustible */ zone_change(ipc_object_zones[IOT_PORT_SET], Z_EXHAUST, TRUE); - ipc_object_zones[IOT_LABELH] = - zinit(sizeof(struct ipc_labelh), - ipc_port_max * sizeof(struct ipc_labelh), - sizeof(struct ipc_labelh), - "label handles"); - /* create special spaces */ kr = ipc_space_create_special(&ipc_space_kernel); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#2 (text+ko) ==== @@ -239,15 +239,10 @@ mach_msg_size_t size = kmsg->ikm_size; ipc_port_t port; - if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) == - IOT_LABELH) { - ipc_object_release (&kmsg->ikm_sender->lh_object); - kmsg->ikm_sender = IO_NULL; + if (kmsg->ikm_sender != NULL) { + labelh_release (kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } - else if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) - != IOT_LABELH) - printf ("strange otype in message label: %d\n", io_otype (&kmsg->ikm_sender->lh_object)); - /* * Check to see if the message is bound to the port. If so, @@ -614,15 +609,10 @@ ipc_kmsg_clean_body(kmsg, body->msgh_descriptor_count); } - if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) == - IOT_LABELH) { - ipc_object_release (&kmsg->ikm_sender->lh_object); - kmsg->ikm_sender = IO_NULL; + if (kmsg->ikm_sender != NULL) { + labelh_release (kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } - else if (kmsg->ikm_sender != IO_NULL && io_otype (&kmsg->ikm_sender->lh_object) - != IOT_LABELH) - printf ("strange otype in message label: %d\n", io_otype (&kmsg->ikm_sender->lh_object)); - } /* @@ -729,9 +719,7 @@ task_t cur = current_thread()->top_act->task; if (cur) { - ipc_object_reference (&cur->label->lh_object); - /*trailer->msgh_labels.sender = (mach_port_name_t)cur->label;*/ - + labelh_reference (cur->label); kmsg->ikm_sender = cur->label; } else @@ -823,7 +811,7 @@ trailer->msgh_labels.sender = 0; - kmsg->ikm_sender = (ipc_labelh_t)IO_NULL; + kmsg->ikm_sender = (ipc_labelh_t)NULL; *kmsgp = kmsg; return MACH_MSG_SUCCESS; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.h#2 (text+ko) ==== @@ -78,7 +78,6 @@ #include #include #include -#include /* * This structure is only the header for a kmsg buffer; @@ -92,13 +91,14 @@ * of the message. */ +struct ipc_labelh; typedef struct ipc_kmsg { struct ipc_kmsg *ikm_next; struct ipc_kmsg *ikm_prev; ipc_port_t ikm_prealloc; /* port we were preallocated from */ mach_msg_size_t ikm_size; - ipc_labelh_t ikm_sender; + struct ipc_labelh *ikm_sender; mach_msg_header_t ikm_header; } *ipc_kmsg_t; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#2 (text+ko) ==== @@ -1,13 +1,16 @@ #include -#include +#include #include +#include kern_return_t mac_label_new (ipc_space_t task, mach_port_name_t *name, vm_offset_t labelstr) { ipc_labelh_t lh; struct label inl; + ipc_port_t port, sport; + kern_return_t kr; if (task == IS_NULL) return (KERN_INVALID_TASK); @@ -16,35 +19,54 @@ if (mac_internalize_port_label (&inl, labelstr)) return KERN_INVALID_ARGUMENT; - int kr = ipc_object_alloc (task, IOT_LABELH, MACH_PORT_TYPE_LABELH, 1, name, &lh); - if (kr) - return kr; + port = ipc_port_alloc_kernel(); + lh = kalloc(sizeof(struct ipc_labelh)); + io_lock_init(lh); + lh->lh_port = port; + lh->lh_type = 0; + lh->lh_references = 1; lh->lh_label = inl; - io_unlock (&lh->lh_object); + ipc_kobject_set(port, (ipc_kobject_t)lh, IKOT_LABELH); + + sport = ipc_port_make_send_locked(port); + ip_release(port); + ip_unlock(port); + *name = ipc_port_copyout_send (port,task); return 0; } +/* This function should be used to allocate label handles + that are stored in other kernel objects, such as tasks. + They must be released along with that object. + The caller gets one reference, which can be applied to either the + port or the ipc_label_t structure itself. +*/ ipc_labelh_t labelh_new () { - ipc_labelh_t lh = (ipc_labelh_t) io_alloc (IOT_LABELH); - io_lock_init (&(lh->lh_object)); - lh->lh_object.io_references = 1; - lh->lh_object.io_bits = io_makebits (TRUE, IOT_LABELH, 0); + ipc_labelh_t lh = (ipc_labelh_t) kalloc(sizeof(struct ipc_labelh)); + io_lock_init(lh); + lh->lh_port = ipc_port_alloc_kernel(); + lh->lh_type = 0; + lh->lh_references = 1; + ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); + ip_unlock(lh->lh_port); return lh; } -/* call with old locked */ +/* call with old locked; returned object is unlocked */ ipc_labelh_t labelh_duplicate (ipc_labelh_t old) { - ipc_labelh_t lh = (ipc_labelh_t) io_alloc (IOT_LABELH); - io_lock_init (&(lh->lh_object)); - lh->lh_object.io_references = 1; - lh->lh_object.io_bits = io_makebits (TRUE, IOT_LABELH, 0); - + ipc_labelh_t lh = (ipc_labelh_t) kalloc(sizeof(struct ipc_labelh)); + io_lock_init(lh); + lh->lh_port = ipc_port_alloc_kernel(); + lh->lh_type = 0; + lh->lh_references = 1; + ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); mac_init_port_label (&lh->lh_label); mac_copy_port_label (&old->lh_label, &lh->lh_label); + ip_unlock(lh->lh_port); return lh; } @@ -52,11 +74,34 @@ ipc_labelh_t labelh_modify (ipc_labelh_t old) { - if (old->lh_object.io_references == 1) + if (old->lh_references == 1) return old; ipc_labelh_t lh = labelh_duplicate (old); - io_release (&old->lh_object); - io_unlock (&old->lh_object); - io_lock (&lh->lh_object); + lh_release(old); + lh_check_unlock (old); + lh_lock (lh); + return lh; +} + +/* add or drop a reference on a label handle; not locked */ + +ipc_labelh_t labelh_reference (ipc_labelh_t lh) +{ + lh_lock(lh); + lh_reference(lh); + lh_unlock(lh); return lh; } + +void labelh_release (ipc_labelh_t lh) +{ + lh_lock(lh); + lh_release(lh); + lh_check_unlock(lh); +} + +void lh_free (ipc_labelh_t lh) +{ + ipc_object_release(lh->lh_port); + mac_destroy_port_label (&lh->lh_label); +} ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#2 (text+ko) ==== @@ -3,17 +3,45 @@ #define _IPC_LABELH_H_ #include -#include +#include #include typedef struct ipc_labelh { - struct ipc_object lh_object; - struct label lh_label; + int lh_references; + int lh_type; + struct label lh_label; + ipc_port_t lh_port; +#if NCPUS == 1 + usimple_lock_data_t io_lock_data; +#else + decl_mutex_data(, io_lock_data) +#endif } *ipc_labelh_t; - ipc_labelh_t labelh_duplicate (ipc_labelh_t old); ipc_labelh_t labelh_modify (ipc_labelh_t old); +void labelh_release (ipc_labelh_t lh); +ipc_labelh_t labelh_reference (ipc_labelh_t lh); +void lh_free (ipc_labelh_t lh); + +#define lh_reference(lh) ((lh)->lh_references++) +#define lh_release(lh) \ +MACRO_BEGIN \ + assert ((lh)->lh_references > 0); \ + (lh)->lh_references--; \ +MACRO_END + +#define lh_lock io_lock +#define lh_unlock io_unlock + +#define lh_check_unlock(lh) \ +MACRO_BEGIN \ + _VOLATILE_ natural_t _refs = (lh)->lh_references; \ + \ + lh_unlock(lh); \ + if (_refs == 0) \ + lh_free(lh); \ +MACRO_END #endif ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#2 (text+ko) ==== @@ -990,17 +990,23 @@ return kr; } +/* + * Get a label out of a port, to be used by a kernel call + * that takes a security label as a parameter. In this case, we want + * to use the label stored in the label handle and not the label on its + * port. + */ + struct label *io_getlabel (ipc_object_t objp) { - switch (io_otype (objp)) - { - case IOT_PORT: - return &((ipc_port_t) objp)->ip_label; + assert(io_otype(objp) == IOT_PORT); + + ipc_port_t port = (ipc_port_t) objp; - case IOT_LABELH: - return &((ipc_labelh_t) objp)->lh_label; - } - return NULL; + if (ip_kotype(port) == IKOT_LABELH) + return &((ipc_labelh_t) port->ip_kobject)->lh_label; + else + return &port->ip_label; } /* @@ -1025,10 +1031,6 @@ and calling it now causes problems. */ mac_destroy_port_label (&port->ip_label); - } - else if (otype == IOT_LABELH) { - ipc_labelh_t lh = (ipc_labelh_t) object; - mac_destroy_port_label (&lh->lh_label); #endif } zfree(ipc_object_zones[otype], (vm_offset_t) object); @@ -1080,6 +1082,7 @@ "(IOKIT_CONNECT) ", "(IOKIT_OBJECT) ", /* 30 */ "(UPL) ", + "(LABELH) ", /* << new entries here */ "(UNKNOWN) " /* magic catchall */ }; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#2 (text+ko) ==== @@ -142,8 +142,7 @@ */ #define IOT_PORT 0 #define IOT_PORT_SET 1 -#define IOT_LABELH 2 /* a label handle */ -#define IOT_NUMBER 3 /* number of types used */ +#define IOT_NUMBER 2 /* number of types used */ extern zone_t ipc_object_zones[IOT_NUMBER]; @@ -152,7 +151,6 @@ /* * Call the routine for io_free so that checking can be performed. - * It is also responsible for freeing labels. */ extern void io_free( unsigned int otype, ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#3 (text+ko) ==== @@ -560,10 +560,6 @@ break; } - case MACH_PORT_TYPE_LABELH: - ipc_object_release (entry->ie_object); - break; - case MACH_PORT_TYPE_SEND: case MACH_PORT_TYPE_RECEIVE: case MACH_PORT_TYPE_SEND_RECEIVE: @@ -678,14 +674,6 @@ break; } - case MACH_PORT_TYPE_LABELH: { - ipc_object_t lh = entry->ie_object; - entry->ie_object = IO_NULL; - ipc_entry_dealloc (space, name, entry); - ipc_object_release (lh); - break; - } - case MACH_PORT_TYPE_SEND: case MACH_PORT_TYPE_RECEIVE: case MACH_PORT_TYPE_SEND_RECEIVE: @@ -1020,21 +1008,6 @@ break; } - case MACH_PORT_RIGHT_LABELH: { - ipc_object_t lh = entry->ie_object; - if ((bits & MACH_PORT_TYPE_LABELH) == 0) - goto invalid_right; - if (delta == 0) - goto success; - else if (delta != -1) - goto invalid_value; - entry->ie_object = IO_NULL; - ipc_entry_dealloc (space, name, entry); - ipc_object_release (lh); - is_write_unlock (space); - break; - } - case MACH_PORT_RIGHT_RECEIVE: { ipc_port_t port; ipc_port_t dnrequest = IP_NULL; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#4 (text+ko) ==== @@ -276,7 +276,7 @@ #if 1 if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_AV)) { - if (kmsg->ikm_sender != IO_NULL && + if (kmsg->ikm_sender != NULL && IP_VALID(kmsg->ikm_header.msgh_remote_port)) { mac_check_ipc_methods (&kmsg->ikm_sender->lh_label, @@ -288,24 +288,32 @@ memset(trailer->msgh_av.av, 0, sizeof(msg_access_vector_t)); } + /* + * The ipc_kmsg_t holds a reference to the label of a label + * handle, not the port. We must get a reference to the port + * and a send right to copyout to the receiver. + */ if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_LABELS)) { - if (kmsg->ikm_sender != IO_NULL) { - ipc_object_t lh = &kmsg->ikm_sender->lh_object; + + if (kmsg->ikm_sender != NULL) { + ipc_labelh_t lh = kmsg->ikm_sender; ipc_entry_t entry; kern_return_t kr; - io_lock (lh); - kr = ipc_entry_alloc (space, &trailer->msgh_labels.sender, &entry); + ip_lock (lh->lh_port); + lh->lh_port->ip_mscount++; + lh->lh_port->ip_srights++; + ip_reference (lh->lh_port); + ip_unlock (lh->lh_port); + + kr = ipc_object_copyout (space, lh->lh_port, MACH_MSG_TYPE_PORT_SEND, 0, + &trailer->msgh_labels.sender); if (kr != KERN_SUCCESS) { + ip_lock (lh->lh_port); + ip_release (lh->lh_port); + ip_check_unlock (lh->lh_port); + trailer->msgh_labels.sender = 0; - /*ipc_object_release (lh);*/ - } - else { - entry->ie_bits |= (1 | MACH_PORT_TYPE_LABELH); - entry->ie_object = lh; - io_reference (lh); - io_unlock (lh); - is_write_unlock (space); } } else { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#2 (text+ko) ==== @@ -1774,6 +1774,7 @@ { ipc_entry_t entry; kern_return_t kr; + struct label *l; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -1785,32 +1786,14 @@ if (kr != KERN_SUCCESS) return kr; - switch (io_otype (entry->ie_object)) { - case IOT_PORT: - { - ipc_port_t port = (ipc_port_t) entry->ie_object; + io_lock(entry->ie_object); + is_write_unlock (space); + l = io_getlabel(entry->ie_object); - ip_lock (port); - is_write_unlock (space); - mac_externalize_port_label (&port->ip_label, policies, outlabel, 512, 0); + mac_externalize_port_label (l, policies, outlabel, 512, 0); - ip_unlock (port); - } + io_unlock (entry->ie_object); return 0; - - case IOT_LABELH: - { - ipc_labelh_t lh = (ipc_labelh_t) entry->ie_object; - io_lock (&lh->lh_object); - is_write_unlock (space); - mac_externalize_port_label (&lh->lh_label, policies, outlabel, 512, 0); - io_unlock (&lh->lh_object); - } - return 0; - } - - is_write_unlock (space); - return KERN_INVALID_ARGUMENT; } kern_return_t ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.h#2 (text+ko) ==== @@ -110,9 +110,10 @@ #define IKOT_IOKIT_CONNECT 29 #define IKOT_IOKIT_OBJECT 30 #define IKOT_UPL 31 +#define IKOT_LABELH 32 /* << new entries here */ -#define IKOT_UNKNOWN 32 /* magic catchall */ -#define IKOT_MAX_TYPE 33 /* # of IKOT_ types */ +#define IKOT_UNKNOWN 33 /* magic catchall */ +#define IKOT_MAX_TYPE 34 /* # of IKOT_ types */ /* Please keep ipc/ipc_object.c:ikot_print_array up to date */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#2 (text+ko) ==== @@ -518,7 +518,7 @@ task_prof_deallocate(task); #ifdef MAC - ipc_object_release (&task->label->lh_object); + labelh_release(task->label); #endif zfree(task_zone, (vm_offset_t) task); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.h#2 (text+ko) ==== @@ -242,11 +242,11 @@ #define maclabel label->lh_label -#define tasklabel_lock(task) io_lock(&(task)->label->lh_object) -#define tasklabel_unlock(task) io_unlock(&(task)->label->lh_object) +#define tasklabel_lock(task) io_lock((task)->label) +#define tasklabel_unlock(task) io_unlock((task)->label) -#define tasklabel_lock2(a,b) io_lock2 (&(a)->label->lh_object, &(b)->label->lh_object) -#define tasklabel_unlock2(a,b) io_unlock2 (&(a)->label->lh_object, &(b)->label->lh_object) +#define tasklabel_lock2(a,b) /*io_lock2 ((a)->label, (b)->label)*/ +#define tasklabel_unlock2(a,b) /*io_unlock2 ((a)->label, (b)->label)*/ #endif From owner-p4-projects@FreeBSD.ORG Tue Jun 14 18:29:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 427C316A420; Tue, 14 Jun 2005 18:29:01 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 020AC16A41C for ; Tue, 14 Jun 2005 18:29:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7BFD43D53 for ; Tue, 14 Jun 2005 18:29:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EIT0hT017836 for ; Tue, 14 Jun 2005 18:29:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EIT0po017833 for perforce@freebsd.org; Tue, 14 Jun 2005 18:29:00 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 18:29:00 GMT Message-Id: <200506141829.j5EIT0po017833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 18:29:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=78539 Change 78539 by peter@peter_daintree on 2005/06/14 18:28:27 IFC @78538 Affected files ... .. //depot/projects/hammer/bin/chflags/chflags.1#10 integrate .. //depot/projects/hammer/bin/dd/dd.1#10 integrate .. //depot/projects/hammer/bin/sh/sh.1#16 integrate .. //depot/projects/hammer/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch .. //depot/projects/hammer/etc/sendmail/freebsd.mc#5 integrate .. //depot/projects/hammer/etc/sendmail/freefall.mc#2 integrate .. //depot/projects/hammer/lib/libc/gen/msgrcv.3#4 integrate .. //depot/projects/hammer/libexec/getty/ttys.5#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#9 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.8#7 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#12 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#24 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#43 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#8 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#57 integrate .. //depot/projects/hammer/share/man/man9/Makefile#54 integrate .. //depot/projects/hammer/share/man/man9/bus_space.9#1 branch .. //depot/projects/hammer/sys/amd64/conf/NOTES#68 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#21 integrate .. //depot/projects/hammer/sys/conf/NOTES#92 integrate .. //depot/projects/hammer/sys/conf/files.alpha#22 integrate .. //depot/projects/hammer/sys/conf/files.amd64#70 integrate .. //depot/projects/hammer/sys/conf/files.ia64#28 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#23 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#36 integrate .. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#7 integrate .. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#7 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#21 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs_sb.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/i386-bitops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/inode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#70 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#49 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#37 integrate .. //depot/projects/hammer/usr.bin/find/find.1#16 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.8#5 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.1#5 integrate .. //depot/projects/hammer/usr.bin/make/make.1#22 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.1#6 integrate .. //depot/projects/hammer/usr.bin/printf/printf.1#7 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#13 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#7 integrate .. //depot/projects/hammer/usr.bin/what/what.1#6 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.8#5 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#23 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.8#7 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.8#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#13 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#15 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/extract.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/show.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/plist.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#10 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.1#5 integrate Differences ... ==== //depot/projects/hammer/bin/chflags/chflags.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.24 2005/05/14 23:23:10 dd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ .\" .Dd May 14, 2005 .Dt CHFLAGS 1 @@ -148,6 +148,11 @@ .Xr stat 2 , .Xr fts 3 , .Xr symlink 7 +.Sh HISTORY +The +.Nm +command first appeared in +.Bx 4.4 . .Sh BUGS Only a limited number of utilities are .Nm @@ -165,8 +170,3 @@ aware is the .Xr pax 1 utility. -.Sh HISTORY -The -.Nm -command first appeared in -.Bx 4.4 . ==== //depot/projects/hammer/bin/dd/dd.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.29 2005/04/07 20:50:38 scottl Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.30 2005/06/14 08:25:54 ru Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,14 +392,6 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" -.Sh BUGS -Protection mechanisms in the -.Xr geom 4 -subsystem might prevent the super-user from writing blocks to a disk. -Instructions for temporarily disabling these protectsion mechanisms can be -found in the -.Xr geom 4 -manpage. .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , @@ -424,3 +416,11 @@ values are extensions to the .Tn POSIX standard. +.Sh BUGS +Protection mechanisms in the +.Xr geom 4 +subsystem might prevent the super-user from writing blocks to a disk. +Instructions for temporarily disabling these protectsion mechanisms can be +found in the +.Xr geom 4 +manpage. ==== //depot/projects/hammer/bin/sh/sh.1#16 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.100 2005/04/15 14:53:29 keramida Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.102 2005/06/14 08:25:00 ru Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -196,12 +196,6 @@ Enable asynchronous notification of background job completion. (UNIMPLEMENTED) -.It Fl c Li string -Read commands from the -.Ar string -operand instead of from the standard input. -Keep in mind that this option only accepts a single string as its -argument, hence multi-word strings must be quoted. .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . @@ -309,6 +303,14 @@ .El .Pp The +.Fl c +option causes the commands to be read from the +.Ar string +operand instead of from the standard input. +Keep in mind that this option only accepts a single string as its +argument, hence multi-word strings must be quoted. +.Pp +The .Fl /+o option takes as its only argument the long name of an option to be enabled or disabled. @@ -2042,14 +2044,6 @@ .Dq Li set -E ) command can be used to enable a subset of emacs-style command line editing features. -.Sh EXIT STATUS -Errors that are detected by the shell, such as a syntax error, will -cause the shell to exit with a non-zero exit status. -If the shell is not an interactive shell, the execution of the shell -file will be aborted. -Otherwise the shell will return the exit status of the last command -executed, or if the exit builtin is used with a numeric argument, it -will return the argument. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -2104,17 +2098,25 @@ section for details. .It Ev PS1 The primary prompt string, which defaults to -.Dq $ \ , +.Dq Li "$ " , unless you are the superuser, in which case it defaults to -.Dq # \ . +.Dq Li "# " . .It Ev PS2 The secondary prompt string, which defaults to -.Dq \*[Gt] \ . +.Dq Li "> " . .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Sh EXIT STATUS +Errors that are detected by the shell, such as a syntax error, will +cause the shell to exit with a non-zero exit status. +If the shell is not an interactive shell, the execution of the shell +file will be aborted. +Otherwise the shell will return the exit status of the last command +executed, or if the exit builtin is used with a numeric argument, it +will return the argument. .Sh SEE ALSO .Xr builtin 1 , .Xr chsh 1 , @@ -2125,10 +2127,10 @@ .Xr getopt 1 , .Xr pwd 1 , .Xr test 1 , -.Xr umask 2 , .Xr vi 1 , .Xr execve 2 , .Xr getrlimit 2 , +.Xr umask 2 , .Xr editrc 5 .Sh HISTORY A ==== //depot/projects/hammer/etc/sendmail/freebsd.mc#5 (text+ko) ==== @@ -44,8 +44,8 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.29 2003/12/24 21:15:09 gshapiro Exp $') -OSTYPE(freebsd5) +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.30 2005/06/14 02:25:17 gshapiro Exp $') +OSTYPE(freebsd6) DOMAIN(generic) FEATURE(access_db, `hash -o -T /etc/mail/access') ==== //depot/projects/hammer/etc/sendmail/freefall.mc#2 (text+ko) ==== @@ -40,8 +40,8 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.19 2002/03/26 13:00:03 ru Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.20 2005/06/14 02:25:17 gshapiro Exp $') -OSTYPE(freebsd5) +OSTYPE(freebsd6) FEATURE(nullclient, hub.$m) MASQUERADE_AS(FreeBSD.org) ==== //depot/projects/hammer/lib/libc/gen/msgrcv.3#4 (text+ko) ==== @@ -28,10 +28,10 @@ .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.19 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.20 2005/06/14 10:56:02 ru Exp $ .\" .\"/ -.Dd November 24, 1997 +.Dd June 15, 2005 .Dt MSGRCV 3 .Os .Sh NAME @@ -122,7 +122,7 @@ will immediately return a value of -1, and set .Va errno to -.Er EAGAIN . +.Er ENOMSG . If .Dv IPC_NOWAIT is not set, the calling process will be blocked @@ -206,7 +206,7 @@ points to an invalid address. .It Bq Er EINTR The system call was interrupted by the delivery of a signal. -.It Bq Er EAGAIN +.It Bq Er ENOMSG There is no message of the requested type available on the message queue, and .Dv IPC_NOWAIT ==== //depot/projects/hammer/libexec/getty/ttys.5#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.17 2005/05/27 06:07:21 eivind Exp $ +.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.18 2005/06/14 08:40:10 ru Exp $ .\" " -.Dd November 17, 1996 +.Dd May 27, 2005 .Dt TTYS 5 .Os .Sh NAME ==== //depot/projects/hammer/libexec/rtld-elf/rtld.1#9 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.39 2005/02/04 02:46:41 mdodd Exp $ +.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.40 2005/06/14 08:41:11 ru Exp $ .\" .Dd May 31, 2003 .Dt RTLD 1 @@ -101,12 +101,12 @@ and .Ql \&, can be used instead of a space and a newline. -This variable is parsed after +This variable is parsed after .Xr libmap.conf 5 , and will override its entries. .It Ev LD_LIBMAP_DISABLE If set, disables the use of -.Xr libmap.conf 5 +.Xr libmap.conf 5 and .Ev LD_LIBMAP . .It Ev LD_LIBRARY_PATH ==== //depot/projects/hammer/sbin/camcontrol/camcontrol.8#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.40 2005/03/26 05:34:54 ken Exp $ +.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.41 2005/06/14 11:24:55 ru Exp $ .\" .Dd September 14, 1998 .Dt CAMCONTROL 8 @@ -677,7 +677,7 @@ .Fl y argument, below. .It Fl r -Run in +Run in .Dq report only mode. This will report status on a format that is already running on the drive. ==== //depot/projects/hammer/sbin/devfs/devfs.8#12 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.14 2005/04/20 01:56:33 jcamou Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.15 2005/06/14 11:24:55 ru Exp $ .\" .Dd July 1, 2002 .Dt DEVFS 8 @@ -234,6 +234,11 @@ .Fl m . The mount-point is only relevant when changing what its current ruleset is or when using one of the apply commands. +.Sh FILES +.Bl -tag -compact +.It Pa /etc/defaults/devfs.rules +.It Pa /etc/devfs.rules +.El .Sh EXAMPLES When the system boots, the only ruleset that exists is ruleset number 0; @@ -338,9 +343,6 @@ The rule numbers are preserved, but ruleset 10 may already have rules with non-conflicting numbers (these will be preserved). -.Sh FILES -.Pa /etc/defaults/devfs.rules , -.Pa /etc/devfs.rules .Sh SEE ALSO .Xr chmod 1 , .Xr jail 2 , ==== //depot/projects/hammer/sbin/dhclient/dhclient.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.3 2005/06/07 14:47:54 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.4 2005/06/13 23:43:08 brooks Exp $ */ /* * Copyright 2004 Henning Brauer @@ -257,12 +257,15 @@ * state and then wait for either a link down * notification or an associate event. */ - script_init("EXPIRE", NULL); - script_write_params("old_", ifi->client->active); - if (ifi->client->alias) - script_write_params("alias_", - ifi->client->alias); - script_go(); + if (ifi->client->active != NULL) { + script_init("EXPIRE", NULL); + script_write_params("old_", + ifi->client->active); + if (ifi->client->alias) + script_write_params("alias_", + ifi->client->alias); + script_go(); + } ifi->client->state = S_INIT; break; } ==== //depot/projects/hammer/sbin/gpt/gpt.8#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.12 2005/04/24 20:08:29 des Exp $ +.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.13 2005/06/14 11:24:55 ru Exp $ .\" .Dd November 12, 2004 .Os @@ -135,12 +135,7 @@ .Cm windows as aliases for the most commonly used partition types. .\" ==== create ==== -.It Xo -.Nm -.Ic create -.Op Fl fp -.Ar device ... -.Xc +.It Nm Ic create Oo Fl fp Oc Ar device ... The .Ic create command allows the user to create a new (empty) GPT. @@ -160,12 +155,7 @@ to create only the primary table and not the backup table. This option is only useful for debugging and should not be used otherwise. .\" ==== destroy ==== -.It Xo -.Nm -.Ic destroy -.Op Fl r -.Ar device ... -.Xc +.It Nm Ic destroy Oo Fl r Oc Ar device ... The .Ic destroy command allows the user to destroy an existing, possibly not empty GPT. @@ -176,12 +166,7 @@ .Nm to destroy the table in a way that it can be recovered. .\" ==== migrate ==== -.It Xo -.Nm -.Ic migrate -.Op Fl fs -.Ar device ... -.Xc +.It Nm Ic migrate Oo Fl fs Oc Ar device ... The .Ic migrate command allows the user to migrate an MBR-based disk partitioning into a @@ -203,14 +188,10 @@ disk labels into GPT partitions by creating the GPT equivalent of a slice. .\" ==== remove ==== +.It Nm Ic remove Oo Fl a Oc .It Xo .Nm .Ic remove -.Op Fl a -.Xc -.It Xo -.Nm -.Ic remove .Op Fl b Ar number .Op Fl i Ar index .Op Fl s Ar count @@ -248,11 +229,7 @@ command accepts. This can cause multiple partitions to be removed. .\" ==== show ==== -.It Xo -.Nm -.Ic show -.Ar device ... -.Xc +.It Nm Ic show Ar device ... The .Ic show command displays the current partitioning on the listed devices and gives ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#24 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.93 2005/06/13 15:49:59 brueffer Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.94 2005/06/14 11:24:55 ru Exp $ .\" -.Dd November 2, 2004 +.Dd June 5, 2005 .Dt IFCONFIG 8 .Os .Sh NAME ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#43 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.172 2005/06/04 19:04:31 green Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.173 2005/06/14 11:24:55 ru Exp $ .\" .Dd February 22, 2005 .Dt IPFW 8 @@ -351,7 +351,7 @@ but the same packets will have the MAC header stripped off when .Nm is invoked from -.Cm ip_input() +.Cm ip_input() or .Cm ip6_input() . .Pp @@ -816,14 +816,14 @@ .It Ar protocol : Oo Cm not Oc Ar protocol-name | protocol-number An IP protocol specified by number or name (for a complete list see -.Pa /etc/protocols ) , +.Pa /etc/protocols ) , or one of the following keywords: -.Bl -tag -width indent +.Bl -tag -width indent .It Cm ip4 | ipv4 Matches IPv4 packets. .It Cm ip6 | ipv6 Matches IPv6 packets. -.It Cm ip | all +.It Cm ip | all Matches any packet. .El .Pp ==== //depot/projects/hammer/sbin/savecore/savecore.8#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)savecore.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.24 2005/06/06 06:47:33 philip Exp $ +.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.25 2005/06/14 11:24:56 ru Exp $ .\" -.Dd September 23, 1994 +.Dd February 24, 2005 .Dt SAVECORE 8 .Os .Sh NAME ==== //depot/projects/hammer/share/man/man5/rc.conf.5#57 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.254 2005/06/08 00:15:36 brooks Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.255 2005/06/14 14:43:36 ru Exp $ .\" -.Dd April 18, 2005 +.Dd June 8, 2005 .Dt RC.CONF 5 .Os .Sh NAME @@ -988,6 +988,7 @@ possible to use something like: .Bd -literal ifconfig_wi0="DHCP WPA mode 11b" +.Ed .Pp It is also possible to rename interface by doing: .Bd -literal ==== //depot/projects/hammer/share/man/man9/Makefile#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.259 2005/06/10 17:16:16 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.260 2005/06/14 03:40:01 imp Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -34,6 +34,7 @@ bus_release_resource.9 \ bus_set_resource.9 \ BUS_SETUP_INTR.9 \ + bus_space.9 \ byteorder.9 \ cd.9 \ condvar.9 \ ==== //depot/projects/hammer/sys/amd64/conf/NOTES#68 (text+ko) ==== @@ -5,7 +5,7 @@ # machine independent notes, look in /sys/conf/NOTES. # # (XXX from i386:NOTES,v 1.1199) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.34 2005/04/30 20:00:58 dwhite Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.35 2005/06/14 14:21:25 ups Exp $ # # @@ -24,8 +24,11 @@ # # Notes: # +# IPI_PREEMPTION instructs the kernel to preempt threads running on other +# CPUS if needed. Relies on the PREEMPTION option # Optional: +options IPI_PREEMPTION device atpic # Optional legacy pic support device mptable # Optional MPSPEC mptable support ==== //depot/projects/hammer/sys/boot/common/loader.8#21 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.81 2005/05/30 12:33:04 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82 2005/06/14 08:49:14 ru Exp $ .\" -.Dd October 15, 2004 +.Dd May 27, 2005 .Dt LOADER 8 .Os .Sh NAME @@ -63,7 +63,7 @@ will probe for a console and set the .Va console variable, or set it to serial console -.Pq Dq comconsole +.Pq Dq Li comconsole if the previous boot stage used that. If multiple consoles are selected, they will be listed separated by spaces. Then, devices are probed, @@ -103,7 +103,7 @@ has not been tried, and if .Va autoboot_delay is not set to -.Dq NO +.Dq Li NO (not case sensitive), then an .Ic autoboot will be tried. @@ -115,13 +115,14 @@ Please note that historically even when .Va autoboot_delay is set to -.Dq 0 +.Dq Li 0 user will be able to interrupt autoboot process by pressing some key -on the console while kernel and modules are being loaded. In some +on the console while kernel and modules are being loaded. +In some cases such behaviour may be undesirable, to prevent it set .Va autoboot_delay to -.Dq -1 , +.Dq Li -1 , in this case .Nm will engage interactive mode only if @@ -337,7 +338,7 @@ will default to 10 seconds. .Pp If set to -.Dq NO , +.Dq Li NO , no .Ic autoboot will be automatically attempted after processing @@ -347,18 +348,18 @@ will be processed normally, defaulting to 10 seconds delay. .Pp If set to -.Dq 0 -no delay will inserted, but user still will be able to interrupt +.Dq Li 0 , +no delay will be inserted, but user still will be able to interrupt .Ic autoboot process and escape into the interactive mode by pressing some key on the console while kernel and modules are being loaded. .Pp If set to -.Dq -1 -no delay will inserted and +.Dq Li -1 , +no delay will be inserted and .Nm -will engange interactive mode only if +will engage interactive mode only if .Ic autoboot has failed for some reason. .It Va boot_askname ==== //depot/projects/hammer/sys/conf/NOTES#92 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1323 2005/06/10 08:05:11 glebius Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1324 2005/06/14 14:21:24 ups Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -216,8 +216,6 @@ # performance and increase the frequency of kernel panics by # design. If you aren't sure that you need it then you don't. # Relies on the PREEMPTION option. DON'T TURN THIS ON. -# IPI_PREEMPTION instructs the kernel to preempt threads running on other -# CPUS if needed. Relies on the PREEMPTION option # MUTEX_DEBUG enables various extra assertions in the mutex code. # SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table # used to hold active sleep queues. @@ -231,7 +229,6 @@ # WITNESS_SKIPSPIN disables the witness checks on spin mutexes. options PREEMPTION options FULL_PREEMPTION -options IPI_PREEMPTION options MUTEX_DEBUG options WITNESS options WITNESS_KDB ==== //depot/projects/hammer/sys/conf/files.alpha#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.120 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.121 2005/06/14 04:16:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -191,6 +191,7 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc +dev/ppc/ppc_puc.c optional ppc puc dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/schistory.c optional sc ==== //depot/projects/hammer/sys/conf/files.amd64#70 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.68 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.69 2005/06/14 04:16:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -159,6 +159,7 @@ dev/mem/memutil.c optional mem dev/nve/if_nve.c optional nve pci dev/ppc/ppc.c optional ppc +dev/ppc/ppc_puc.c optional ppc puc dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/apm/apm_saver.c optional apm_saver apm ==== //depot/projects/hammer/sys/conf/files.ia64#28 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.79 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.80 2005/06/14 04:16:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -64,6 +64,7 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc isa +dev/ppc/ppc_puc.c optional ppc puc dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc dev/syscons/scterm-dumb.c optional sc ==== //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.c,v 1.1.1.1 2005/04/25 18:15:41 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.c,v 1.2 2005/06/14 09:18:26 darrenr Exp $ */ /* * Copyright (C) 1995-1998 by Darren Reed. @@ -442,21 +442,26 @@ l = get_sleep_lock(&sl_tail); err = sleep(&sl_tail, PZERO+1); + if (err) { + MUTEX_EXIT(&ipsl_mutex); + return EINTR; + } spinunlock(l); } # else /* __hpux */ # ifdef __osf__ err = mpsleep(&sl_tail, PSUSP|PCATCH, "ipl sleep", 0, &ipsl_mutex, MS_LOCK_SIMPLE); + if (err) + return EINTR; # else MUTEX_EXIT(&ipsl_mutex); err = SLEEP(&sl_tail, "ipl sleep"); + if (err) + return EINTR; + MUTEX_ENTER(&ipsl_mutex); # endif /* __osf__ */ # endif /* __hpux */ - if (err) { - MUTEX_EXIT(&ipsl_mutex); - return err; - } # endif /* SOLARIS */ } MUTEX_EXIT(&ipsl_mutex); ==== //depot/projects/hammer/sys/dev/an/if_an.c#23 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.66 2005/06/10 16:49:03 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.67 2005/06/14 14:50:40 delphij Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -676,7 +676,7 @@ mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - ifp = if_alloc(IFT_ETHER); + ifp = sc->an_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { printf("an%d: can not if_alloc()\n", sc->an_unit); goto fail; ==== //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#36 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.98 2005/06/10 16:49:10 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.99 2005/06/14 17:47:31 brooks Exp $"); #include "opt_bdg.h" @@ -467,6 +467,12 @@ int i; sc = device_get_softc(dev); + ifp = sc->ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + error = ENOSPC; + goto fail; + } + ifp->if_softc = sc; mtx_init(&sc->ndis_mtx, "ndis softc lock", MTX_NETWORK_LOCK, MTX_DEF); @@ -612,12 +618,6 @@ /* Check for task offload support. */ ndis_probe_offload(sc); - ifp = sc->ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - error = ENOSPC; - goto fail; - } - ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ==== //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.21 2005/05/29 12:47:39 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.22 2005/06/14 02:43:45 peter Exp $"); #include "opt_syscons.h" #include "opt_gfb.h" ==== //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.18 2005/05/30 18:37:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.19 2005/06/14 02:43:45 peter Exp $"); #include "opt_syscons.h" #include "opt_vga.h" ==== //depot/projects/hammer/sys/dev/xe/if_xe.c#21 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.54 2005/06/10 16:49:17 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.55 2005/06/14 17:38:36 brooks Exp $"); /* * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters. The @@ -226,7 +226,7 @@ /* Initialise stuff... */ scp->dev = dev; - scp->ifp = scp->ifp = if_alloc(IFT_ETHER); + scp->ifp = if_alloc(IFT_ETHER); if (scp->ifp == NULL) return ENOSPC; scp->ifm = &scp->ifmedia; ==== //depot/projects/hammer/sys/i386/conf/NOTES#70 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1199 2005/05/24 18:31:34 mux Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1200 2005/06/14 14:21:24 ups Exp $ # # @@ -39,12 +39,15 @@ # MPTABLE_FORCE_HTT option. Do NOT use this option if you have HTT # disabled in your BIOS. # +# IPI_PREEMPTION instructs the kernel to preempt threads running on other +# CPUS if needed. Relies on the PREEMPTION option # Mandatory: device apic # I/O apic # Optional: options MPTABLE_FORCE_HTT # Enable HTT CPUs with the MP Table +options IPI_PREEMPTION # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 14 18:45:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7C8D16A420; Tue, 14 Jun 2005 18:45:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 810FA16A41C for ; Tue, 14 Jun 2005 18:45:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C38643D1F for ; Tue, 14 Jun 2005 18:45:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EIjLO2018427 for ; Tue, 14 Jun 2005 18:45:21 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EIjL1s018424 for perforce@freebsd.org; Tue, 14 Jun 2005 18:45:21 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 18:45:21 GMT Message-Id: <200506141845.j5EIjL1s018424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 18:45:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=78541 Change 78541 by peter@peter_daintree on 2005/06/14 18:44:58 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#98 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#69 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#34 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#98 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#69 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1199) +# (XXX from i386:NOTES,v 1.1200) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.35 2005/06/14 14:21:25 ups Exp $ # ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#34 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 14 21:03:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C49A416A420; Tue, 14 Jun 2005 21:03:09 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9A13E16A41C for ; Tue, 14 Jun 2005 21:03:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78FE643D4C for ; Tue, 14 Jun 2005 21:03:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EL39sJ030831 for ; Tue, 14 Jun 2005 21:03:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EL397a030828 for perforce@freebsd.org; Tue, 14 Jun 2005 21:03:09 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 21:03:09 GMT Message-Id: <200506142103.j5EL397a030828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 21:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=78546 Change 78546 by peter@peter_daintree on 2005/06/14 21:03:07 Properly sync the i386 and amd64 cpu feature flags instead of needless reformatting. While here do the AMD features the same way so that prescott/nocona cores with AMD features will report them. We need to export this info for PG_NX support in i386/PAE. Affected files ... .. //depot/projects/hammer/sys/i386/i386/identcpu.c#22 edit .. //depot/projects/hammer/sys/i386/i386/initcpu.c#12 edit .. //depot/projects/hammer/sys/i386/include/md_var.h#15 edit Differences ... ==== //depot/projects/hammer/sys/i386/i386/identcpu.c#22 (text+ko) ==== @@ -74,9 +74,6 @@ void panicifcpuunsupported(void); static void identifycyrix(void); -#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) -static void print_AMD_features(void); -#endif static void print_AMD_info(void); static void print_AMD_assoc(int i); static void print_transmeta_info(void); @@ -688,42 +685,80 @@ "\040PBE" /* Pending Break Enable */ ); - if (cpu_feature2 != 0) - printf("\n Features2=0x%b", cpu_feature2, - "\020" - "\001SSE3" /* SSE3 */ - "\002" - "\003RSVD2" /* "Reserved" bit 2 */ - "\004MON" /* MONITOR/MWAIT Instructions */ - "\005DS_CPL" /* CPL Qualified Debug Store */ - "\006" /* Machine specific registers */ - "\007" /* Physical address extension */ - "\010EST" /* Enhanced SpeedStep */ - "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ - "\014" - "\015" - "\016CX16" /* CMPXCHG16B Instruction */ - "\017" - "\020" - "\021" - "\022" - "\023" - "\024" - "\025" - "\026" - "\027" - "\030" - "\031" - "\032" - "\033" - "\034" - "\035" - "\036" - "\037" - "\040" - ); + if (cpu_feature2 != 0) { + printf("\n Features2=0x%b", cpu_feature2, + "\020" + "\001SSE3" /* SSE3 */ + "\002" + "\003RSVD2" /* "Reserved" bit 2 */ + "\004MON" /* MONITOR/MWAIT Instructions */ + "\005DS_CPL" /* CPL Qualified Debug Store */ + "\006" /* Machine specific registers */ + "\007" /* Physical address extension */ + "\010EST" /* Enhanced SpeedStep */ + "\011TM2" /* Thermal Monitor 2 */ + "\012" + "\013CNTX-ID" /* L1 context ID available */ + "\014" + "\015" + "\016CX16" /* CMPXCHG16B Instruction */ + "\017" + "\020" + "\021" + "\022" + "\023" + "\024" + "\025" + "\026" + "\027" + "\030" + "\031" + "\032" + "\033" + "\034" + "\035" + "\036" + "\037" + "\040" + ); + } + if (amd_feature != 0) { + printf("\n AMD Features=0x%b", amd_feature, + "\020" /* in hex */ + "\001" /* Same */ + "\002" /* Same */ + "\003" /* Same */ + "\004" /* Same */ + "\005" /* Same */ + "\006" /* Same */ + "\007" /* Same */ + "\010" /* Same */ + "\011" /* Same */ + "\012" /* Same */ + "\013" /* Undefined */ + "\014SYSCALL" /* Have SYSCALL/SYSRET */ + "\015" /* Same */ + "\016" /* Same */ + "\017" /* Same */ + "\020" /* Same */ + "\021" /* Same */ + "\022" /* Same */ + "\023" /* Reserved, unknown */ + "\024MP" /* Multiprocessor Capable */ + "\025NX" /* Has EFER.NXE, NX */ + "\026" /* Undefined */ + "\027MMX+" /* AMD MMX Extensions */ + "\030" /* Same */ + "\031" /* Same */ + "\032" /* Undefined */ + "\033" /* Undefined */ + "\034" /* Undefined */ + "\035" /* Undefined */ + "\036LM" /* 64 bit long mode */ + "\0373DNow+" /* AMD 3DNow! Extensions */ + "\0403DNow" /* AMD 3DNow! */ + ); + } /* * If this CPU supports hyperthreading then mention @@ -734,9 +769,6 @@ printf("\n Hyperthreading: %d logical CPUs", (cpu_procinfo & CPUID_HTT_CORES) >> 16); } - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && - cpu_exthigh >= 0x80000001) - print_AMD_features(); } else if (strcmp(cpu_vendor, "CyrixInstead") == 0) { printf(" DIR=0x%04x", cyrix_did); printf(" Stepping=%u", (cyrix_did & 0xf000) >> 12); @@ -1101,55 +1133,6 @@ } } -#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) -static void -print_AMD_features(void) -{ - u_int regs[4]; - - /* - * Values taken from AMD Processor Recognition - * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf - */ - do_cpuid(0x80000001, regs); - printf("\n AMD Features=0x%b", regs[3] &~ cpu_feature, - "\020" /* in hex */ - "\001FPU" /* Integral FPU */ - "\002VME" /* Extended VM86 mode support */ - "\003DE" /* Debug extensions */ - "\004PSE" /* 4MByte page tables */ - "\005TSC" /* Timestamp counter */ - "\006MSR" /* Machine specific registers */ - "\007PAE" /* Physical address extension */ - "\010MCE" /* Machine Check support */ - "\011CX8" /* CMPEXCH8 instruction */ - "\012APIC" /* SMP local APIC */ - "\013" - "\014SYSCALL" /* SYSENTER/SYSEXIT instructions */ - "\015MTRR" /* Memory Type Range Registers */ - "\016PGE" /* PG_G (global bit) support */ - "\017MCA" /* Machine Check Architecture */ - "\020ICMOV" /* CMOV instruction */ - "\021PAT" /* Page attributes table */ - "\022PGE36" /* 36 bit address space support */ - "\023RSVD" /* Reserved, unknown */ - "\024MP" /* Multiprocessor Capable */ - "\025NX" /* Has EFER.NXE, NX (no execute pte bit) */ - "\026" - "\027AMIE" /* AMD MMX Instruction Extensions */ - "\030MMX" - "\031FXSAVE" /* FXSAVE/FXRSTOR */ - "\032" - "\033" - "\034" - "\035" - "\036LM" /* Long mode */ - "\037DSP" /* AMD 3DNow! Instruction Extensions */ - "\0403DNow!" /* AMD 3DNow! Instructions */ - ); -} -#endif - static void print_transmeta_info() { ==== //depot/projects/hammer/sys/i386/i386/initcpu.c#12 (text+ko) ==== @@ -80,6 +80,7 @@ int cpu = 0; /* Are we 386, 386sx, 486, etc? */ u_int cpu_feature = 0; /* Feature flags */ u_int cpu_feature2 = 0; /* Feature flags */ +u_int amd_feature = 0; /* Feature flags */ u_int cpu_high = 0; /* Highest arg to CPUID */ u_int cpu_id = 0; /* Stepping ID */ u_int cpu_procinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */ ==== //depot/projects/hammer/sys/i386/include/md_var.h#15 (text+ko) ==== @@ -45,7 +45,9 @@ extern u_int basemem; /* PA of original top of base memory */ extern int busdma_swi_pending; extern u_int cpu_exthigh; -extern u_int cpu_feature, cpu_feature2; +extern u_int cpu_feature; +extern u_int cpu_feature2; +extern u_int amd_feature; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; From owner-p4-projects@FreeBSD.ORG Tue Jun 14 21:07:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3296C16A420; Tue, 14 Jun 2005 21:07:15 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0D3E116A41C for ; Tue, 14 Jun 2005 21:07:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D73DB43D1F for ; Tue, 14 Jun 2005 21:07:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EL7EdF030998 for ; Tue, 14 Jun 2005 21:07:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EL7EsX030995 for perforce@freebsd.org; Tue, 14 Jun 2005 21:07:14 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 21:07:14 GMT Message-Id: <200506142107.j5EL7EsX030995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 21:07:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=78547 Change 78547 by peter@peter_hammer on 2005/06/14 21:07:11 Make this compile Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#9 edit Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#9 (text+ko) ==== @@ -77,10 +77,8 @@ struct kcb * _kcb_ctor(struct kse *kse) { - union descriptor ldt; void *base; struct kcb *kcb; - int error; kcb = malloc(sizeof(struct kcb)); if (kcb != NULL) { From owner-p4-projects@FreeBSD.ORG Tue Jun 14 21:14:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 379BE16A420; Tue, 14 Jun 2005 21:14:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0A4A216A41C for ; Tue, 14 Jun 2005 21:14:24 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA81843D4C for ; Tue, 14 Jun 2005 21:14:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5ELENWO031339 for ; Tue, 14 Jun 2005 21:14:23 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5ELENZ9031336 for perforce@freebsd.org; Tue, 14 Jun 2005 21:14:23 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 21:14:23 GMT Message-Id: <200506142114.j5ELENZ9031336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 21:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=78548 Change 78548 by peter@peter_melody on 2005/06/14 21:14:23 GC more junk that is OBE Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#10 edit .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#15 edit Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#10 (text+ko) ==== @@ -41,8 +41,6 @@ #include "rtld_tls.h" #include "pthread_md.h" -int _thr_using_setbase; - struct tcb * _tcb_ctor(struct pthread *thread, int initial) { ==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#15 (text+ko) ==== @@ -40,8 +40,6 @@ extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); extern int _thr_getcontext(mcontext_t *); -extern int _thr_using_setbase; - #define KSE_STACKSIZE 16384 #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) From owner-p4-projects@FreeBSD.ORG Tue Jun 14 22:49:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F2716A420; Tue, 14 Jun 2005 22:49:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 735FD16A41C for ; Tue, 14 Jun 2005 22:49:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5543643D49 for ; Tue, 14 Jun 2005 22:49:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EMnJit035835 for ; Tue, 14 Jun 2005 22:49:19 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EMnIXs035832 for perforce@freebsd.org; Tue, 14 Jun 2005 22:49:18 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 22:49:18 GMT Message-Id: <200506142249.j5EMnIXs035832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 22:49:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=78551 Change 78551 by peter@peter_overcee on 2005/06/14 22:48:58 There is no reason at all why HWPMC_HOOKS needs to be in opt_global.h and force a universal recompile if the option is changed. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#51 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#63 edit .. //depot/projects/hammer/sys/conf/options#76 edit .. //depot/projects/hammer/sys/i386/i386/local_apic.c#16 edit .. //depot/projects/hammer/sys/i386/i386/trap.c#33 edit .. //depot/projects/hammer/sys/kern/kern_clock.c#25 edit .. //depot/projects/hammer/sys/kern/kern_exec.c#50 edit .. //depot/projects/hammer/sys/kern/sched_4bsd.c#39 edit .. //depot/projects/hammer/sys/kern/sched_ule.c#60 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#51 (text+ko) ==== @@ -34,6 +34,8 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.15 2005/05/22 16:32:02 peter Exp $"); +#include "opt_hwpmc_hooks.h" + #include #include #include ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#63 (text+ko) ==== @@ -46,6 +46,7 @@ #include "opt_clock.h" #include "opt_cpu.h" +#include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_ktrace.h" ==== //depot/projects/hammer/sys/conf/options#76 (text+ko) ==== @@ -707,4 +707,4 @@ LOOKUP_SHARED opt_vfs.h # HWPMC options -HWPMC_HOOKS opt_global.h +HWPMC_HOOKS ==== //depot/projects/hammer/sys/i386/i386/local_apic.c#16 (text+ko) ==== @@ -34,6 +34,8 @@ #include __FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.16 2005/04/19 04:01:23 jkoshy Exp $"); +#include "opt_hwpmc_hooks.h" + #include #include #include ==== //depot/projects/hammer/sys/i386/i386/trap.c#33 (text+ko) ==== @@ -46,6 +46,7 @@ #include "opt_clock.h" #include "opt_cpu.h" +#include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_ktrace.h" #include "opt_npx.h" ==== //depot/projects/hammer/sys/kern/kern_clock.c#25 (text+ko) ==== @@ -37,9 +37,10 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.175 2005/05/30 06:29:29 jkoshy Exp $"); +#include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include "opt_ntp.h" #include "opt_watchdog.h" -#include "opt_compat.h" #include #include ==== //depot/projects/hammer/sys/kern/kern_exec.c#50 (text+ko) ==== @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.273 2005/06/09 19:45:08 jkoshy Exp $"); +#include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/sched_4bsd.c#39 (text+ko) ==== @@ -35,6 +35,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.76 2005/06/09 19:43:08 ups Exp $"); +#include "opt_hwpmc_hooks.h" + #define kse td_sched #include ==== //depot/projects/hammer/sys/kern/sched_ule.c#60 (text+ko) ==== @@ -27,7 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.152 2005/06/07 02:59:16 jeff Exp $"); -#include +#include "opt_hwpmc_hooks.h" +#include "opt_sched.h" #define kse td_sched From owner-p4-projects@FreeBSD.ORG Wed Jun 15 20:45:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29E1516A420; Wed, 15 Jun 2005 20:45:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 037F216A41C for ; Wed, 15 Jun 2005 20:45:13 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9BCD43D4C for ; Wed, 15 Jun 2005 20:45:12 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5FKjCCQ031384 for ; Wed, 15 Jun 2005 20:45:12 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5FKjCgo031381 for perforce@freebsd.org; Wed, 15 Jun 2005 20:45:12 GMT (envelope-from csjp@freebsd.org) Date: Wed, 15 Jun 2005 20:45:12 GMT Message-Id: <200506152045.j5FKjCgo031381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 78581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2005 20:45:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=78581 Change 78581 by csjp@csjp_xor on 2005/06/15 20:44:22 -Remove all un-used KTR masks and replace with place holders instead. -Introduce KTR_MAC which will be used for tracing in the mandatory access control framework. -Introduce KTR_SPARE which people can use if they want there file to be debugged. This should solve the lack of bits problem in the mask. To use KTR_SPARE sombody might do this: #ifdef DEBUG_MY_FILE #define KTR_MY_FILE KTR_SPARE #endif CTR0(KTR_MY_FILE, "trace info here"); Discussed with: jeff Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/ktr.h#14 (text+ko) ==== @@ -40,13 +40,13 @@ * Trace classes */ #define KTR_GEN 0x00000001 /* General (TR) */ -#define KTR_NET 0x00000002 /* Network */ -#define KTR_DEV 0x00000004 /* Device driver */ +#define KTR_MAC 0x00000002 /* Mandatory Access Control */ +#define KTR_UNUSED0 0x00000004 #define KTR_LOCK 0x00000008 /* MP locking */ #define KTR_SMP 0x00000010 /* MP general */ -#define KTR_FS 0x00000020 /* Filesystem */ +#define KTR_UNUSED1 0x00000020 #define KTR_PMAP 0x00000040 /* Pmap tracing */ -#define KTR_MALLOC 0x00000080 /* Malloc tracing */ +#define KTR_UNUSED2 0x00000080 #define KTR_TRAP 0x00000100 /* Trap processing */ #define KTR_INTR 0x00000200 /* Interrupt tracing */ #define KTR_SIG 0x00000400 /* Signal processing */ @@ -54,8 +54,8 @@ #define KTR_PROC 0x00001000 /* Process scheduling */ #define KTR_SYSC 0x00002000 /* System call */ #define KTR_INIT 0x00004000 /* System initialization */ -#define KTR_KGDB 0x00008000 /* Trace kgdb internals */ -#define KTR_IO 0x00010000 /* Upper I/O */ +#define KTR_UNUSED3 0x00008000 +#define KTR_UNUSED4 0x00010000 #define KTR_EVH 0x00020000 /* Eventhandler */ #define KTR_NFS 0x00040000 /* The obvious */ #define KTR_VOP 0x00080000 /* The obvious */ @@ -70,7 +70,8 @@ #define KTR_CRITICAL 0x10000000 /* Critical sections */ #define KTR_SCHED 0x20000000 /* Machine parsed sched info. */ #define KTR_BUF 0x40000000 /* Buffer cache */ -#define KTR_ALL 0x7fffffff +#define KTR_SPARE 0x80000000 /* Mandatory Access Control */ +#define KTR_ALL 0xffffffff /* * Trace classes which can be assigned to particular use at compile time From owner-p4-projects@FreeBSD.ORG Wed Jun 15 20:53:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6A3D16A420; Wed, 15 Jun 2005 20:53:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 98F7416A41C for ; Wed, 15 Jun 2005 20:53:46 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D8EF43D48 for ; Wed, 15 Jun 2005 20:53:46 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5FKrkM7038642 for ; Wed, 15 Jun 2005 20:53:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5FKrXSe038639 for perforce@freebsd.org; Wed, 15 Jun 2005 20:53:33 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Jun 2005 20:53:33 GMT Message-Id: <200506152053.j5FKrXSe038639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2005 20:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=78582 Change 78582 by jhb@jhb_slimer on 2005/06/15 20:53:05 IFC @78573. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#15 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#69 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#48 integrate .. //depot/projects/smpng/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/alpha/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/timerreg.h#2 integrate .. //depot/projects/smpng/sys/alpha/isa/mcclock_isa.c#5 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#16 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#14 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#14 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#16 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#16 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#9 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#8 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#8 integrate .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#42 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#26 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#17 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/bus.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/bus_memio.h#4 delete .. //depot/projects/smpng/sys/amd64/include/bus_pio.h#4 delete .. //depot/projects/smpng/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/smpng/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#17 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/smpng/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/arm/include/cpufunc.h#7 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#5 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#10 integrate .. //depot/projects/smpng/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#11 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#6 integrate .. //depot/projects/smpng/sys/boot/alpha/common/main.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/delay.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/devicename.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/getsecs.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#4 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#36 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#19 integrate .. //depot/projects/smpng/sys/bsm/audit.h#1 branch .. //depot/projects/smpng/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#59 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#57 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#27 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#28 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#16 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#29 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#29 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#98 integrate .. //depot/projects/smpng/sys/conf/files#141 integrate .. //depot/projects/smpng/sys/conf/files.alpha#35 integrate .. //depot/projects/smpng/sys/conf/files.amd64#32 integrate .. //depot/projects/smpng/sys/conf/files.arm#6 integrate .. //depot/projects/smpng/sys/conf/files.i386#83 integrate .. //depot/projects/smpng/sys/conf/files.ia64#49 integrate .. //depot/projects/smpng/sys/conf/files.pc98#74 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#23 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#51 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#46 integrate .. //depot/projects/smpng/sys/conf/options#99 integrate .. //depot/projects/smpng/sys/conf/options.arm#5 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#13 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltrvar.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#12 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#14 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#49 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#37 integrate .. //depot/projects/smpng/sys/dev/aac/aac_tables.h#4 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#16 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#85 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#6 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/advlib.c#5 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/adwlib.c#5 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#16 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#14 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#12 integrate .. //depot/projects/smpng/sys/dev/aic/aic.c#8 integrate .. //depot/projects/smpng/sys/dev/aic/aic_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#16 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#15 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#30 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#43 integrate .. //depot/projects/smpng/sys/dev/an/if_anreg.h#13 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#18 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#8 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#53 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#56 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#31 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#35 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#20 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#27 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#16 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbd_atkbdc.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_ebus.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_isa.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_subr.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_subr.h#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdcreg.h#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/atkbdreg.h#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#1 branch .. //depot/projects/smpng/sys/dev/atkbdc/psm.h#1 branch .. //depot/projects/smpng/sys/dev/auxio/auxio.c#3 integrate .. //depot/projects/smpng/sys/dev/awi/am79c930.c#6 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#23 integrate .. //depot/projects/smpng/sys/dev/awi/awivar.h#7 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#16 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#55 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#30 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.c#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#13 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#17 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#8 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#25 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#8 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#14 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#9 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#41 integrate .. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#11 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6var.h#4 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#18 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#14 integrate .. //depot/projects/smpng/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#13 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#17 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#13 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#30 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#13 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#28 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#10 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#48 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#26 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#26 integrate .. //depot/projects/smpng/sys/dev/en/midwayvar.h#9 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#20 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#8 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#16 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#12 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatmvar.h#5 integrate .. //depot/projects/smpng/sys/dev/fb/boot_font.c#4 integrate .. //depot/projects/smpng/sys/dev/fb/creator.c#7 integrate .. //depot/projects/smpng/sys/dev/fb/gfb.c#6 integrate .. //depot/projects/smpng/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/smpng/sys/dev/fb/s3_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/fb/tga.c#6 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#19 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_cbus.c#8 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/fe/if_fevar.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#26 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwevar.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwipvar.h#3 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#63 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#16 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#21 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#10 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/harp/if_harp.c#7 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#16 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#11 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#7 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#7 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#10 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#8 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#10 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#10 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_transmit.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#8 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#22 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#23 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#13 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#8 integrate .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_alpha.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.h#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_arm.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ia64.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_intel.c#2 delete .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_pentium.h#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.h#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.h#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_sparc64.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_x86.c#1 branch .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#1 branch .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#9 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_var.h#3 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#19 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#15 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#12 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/idt/idt.c#9 integrate .. //depot/projects/smpng/sys/dev/idt/idt_harp.c#7 integrate .. //depot/projects/smpng/sys/dev/idt/idt_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#12 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ie/if_ievar.h#3 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#29 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#14 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#12 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#13 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#11 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.h#4 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#25 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#30 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#9 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.h#6 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#15 delete .. //depot/projects/smpng/sys/dev/kbd/atkbdc.c#9 delete .. //depot/projects/smpng/sys/dev/kbd/atkbdcreg.h#6 delete .. //depot/projects/smpng/sys/dev/kbd/atkbdreg.h#3 delete .. //depot/projects/smpng/sys/dev/lge/if_lge.c#27 integrate .. //depot/projects/smpng/sys/dev/lge/if_lgereg.h#4 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#18 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#9 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lncvar.h#4 integrate .. //depot/projects/smpng/sys/dev/mc146818/mc146818.c#4 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#13 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/pnphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#18 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#25 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#19 integrate .. //depot/projects/smpng/sys/dev/my/if_myreg.h#3 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#9 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#40 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#9 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#10 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/smpng/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#9 integrate .. //depot/projects/smpng/sys/dev/owi/if_wivar.h#4 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm.c#7 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#8 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#5 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#7 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#7 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#7 integrate .. //depot/projects/smpng/sys/dev/patm/if_patmvar.h#4 integrate .. //depot/projects/smpng/sys/dev/pbio/pbio.c#5 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#58 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fea.c#9 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#10 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq.c#7 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#8 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#11 integrate .. //depot/projects/smpng/sys/dev/pdq/pdqvar.h#7 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#14 integrate .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#5 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#2 integrate .. //depot/projects/smpng/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/smpng/sys/dev/random/probe.c#3 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#20 integrate .. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#6 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#22 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#25 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#18 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbnivar.h#5 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#9 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#12 integrate .. //depot/projects/smpng/sys/dev/scd/scd_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#54 integrate .. //depot/projects/smpng/sys/dev/sio/sio_isa.c#15 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/sio/sio_puc.c#8 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#19 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/sn/if_snvar.h#4 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#13 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932var.h#5 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#29 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#19 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#10 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_subr.c#5 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#23 integrate .. //depot/projects/smpng/sys/dev/syscons/scgfbrndr.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#11 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#8 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#48 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#12 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#21 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#10 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#21 integrate .. //depot/projects/smpng/sys/dev/tx/if_txvar.h#7 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#25 integrate .. //depot/projects/smpng/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#13 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_cdcereg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/if_ruereg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#38 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.c#9 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/smpng/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#19 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#5 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#72 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#21 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#24 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#21 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/xe/if_xevar.h#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#46 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#30 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#11 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#7 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bitops.h#3 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#10 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#13 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs.h#7 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs_sb.h#4 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#18 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode_cnv.c#5 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#8 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_ialloc.c#6 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#18 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#8 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_readwrite.c#10 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#11 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#44 delete .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#32 delete .. //depot/projects/smpng/sys/gnu/ext2fs/fs.h#9 delete .. //depot/projects/smpng/sys/gnu/ext2fs/i386-bitops.h#3 delete .. //depot/projects/smpng/sys/gnu/ext2fs/inode.h#7 delete .. //depot/projects/smpng/sys/gnu/ext2fs/sparc64-bitops.h#3 delete .. //depot/projects/smpng/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_bitops.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_fs.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_fs_sb.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/fs.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/i386-bitops.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/inode.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/smpng/sys/gnu/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#101 integrate .. //depot/projects/smpng/sys/i386/i386/autoconf.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#83 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#82 integrate .. //depot/projects/smpng/sys/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/smpng/sys/i386/i386/trap.c#77 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#9 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#15 integrate .. //depot/projects/smpng/sys/i386/include/bus.h#7 integrate .. //depot/projects/smpng/sys/i386/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/i386/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/i386/include/ptrace.h#6 integrate .. //depot/projects/smpng/sys/i386/include/reg.h#9 integrate .. //depot/projects/smpng/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/if_el.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#9 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#16 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#20 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#20 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#20 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#21 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#13 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/autoconf.c#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#70 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#19 integrate .. //depot/projects/smpng/sys/ia64/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/ia64/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/smp.h#7 integrate .. //depot/projects/smpng/sys/isa/atkbd_isa.c#10 delete .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#11 delete .. //depot/projects/smpng/sys/isa/psm.c#33 delete .. //depot/projects/smpng/sys/kern/imgact_shell.c#10 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#59 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#16 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#51 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#57 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#53 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#39 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#132 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#56 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#58 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#34 integrate .. //depot/projects/smpng/sys/kern/uipc_accf.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#69 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#57 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#79 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#28 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#41 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#103 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#90 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#64 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#26 integrate .. //depot/projects/smpng/sys/modules/Makefile#97 integrate .. //depot/projects/smpng/sys/modules/cam/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/ext2fs/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/ichsmb/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_bridge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ipfilter/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#22 integrate .. //depot/projects/smpng/sys/modules/netgraph/tcpmss/Makefile#1 branch .. //depot/projects/smpng/sys/modules/osf1/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/pecoff/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/pf/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/udbp/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ugen/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/uhid/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ukbd/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/ulpt/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/umass/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/umodem/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ums/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/uscanner/Makefile#6 integrate .. //depot/projects/smpng/sys/net/bpf.c#50 integrate .. //depot/projects/smpng/sys/net/bpf.h#14 integrate .. //depot/projects/smpng/sys/net/bridge.c#37 integrate .. //depot/projects/smpng/sys/net/bridge.h#9 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#1 branch .. //depot/projects/smpng/sys/net/firewire.h#2 integrate .. //depot/projects/smpng/sys/net/if.c#66 integrate .. //depot/projects/smpng/sys/net/if.h#25 integrate .. //depot/projects/smpng/sys/net/if_arc.h#8 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#18 integrate .. //depot/projects/smpng/sys/net/if_arp.h#8 integrate .. //depot/projects/smpng/sys/net/if_atm.h#12 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#18 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#1 branch .. //depot/projects/smpng/sys/net/if_bridgevar.h#1 branch .. //depot/projects/smpng/sys/net/if_disc.c#18 integrate .. //depot/projects/smpng/sys/net/if_ef.c#19 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#59 integrate .. //depot/projects/smpng/sys/net/if_faith.c#26 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#24 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#7 integrate .. //depot/projects/smpng/sys/net/if_gif.c#25 integrate .. //depot/projects/smpng/sys/net/if_gif.h#11 integrate .. //depot/projects/smpng/sys/net/if_gre.c#22 integrate .. //depot/projects/smpng/sys/net/if_gre.h#9 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#21 integrate .. //depot/projects/smpng/sys/net/if_llc.h#6 integrate .. //depot/projects/smpng/sys/net/if_loop.c#36 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#32 integrate .. //depot/projects/smpng/sys/net/if_pppvar.h#9 integrate .. //depot/projects/smpng/sys/net/if_sl.c#28 integrate .. //depot/projects/smpng/sys/net/if_slvar.h#5 integrate .. //depot/projects/smpng/sys/net/if_sppp.h#6 integrate .. //depot/projects/smpng/sys/net/if_spppfr.c#3 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#25 integrate .. //depot/projects/smpng/sys/net/if_stf.c#31 integrate .. //depot/projects/smpng/sys/net/if_tap.c#36 integrate .. //depot/projects/smpng/sys/net/if_tapvar.h#8 integrate .. //depot/projects/smpng/sys/net/if_tun.c#42 integrate .. //depot/projects/smpng/sys/net/if_types.h#7 integrate .. //depot/projects/smpng/sys/net/if_var.h#38 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#36 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#18 integrate .. //depot/projects/smpng/sys/net/rtsock.c#45 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_none.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#11 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#18 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#14 integrate .. //depot/projects/smpng/sys/netatm/atm_if.h#11 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#15 integrate .. //depot/projects/smpng/sys/netatm/atm_usrreq.c#15 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#8 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#9 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_output.c#6 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#8 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#9 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_arp.c#10 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp.c#10 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#8 integrate .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#4 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_lmi.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#30 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_tcpmss.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_tcpmss.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_tee.c#13 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#35 integrate .. //depot/projects/smpng/sys/netinet/in.c#26 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#14 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#56 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#39 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#29 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#53 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#72 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#72 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#68 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#42 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#38 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#57 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#25 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#9 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#40 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#15 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#33 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#12 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.h#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#41 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#50 integrate .. //depot/projects/smpng/sys/nfsclient/nfsargs.h#6 integrate .. //depot/projects/smpng/sys/nfsclient/nfsmount.h#11 integrate .. //depot/projects/smpng/sys/opencrypto/deflate.c#4 integrate .. //depot/projects/smpng/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/smpng/sys/pc98/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/pc98/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/smpng/sys/pci/alpm.c#10 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#13 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#66 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#24 integrate .. //depot/projects/smpng/sys/pci/if_de.c#25 integrate .. //depot/projects/smpng/sys/pci/if_devar.h#8 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#13 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#33 integrate .. //depot/projects/smpng/sys/pci/if_pcnreg.h#5 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#55 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#24 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#35 integrate .. //depot/projects/smpng/sys/pci/if_sfreg.h#7 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#50 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#15 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#47 integrate .. //depot/projects/smpng/sys/pci/if_skreg.h#12 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#35 integrate .. //depot/projects/smpng/sys/pci/if_stereg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#45 integrate .. //depot/projects/smpng/sys/pci/if_tireg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#26 integrate .. //depot/projects/smpng/sys/pci/if_tlreg.h#5 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#35 integrate .. //depot/projects/smpng/sys/pci/if_vrreg.h#9 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#29 integrate .. //depot/projects/smpng/sys/pci/if_wbreg.h#4 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#57 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#17 integrate .. //depot/projects/smpng/sys/pci/intpm.c#11 integrate .. //depot/projects/smpng/sys/pci/viapm.c#9 integrate .. //depot/projects/smpng/sys/powerpc/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/powerpc/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/profile.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#55 integrate .. //depot/projects/smpng/sys/powerpc/psim/sio_iobus.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#34 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#32 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#12 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#30 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#56 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#17 integrate .. //depot/projects/smpng/sys/sparc64/creator/creator.h#4 integrate .. //depot/projects/smpng/sys/sparc64/creator/creator_upa.c#8 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#20 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#6 integrate .. //depot/projects/smpng/sys/sparc64/include/bus_memio.h#3 delete .. //depot/projects/smpng/sys/sparc64/include/bus_pio.h#3 delete .. //depot/projects/smpng/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/autoconf.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#59 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/rtc.c#4 integrate .. //depot/projects/smpng/sys/sys/_pthreadtypes.h#1 branch .. //depot/projects/smpng/sys/sys/bio.h#25 integrate .. //depot/projects/smpng/sys/sys/buf.h#37 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#5 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#29 integrate .. //depot/projects/smpng/sys/sys/event.h#17 integrate .. //depot/projects/smpng/sys/sys/jail.h#15 integrate .. //depot/projects/smpng/sys/sys/ktr.h#21 integrate .. //depot/projects/smpng/sys/sys/mac.h#31 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#30 integrate .. //depot/projects/smpng/sys/sys/malloc.h#21 integrate .. //depot/projects/smpng/sys/sys/mount.h#40 integrate .. //depot/projects/smpng/sys/sys/param.h#82 integrate .. //depot/projects/smpng/sys/sys/pmc.h#2 integrate .. //depot/projects/smpng/sys/sys/pmckern.h#2 integrate .. //depot/projects/smpng/sys/sys/pmclog.h#1 branch .. //depot/projects/smpng/sys/sys/proc.h#145 integrate .. //depot/projects/smpng/sys/sys/sockio.h#9 integrate .. //depot/projects/smpng/sys/sys/syscall.h#55 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#55 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#21 integrate .. //depot/projects/smpng/sys/sys/sysent.h#12 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#57 integrate .. //depot/projects/smpng/sys/sys/tree.h#5 integrate .. //depot/projects/smpng/sys/sys/types.h#29 integrate .. //depot/projects/smpng/sys/sys/user.h#25 integrate .. //depot/projects/smpng/sys/sys/vnode.h#63 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#72 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#43 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#51 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#20 integrate .. //depot/projects/smpng/sys/vm/pmap.h#26 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.61 2005/03/18 09:45:43 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.63 2005/05/29 23:44:21 marcel Exp $"); #include "opt_bootp.h" #include "opt_isa.h" @@ -36,7 +36,6 @@ #include #include - #include #include #include @@ -69,105 +68,20 @@ device_t isa_bus_device = 0; #endif -#if 0 - -static int -atoi(const char *s) -{ - int n = 0; - while (*s >= '0' && *s <= '9') - n = n * 10 + (*s++ - '0'); - return n; -} - -static const char * -bootdev_field(int which) -{ - char *p = bootinfo.booted_dev; - char *q; - static char field[128]; - - /* Skip characters to find the right field */ - for (; which; which--) { - while (*p != ' ' && *p != '\0') - p++; - if (*p) - p++; - } - - /* Copy out the field and return it */ - q = field; - while (*p != ' ' && *p != '\0') - *q++ = *p++; - *q = '\0'; - - return field; -} - -static const char * -bootdev_protocol(void) -{ - return bootdev_field(0); -} - -static int -bootdev_slot(void) -{ - return atoi(bootdev_field(2)); -} - -static int -bootdev_unit(void) -{ - return atoi(bootdev_field(5)); -} - -static int -bootdev_bus(void) -{ - return atoi(bootdev_field(1)); -} - -static int -bootdev_channel(void) -{ - return atoi(bootdev_field(3)); -} - -static const char * -bootdev_remote_address(void) -{ - return bootdev_field(4); -} - -static int -bootdev_boot_dev_type(void) -{ - return atoi(bootdev_field(6)); -} - -static const char * -bootdev_ctrl_dev_type(void) -{ - return bootdev_field(7); -} - -#endif - /* * Determine i/o configuration for a machine. */ static void configure_first(void *dummy) { + + device_add_child(root_bus, platform.iobus, 0); } static void configure(void *dummy) { - device_add_child(root_bus, platform.iobus, 0); - root_bus_configure(); /* @@ -189,5 +103,6 @@ */ alpha_pal_swpipl(ALPHA_PSL_IPL_0); + cninit_finish(); cold = 0; } ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#69 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.177 2005/01/05 20:05:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178 2005/06/10 03:33:35 alc Exp $"); #include #include @@ -302,7 +302,6 @@ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ -static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ static int nklev3, nklev2; vm_offset_t kernel_vm_end; @@ -554,29 +553,24 @@ } /* + * Initialize a vm_page's machine-dependent fields. + */ +void +pmap_page_init(vm_page_t m) +{ + + TAILQ_INIT(&m->md.pv_list); + m->md.pv_list_count = 0; +} + +/* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap * system needs to map virtual memory. - * pmap_init has been enhanced to support in a fairly consistant - * way, discontiguous physical memory. */ void pmap_init(void) { - int i; - - /* - * Allocate memory for random pmap data structures. Includes the - * pv_head_table. - */ - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 15 20:58:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 822E716A420; Wed, 15 Jun 2005 20:58:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 554F716A41C for ; Wed, 15 Jun 2005 20:58:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E02543D55 for ; Wed, 15 Jun 2005 20:58:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5FKwrIL038881 for ; Wed, 15 Jun 2005 20:58:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5FKwqgO038878 for perforce@freebsd.org; Wed, 15 Jun 2005 20:58:52 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Jun 2005 20:58:52 GMT Message-Id: <200506152058.j5FKwqgO038878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2005 20:58:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=78583 Change 78583 by jhb@jhb_slimer on 2005/06/15 20:58:09 IFC @78573. Affected files ... .. //depot/projects/smpng/sys/dev/ed/if_ed.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/dev/ed/if_ed.c#31 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.253 2005/06/10 16:49:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.254 2005/06/15 20:23:40 brooks Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -616,7 +616,7 @@ static __inline void ed_xmit(struct ed_softc *sc) { - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; unsigned short len; if (sc->gone) @@ -964,7 +964,7 @@ edintr(void *arg) { struct ed_softc *sc = (struct ed_softc*) arg; - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; u_char isr; int count; @@ -1479,7 +1479,7 @@ static u_short ed_pio_write_mbufs(struct ed_softc *sc, struct mbuf *m, long dst) { - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; unsigned short total_len, dma_len; struct mbuf *mp; int maxwait = 200; /* about 240us */ @@ -1691,7 +1691,7 @@ static void ed_setrcr(struct ed_softc *sc) { - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; int i; u_char reg1; From owner-p4-projects@FreeBSD.ORG Wed Jun 15 20:59:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38F7816A420; Wed, 15 Jun 2005 20:59:55 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1344D16A41C for ; Wed, 15 Jun 2005 20:59:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEFFA43D53 for ; Wed, 15 Jun 2005 20:59:54 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5FKxsq3038933 for ; Wed, 15 Jun 2005 20:59:54 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5FKxsAO038930 for perforce@freebsd.org; Wed, 15 Jun 2005 20:59:54 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Jun 2005 20:59:54 GMT Message-Id: <200506152059.j5FKxsAO038930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2005 20:59:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=78584 Change 78584 by jhb@jhb_slimer on 2005/06/15 20:59:31 Fixup. Affected files ... .. //depot/projects/smpng/sys/notes#39 edit Differences ... ==== //depot/projects/smpng/sys/notes#39 (text+ko) ==== @@ -88,7 +88,7 @@ - Add a cache-line padded mtx_aligned union and use it for the mutex pools. Active child branches: -- jhb_intr - intr_vector stuff +- jhb_intr - intr_event stuff - jhb_ktrace - kernel debugging stuff, possibly per-thread ktrace - jhb_lock - rwlocks - jhb_needresched - scheduler fun From owner-p4-projects@FreeBSD.ORG Thu Jun 16 10:50:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FAC716A420; Thu, 16 Jun 2005 10:50:50 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D9F5C16A41C for ; Thu, 16 Jun 2005 10:50:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C78DC43D1D for ; Thu, 16 Jun 2005 10:50:49 +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.13.1/8.13.1) with ESMTP id j5GAonsc008247 for ; Thu, 16 Jun 2005 10:50:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GAonKI008244 for perforce@freebsd.org; Thu, 16 Jun 2005 10:50:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Jun 2005 10:50:49 GMT Message-Id: <200506161050.j5GAonKI008244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 78613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 10:50:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=78613 Change 78613 by rwatson@rwatson_paprika on 2005/06/16 10:50:02 Darwin uses KERNEL not _KERNEL. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/sbuf.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/sbuf.h#2 (text+ko) ==== @@ -74,7 +74,7 @@ int sbuf_done(struct sbuf *); void sbuf_delete(struct sbuf *); -#ifdef _KERNEL +#ifdef KERNEL struct uio; struct sbuf *sbuf_uionew(struct sbuf *, struct uio *, int *); int sbuf_bcopyin(struct sbuf *, const void *, size_t); From owner-p4-projects@FreeBSD.ORG Thu Jun 16 10:55:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9E0F16A420; Thu, 16 Jun 2005 10:55:56 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7E4FD16A41C for ; Thu, 16 Jun 2005 10:55:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6357F43D4C for ; Thu, 16 Jun 2005 10:55:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GAtu4j008443 for ; Thu, 16 Jun 2005 10:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GAtuYt008440 for perforce@freebsd.org; Thu, 16 Jun 2005 10:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Jun 2005 10:55:56 GMT Message-Id: <200506161055.j5GAtuYt008440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 78614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 10:55:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=78614 Change 78614 by rwatson@rwatson_paprika on 2005/06/16 10:55:50 Remove gratuitous white space differences from FreeBSD in prepartion for merge to Darwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/subr_sbuf.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/subr_sbuf.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ #define SBMALLOC(size) malloc(size) #define SBFREE(buf) free(buf) #define min(x,y) MIN(x,y) - + #endif /* KERNEL */ /* @@ -247,7 +247,7 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + KASSERT(pos >= 0, ("attempt to seek to a negative position (%d)", pos)); KASSERT(pos < s->s_size, @@ -267,10 +267,10 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + if (SBUF_HASOVERFLOWED(s)) return (-1); - + for (; len; len--) { if (!SBUF_HASROOM(s) && sbuf_extend(s, len) < 0) break; @@ -305,7 +305,7 @@ if (copyin(uaddr, s->s_buf + s->s_len, len) != 0) return (-1); s->s_len += len; - + return (0); } #endif @@ -318,7 +318,7 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + sbuf_clear(s); return (sbuf_bcat(s, str, len)); } @@ -331,10 +331,10 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + if (SBUF_HASOVERFLOWED(s)) return (-1); - + while (*str) { if (!SBUF_HASROOM(s) && sbuf_extend(s, strlen(str)) < 0) break; @@ -355,7 +355,7 @@ sbuf_copyin(struct sbuf *s, const void *uaddr, size_t len) { size_t done; - + assert_sbuf_integrity(s); assert_sbuf_state(s, 0); @@ -378,7 +378,7 @@ default: return (-1); /* XXX */ } - + return (0); } #endif @@ -391,7 +391,7 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + sbuf_clear(s); return (sbuf_cat(s, str)); } @@ -466,10 +466,10 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + if (SBUF_HASOVERFLOWED(s)) return (-1); - + if (!SBUF_HASROOM(s) && sbuf_extend(s, 1) < 0) { SBUF_SETFLAG(s, SBUF_OVERFLOWED); return (-1); @@ -492,10 +492,10 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + if (SBUF_HASOVERFLOWED(s)) return (-1); - + while (s->s_len && isspace(s->s_buf[s->s_len-1])) --s->s_len; @@ -519,7 +519,7 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, 0); - + s->s_buf[s->s_len] = '\0'; SBUF_CLEARFLAG(s, SBUF_OVERFLOWED); SBUF_SETFLAG(s, SBUF_FINISHED); @@ -533,7 +533,7 @@ { assert_sbuf_integrity(s); assert_sbuf_state(s, SBUF_FINISHED); - + return s->s_buf; } @@ -545,7 +545,7 @@ { assert_sbuf_integrity(s); /* don't care if it's finished or not */ - + if (SBUF_HASOVERFLOWED(s)) return (-1); return s->s_len; @@ -561,7 +561,7 @@ assert_sbuf_integrity(s); /* don't care if it's finished or not */ - + if (SBUF_ISDYNAMIC(s)) SBFREE(s->s_buf); isdyn = SBUF_ISDYNSTRUCT(s); From owner-p4-projects@FreeBSD.ORG Thu Jun 16 13:30:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 986B016A422; Thu, 16 Jun 2005 13:30:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 55DA316A42F for ; Thu, 16 Jun 2005 13:30:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A97243D1D for ; Thu, 16 Jun 2005 13:30:08 +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.13.1/8.13.1) with ESMTP id j5GDU83N022562 for ; Thu, 16 Jun 2005 13:30:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GDU7jL022558 for perforce@freebsd.org; Thu, 16 Jun 2005 13:30:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Jun 2005 13:30:07 GMT Message-Id: <200506161330.j5GDU7jL022558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 78626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 13:30:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=78626 Change 78626 by rwatson@rwatson_fledge on 2005/06/16 13:29:51 Eliminate MAC entry point mac_create_mbuf_from_mbuf(), which is redundant with respect to existing mbuf copy label routines. Expose a new mac_copy_mbuf() routine at the top end of the Framework and use that; use the existing mpo_copy_mbuf_label() routine on the bottom end. Affected files ... .. //depot/projects/trustedbsd/mac/sys/net/bsd_comp.c#11 edit .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#26 edit .. //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#9 edit .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_output.c#11 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#42 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#28 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#255 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#94 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#208 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#35 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#148 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#277 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#234 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/net/bsd_comp.c#11 (text+ko) ==== @@ -880,7 +880,7 @@ wptr = mtod(dmp, u_char *); space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1; #ifdef MAC - mac_create_mbuf_from_mbuf(cmp, dmp); + mac_copy_mbuf(cmp, dmp); #endif /* ==== //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#26 (text+ko) ==== @@ -1483,7 +1483,7 @@ } } #ifdef MAC - mac_create_mbuf_from_mbuf(m, mp); + mac_copy_mbuf(m, mp); #endif cp = mtod(mp, u_char *); cp[0] = adrs; @@ -1537,7 +1537,7 @@ MGETHDR(mp, M_DONTWAIT, MT_DATA); if (mp != NULL) { #ifdef MAC - mac_create_mbuf_from_mbuf(m, mp); + mac_copy_mbuf(m, mp); #endif m_copydata(m, 0, ilen, mtod(mp, caddr_t)); m_freem(m); ==== //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#9 (text+ko) ==== @@ -523,7 +523,7 @@ ospace -= state->hdrlen; } #ifdef MAC - mac_create_mbuf_from_mbuf(mi, mo); + mac_copy_mbuf(mi, mo); #endif /* ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_output.c#11 (text+ko) ==== @@ -207,7 +207,7 @@ return (ENOBUFS); } #ifdef MAC - mac_create_mbuf_from_mbuf(m, m0); + mac_copy_mbuf(m, m0); #endif m0->m_next = m; /* XXX perhaps we ought to align the header? */ ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#42 (text+ko) ==== @@ -1071,7 +1071,7 @@ M_MOVE_PKTHDR(n, m); n->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC - mac_create_mbuf_from_mbuf(m, n); + mac_copy_mbuf(m, n); #endif n->m_pkthdr.len += optlen; m->m_len -= sizeof(struct ip); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#28 (text+ko) ==== @@ -253,6 +253,17 @@ MAC_PERFORM(copy_mbuf_label, src_label, dest_label); } +void +mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to) +{ + struct label *src_label, *dest_label; + + src_label = mac_mbuf_to_label(m_from); + dest_label = mac_mbuf_to_label(m_to); + + MAC_PERFORM(copy_mbuf_label, src_label, dest_label); +} + static void mac_copy_ifnet_label(struct label *src, struct label *dest) { @@ -298,18 +309,6 @@ } void -mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) -{ - struct label *oldmbuflabel, *newmbuflabel; - - oldmbuflabel = mac_mbuf_to_label(oldmbuf); - newmbuflabel = mac_mbuf_to_label(newmbuf); - - MAC_PERFORM(create_mbuf_from_mbuf, oldmbuf, oldmbuflabel, newmbuf, - newmbuflabel); -} - -void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) { struct label *label; ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#255 (text+ko) ==== @@ -1354,27 +1354,6 @@ } static void -mac_biba_create_mbuf_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) -{ - struct mac_biba *source, *dest; - - source = SLOT(oldmbuflabel); - dest = SLOT(newmbuflabel); - - /* - * Because the source mbuf may not yet have been "created", - * just initialized, we do a conditional copy. Since we don't - * allow mbufs to have ranges, do a KASSERT to make sure that - * doesn't happen. - */ - KASSERT((source->mb_flags & MAC_BIBA_FLAG_RANGE) == 0, - ("mac_biba_create_mbuf_from_mbuf: source mbuf has range")); - mac_biba_copy(source, dest); -} - -static void mac_biba_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -3204,7 +3183,6 @@ .mpo_create_sysv_shm = mac_biba_create_sysv_shm, .mpo_create_ipq = mac_biba_create_ipq, .mpo_create_mbuf_from_inpcb = mac_biba_create_mbuf_from_inpcb, - .mpo_create_mbuf_from_mbuf = mac_biba_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_biba_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_biba_create_mbuf_from_bpfdesc, .mpo_create_mbuf_from_ifnet = mac_biba_create_mbuf_from_ifnet, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#94 (text+ko) ==== @@ -1437,27 +1437,6 @@ } static void -mac_lomac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) -{ - struct mac_lomac *source, *dest; - - source = SLOT(oldmbuflabel); - dest = SLOT(newmbuflabel); - - /* - * Because the source mbuf may not yet have been "created", - * just initialized, we do a conditional copy. Since we don't - * allow mbufs to have ranges, do a KASSERT to make sure that - * doesn't happen. - */ - KASSERT((source->ml_flags & MAC_LOMAC_FLAG_RANGE) == 0, - ("mac_lomac_create_mbuf_from_mbuf: source mbuf has range")); - mac_lomac_copy(source, dest); -} - -static void mac_lomac_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -3131,7 +3110,6 @@ .mpo_create_sysv_shm = mac_lomac_create_sysv_shm, .mpo_create_ipq = mac_lomac_create_ipq, .mpo_create_mbuf_from_inpcb = mac_lomac_create_mbuf_from_inpcb, - .mpo_create_mbuf_from_mbuf = mac_lomac_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_lomac_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_lomac_create_mbuf_from_bpfdesc, .mpo_create_mbuf_from_ifnet = mac_lomac_create_mbuf_from_ifnet, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#208 (text+ko) ==== @@ -1291,27 +1291,6 @@ } static void -mac_mls_create_mbuf_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) -{ - struct mac_mls *source, *dest; - - source = SLOT(oldmbuflabel); - dest = SLOT(newmbuflabel); - - /* - * Because the source mbuf may not yet have been "created", - * just initialized, we do a conditional copy. Since we don't - * allow mbufs to have ranges, do a KASSERT to make sure that - * doesn't happen. - */ - KASSERT((source->mm_flags & MAC_MLS_FLAG_RANGE) == 0, - ("mac_mls_create_mbuf_from_mbuf: source mbuf has range")); - mac_mls_copy(source, dest); -} - -static void mac_mls_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -2986,7 +2965,6 @@ .mpo_create_sysv_sema = mac_mls_create_sysv_sema, .mpo_create_sysv_shm = mac_mls_create_sysv_shm, .mpo_create_mbuf_from_inpcb = mac_mls_create_mbuf_from_inpcb, - .mpo_create_mbuf_from_mbuf = mac_mls_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_mls_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_mls_create_mbuf_from_bpfdesc, .mpo_create_mbuf_from_ifnet = mac_mls_create_mbuf_from_ifnet, ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#35 (text+ko) ==== @@ -400,14 +400,6 @@ } static void -stub_create_mbuf_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) -{ - -} - -static void stub_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -1465,7 +1457,6 @@ .mpo_create_fragment = stub_create_fragment, .mpo_create_ipq = stub_create_ipq, .mpo_create_mbuf_from_inpcb = stub_create_mbuf_from_inpcb, - .mpo_create_mbuf_from_mbuf = stub_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = stub_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = stub_create_mbuf_from_bpfdesc, .mpo_create_mbuf_from_ifnet = stub_create_mbuf_from_ifnet, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#148 (text+ko) ==== @@ -1142,16 +1142,6 @@ } static void -mac_test_create_mbuf_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) -{ - - ASSERT_MBUF_LABEL(oldmbuflabel); - ASSERT_MBUF_LABEL(newmbuflabel); -} - -static void mac_test_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -2530,7 +2520,6 @@ .mpo_create_fragment = mac_test_create_fragment, .mpo_create_ipq = mac_test_create_ipq, .mpo_create_mbuf_from_inpcb = mac_test_create_mbuf_from_inpcb, - .mpo_create_mbuf_from_mbuf = mac_test_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_test_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_test_create_mbuf_from_bpfdesc, .mpo_create_mbuf_from_ifnet = mac_test_create_mbuf_from_ifnet, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#277 (text+ko) ==== @@ -163,6 +163,7 @@ void mac_init_mount(struct mount *); void mac_init_proc(struct proc *); void mac_init_vnode(struct vnode *); +void mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to); void mac_copy_mbuf_tag(struct m_tag *, struct m_tag *); void mac_copy_vnode_label(struct label *, struct label *label); void mac_destroy_bpfdesc(struct bpf_d *); @@ -253,7 +254,6 @@ void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); void mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m); -void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#234 (text+ko) ==== @@ -286,9 +286,6 @@ void (*mpo_create_mbuf_from_inpcb)(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel); - void (*mpo_create_mbuf_from_mbuf)(struct mbuf *oldmbuf, - struct label *oldlabel, struct mbuf *newmbuf, - struct label *newlabel); void (*mpo_create_mbuf_linklayer)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); From owner-p4-projects@FreeBSD.ORG Thu Jun 16 13:47:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60E3216A420; Thu, 16 Jun 2005 13:47:30 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 23EC016A41C for ; Thu, 16 Jun 2005 13:47:30 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED1AA43D4C for ; Thu, 16 Jun 2005 13:47:29 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GDlTV5023285 for ; Thu, 16 Jun 2005 13:47:29 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GDlTuA023282 for perforce@freebsd.org; Thu, 16 Jun 2005 13:47:29 GMT (envelope-from des@freebsd.org) Date: Thu, 16 Jun 2005 13:47:29 GMT Message-Id: <200506161347.j5GDlTuA023282@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 Cc: Subject: PERFORCE change 78628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 13:47:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=78628 Change 78628 by des@des.at.des.no on 2005/06/16 13:46:58 Roll OpenPAM Figwort. Affected files ... .. //depot/projects/openpam/HISTORY#24 edit .. //depot/projects/openpam/RELNOTES#22 edit .. //depot/projects/openpam/include/security/openpam_version.h#14 edit Differences ... ==== //depot/projects/openpam/HISTORY#24 (text+ko) ==== @@ -1,3 +1,16 @@ +OpenPAM Figwort 2005-06-16 + + - BUGFIX: Correct several small signedness and initialization bugs + discovered during review by the NetBSD team. + + - BUGFIX: Modify gendoc.pl to sort cross-references in dictionary + order within each section. + + - ENHANCE: if a policy specifies a relative module path, prepend the + module directory so we never call dlopen(3) with a relative path. + + - ENHANCE: add a pam.conf(5) manual page. +============================================================================ OpenPAM Feterita 2005-02-01 - BUGFIX: Correct numerous markup errors, invalid cross-references, @@ -16,7 +29,6 @@ - ENHANCE: Minor overhaul of the autoconf / build system. - ENHANCE: Add openpam_free_envlist(3). - ============================================================================ OpenPAM Eelgrass 2004-02-10 @@ -292,4 +304,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#23 $ +$P4: //depot/projects/openpam/HISTORY#24 $ ==== //depot/projects/openpam/RELNOTES#22 (text+ko) ==== @@ -1,6 +1,6 @@ - Release notes for OpenPAM Feterita - ================================== + Release notes for OpenPAM Figwort + ================================= This release corresponds to the code used in FreeBSD-CURRENT as of the release date. It has also been tested on several other platforms, and @@ -26,4 +26,4 @@ Please direct bug reports and inquiries to . -$P4: //depot/projects/openpam/RELNOTES#21 $ +$P4: //depot/projects/openpam/RELNOTES#22 $ ==== //depot/projects/openpam/include/security/openpam_version.h#14 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#13 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#14 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20050201 -#define _OPENPAM_RELEASE "Feterita" +#define _OPENPAM_VERSION 20050616 +#define _OPENPAM_RELEASE "Figwort" #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 16 13:48:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1114216A420; Thu, 16 Jun 2005 13:48:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D262B16A41C for ; Thu, 16 Jun 2005 13:48:31 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB0AA43D4C for ; Thu, 16 Jun 2005 13:48:31 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GDmVxb023345 for ; Thu, 16 Jun 2005 13:48:31 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GDmVd9023342 for perforce@freebsd.org; Thu, 16 Jun 2005 13:48:31 GMT (envelope-from des@freebsd.org) Date: Thu, 16 Jun 2005 13:48:31 GMT Message-Id: <200506161348.j5GDmVd9023342@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 Cc: Subject: PERFORCE change 78629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 13:48:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=78629 Change 78629 by des@des.at.des.no on 2005/06/16 13:47:48 Bump release date. Affected files ... .. //depot/projects/openpam/configure.ac#3 edit Differences ... ==== //depot/projects/openpam/configure.ac#3 (text+ko) ==== @@ -1,7 +1,7 @@ -dnl $P4: //depot/projects/openpam/configure.ac#2 $ +dnl $P4: //depot/projects/openpam/configure.ac#3 $ AC_PREREQ(2.53) -AC_INIT([OpenPAM],[20050201],[des@freebsd.org],[openpam]) +AC_INIT([OpenPAM],[20050616],[des@freebsd.org],[openpam]) AC_CONFIG_SRCDIR([lib/pam_start.c]) AM_CONFIG_HEADER([config.h]) From owner-p4-projects@FreeBSD.ORG Thu Jun 16 17:53:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8488716A420; Thu, 16 Jun 2005 17:53:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 57DD516A41C for ; Thu, 16 Jun 2005 17:53:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B01143D1D for ; Thu, 16 Jun 2005 17:53:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GHr3Gh040389 for ; Thu, 16 Jun 2005 17:53:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GHr3Ip040386 for perforce@freebsd.org; Thu, 16 Jun 2005 17:53:03 GMT (envelope-from jhb@freebsd.org) Date: Thu, 16 Jun 2005 17:53:03 GMT Message-Id: <200506161753.j5GHr3Ip040386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 17:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=78637 Change 78637 by jhb@jhb_slimer on 2005/06/16 17:52:47 Update. Affected files ... .. //depot/projects/smpng/sys/notes#40 edit Differences ... ==== //depot/projects/smpng/sys/notes#40 (text+ko) ==== @@ -86,6 +86,7 @@ - arm, powerpc? - fork counts? - Add a cache-line padded mtx_aligned union and use it for the mutex pools. +- Robert wants intrcnt's for IPIs Active child branches: - jhb_intr - intr_event stuff From owner-p4-projects@FreeBSD.ORG Thu Jun 16 18:24:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAFAA16A420; Thu, 16 Jun 2005 18:24:44 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6D4AB16A41C for ; Thu, 16 Jun 2005 18:24:44 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46D4043D49 for ; Thu, 16 Jun 2005 18:24:44 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GIOiEj041858 for ; Thu, 16 Jun 2005 18:24:44 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GIOhPD041855 for perforce@freebsd.org; Thu, 16 Jun 2005 18:24:43 GMT (envelope-from areisse@nailabs.com) Date: Thu, 16 Jun 2005 18:24:43 GMT Message-Id: <200506161824.j5GIOhPD041855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 78641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 18:24:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=78641 Change 78641 by areisse@areisse_ibook on 2005/06/16 18:24:09 Many label handle related fixes: -Use the zone allocator and properly free the ports. -Locking fixes. -Move the security.defs calls to a new file, kern/security.c. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/conf/files#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_init.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/conf/files#2 (text+ko) ==== @@ -168,6 +168,7 @@ osfmk/kern/processor.c standard osfmk/kern/queue.c standard osfmk/kern/sched_prim.c standard +osfmk/kern/security.c standard osfmk/kern/sscanf.c standard osfmk/kern/startup.c standard osfmk/kern/sync_lock.c standard ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_init.c#3 (text+ko) ==== @@ -165,6 +165,12 @@ /* make it exhaustible */ zone_change(ipc_object_zones[IOT_PORT_SET], Z_EXHAUST, TRUE); + ipc_labelh_zone = + zinit(sizeof(struct ipc_labelh), + ipc_port_max * sizeof(struct ipc_labelh), + sizeof(struct ipc_labelh), + "label handles"); + /* create special spaces */ kr = ipc_space_create_special(&ipc_space_kernel); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#3 (text+ko) ==== @@ -4,6 +4,8 @@ #include #include +zone_t ipc_labelh_zone; + kern_return_t mac_label_new (ipc_space_t task, mach_port_name_t *name, vm_offset_t labelstr) { @@ -21,7 +23,7 @@ port = ipc_port_alloc_kernel(); - lh = kalloc(sizeof(struct ipc_labelh)); + lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); io_lock_init(lh); lh->lh_port = port; lh->lh_type = 0; @@ -44,7 +46,7 @@ */ ipc_labelh_t labelh_new () { - ipc_labelh_t lh = (ipc_labelh_t) kalloc(sizeof(struct ipc_labelh)); + ipc_labelh_t lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); io_lock_init(lh); lh->lh_port = ipc_port_alloc_kernel(); lh->lh_type = 0; @@ -58,7 +60,7 @@ ipc_labelh_t labelh_duplicate (ipc_labelh_t old) { - ipc_labelh_t lh = (ipc_labelh_t) kalloc(sizeof(struct ipc_labelh)); + ipc_labelh_t lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); io_lock_init(lh); lh->lh_port = ipc_port_alloc_kernel(); lh->lh_type = 0; @@ -93,7 +95,7 @@ return lh; } -void labelh_release (ipc_labelh_t lh) +void labelh_release(ipc_labelh_t lh) { lh_lock(lh); lh_release(lh); @@ -102,6 +104,7 @@ void lh_free (ipc_labelh_t lh) { - ipc_object_release(lh->lh_port); + ipc_object_release(&lh->lh_port->ip_object); mac_destroy_port_label (&lh->lh_label); + zfree(ipc_labelh_zone, (vm_offset_t)lh); } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#3 (text+ko) ==== @@ -32,6 +32,8 @@ (lh)->lh_references--; \ MACRO_END +extern zone_t ipc_labelh_zone; + #define lh_lock io_lock #define lh_unlock io_unlock ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#3 (text+ko) ==== @@ -995,6 +995,11 @@ * that takes a security label as a parameter. In this case, we want * to use the label stored in the label handle and not the label on its * port. + * + * The port should be locked for this call. The lock protecting + * label handle contents should not be necessary, as they can only + * be modified when a label handle with one reference is a task label. + * User allocated label handles can never be modified. */ struct label *io_getlabel (ipc_object_t objp) ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#3 (text+ko) ==== @@ -226,42 +226,15 @@ (io)->io_references--; \ MACRO_END -/* There doesn't seem to be an established lock order for two - ipc_objects of the same type */ -extern inline void io_lock2 (ipc_object_t a, ipc_object_t b) -{ - if (a == b) - io_lock (a); - else if (a < b) - { - io_lock (a); - io_lock (b); - } - else - { - io_lock (b); - io_lock (a); - } -} +/* + * Retrieve a label for use in a kernel call that takes a security + * label as a parameter. If necessary, io_getlabel acquires internal + * (not io_lock) locks, and io_unlocklabel releases them. + */ -extern inline void io_unlock2 (ipc_object_t a, ipc_object_t b) -{ - if (a == b) - io_unlock (a); - else if (a < b) - { - io_unlock (b); - io_unlock (a); - } - else - { - io_unlock (a); - io_unlock (b); - } -} - struct label; extern struct label *io_getlabel (ipc_object_t obj); +#define io_unlocklabel(obj) /* * Exported interfaces ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#3 (text+ko) ==== @@ -1792,6 +1792,7 @@ mac_externalize_port_label (l, policies, outlabel, 512, 0); + io_unlocklabel(entry->ie_object); io_unlock (entry->ie_object); return 0; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.c#2 (text+ko) ==== @@ -88,6 +88,7 @@ #include #include #include +#include #include @@ -515,6 +516,10 @@ host_notify_port_destroy(port); break; + case IKOT_LABELH: + labelh_release(port->ip_kobject); + break; + default: break; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#3 (text+ko) ==== @@ -1756,6 +1756,31 @@ return (current_task_fast()); } +/* + * Protect 2 task labels against modification by adding a reference on + * both label handles. The locks do not actually have to be held while + * using the labels as only labels with one reference can be modified + * in place. + */ + +void +tasklabel_lock2( + task_t a, + task_t b) +{ + labelh_reference(a->label); + labelh_reference(b->label); +} + +void +tasklabel_unlock2( + task_t a, + task_t b) +{ + labelh_release(a->label); + labelh_release(b->label); +} + void mac_update_task_label (struct label *pl, struct task *t) { tasklabel_lock (t); @@ -1776,160 +1801,3 @@ tasklabel_unlock (pt); } -kern_return_t -mach_get_task_label_text( - task_t t, - labelstr_t policies, - labelstr_t outl) -{ - tasklabel_lock (t); - mac_externalize_task_label (&t->maclabel, policies, outl, 512, 0); - tasklabel_unlock (t); - - return KERN_SUCCESS; -} - -int mac_check_task_service_access (task_t self, task_t obj, const char * perm) -{ - tasklabel_lock2 (self, obj); - - int rc = mac_check_service_access (&self->maclabel, &obj->maclabel, - "mach_task", perm); - - tasklabel_unlock2 (self, obj); - - return rc; -} - -kern_return_t -mac_check_named_access (ipc_space_t space, labelstr_t subj, labelstr_t obj, - labelstr_t serv, labelstr_t perm) -{ - struct label subjl, objl; - - mac_init_task_label (&subjl); - int rc = mac_internalize_port_label (&subjl, subj); - if (rc) - { - mac_destroy_task_label (&subjl); - return KERN_INVALID_ARGUMENT; - } - mac_init_task_label (&objl); - rc = mac_internalize_port_label (&objl, obj); - if (rc) - { - mac_destroy_task_label (&subjl); - mac_destroy_task_label (&objl); - return KERN_INVALID_ARGUMENT; - } - - rc = mac_check_service_access (&subjl, &objl, serv, perm); - mac_destroy_task_label (&subjl); - mac_destroy_task_label (&objl); - if (rc == /*EINVAL*/ 22) - return KERN_INVALID_ARGUMENT; - else if (rc != 0) - return KERN_NO_ACCESS; - else - return 0; -} - -kern_return_t -mac_check_name_port_access (ipc_space_t space, labelstr_t subj, mach_port_name_t obj, - labelstr_t serv, labelstr_t perm) -{ - struct label subjl; - ipc_entry_t entry; - ipc_object_t objp; - kern_return_t kr; - struct label *objl; - - if (space == IS_NULL || space->is_task == NULL) - return KERN_INVALID_TASK; - - if (!MACH_PORT_VALID(obj)) - return KERN_INVALID_NAME; - - mac_init_task_label (&subjl); - int rc = mac_internalize_port_label (&subjl, subj); - if (rc) - { - mac_destroy_task_label (&subjl); - return KERN_INVALID_ARGUMENT; - } - - kr = ipc_right_lookup_write(space, obj, &entry); - if (kr != KERN_SUCCESS) - { - mac_destroy_task_label (&subjl); - return kr; - } - - objp = entry->ie_object; - io_lock (objp); - is_write_unlock (space); - - objl = io_getlabel (objp); - if (objl == NULL) { - io_unlock (objp); - return KERN_INVALID_ARGUMENT; - } - - rc = mac_check_service_access (&subjl, objl, serv, perm); - io_unlock (objp); - - mac_destroy_task_label (&subjl); - if (rc == /*EINVAL*/ 22) - return KERN_INVALID_ARGUMENT; - else if (rc != 0) - return KERN_NO_ACCESS; - else - return 0; -} - -kern_return_t -mac_check_port_access (ipc_space_t space, mach_port_name_t sub, mach_port_name_t obj, - labelstr_t serv, labelstr_t perm) -{ - ipc_entry_t subi, obji; - ipc_object_t subp, objp; - kern_return_t kr; - struct label *objl, *subl; - int rc; - - if (space == IS_NULL || space->is_task == NULL) - return KERN_INVALID_TASK; - - if (!MACH_PORT_VALID(obj) || !MACH_PORT_VALID(sub)) - return KERN_INVALID_NAME; - - kr = ipc_right_lookup_two_write(space, obj, &obji, sub, &subi); - if (kr != KERN_SUCCESS) - return kr; - - objp = obji->ie_object; - subp = subi->ie_object; - is_write_unlock (space); - - io_lock2 (objp, subp); - objl = io_getlabel (objp); - if (objl == NULL) - goto errout; - subl = io_getlabel (subp); - if (subl == NULL) - goto errout; - - rc = mac_check_service_access (subl, objl, serv, perm); - io_unlock2 (subp, objp); - - if (rc == /*EINVAL*/ 22) - return KERN_INVALID_ARGUMENT; - else if (rc != 0) - return KERN_NO_ACCESS; - else - return 0; - - errout: - io_unlock2 (subp, objp); - return KERN_INVALID_ARGUMENT; -} ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.h#3 (text+ko) ==== @@ -245,8 +245,8 @@ #define tasklabel_lock(task) io_lock((task)->label) #define tasklabel_unlock(task) io_unlock((task)->label) -#define tasklabel_lock2(a,b) /*io_lock2 ((a)->label, (b)->label)*/ -#define tasklabel_unlock2(a,b) /*io_unlock2 ((a)->label, (b)->label)*/ +extern void tasklabel_lock2(task_t a, task_t b); +extern void tasklabel_unlock2(task_t a, task_t b); #endif ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#2 (text+ko) ==== @@ -23,6 +23,12 @@ policies : labelstr_t; out label : labelstr_t); +/* + * Relabel a port. This does not alter the user label data in a label + * handle, but changes the label that is used for access control on the + * port itself. That label cannot be retrieved (with the current interfaces). + */ + routine mach_set_port_label(task : ipc_space_t; name : mach_port_name_t; label : labelstr_t); From owner-p4-projects@FreeBSD.ORG Thu Jun 16 19:40:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1236316A420; Thu, 16 Jun 2005 19:40:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DBE6516A41F for ; Thu, 16 Jun 2005 19:40:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C907E43D49 for ; Thu, 16 Jun 2005 19:40:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GJeGif045734 for ; Thu, 16 Jun 2005 19:40:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GJeG16045731 for perforce@freebsd.org; Thu, 16 Jun 2005 19:40:16 GMT (envelope-from jhb@freebsd.org) Date: Thu, 16 Jun 2005 19:40:16 GMT Message-Id: <200506161940.j5GJeG16045731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 19:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=78645 Change 78645 by jhb@jhb_slimer on 2005/06/16 19:40:11 Revert this hack as it didn't fix the PnP BIOS problem. Affected files ... .. //depot/projects/smpng/sys/i386/i386/locore.s#26 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/locore.s#26 (text+ko) ==== @@ -783,24 +783,9 @@ movl $1,%ecx fillkptphys(%edx) -#define BIOS_START 0xc0000 -#define BIOS_END 0xfffff - -/* Map read-only from page 1 to the beginning of BIOS */ +/* Map read-only from page 1 to the beginning of the kernel text section */ movl $PAGE_SIZE, %eax xorl %edx,%edx - movl $(BIOS_START - PAGE_SIZE)/PAGE_SIZE,%ecx - fillkptphys(%edx) - -/* Map the BIOS read-write for BIOS calls that want to write to it */ - movl $BIOS_START, %eax - movl $PG_RW,%edx - movl $(BIOS_END + 1 - BIOS_START)/PAGE_SIZE,%ecx - fillkptphys(%edx) - -/* Map read-only from the BIOS to the beginning of the kernel text section */ - movl $BIOS_END + 1, %eax - xorl %edx,%edx movl $R(btext),%ecx addl $PAGE_MASK,%ecx subl %eax,%ecx From owner-p4-projects@FreeBSD.ORG Thu Jun 16 19:41:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0096516A421; Thu, 16 Jun 2005 19:41:18 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B8E2F16A41C for ; Thu, 16 Jun 2005 19:41:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A195B43D58 for ; Thu, 16 Jun 2005 19:41:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GJfIUI045846 for ; Thu, 16 Jun 2005 19:41:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GJfIus045843 for perforce@freebsd.org; Thu, 16 Jun 2005 19:41:18 GMT (envelope-from jhb@freebsd.org) Date: Thu, 16 Jun 2005 19:41:18 GMT Message-Id: <200506161941.j5GJfIus045843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 19:41:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=78646 Change 78646 by jhb@jhb_slimer on 2005/06/16 19:41:15 The current method of turning the local APIC off and then back on is confirmed to work ok, so remove this alternative fix that left the APIC on but registered a handler for the spurious APIC interrupts that can be triggered by the Errata in question. Affected files ... .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#14 edit .. //depot/projects/smpng/sys/i386/i386/exception.s#23 edit .. //depot/projects/smpng/sys/i386/i386/initcpu.c#24 edit .. //depot/projects/smpng/sys/i386/i386/local_apic.c#30 edit .. //depot/projects/smpng/sys/i386/i386/machdep.c#94 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/apic_vector.s#14 (text+ko) ==== @@ -107,8 +107,6 @@ iret -#ifdef DEV_APIC - ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) ISR_VEC(3, apic_isr3) @@ -383,4 +381,3 @@ POP_FRAME iret #endif /* SMP */ -#endif /* DEV_APIC */ ==== //depot/projects/smpng/sys/i386/i386/exception.s#23 (text+ko) ==== @@ -234,12 +234,14 @@ #include +#ifdef DEV_APIC .data .p2align 4 .text SUPERALIGN_TEXT #include +#endif .data .p2align 4 ==== //depot/projects/smpng/sys/i386/i386/initcpu.c#24 (text+ko) ==== @@ -68,6 +68,7 @@ #ifdef I686_CPU static void init_6x86MX(void); +static void init_ppro(void); static void init_mendocino(void); #endif @@ -471,6 +472,19 @@ write_eflags(eflags); } +static void +init_ppro(void) +{ + u_int64_t apicbase; + + /* + * Local APIC should be disabled if it is not going to be used. + */ + apicbase = rdmsr(MSR_APICBASE); + apicbase &= ~APICBASE_ENABLED; + wrmsr(MSR_APICBASE, apicbase); +} + /* * Initialize BBL_CR_CTL3 (Control register 3: used to configure the * L2 cache). @@ -561,6 +575,9 @@ case CPU_686: if (strcmp(cpu_vendor, "GenuineIntel") == 0) { switch (cpu_id & 0xff0) { + case 0x610: + init_ppro(); + break; case 0x660: init_mendocino(); break; ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#30 (text+ko) ==== @@ -747,6 +747,7 @@ apic_init(void *dummy __unused) { struct apic_enumerator *enumerator; + uint64_t apic_base; int retval, best; /* We only support built in local APICs. */ @@ -779,6 +780,18 @@ printf("APIC: Using the %s enumerator.\n", best_enum->apic_name); + /* + * To work around an errata, we disable the local APIC on some + * CPUs during early startup. We need to turn the local APIC back + * on on such CPUs now. + */ + if (cpu == CPU_686 && strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xff0) == 0x610) { + apic_base = rdmsr(MSR_APICBASE); + apic_base |= APICBASE_ENABLED; + wrmsr(MSR_APICBASE, apic_base); + } + /* Second, probe the CPU's in the system. */ retval = best_enum->apic_probe_cpus(); if (retval != 0) ==== //depot/projects/smpng/sys/i386/i386/machdep.c#94 (text+ko) ==== @@ -112,7 +112,6 @@ #include #include #include -#include #include #include #include @@ -2141,13 +2140,6 @@ setidt(IDT_SYSCALL, &IDTVEC(int0x80_syscall), SDT_SYS386TGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL)); - /* - * Workaround for PentiumPro Errata 5AP: Spurious interrupts routed - * to int15 in APIC virtual wire mode. - */ - setidt(15, &IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL, - GSEL(GCODE_SEL, SEL_KPL)); - r_idt.rd_limit = sizeof(idt0) - 1; r_idt.rd_base = (int) idt; lidt(&r_idt); From owner-p4-projects@FreeBSD.ORG Thu Jun 16 19:43:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2C2716A420; Thu, 16 Jun 2005 19:43:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 ACC4A16A41C for ; Thu, 16 Jun 2005 19:43:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AAD543D1F for ; Thu, 16 Jun 2005 19:43:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GJhLTe046066 for ; Thu, 16 Jun 2005 19:43:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GJhLMa046063 for perforce@freebsd.org; Thu, 16 Jun 2005 19:43:21 GMT (envelope-from jhb@freebsd.org) Date: Thu, 16 Jun 2005 19:43:21 GMT Message-Id: <200506161943.j5GJhLMa046063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 19:43:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=78647 Change 78647 by jhb@jhb_slimer on 2005/06/16 19:42:33 Add some extra witness checks to catch threads exiting with locks held. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#95 edit .. //depot/projects/smpng/sys/kern/kern_kse.c#20 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#95 (text+ko) ==== @@ -505,6 +505,8 @@ wakeup(p->p_pptr); PROC_UNLOCK(p->p_pptr); + WITNESS_WARN(WARN_PANIC, &p->p_mtx, "process (pid %d) exiting", + p->p_pid); mtx_lock_spin(&sched_lock); critical_exit(); ==== //depot/projects/smpng/sys/kern/kern_kse.c#20 (text+ko) ==== @@ -1304,7 +1304,7 @@ thread_export_context(td, 0); /* * There is something to report, and we own an upcall - * strucuture, we can go to userland. + * structure, we can go to userland. * Turn ourself into an upcall thread. */ td->td_pflags |= TDP_UPCALLING; @@ -1313,6 +1313,8 @@ PROC_LOCK(p); if (kg->kg_upsleeps) wakeup(&kg->kg_completed); + WITNESS_WARN(WARN_PANIC, &p->p_mtx, + "thread exiting in userret"); mtx_lock_spin(&sched_lock); thread_stopped(p); thread_exit(); From owner-p4-projects@FreeBSD.ORG Thu Jun 16 19:43:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EBE316A44F; Thu, 16 Jun 2005 19:43:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0B87C16A41C for ; Thu, 16 Jun 2005 19:43:22 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBCEF43D1F for ; Thu, 16 Jun 2005 19:43:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GJhLlG046076 for ; Thu, 16 Jun 2005 19:43:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GJhLCB046069 for perforce@freebsd.org; Thu, 16 Jun 2005 19:43:21 GMT (envelope-from jhb@freebsd.org) Date: Thu, 16 Jun 2005 19:43:21 GMT Message-Id: <200506161943.j5GJhLCB046069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 19:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=78648 Change 78648 by jhb@jhb_slimer on 2005/06/16 19:43:00 Update. Affected files ... .. //depot/projects/smpng/sys/notes#41 edit Differences ... ==== //depot/projects/smpng/sys/notes#41 (text+ko) ==== @@ -3,11 +3,6 @@ - Consolidate linux module version and dependencies into MI location. - Untested -- Use an explicit IDT handler for the PPro errata 5AP. - - CVS already has a different work around where we disable the local APIC - on these processors. However, the apic(4) code tries to re-enable the - local APIC. We need to test to see if that works. If it doesn't, we - need to use this solution instead of the disable local APIC hack. - Redo sched_lock locking for i386 ldt to not use mtx_owned(). This is the only user of mtx_owned() on spin locks and keeps us from optimizing spin locks on UP kernels to only do critical sections. From owner-p4-projects@FreeBSD.ORG Fri Jun 17 01:08:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1596116A420; Fri, 17 Jun 2005 01:08:55 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D1BD916A41C for ; Fri, 17 Jun 2005 01:08:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC72C43D48 for ; Fri, 17 Jun 2005 01:08:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5H18sJl075491 for ; Fri, 17 Jun 2005 01:08:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5H18sqq075488 for perforce@freebsd.org; Fri, 17 Jun 2005 01:08:54 GMT (envelope-from wsalamon@computer.org) Date: Fri, 17 Jun 2005 01:08:54 GMT Message-Id: <200506170108.j5H18sqq075488@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 Cc: Subject: PERFORCE change 78653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 01:08:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=78653 Change 78653 by wsalamon@rickenbacker on 2005/06/17 01:08:00 Change the auditctl() prototype back to match that in Darwin, where only the audit log filename can be passed in. Some other manner will be used to send triggers in non-Mach systems. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#21 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#11 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#14 (text+ko) ==== @@ -659,6 +659,6 @@ *auditinfo_addr, u_int length); } 452 AUE_SETAUDIT_ADDR MSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -453 AUE_AUDITCTL MSTD { int auditctl(int cmd, void *data, u_int length); } +453 AUE_AUDITCTL MSTD { int auditctl(char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#21 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#11 (text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#7 (text+ko) ==== @@ -149,13 +149,6 @@ #define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ -/* - * auditctl(2) commands - */ -#define AC_SETLOGFILE 1 -#define AC_SHUTDOWN 2 -#define AC_SENDTRIGGER 3 - __BEGIN_DECLS typedef uid_t au_id_t; @@ -291,7 +284,7 @@ int audit (const void *, int); int auditon (int, void *, int); -int auditctl (int, const void *, u_int); +int auditctl (const char *); int getauid (au_id_t *); int setauid (const au_id_t *); int getaudit (struct auditinfo *); From owner-p4-projects@FreeBSD.ORG Fri Jun 17 01:41:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAEC416A420; Fri, 17 Jun 2005 01:41:38 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5F65316A41C for ; Fri, 17 Jun 2005 01:41:38 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4262C43D49 for ; Fri, 17 Jun 2005 01:41:38 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5H1fcqm076669 for ; Fri, 17 Jun 2005 01:41:38 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5H1fb92076666 for perforce@freebsd.org; Fri, 17 Jun 2005 01:41:37 GMT (envelope-from wsalamon@computer.org) Date: Fri, 17 Jun 2005 01:41:37 GMT Message-Id: <200506170141.j5H1fb92076666@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 Cc: Subject: PERFORCE change 78654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 01:41:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=78654 Change 78654 by wsalamon@rickenbacker on 2005/06/17 01:40:59 Update the kernel changes to auditctl(), for real this time. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#12 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#22 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#12 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#22 (text+ko) ==== @@ -1215,7 +1215,6 @@ struct nameidata nd; struct ucred *cred; struct vnode *vp; - union auditctl_udata udata; int error = 0; int flags; @@ -1223,70 +1222,44 @@ if (error) return (error); - /* Some commands don't have associated data; only copy in data if - * it is there. - */ - if (uap->data != NULL) { - if ((uap->length <= 0) || - (uap->length > sizeof(union auditctl_udata))) - return (EINVAL); - - error = copyin(uap->data, (void *)&udata, uap->length); - if (error) - return error; - } - vp = NULL; cred = NULL; - switch (uap->cmd) { - case AC_SETLOGFILE: - /* - * If a path is specified, open the replacement vnode, perform - * validity checks, and grab another reference to the current - * credential. - */ - if (udata.ac_path == NULL) - return (EINVAL); + /* + * If a path is specified, open the replacement vnode, perform + * validity checks, and grab another reference to the current + * credential. + */ + if (uap->path == NULL) + return (EINVAL); - fn = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(udata.ac_path, fn, MAXPATHLEN, NULL); - if (error != 0) - goto err_out; + fn = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(uap->path, fn, MAXPATHLEN, NULL); + if (error != 0) + goto err_out; - mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, fn, td); - flags = audit_open_flags; - error = vn_open(&nd, &flags, 0, -1); - if (error) { - mtx_unlock(&Giant); - goto err_out; - } - VOP_UNLOCK(nd.ni_vp, 0, td); - vp = nd.ni_vp; - if (vp->v_type != VREG) { - vn_close(vp, audit_close_flags, - td->td_ucred, td); - mtx_unlock(&Giant); - error = EINVAL; - goto err_out; - } - cred = td->td_ucred; - crhold(cred); - audit_suspended = 0; - + mtx_lock(&Giant); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, fn, td); + flags = audit_open_flags; + error = vn_open(&nd, &flags, 0, -1); + if (error) { + mtx_unlock(&Giant); + goto err_out; + } + VOP_UNLOCK(nd.ni_vp, 0, td); + vp = nd.ni_vp; + if (vp->v_type != VREG) { + vn_close(vp, audit_close_flags, td->td_ucred, td); mtx_unlock(&Giant); - audit_rotate_vnode(cred, vp); - break; + error = EINVAL; + goto err_out; + } + cred = td->td_ucred; + crhold(cred); + audit_suspended = 0; - case AC_SHUTDOWN: - audit_shutdown(); - break; - - case AC_SENDTRIGGER: - error = send_trigger(udata.ac_trigger); - break; - } + mtx_unlock(&Giant); + audit_rotate_vnode(cred, vp); err_out: if (fn) ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#12 (text+ko) ==== @@ -1336,9 +1336,7 @@ char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)]; }; struct auditctl_args { - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; - char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; }; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); From owner-p4-projects@FreeBSD.ORG Fri Jun 17 01:54:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2007816A420; Fri, 17 Jun 2005 01:54:55 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DFB5E16A41C for ; Fri, 17 Jun 2005 01:54:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B698A43D1F for ; Fri, 17 Jun 2005 01:54:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5H1ssxl077090 for ; Fri, 17 Jun 2005 01:54:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5H1sscO077087 for perforce@freebsd.org; Fri, 17 Jun 2005 01:54:54 GMT (envelope-from wsalamon@computer.org) Date: Fri, 17 Jun 2005 01:54:54 GMT Message-Id: <200506170154.j5H1sscO077087@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 Cc: Subject: PERFORCE change 78655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 01:54:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=78655 Change 78655 by wsalamon@rickenbacker on 2005/06/17 01:54:17 Remove the obsolete union definition for the auditctl() syscall now that it only takes a single char * parameter. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#14 (text+ko) ==== @@ -131,11 +131,6 @@ u_short so_lport; /* local port */ }; -union auditctl_udata { - char *ac_path; - unsigned int ac_trigger; -}; - union auditon_udata { char *au_path; long au_cond; From owner-p4-projects@FreeBSD.ORG Fri Jun 17 06:24:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD7A616A420; Fri, 17 Jun 2005 06:24:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9FEE116A41C for ; Fri, 17 Jun 2005 06:24:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75A5343D4C for ; Fri, 17 Jun 2005 06:24:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5H6OJsF095850 for ; Fri, 17 Jun 2005 06:24:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5H6OImS095847 for perforce@freebsd.org; Fri, 17 Jun 2005 06:24:18 GMT (envelope-from marcel@freebsd.org) Date: Fri, 17 Jun 2005 06:24:18 GMT Message-Id: <200506170624.j5H6OImS095847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 78658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 06:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=78658 Change 78658 by marcel@marcel_nfs on 2005/06/17 06:23:53 IFC @78657 Affected files ... .. //depot/projects/tty/Makefile#12 integrate .. //depot/projects/tty/Makefile.inc1#22 integrate .. //depot/projects/tty/bin/chflags/chflags.1#9 integrate .. //depot/projects/tty/bin/dd/dd.1#6 integrate .. //depot/projects/tty/bin/sh/sh.1#10 integrate .. //depot/projects/tty/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/tty/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/tty/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/tty/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.8#6 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.8#5 integrate .. //depot/projects/tty/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/tty/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/tty/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/tty/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/tty/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/tty/contrib/hostapd/Makefile#2 integrate .. //depot/projects/tty/contrib/hostapd/common.h#2 integrate .. //depot/projects/tty/contrib/hostapd/config.c#2 integrate .. //depot/projects/tty/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/tty/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/tty/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/tty/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/tty/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/tty/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/tty/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/tty/contrib/hostapd/version.h#2 integrate .. //depot/projects/tty/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/tty/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/tty/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/radius.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/radius.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/tty/etc/mtree/BSD.x11-4.dist#6 integrate .. //depot/projects/tty/etc/pccard_ether#9 integrate .. //depot/projects/tty/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/tty/etc/sendmail/freefall.mc#2 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/tty/gnu/usr.bin/send-pr/send-pr.1#5 integrate .. //depot/projects/tty/lib/libarchive/libarchive-formats.5#5 integrate .. //depot/projects/tty/lib/libarchive/tar.5#5 integrate .. //depot/projects/tty/lib/libautofs/libautofs.3#3 integrate .. //depot/projects/tty/lib/libc/gen/msgrcv.3#3 integrate .. //depot/projects/tty/lib/libc/gen/sysctl.3#7 integrate .. //depot/projects/tty/lib/libc/gen/ttyname.3#4 integrate .. //depot/projects/tty/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/tty/lib/libc/net/getaddrinfo.3#9 integrate .. //depot/projects/tty/lib/libc/net/getnameinfo.3#8 integrate .. //depot/projects/tty/lib/libc/net/getnetent.3#5 integrate .. //depot/projects/tty/lib/libc/net/inet6_rth_space.3#6 integrate .. //depot/projects/tty/lib/libc/nls/catgets.3#3 integrate .. //depot/projects/tty/lib/libc/sys/send.2#7 integrate .. //depot/projects/tty/lib/libmd/sha.3#6 integrate .. //depot/projects/tty/lib/libmd/sha256.3#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_exec/pam_exec.8#5 integrate .. //depot/projects/tty/lib/libpam/modules/pam_radius/pam_radius.c#7 integrate .. //depot/projects/tty/lib/libsdp/sdp.3#6 integrate .. //depot/projects/tty/lib/libthr/libthr.3#2 integrate .. //depot/projects/tty/lib/msun/man/fenv.3#4 integrate .. //depot/projects/tty/lib/msun/man/ieee.3#6 integrate .. //depot/projects/tty/lib/msun/man/lround.3#3 integrate .. //depot/projects/tty/lib/msun/man/math.3#5 integrate .. //depot/projects/tty/lib/msun/man/round.3#4 integrate .. //depot/projects/tty/lib/msun/man/trunc.3#3 integrate .. //depot/projects/tty/libexec/getty/ttys.5#4 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.1#7 integrate .. //depot/projects/tty/release/Makefile#19 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#10 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate .. //depot/projects/tty/release/scripts/lib32-make.sh#1 branch .. //depot/projects/tty/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/tty/sbin/devfs/devfs.8#5 integrate .. //depot/projects/tty/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/tty/sbin/gpt/gpt.8#6 integrate .. //depot/projects/tty/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/tty/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#17 integrate .. //depot/projects/tty/sbin/mount/mount.8#9 integrate .. //depot/projects/tty/sbin/savecore/savecore.8#7 integrate .. //depot/projects/tty/share/man/man1/builtin.1#3 integrate .. //depot/projects/tty/share/man/man3/pthread_atfork.3#2 integrate .. //depot/projects/tty/share/man/man4/acpi.4#12 integrate .. //depot/projects/tty/share/man/man4/carp.4#3 integrate .. //depot/projects/tty/share/man/man4/cdce.4#2 integrate .. //depot/projects/tty/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/tty/share/man/man4/ed.4#6 integrate .. //depot/projects/tty/share/man/man4/geom.4#8 integrate .. //depot/projects/tty/share/man/man4/icmp6.4#5 integrate .. //depot/projects/tty/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/tty/share/man/man4/ipw.4#3 integrate .. //depot/projects/tty/share/man/man4/iwi.4#4 integrate .. //depot/projects/tty/share/man/man4/man4.i386/acpi_fujitsu.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/mcd.4#5 integrate .. //depot/projects/tty/share/man/man4/man4.i386/pnp.4#3 integrate .. //depot/projects/tty/share/man/man4/man4.i386/smapi.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_nat.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_netflow.4#5 integrate .. //depot/projects/tty/share/man/man4/ng_source.4#5 integrate .. //depot/projects/tty/share/man/man4/ng_tcpmss.4#2 integrate .. //depot/projects/tty/share/man/man4/nve.4#2 integrate .. //depot/projects/tty/share/man/man4/ral.4#2 integrate .. //depot/projects/tty/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/tty/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_emu10k1.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_maestro3.4#4 integrate .. //depot/projects/tty/share/man/man4/snd_via8233.4#2 integrate .. //depot/projects/tty/share/man/man4/unix.4#4 integrate .. //depot/projects/tty/share/man/man4/ural.4#2 integrate .. //depot/projects/tty/share/man/man4/witness.4#6 integrate .. //depot/projects/tty/share/man/man4/wlan_tkip.4#2 integrate .. //depot/projects/tty/share/man/man5/autofs.5#3 integrate .. //depot/projects/tty/share/man/man5/devfs.conf.5#2 integrate .. //depot/projects/tty/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/tty/share/man/man5/elf.5#7 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/tty/share/man/man7/release.7#13 integrate .. //depot/projects/tty/share/man/man9/MUTEX_PROFILING.9#5 integrate .. //depot/projects/tty/share/man/man9/Makefile#14 integrate .. //depot/projects/tty/share/man/man9/VFS_SYNC.9#5 integrate .. //depot/projects/tty/share/man/man9/VFS_VGET.9#7 integrate .. //depot/projects/tty/share/man/man9/VOP_GETPAGES.9#6 integrate .. //depot/projects/tty/share/man/man9/alloc_unr.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_dma.9#8 integrate .. //depot/projects/tty/share/man/man9/bus_space.9#1 branch .. //depot/projects/tty/share/man/man9/devclass_get_drivers.9#3 integrate .. //depot/projects/tty/share/man/man9/device_find_child.9#4 integrate .. //depot/projects/tty/share/man/man9/ifnet.9#11 integrate .. //depot/projects/tty/share/man/man9/kthread.9#3 integrate .. //depot/projects/tty/share/man/man9/ktr.9#5 integrate .. //depot/projects/tty/share/man/man9/mbuf.9#11 integrate .. //depot/projects/tty/share/man/man9/pci.9#5 integrate .. //depot/projects/tty/share/man/man9/pmap.9#4 integrate .. //depot/projects/tty/share/man/man9/rman.9#4 integrate .. //depot/projects/tty/share/man/man9/taskqueue.9#9 integrate .. //depot/projects/tty/share/man/man9/time.9#6 integrate .. //depot/projects/tty/share/man/man9/timeout.9#7 integrate .. //depot/projects/tty/share/man/man9/vfs_suser.9#3 integrate .. //depot/projects/tty/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/tty/sys/arm/arm/trap.c#6 integrate .. //depot/projects/tty/sys/boot/common/loader.8#14 integrate .. //depot/projects/tty/sys/conf/NOTES#26 integrate .. //depot/projects/tty/sys/conf/files#34 integrate .. //depot/projects/tty/sys/conf/files.alpha#17 integrate .. //depot/projects/tty/sys/conf/files.amd64#20 integrate .. //depot/projects/tty/sys/conf/files.ia64#20 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/tty/sys/dev/an/if_an.c#14 integrate .. //depot/projects/tty/sys/dev/ed/if_ed.c#13 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/tty/sys/dev/syscons/scgfbrndr.c#6 integrate .. //depot/projects/tty/sys/dev/syscons/scvgarndr.c#7 integrate .. //depot/projects/tty/sys/dev/uart/uart_cpu_alpha.c#6 integrate .. //depot/projects/tty/sys/dev/xe/if_xe.c#12 integrate .. //depot/projects/tty/sys/gnu/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_alloc.c#5 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_balloc.c#5 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_bitops.h#3 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_bmap.c#6 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_extern.h#6 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_fs.h#4 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_fs_sb.h#4 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_inode.c#8 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_inode_cnv.c#4 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_linux_balloc.c#6 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_linux_ialloc.c#5 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_lookup.c#7 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_mount.h#5 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_readwrite.c#4 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_subr.c#5 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_vfsops.c#11 delete .. //depot/projects/tty/sys/gnu/ext2fs/ext2_vnops.c#11 delete .. //depot/projects/tty/sys/gnu/ext2fs/fs.h#7 delete .. //depot/projects/tty/sys/gnu/ext2fs/i386-bitops.h#3 delete .. //depot/projects/tty/sys/gnu/ext2fs/inode.h#6 delete .. //depot/projects/tty/sys/gnu/ext2fs/sparc64-bitops.h#3 delete .. //depot/projects/tty/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_bitops.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_fs.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_fs_sb.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/fs.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/i386-bitops.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/inode.h#1 branch .. //depot/projects/tty/sys/gnu/fs/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/tty/sys/gnu/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/tty/sys/i386/conf/NOTES#21 integrate .. //depot/projects/tty/sys/ia64/include/smp.h#3 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/tty/sys/kern/subr_disk.c#9 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/tty/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/tty/sys/kern/vfs_default.c#16 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/tty/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/tty/sys/modules/ext2fs/Makefile#3 integrate .. //depot/projects/tty/sys/net/if_stf.c#11 integrate .. //depot/projects/tty/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/tty/sys/nfsclient/nfs_bio.c#12 integrate .. //depot/projects/tty/sys/sys/bio.h#8 integrate .. //depot/projects/tty/sys/sys/buf.h#14 integrate .. //depot/projects/tty/sys/sys/vnode.h#16 integrate .. //depot/projects/tty/sys/vm/uma_int.h#10 integrate .. //depot/projects/tty/usr.bin/find/find.1#7 integrate .. //depot/projects/tty/usr.bin/ktrdump/ktrdump.8#5 integrate .. //depot/projects/tty/usr.bin/lockf/lockf.1#5 integrate .. //depot/projects/tty/usr.bin/make/make.1#9 integrate .. //depot/projects/tty/usr.bin/pkill/pkill.1#4 integrate .. //depot/projects/tty/usr.bin/printf/printf.1#5 integrate .. //depot/projects/tty/usr.bin/sed/sed.1#8 integrate .. //depot/projects/tty/usr.bin/stat/stat.1#5 integrate .. //depot/projects/tty/usr.bin/truss/syscalls.c#10 integrate .. //depot/projects/tty/usr.bin/what/what.1#5 integrate .. //depot/projects/tty/usr.sbin/chkgrp/chkgrp.8#5 integrate .. //depot/projects/tty/usr.sbin/jail/jail.8#15 integrate .. //depot/projects/tty/usr.sbin/mixer/mixer.8#7 integrate .. //depot/projects/tty/usr.sbin/mount_portalfs/mount_portalfs.8#4 integrate .. //depot/projects/tty/usr.sbin/mtree/mtree.8#8 integrate .. //depot/projects/tty/usr.sbin/ndiscvt/ndiscvt.8#4 integrate .. //depot/projects/tty/usr.sbin/ndiscvt/ndisgen.8#2 integrate .. //depot/projects/tty/usr.sbin/newsyslog/newsyslog.8#7 integrate .. //depot/projects/tty/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/tty/usr.sbin/pkg_install/create/pkg_create.1#7 integrate .. //depot/projects/tty/usr.sbin/pkg_install/info/show.c#4 integrate .. //depot/projects/tty/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/tty/usr.sbin/pkg_install/lib/plist.c#4 integrate .. //depot/projects/tty/usr.sbin/pkg_install/version/pkg_version.1#7 integrate .. //depot/projects/tty/usr.sbin/powerd/powerd.8#2 integrate .. //depot/projects/tty/usr.sbin/pwd_mkdb/pwd_mkdb.c#6 integrate .. //depot/projects/tty/usr.sbin/sysinstall/dist.c#10 integrate .. //depot/projects/tty/usr.sbin/sysinstall/dist.h#6 integrate .. //depot/projects/tty/usr.sbin/sysinstall/menus.c#17 integrate .. //depot/projects/tty/usr.sbin/sysinstall/sysinstall.8#8 integrate .. //depot/projects/tty/usr.sbin/vidcontrol/vidcontrol.1#5 integrate .. //depot/projects/tty/usr.sbin/wpa/hostapd/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/wpa/hostapd/hostapd.1#2 delete .. //depot/projects/tty/usr.sbin/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/tty/usr.sbin/wpa/hostapd/hostapd.conf.5#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_cli/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/wpa/wpa_cli/wpa_cli.1#2 delete .. //depot/projects/tty/usr.sbin/wpa/wpa_cli/wpa_cli.8#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.1#2 delete .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#1 branch .. //depot/projects/tty/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/tty/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.318 2005/03/02 12:33:22 harti Exp $ +# $FreeBSD: src/Makefile,v 1.319 2005/06/16 18:16:12 ru Exp $ # # The user-driven targets are: # @@ -71,7 +71,7 @@ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - build32 install32 + build32 distribute32 install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/tty/Makefile.inc1#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.497 2005/06/06 09:39:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.498 2005/06/16 18:16:12 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -435,14 +435,18 @@ PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endfor -install32: - mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree - cd ${.CURDIR}/lib; ${LIB32MAKE} install - cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install +distribute32 install32: +.if make(distribute32) + mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree +.else + mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree +.endif + cd ${.CURDIR}/lib; ${LIB32MAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} ${.TARGET:S/32$//} .if !defined(NO_CRYPT) - cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install + cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//} .endif @@ -550,6 +554,9 @@ @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute +.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32 +.endif distribution: cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} distribution ==== //depot/projects/tty/bin/chflags/chflags.1#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.24 2005/05/14 23:23:10 dd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ .\" .Dd May 14, 2005 .Dt CHFLAGS 1 @@ -148,6 +148,11 @@ .Xr stat 2 , .Xr fts 3 , .Xr symlink 7 +.Sh HISTORY +The +.Nm +command first appeared in +.Bx 4.4 . .Sh BUGS Only a limited number of utilities are .Nm @@ -165,8 +170,3 @@ aware is the .Xr pax 1 utility. -.Sh HISTORY -The -.Nm -command first appeared in -.Bx 4.4 . ==== //depot/projects/tty/bin/dd/dd.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.29 2005/04/07 20:50:38 scottl Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.30 2005/06/14 08:25:54 ru Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,14 +392,6 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" -.Sh BUGS -Protection mechanisms in the -.Xr geom 4 -subsystem might prevent the super-user from writing blocks to a disk. -Instructions for temporarily disabling these protectsion mechanisms can be -found in the -.Xr geom 4 -manpage. .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , @@ -424,3 +416,11 @@ values are extensions to the .Tn POSIX standard. +.Sh BUGS +Protection mechanisms in the +.Xr geom 4 +subsystem might prevent the super-user from writing blocks to a disk. +Instructions for temporarily disabling these protectsion mechanisms can be +found in the +.Xr geom 4 +manpage. ==== //depot/projects/tty/bin/sh/sh.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.100 2005/04/15 14:53:29 keramida Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.102 2005/06/14 08:25:00 ru Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -196,12 +196,6 @@ Enable asynchronous notification of background job completion. (UNIMPLEMENTED) -.It Fl c Li string -Read commands from the -.Ar string -operand instead of from the standard input. -Keep in mind that this option only accepts a single string as its -argument, hence multi-word strings must be quoted. .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . @@ -309,6 +303,14 @@ .El .Pp The +.Fl c +option causes the commands to be read from the +.Ar string +operand instead of from the standard input. +Keep in mind that this option only accepts a single string as its +argument, hence multi-word strings must be quoted. +.Pp +The .Fl /+o option takes as its only argument the long name of an option to be enabled or disabled. @@ -2042,14 +2044,6 @@ .Dq Li set -E ) command can be used to enable a subset of emacs-style command line editing features. -.Sh EXIT STATUS -Errors that are detected by the shell, such as a syntax error, will -cause the shell to exit with a non-zero exit status. -If the shell is not an interactive shell, the execution of the shell -file will be aborted. -Otherwise the shell will return the exit status of the last command -executed, or if the exit builtin is used with a numeric argument, it -will return the argument. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -2104,17 +2098,25 @@ section for details. .It Ev PS1 The primary prompt string, which defaults to -.Dq $ \ , +.Dq Li "$ " , unless you are the superuser, in which case it defaults to -.Dq # \ . +.Dq Li "# " . .It Ev PS2 The secondary prompt string, which defaults to -.Dq \*[Gt] \ . +.Dq Li "> " . .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Sh EXIT STATUS +Errors that are detected by the shell, such as a syntax error, will +cause the shell to exit with a non-zero exit status. +If the shell is not an interactive shell, the execution of the shell +file will be aborted. +Otherwise the shell will return the exit status of the last command +executed, or if the exit builtin is used with a numeric argument, it +will return the argument. .Sh SEE ALSO .Xr builtin 1 , .Xr chsh 1 , @@ -2125,10 +2127,10 @@ .Xr getopt 1 , .Xr pwd 1 , .Xr test 1 , -.Xr umask 2 , .Xr vi 1 , .Xr execve 2 , .Xr getrlimit 2 , +.Xr umask 2 , .Xr editrc 5 .Sh HISTORY A ==== //depot/projects/tty/contrib/amd/amd/amd.8#4 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.19 2004/07/06 13:16:44 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.20 2005/06/16 20:21:01 ru Exp $ .\" .Dd April 19, 1994 .Dt AMD 8 @@ -50,7 +50,7 @@ .Sh SYNOPSIS .Nm amd .Fl H -.Nm amd +.Nm amd .Op Fl F Ar conf_file .Nm amd .Op Fl nprvHS @@ -83,7 +83,8 @@ .Sh DESCRIPTION .Nm Amd is a daemon that automatically mounts file systems whenever a file or directory -within that file system is accessed. File systems are automatically unmounted +within that file system is accessed. +File systems are automatically unmounted when they appear to be quiescent. .Pp .Nm Amd @@ -96,17 +97,19 @@ .Nm amd , which uses the map defined by .Ar mapname -to determine how to resolve the lookup. Generally, this will be a host name, +to determine how to resolve the lookup. +Generally, this will be a host name, some file system information and some mount options for the given file system. .Pp In the first form depicted above, .Nm amd -will print a short help string. In the second form, if no options are +will print a short help string. +In the second form, if no options are specified, or if the .Fl F -is used, -.Nm amd -will read configuration parameters from the file +is used, +.Nm amd +will read configuration parameters from the file .Ar conf_file which defaults to .Pa /etc/amd.conf . @@ -121,12 +124,15 @@ Specify a .Ar duration , in seconds, that a looked up name remains -cached when not in use. The default is 5 minutes. +cached when not in use. +The default is 5 minutes. .It Fl d Ar domain -Specify the local domain name. If this option is not +Specify the local domain name. +If this option is not given the domain name is determined from the hostname. .It Fl k Ar kernel-arch -Specifies the kernel architecture. This is used solely +Specifies the kernel architecture. +This is used solely to set the ${karch} selector. .It Fl l Ar logfile Specify a logfile in which to record mount and unmount events. @@ -136,31 +142,32 @@ .Em syslog , the log messages will be sent to the system log daemon by .Xr syslog 3 . -The default syslog facility used is LOG_DAEMON. +The default syslog facility used is LOG_DAEMON. If you wish to change it, append its name to the log file name, delimited by a single colon. -For example, if +For example, if .Ar logfile is the string .Dq Li syslog:local7 then .Nm amd -will log messages via +will log messages via .Xr syslog 3 using the LOG_LOCAL7 facility (if it exists on the system). .It Fl n Normalize hostnames. The name referred to by ${rhost} is normalized relative to the -host database before being used. The effect is to translate +host database before being used. +The effect is to translate aliases into ``official'' names. .It Fl o Ar op_sys_ver Override the compiled-in version number of the operating system. -Useful when the built in version is not desired for backward +Useful when the built in version is not desired for backward compatibility reasons. -For example, if the build in version is -.Dq 2.5.1 , +For example, if the build in version is +.Dq 2.5.1 , you can override it to -.Dq 5.5.1 , +.Dq 5.5.1 , and use older maps that were written with the latter in mind. .It Fl p Print @@ -172,7 +179,8 @@ Restart existing mounts. .Nm Amd will scan the mount file table to determine which file systems -are currently mounted. Whenever one of these would have +are currently mounted. +Whenever one of these would have been auto-mounted, .Nm amd .Em inherits @@ -182,25 +190,33 @@ .Ar interval , in tenths of a second, between .Tn NFS/RPC -retries (for UDP only). The default -is 0.8 seconds. The second value alters the retransmit counter, which -defaults to 11 retransmissions. Both of these values are used by the kernel -to communicate with amd. Useful defaults are supplied if either or both +retries (for UDP only). +The default +is 0.8 seconds. +The second value alters the retransmit counter, which +defaults to 11 retransmissions. +Both of these values are used by the kernel +to communicate with amd. +Useful defaults are supplied if either or both values are missing. .Pp Amd relies on the kernel RPC retransmit mechanism to trigger mount retries. -The values of these parameters change the overall retry interval. Too long +The values of these parameters change the overall retry interval. +Too long an interval gives poor interactive response; too short an interval causes excessive retries. .It Fl v -Version. Displays version and configuration information on standard error. +Version. +Displays version and configuration information on standard error. .It Fl w Ar interval Specify an .Ar interval , in seconds, between attempts to dismount file systems that have exceeded their -cached times. The default is 2 minutes. +cached times. +The default is 2 minutes. .It Fl x Ar options -Specify run-time logging options. The options are a comma separated list +Specify run-time logging options. +The options are a comma separated list chosen from: fatal, error, user, warn, info, map, stats, all. .It Fl y Ar domain Specify an alternative @@ -215,10 +231,12 @@ .It Fl C Ar cluster-name Specify an alternative HP-UX cluster name to use. .It Fl D Ar option -Select from a variety of debug options. Prefixing an +Select from a variety of debug options. +Prefixing an option with the string .Em no -reverses the effect of that option. Options are cumulative. +reverses the effect of that option. +Options are cumulative. The most useful option is .Ar all . .Pp @@ -232,40 +250,47 @@ .It Fl F Ar conf_file Specify an .Nm amd -configuration file to use. See +configuration file to use. +See .Xr amd.conf 5 -for description of this file's format. This configuration file is used to -specify any options in lieu of typing many of them on the command line. The +for description of this file's format. +This configuration file is used to +specify any options in lieu of typing many of them on the command line. +The .Nm amd.conf file includes directives for every command line option amd has, and many more that are only available via the configuration file -facility. The configuration file specified by this option is +facility. +The configuration file specified by this option is processed after all other options have been processed, regardless of the actual location of this option on the command line. .It Fl H Print help and usage string. .It Fl O Ar op_sys_name -Override the compiled-in name of the operating system. +Override the compiled-in name of the operating system. Useful when the built in name is not desired for backward compatibility reasons. For example, if the build in name is -.Dq sunos5 , +.Dq sunos5 , you can override it to .Dq sos5 and use older maps which were written with the latter in mind. .It Fl S Do not lock the running executable pages of .Nm amd -into memory. To improve +into memory. +To improve .Nm amd's -performance, systems that support the +performance, systems that support the .Xr plock 3 call, could lock the .Nm amd -process into memory. This way there is less chance the operating system will +process into memory. +This way there is less chance the operating system will schedule, page out, and swap the .Nm amd -process as needed. This tends to improve +process as needed. +This tends to improve .Nm amd's performance, at the cost of reserving the memory used by the .Nm amd @@ -277,7 +302,7 @@ .It Fl T Ar tag Specify a tag to use with .Xr amd.conf 5 . -All Map entries tagged with tag will be processed. +All Map entries tagged with tag will be processed. Map entries that are not tagged are always processed. Map entries that are tagged with a tag other than .Ar tag @@ -331,6 +356,11 @@ .Re .Pp .Pa http://www.cs.columbia.edu/~ezk/am-utils/ +.Sh HISTORY +The +.Nm amd +utility first appeared in +.Bx 4.4 . .Sh AUTHORS .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. @@ -340,10 +370,5 @@ New York, USA. .Pp Other authors and contributors to am-utils are listed in the -.Pa AUTHORS +.Pa AUTHORS file distributed with am-utils. -.Sh HISTORY -The -.Nm amd -utility first appeared in -.Bx 4.4 . ==== //depot/projects/tty/contrib/amd/amq/amq.8#4 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.11 2004/07/06 13:16:44 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $ .\" .Dd March 16, 1991 .Dt AMQ 8 @@ -81,17 +81,19 @@ .It Fl h Ar hostname Query alternate host .Ar hostname . -By default the local host is used. In an +By default the local host is used. +In an .Tn HP-UX cluster, the root server is queried by default, since that is the system on which the automounter is normally run. .It Fl l Ar log_file Tell amd to use .Ar log_file -as the log file name. +as the log file name. For security reasons, this must be the same log file which .Nm amd -used when started. This option is therefore only useful to +used when started. +This option is therefore only useful to refresh .Nm amd Ns \'s open file handle on the log file, so that it can be rotated and compressed via @@ -102,10 +104,11 @@ which occurred while mounting. .It Fl p Return the process ID of the remote or locally running -.Nm amd . +.Nm amd . Useful when you need to send a signal to the local .Nm amd -process, and would rather not have to search through the process table. This +process, and would rather not have to search through the process table. +This option is used in the .Pa ctl-amd script. @@ -113,51 +116,54 @@ Request the automounter to provide system-wide mount statistics. .It Fl u Request the automounter to unmount the named file systems -instead of providing information about them. Unmounts are requested, -not forced. They merely cause the mounted file system to timeout, +instead of providing information about them. +Unmounts are requested, +not forced. +They merely cause the mounted file system to timeout, which will be picked up by .Nm amd Ns \'s main scheduler thus causing the normal timeout action to be taken. .It Fl v -Request the automounter to provide version information. This is a subset +Request the automounter to provide version information. +This is a subset of the information provided by .Nm amd Ns \'s Fl v option. .It Fl x Ar log_options -Ask the automounter to use the logging options specified in +Ask the automounter to use the logging options specified in .Ar log_options from now on. .It Fl D Ar log_options -Ask the automounter to use the debugging options specified in +Ask the automounter to use the debugging options specified in .Ar debug_options from now on. .It Fl M -Pass a mount map entry to +Pass a mount map entry to .Nm amd and wait for it to be evaluated, possibly causing a mount. -This option is highly insecure. +This option is highly insecure. By default, .Nm amd -and +and .Nm amq do not support it. It is necessary to configure .Nm am-utils -with +with .Ar --enable-amq-mount to enable this option. .It Fl P Ar program_number -Contact an alternate running -.Nm amd +Contact an alternate running +.Nm amd that had registered itself on a different RPC -.Ar program_number -and apply all other operations to that instance of the automounter. -This is useful when running multiple copies of -.Nm amd , -and need to manage each one separately. -If not specified, +.Ar program_number +and apply all other operations to that instance of the automounter. +This is useful when running multiple copies of +.Nm amd , +and need to manage each one separately. +If not specified, .Nm amq -will use the default program number for +will use the default program number for .Nm amd , 300019. For security reasons, the only alternate program numbers @@ -166,14 +172,14 @@ .It Fl T Contact .Nm amd -using the TCP transport only. -Normally +using the TCP transport only. +Normally .Nm amq will try TCP, and if that fails, will try UDP. .It Fl U -Contact +Contact .Nm amd -using UDP (connectionless) transport only. +using UDP (connectionless) transport only. Normally .Nm amq will try TCP, and if that fails, will try UDP. @@ -195,6 +201,10 @@ .Sh SEE ALSO .Xr amd.conf 5 , .Xr amd 8 +.Sh HISTORY +.Nm Amq +first appeared in +.Bx 4.4 . .Sh AUTHORS .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. @@ -202,13 +212,9 @@ .An Erez Zadok Aq ezk@cs.columbia.edu , Department of Computer Science, Columbia University, New York, USA. .Pp -.An Other authors and contributors to +.An Other authors and contributors to .Nm am-utils are listed in the -.Nm AUTHORS +.Nm AUTHORS file distributed with .Nm am-utils . -.Sh HISTORY -.Nm Amq -first appeared in -.Bx 4.4 . ==== //depot/projects/tty/contrib/amd/amq/pawd.1#4 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: pawd.1,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.6 2004/07/06 13:16:44 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.7 2005/06/16 20:21:02 ru Exp $ .\" .Dd January 6, 1998 .Dt PAWD 1 @@ -54,17 +54,20 @@ .Nm is used to print the current working directory, adjusted to reflect proper paths that can be reused to go through the automounter for the shortest -possible path. In particular, the path printed back does not include any +possible path. +In particular, the path printed back does not include any of .Nm Amd Ns \'s -local mount points. Using them is unsafe, because +local mount points. +Using them is unsafe, because .Nm Amd may unmount managed file systems from the mount points, and thus including them in paths may not always find the files within. .Pp Without any arguments, .Nm -will print the automounter adjusted current working directory. With any +will print the automounter adjusted current working directory. +With any number of arguments, it will print the adjusted .Ar path of each one of the @@ -72,7 +75,7 @@ .Sh SEE ALSO >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 17 13:05:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD0516A420; Fri, 17 Jun 2005 13:05:30 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8905F16A41C for ; Fri, 17 Jun 2005 13:05:30 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75BF343D1F for ; Fri, 17 Jun 2005 13:05:30 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5HD5UVG026440 for ; Fri, 17 Jun 2005 13:05:30 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5HD5USq026437 for perforce@freebsd.org; Fri, 17 Jun 2005 13:05:30 GMT (envelope-from des@freebsd.org) Date: Fri, 17 Jun 2005 13:05:30 GMT Message-Id: <200506171305.j5HD5USq026437@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 Cc: Subject: PERFORCE change 78670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 13:05:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=78670 Change 78670 by des@des.at.des.no on 2005/06/17 13:04:51 Fix xref ordering and single space after Inc. Submitted by: ru Affected files ... .. //depot/projects/openpam/doc/man/pam_conv.3#5 edit Differences ... ==== //depot/projects/openpam/doc/man/pam_conv.3#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#4 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#5 $ .\" .Dd May 27, 2002 .Dt PAM_CONV 3 @@ -159,8 +159,8 @@ System error. .El .Sh SEE ALSO +.Xr openpam_nullconv 3 , .Xr openpam_ttyconv 3 , -.Xr openpam_nullconv 3 , .Xr pam 3 , .Xr pam_error 3 , .Xr pam_get_item 3 , @@ -176,7 +176,7 @@ .Sh AUTHORS The OpenPAM library and this manual page were developed for the FreeBSD Project by ThinkSec AS and Network Associates Laboratories, -the Security Research Division of Network Associates, Inc. under +the Security Research Division of Network Associates, Inc.\& under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. From owner-p4-projects@FreeBSD.ORG Fri Jun 17 13:05:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D28F16A446; Fri, 17 Jun 2005 13:05:31 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DB66916A426 for ; Fri, 17 Jun 2005 13:05:30 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C342043D1F for ; Fri, 17 Jun 2005 13:05:30 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5HD5U8p026447 for ; Fri, 17 Jun 2005 13:05:30 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5HD5Uxg026443 for perforce@freebsd.org; Fri, 17 Jun 2005 13:05:30 GMT (envelope-from des@freebsd.org) Date: Fri, 17 Jun 2005 13:05:30 GMT Message-Id: <200506171305.j5HD5Uxg026443@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 Cc: Subject: PERFORCE change 78671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 13:05:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=78671 Change 78671 by des@des.at.des.no on 2005/06/17 13:05:26 Correctly escape \& in Perl strings. Submitted by: ru Affected files ... .. //depot/projects/openpam/misc/gendoc.pl#31 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#31 (text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/misc/gendoc.pl#30 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#31 $ # use strict; @@ -444,7 +444,7 @@ function and this manual page were developed for the .Fx Project by ThinkSec AS and Network Associates Laboratories, the -Security Research Division of Network Associates, Inc.\& under +Security Research Division of Network Associates, Inc.\\& under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. @@ -558,7 +558,7 @@ The OpenPAM library and this manual page were developed for the .Fx Project by ThinkSec AS and Network Associates Laboratories, the -Security Research Division of Network Associates, Inc.\& under +Security Research Division of Network Associates, Inc.\\& under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. From owner-p4-projects@FreeBSD.ORG Fri Jun 17 14:00:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7452516A420; Fri, 17 Jun 2005 14:00:37 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 45DDF16A41F for ; Fri, 17 Jun 2005 14:00:37 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16FFA43D53 for ; Fri, 17 Jun 2005 14:00:37 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5HE0axd028630 for ; Fri, 17 Jun 2005 14:00:36 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5HE0ang028627 for perforce@freebsd.org; Fri, 17 Jun 2005 14:00:36 GMT (envelope-from des@freebsd.org) Date: Fri, 17 Jun 2005 14:00:36 GMT Message-Id: <200506171400.j5HE0ang028627@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 Cc: Subject: PERFORCE change 78672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 14:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=78672 Change 78672 by des@des.at.des.no on 2005/06/17 13:59:46 Markup nits. Submitted by: ru Affected files ... .. //depot/projects/openpam/doc/man/pam.conf.5#3 edit Differences ... ==== //depot/projects/openpam/doc/man/pam.conf.5#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.conf.5#2 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.conf.5#3 $ .\" -.Dd June 9, 2005 +.Dd June 16, 2005 .Dt PAM.CONF 5 .Os .Sh NAME @@ -56,7 +56,7 @@ Entries in per-service policy files must be of one of the two forms below: .Bd -unfilled -offset indent -.Ar function-class Ar control-flag Ar module-path Op Ar arguments ... +.Ar function-class control-flag module-path Op Ar arguments ... .Ar function-class Cm include Ar other-service-name .Ed .Pp @@ -66,13 +66,15 @@ field specifying the name of the service they apply to. .Pp In both types of policy files, blank lines are ignored, as is anything -to the right of a `#' sign. +to the right of a +.Ql # +sign. .Pp The .Ar function-class field specifies the class of functions the entry applies to, and is one of: -.Bl -tag -width "password" +.Bl -tag -width ".Cm password" .It Cm auth Authentication functions .Po @@ -98,7 +100,7 @@ field determines how the result returned by the module affects the flow of control through (and the final result of) the rest of the chain, and is one of: -.Bl -tag -width "sufficient" +.Bl -tag -width ".Cm sufficient" .It Cm required If this module succeeds, the result of the chain will be success unless a later module fails. @@ -163,9 +165,11 @@ .%D "June 1997" .Re .Sh AUTHORS -The OpenPAM library was developed for the FreeBSD Project by ThinkSec +The OpenPAM library was developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the Security Research Division -of Network Associates, Inc. under DARPA/SPAWAR contract +of Network Associates, Inc.\& under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. From owner-p4-projects@FreeBSD.ORG Fri Jun 17 14:00:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D609816A445; Fri, 17 Jun 2005 14:00:37 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9105B16A429 for ; Fri, 17 Jun 2005 14:00:37 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62C2D43D4C for ; Fri, 17 Jun 2005 14:00:37 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5HE0bYn028636 for ; Fri, 17 Jun 2005 14:00:37 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5HE0b8c028633 for perforce@freebsd.org; Fri, 17 Jun 2005 14:00:37 GMT (envelope-from des@freebsd.org) Date: Fri, 17 Jun 2005 14:00:37 GMT Message-Id: <200506171400.j5HE0b8c028633@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 Cc: Subject: PERFORCE change 78673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 14:00:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=78673 Change 78673 by des@des.at.des.no on 2005/06/17 14:00:13 Bump the date. Affected files ... .. //depot/projects/openpam/doc/man/pam_conv.3#6 edit Differences ... ==== //depot/projects/openpam/doc/man/pam_conv.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#6 $ .\" -.Dd May 27, 2002 +.Dd June 16, 2005 .Dt PAM_CONV 3 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Fri Jun 17 19:55:49 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81FF516A420; Fri, 17 Jun 2005 19:55:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5158F16A41C for ; Fri, 17 Jun 2005 19:55:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 273FB43D1D for ; Fri, 17 Jun 2005 19:55:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5HJtm51050918 for ; Fri, 17 Jun 2005 19:55:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5HJtlST050915 for perforce@freebsd.org; Fri, 17 Jun 2005 19:55:47 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Jun 2005 19:55:47 GMT Message-Id: <200506171955.j5HJtlST050915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 19:55:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=78683 Change 78683 by jhb@jhb_slimer on 2005/06/17 19:55:36 Backout the atomic patches for now so I can break it up into more palatable chunks. Affected files ... .. //depot/projects/smpng/sys/alpha/include/atomic.h#21 edit .. //depot/projects/smpng/sys/amd64/include/atomic.h#15 edit .. //depot/projects/smpng/sys/amd64/include/bus.h#7 edit .. //depot/projects/smpng/sys/arm/include/atomic.h#11 edit .. //depot/projects/smpng/sys/arm/include/endian.h#11 edit .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#12 edit .. //depot/projects/smpng/sys/i386/include/atomic.h#32 edit .. //depot/projects/smpng/sys/i386/include/bus.h#8 edit .. //depot/projects/smpng/sys/ia64/include/atomic.h#9 edit .. //depot/projects/smpng/sys/kern/kern_mutex.c#99 edit .. //depot/projects/smpng/sys/pc98/include/bus.h#4 edit .. //depot/projects/smpng/sys/powerpc/include/atomic.h#12 edit .. //depot/projects/smpng/sys/sparc64/include/atomic.h#12 edit .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#24 edit .. //depot/projects/smpng/sys/sys/mutex.h#56 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/atomic.h#21 (text+ko) ==== @@ -56,12 +56,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ - "bis %0, %2, %0\n\t" /* calculate new value */ + "1:\tldl_l %0, %2\n\t" /* load old value */ + "bis %0, %3, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "m" (*p), "r" (v) : "memory"); #endif } @@ -76,8 +76,8 @@ "bic %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -92,8 +92,8 @@ "addl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -108,8 +108,8 @@ "subl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -125,8 +125,8 @@ "ldiq %1,0\n\t" /* value to store */ "stl_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ - : "=&r"(result), "=&r"(temp), "=m" (*addr) - : "m" (*addr) + : "=&r"(result), "=&r"(temp), "+m" (*addr) + : : "memory"); #endif @@ -143,8 +143,8 @@ "bis %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -159,8 +159,8 @@ "bic %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -175,8 +175,8 @@ "addq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -191,8 +191,8 @@ "subq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "=m" (*p) - : "r" (v), "m" (*p) + : "=&r" (temp), "+m" (*p) + : "r" (v) : "memory"); #endif } @@ -208,14 +208,36 @@ "ldiq %1,0\n\t" /* value to store */ "stq_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ - : "=&r"(result), "=&r"(temp), "=m" (*addr) - : "m" (*addr) + : "=&r"(result), "=&r"(temp), "+m" (*addr) + : : "memory"); #endif return result; } +#define atomic_set_char atomic_set_8 +#define atomic_clear_char atomic_clear_8 +#define atomic_add_char atomic_add_8 +#define atomic_subtract_char atomic_subtract_8 + +#define atomic_set_short atomic_set_16 +#define atomic_clear_short atomic_clear_16 +#define atomic_add_short atomic_add_16 +#define atomic_subtract_short atomic_subtract_16 + +#define atomic_set_int atomic_set_32 +#define atomic_clear_int atomic_clear_32 +#define atomic_add_int atomic_add_32 +#define atomic_subtract_int atomic_subtract_32 +#define atomic_readandclear_int atomic_readandclear_32 + +#define atomic_set_long atomic_set_64 +#define atomic_clear_long atomic_clear_64 +#define atomic_add_long atomic_add_64 +#define atomic_subtract_long atomic_subtract_64 +#define atomic_readandclear_long atomic_readandclear_64 + #define ATOMIC_ACQ_REL(NAME, WIDTH, TYPE) \ static __inline void \ atomic_##NAME##_acq_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ @@ -227,11 +249,24 @@ static __inline void \ atomic_##NAME##_rel_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ - alpha_wmb(); \ + alpha_mb(); \ + atomic_##NAME##_##WIDTH(p, v); \ +} \ + \ +static __inline void \ +atomic_##NAME##_acq_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ +{ \ + atomic_##NAME##_##WIDTH(p, v); \ + alpha_mb(); \ +} \ + \ +static __inline void \ +atomic_##NAME##_rel_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ +{ \ + alpha_mb(); \ atomic_##NAME##_##WIDTH(p, v); \ } -/* Variants of simple arithmetic with memory barriers. */ ATOMIC_ACQ_REL(set, 8, char) ATOMIC_ACQ_REL(clear, 8, char) ATOMIC_ACQ_REL(add, 8, char) @@ -254,11 +289,27 @@ /* * We assume that a = b will do atomic loads and stores. */ -#define ATOMIC_STORE_LOAD(WIDTH) \ -static __inline u_int##WIDTH##_t \ -atomic_load_acq_##WIDTH(volatile u_int##WIDTH##_t *p) \ +#define ATOMIC_STORE_LOAD(TYPE, WIDTH) \ +static __inline u_##TYPE \ +atomic_load_acq_##WIDTH(volatile u_##TYPE *p) \ +{ \ + u_##TYPE v; \ + \ + v = *p; \ + alpha_mb(); \ + return (v); \ +} \ + \ +static __inline void \ +atomic_store_rel_##WIDTH(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + alpha_mb(); \ + *p = v; \ +} \ +static __inline u_##TYPE \ +atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ - u_int##WIDTH##_t v; \ + u_##TYPE v; \ \ v = *p; \ alpha_mb(); \ @@ -266,14 +317,16 @@ } \ \ static __inline void \ -atomic_store_rel_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ +atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - alpha_wmb(); \ + alpha_mb(); \ *p = v; \ } -ATOMIC_STORE_LOAD(32) -ATOMIC_STORE_LOAD(64) +ATOMIC_STORE_LOAD(char, 8) +ATOMIC_STORE_LOAD(short, 16) +ATOMIC_STORE_LOAD(int, 32) +ATOMIC_STORE_LOAD(long, 64) #undef ATOMIC_STORE_LOAD @@ -296,8 +349,8 @@ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n\t" /* if it failed, spin */ "2:\n" - : "=&r" (ret), "=m" (*p) - : "r" ((long)(int)cmpval), "r" (newval), "m" (*p) + : "=&r" (ret), "+m" (*p) + : "r" ((long)(int)cmpval), "r" (newval) : "memory"); #endif @@ -323,14 +376,25 @@ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n\t" /* if it failed, spin */ "2:\n" - : "=&r" (ret), "=m" (*p) - : "r" (cmpval), "r" (newval), "m" (*p) + : "=&r" (ret), "+m" (*p) + : "r" (cmpval), "r" (newval) : "memory"); #endif return ret; } +#define atomic_cmpset_int atomic_cmpset_32 +#define atomic_cmpset_long atomic_cmpset_64 + +static __inline int +atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_long((volatile u_long *)dst, (u_long)exp, + (u_long)src)); +} + static __inline u_int32_t atomic_cmpset_acq_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval) { @@ -344,7 +408,7 @@ static __inline u_int32_t atomic_cmpset_rel_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval) { - alpha_wmb(); + alpha_mb(); return (atomic_cmpset_32(p, cmpval, newval)); } @@ -361,96 +425,67 @@ static __inline u_int64_t atomic_cmpset_rel_64(volatile u_int64_t *p, u_int64_t cmpval, u_int64_t newval) { - alpha_wmb(); + alpha_mb(); return (atomic_cmpset_64(p, cmpval, newval)); } -/* Operations on chars. */ -#define atomic_set_char atomic_set_8 -#define atomic_set_acq_char atomic_set_acq_8 -#define atomic_set_rel_char atomic_set_rel_8 -#define atomic_clear_char atomic_clear_8 -#define atomic_clear_acq_char atomic_clear_acq_8 -#define atomic_clear_rel_char atomic_clear_rel_8 -#define atomic_add_char atomic_add_8 -#define atomic_add_acq_char atomic_add_acq_8 -#define atomic_add_rel_char atomic_add_rel_8 -#define atomic_subtract_char atomic_subtract_8 -#define atomic_subtract_acq_char atomic_subtract_acq_8 -#define atomic_subtract_rel_char atomic_subtract_rel_8 - -/* Operations on shorts. */ -#define atomic_set_short atomic_set_16 -#define atomic_set_acq_short atomic_set_acq_16 -#define atomic_set_rel_short atomic_set_rel_16 -#define atomic_clear_short atomic_clear_16 -#define atomic_clear_acq_short atomic_clear_acq_16 -#define atomic_clear_rel_short atomic_clear_rel_16 -#define atomic_add_short atomic_add_16 -#define atomic_add_acq_short atomic_add_acq_16 -#define atomic_add_rel_short atomic_add_rel_16 -#define atomic_subtract_short atomic_subtract_16 -#define atomic_subtract_acq_short atomic_subtract_acq_16 -#define atomic_subtract_rel_short atomic_subtract_rel_16 - -/* Operations on ints. */ -#define atomic_set_int atomic_set_32 -#define atomic_set_acq_int atomic_set_acq_32 -#define atomic_set_rel_int atomic_set_rel_32 -#define atomic_clear_int atomic_clear_32 -#define atomic_clear_acq_int atomic_clear_acq_32 -#define atomic_clear_rel_int atomic_clear_rel_32 -#define atomic_add_int atomic_add_32 -#define atomic_add_acq_int atomic_add_acq_32 -#define atomic_add_rel_int atomic_add_rel_32 -#define atomic_subtract_int atomic_subtract_32 -#define atomic_subtract_acq_int atomic_subtract_acq_32 -#define atomic_subtract_rel_int atomic_subtract_rel_32 -#define atomic_cmpset_int atomic_cmpset_32 #define atomic_cmpset_acq_int atomic_cmpset_acq_32 #define atomic_cmpset_rel_int atomic_cmpset_rel_32 -#define atomic_load_acq_int atomic_load_acq_32 -#define atomic_store_rel_int atomic_store_rel_32 -#define atomic_readandclear_int atomic_readandclear_32 - -/* Operations on longs. */ -#define atomic_set_long atomic_set_64 -#define atomic_set_acq_long atomic_set_acq_64 -#define atomic_set_rel_long atomic_set_rel_64 -#define atomic_clear_long atomic_clear_64 -#define atomic_clear_acq_long atomic_clear_acq_64 -#define atomic_clear_rel_long atomic_clear_rel_64 -#define atomic_add_long atomic_add_64 -#define atomic_add_acq_long atomic_add_acq_64 -#define atomic_add_rel_long atomic_add_rel_64 -#define atomic_subtract_long atomic_subtract_64 -#define atomic_subtract_acq_long atomic_subtract_acq_64 -#define atomic_subtract_rel_long atomic_subtract_rel_64 -#define atomic_cmpset_long atomic_cmpset_64 #define atomic_cmpset_acq_long atomic_cmpset_acq_64 #define atomic_cmpset_rel_long atomic_cmpset_rel_64 -#define atomic_load_acq_long atomic_load_acq_64 -#define atomic_store_rel_long atomic_store_rel_64 -#define atomic_readandclear_long atomic_readandclear_64 + +static __inline int +atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_acq_long((volatile u_long *)dst, (u_long)exp, + (u_long)src)); +} + +static __inline int +atomic_cmpset_rel_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_rel_long((volatile u_long *)dst, (u_long)exp, + (u_long)src)); +} + +static __inline void * +atomic_load_acq_ptr(volatile void *p) +{ + return (void *)atomic_load_acq_long((volatile u_long *)p); +} + +static __inline void +atomic_store_rel_ptr(volatile void *p, void *v) +{ + atomic_store_rel_long((volatile u_long *)p, (u_long)v); +} + +#define ATOMIC_PTR(NAME) \ +static __inline void \ +atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ +{ \ + atomic_##NAME##_long((volatile u_long *)p, v); \ +} \ + \ +static __inline void \ +atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ +{ \ + atomic_##NAME##_acq_long((volatile u_long *)p, v);\ +} \ + \ +static __inline void \ +atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ +{ \ + atomic_##NAME##_rel_long((volatile u_long *)p, v);\ +} + +ATOMIC_PTR(set) +ATOMIC_PTR(clear) +ATOMIC_PTR(add) +ATOMIC_PTR(subtract) -/* Operations on pointers. */ -#define atomic_set_ptr atomic_set_64 -#define atomic_set_acq_ptr atomic_set_acq_64 -#define atomic_set_rel_ptr atomic_set_rel_64 -#define atomic_clear_ptr atomic_clear_64 -#define atomic_clear_acq_ptr atomic_clear_acq_64 -#define atomic_clear_rel_ptr atomic_clear_rel_64 -#define atomic_add_ptr atomic_add_64 -#define atomic_add_acq_ptr atomic_add_acq_64 -#define atomic_add_rel_ptr atomic_add_rel_64 -#define atomic_subtract_ptr atomic_subtract_64 -#define atomic_subtract_acq_ptr atomic_subtract_acq_64 -#define atomic_subtract_rel_ptr atomic_subtract_rel_64 -#define atomic_cmpset_ptr atomic_cmpset_64 -#define atomic_cmpset_acq_ptr atomic_cmpset_acq_64 -#define atomic_cmpset_rel_ptr atomic_cmpset_rel_64 -#define atomic_load_acq_ptr atomic_load_acq_64 -#define atomic_store_rel_ptr atomic_store_rel_64 -#define atomic_readandclear_ptr atomic_readandclear_64 +#undef ATOMIC_PTR #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/amd64/include/atomic.h#15 (text+ko) ==== @@ -68,15 +68,13 @@ * This allows kernel modules to be portable between UP and SMP systems. */ #if defined(KLD_MODULE) -#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ -void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \ -void atomic_##NAME##_##TYPE_acq(volatile u_##TYPE *p, u_##TYPE v); \ -void atomic_##NAME##_##TYPE_rel(volatile u_##TYPE *p, u_##TYPE v) +#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ +void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); -#define ATOMIC_STORE_LOAD(TYPE) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -89,13 +87,9 @@ * the binaries will run on both types of systems. */ #if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED "lock ; " -#define MPLFENCE "lfence ; " -#define MPSFENCE "sfence ; " +#define MPLOCKED lock ; #else -#define MPLOCKED "" -#define MPLFENCE "" -#define MPSFENCE "" +#define MPLOCKED #endif /* @@ -106,32 +100,16 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p)); \ -} \ - \ -static __inline void \ -atomic_##NAME##_##TYPE##_acq(volatile u_##TYPE *p, u_##TYPE v)\ -{ \ - atomic_##NAME_##TYPE(p, v); \ - __asm __volatile(MPLFENCE ::: "memory"); \ + __asm __volatile(__XSTRING(MPLOCKED) OP \ + : "+m" (*p) \ + : CONS (V)); \ } \ - \ -static __inline void \ -atomic_##NAME##_##TYPE##_rel(volatile u_##TYPE *p, u_##TYPE v)\ -{ \ - __asm __volatile(MPSFENCE); \ - atomic_##NAME_##TYPE(p, v); \ -} \ struct __hack #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ -extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \ -extern void atomic_##NAME##_##TYPE##_acq(volatile u_##TYPE *p, u_##TYPE v); \ -extern void atomic_##NAME##_##TYPE##_rel(volatile u_##TYPE *p, u_##TYPE v) +extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) #endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ @@ -151,17 +129,16 @@ int res = exp; __asm __volatile ( - " " MPLOCKED " " - " cmpxchgl %2,%1 ; " + " " __XSTRING(MPLOCKED) " " + " cmpxchgl %1,%2 ; " " setz %%al ; " " movzbl %%al,%0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res), /* 0 (result) */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ - : "memory"); + : "+a" (res) /* 0 (result) */ + : "r" (src), /* 1 */ + "m" (*(dst)) /* 2 */ + : "memory"); return (res); } @@ -172,56 +149,47 @@ long res = exp; __asm __volatile ( - " " MPLOCKED " " - " cmpxchgq %2,%1 ; " + " " __XSTRING(MPLOCKED) " " + " cmpxchgq %1,%2 ; " " setz %%al ; " " movzbq %%al,%0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res), /* 0 (result) */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ - : "memory"); + : "+a" (res) /* 0 (result) */ + : "r" (src), /* 1 */ + "m" (*(dst)) /* 2 */ + : "memory"); return (res); } +#endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ -#define ATOMIC_CMPSET(TYPE) \ -static __inline int \ -atomic_cmpset_acq_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ -{ \ - int retval; \ - \ - retval = atomic_cmpset_##TYPE(dst, exp, src); \ - __asm __volatile(MPLFENCE ::: "memory"); \ - return (retval); \ -} \ - \ -static __inline int \ -atomic_cmpset_rel_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ -{ \ - __asm __volatile(MPSFENCE); \ - return (atomic_cmpset_##TYPE(dst, exp, src)); \ -} \ -struct __hack +#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE) -#define ATOMIC_STORE_LOAD(TYPE) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ - u_##TYPE v; \ + u_##TYPE res; \ + \ + __asm __volatile(__XSTRING(MPLOCKED) LOP \ + : "=a" (res), /* 0 (result) */\ + "+m" (*p) /* 1 */ \ + : : "memory"); \ \ - v = *p; \ - __asm __volatile(MPLFENCE ::: "memory"); \ - return (v); \ + return (res); \ } \ \ +/* \ + * The XCHG instruction asserts LOCK automagically. \ + */ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(MPSFENCE); \ - *p = v; \ + __asm __volatile(SOP \ + : "+m" (*p), /* 0 */ \ + "+r" (v) /* 1 */ \ + : : "memory"); \ } \ struct __hack @@ -230,13 +198,7 @@ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); extern int atomic_cmpset_long(volatile u_long *, u_long, u_long); -#define ATOMIC_CMPSET(TYPE) \ -extern int atomic_cmpset_acq_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp,\ - u_##TYPE src); \ -extern int atomic_cmpset_rel_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp,\ - u_##TYPE src) - -#define ATOMIC_STORE_LOAD(TYPE) \ +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -264,17 +226,55 @@ ATOMIC_ASM(add, long, "addq %1,%0", "ir", v); ATOMIC_ASM(subtract, long, "subq %1,%0", "ir", v); -ATOMIC_CMPSET(int); -ATOMIC_CMPSET(long); - -ATOMIC_STORE_LOAD(char); -ATOMIC_STORE_LOAD(short); -ATOMIC_STORE_LOAD(int); -ATOMIC_STORE_LOAD(long); +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, "cmpxchgq %0,%1", "xchgq %1,%0"); #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD +#define atomic_set_acq_char atomic_set_char +#define atomic_set_rel_char atomic_set_char +#define atomic_clear_acq_char atomic_clear_char +#define atomic_clear_rel_char atomic_clear_char +#define atomic_add_acq_char atomic_add_char +#define atomic_add_rel_char atomic_add_char +#define atomic_subtract_acq_char atomic_subtract_char +#define atomic_subtract_rel_char atomic_subtract_char + +#define atomic_set_acq_short atomic_set_short +#define atomic_set_rel_short atomic_set_short +#define atomic_clear_acq_short atomic_clear_short +#define atomic_clear_rel_short atomic_clear_short +#define atomic_add_acq_short atomic_add_short +#define atomic_add_rel_short atomic_add_short +#define atomic_subtract_acq_short atomic_subtract_short +#define atomic_subtract_rel_short atomic_subtract_short + +#define atomic_set_acq_int atomic_set_int +#define atomic_set_rel_int atomic_set_int +#define atomic_clear_acq_int atomic_clear_int +#define atomic_clear_rel_int atomic_clear_int +#define atomic_add_acq_int atomic_add_int +#define atomic_add_rel_int atomic_add_int +#define atomic_subtract_acq_int atomic_subtract_int +#define atomic_subtract_rel_int atomic_subtract_int +#define atomic_cmpset_acq_int atomic_cmpset_int +#define atomic_cmpset_rel_int atomic_cmpset_int + +#define atomic_set_acq_long atomic_set_long +#define atomic_set_rel_long atomic_set_long +#define atomic_clear_acq_long atomic_clear_long +#define atomic_clear_rel_long atomic_clear_long +#define atomic_add_acq_long atomic_add_long +#define atomic_add_rel_long atomic_add_long +#define atomic_subtract_acq_long atomic_subtract_long +#define atomic_subtract_rel_long atomic_subtract_long + +#define atomic_cmpset_acq_ptr atomic_cmpset_ptr +#define atomic_cmpset_rel_ptr atomic_cmpset_ptr + #define atomic_set_8 atomic_set_char #define atomic_set_acq_8 atomic_set_acq_char #define atomic_set_rel_8 atomic_set_rel_char @@ -317,33 +317,63 @@ #define atomic_subtract_32 atomic_subtract_int #define atomic_subtract_acq_32 atomic_subtract_acq_int #define atomic_subtract_rel_32 atomic_subtract_rel_int +#define atomic_load_acq_32 atomic_load_acq_int +#define atomic_store_rel_32 atomic_store_rel_int #define atomic_cmpset_32 atomic_cmpset_int #define atomic_cmpset_acq_32 atomic_cmpset_acq_int #define atomic_cmpset_rel_32 atomic_cmpset_rel_int -#define atomic_load_acq_32 atomic_load_acq_int -#define atomic_store_rel_32 atomic_store_rel_int #define atomic_readandclear_32 atomic_readandclear_int -#define atomic_set_ptr atomic_set_int -#define atomic_set_acq_ptr atomic_set_acq_int -#define atomic_set_rel_ptr atomic_set_rel_int -#define atomic_clear_ptr atomic_clear_int -#define atomic_clear_acq_ptr atomic_clear_acq_int -#define atomic_clear_rel_ptr atomic_clear_rel_int -#define atomic_add_ptr atomic_add_int -#define atomic_add_acq_ptr atomic_add_acq_int -#define atomic_add_rel_ptr atomic_add_rel_int -#define atomic_subtract_ptr atomic_subtract_int -#define atomic_subtract_acq_ptr atomic_subtract_acq_int -#define atomic_subtract_rel_ptr atomic_subtract_rel_int -#define atomic_cmpset_ptr atomic_cmpset_int -#define atomic_cmpset_acq_ptr atomic_cmpset_acq_int -#define atomic_cmpset_rel_ptr atomic_cmpset_rel_int -#define atomic_load_acq_ptr atomic_load_acq_int -#define atomic_store_rel_ptr atomic_store_rel_int -#define atomic_readandclear_ptr atomic_readandclear_int +#if !defined(WANT_FUNCTIONS) +static __inline int +atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_long((volatile u_long *)dst, + (u_long)exp, (u_long)src)); +} + +static __inline void * +atomic_load_acq_ptr(volatile void *p) +{ + /* + * The apparently-bogus cast to intptr_t in the following is to + * avoid a warning from "gcc -Wbad-function-cast". + */ + return ((void *)(intptr_t)atomic_load_acq_long((volatile u_long *)p)); +} + +static __inline void +atomic_store_rel_ptr(volatile void *p, void *v) +{ + atomic_store_rel_long((volatile u_long *)p, (u_long)v); +} + +#define ATOMIC_PTR(NAME) \ +static __inline void \ +atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ +{ \ + atomic_##NAME##_long((volatile u_long *)p, v); \ +} \ + \ +static __inline void \ +atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ +{ \ + atomic_##NAME##_acq_long((volatile u_long *)p, v);\ +} \ + \ +static __inline void \ +atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ +{ \ + atomic_##NAME##_rel_long((volatile u_long *)p, v);\ +} + +ATOMIC_PTR(set) +ATOMIC_PTR(clear) +ATOMIC_PTR(add) +ATOMIC_PTR(subtract) -#if !defined(WANT_FUNCTIONS) +#undef ATOMIC_PTR #if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE) @@ -356,9 +386,8 @@ " xorl %0,%0 ; " " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ - : "m" (*addr)); /* 2 (addr) */ + : "=&r" (result) /* 0 (result) */ + : "m" (*addr)); /* 1 (addr) */ return (result); } @@ -372,9 +401,8 @@ " xorq %0,%0 ; " " xchgq %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ - : "m" (*addr)); /* 2 (addr) */ + : "=&r" (result) /* 0 (result) */ + : "m" (*addr)); /* 1 (addr) */ return (result); } ==== //depot/projects/smpng/sys/amd64/include/bus.h#7 (text+ko) ==== @@ -278,8 +278,8 @@ 1: movb (%2),%%al \n\ stosb \n\ loop 1b" : - "+D" (addr), "+c" (count) : - "r" (bsh + offset) : + "=D" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); #endif } @@ -299,8 +299,8 @@ 1: movw (%2),%%ax \n\ stosw \n\ loop 1b" : - "+D" (addr), "+c" (count) : - "r" (bsh + offset) : + "=D" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); #endif } @@ -320,8 +320,8 @@ 1: movl (%2),%%eax \n\ stosl \n\ loop 1b" : - "+D" (addr), "+c" (count) : - "r" (bsh + offset) : + "=D" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); #endif } @@ -366,7 +366,8 @@ stosb \n\ incl %2 \n\ loop 1b" : - "+D" (addr), "+c" (count), "+d" (_port_) :: + "=D" (addr), "=c" (count), "=d" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); #endif } else { @@ -376,7 +377,8 @@ cld \n\ repne \n\ movsb" : - "+D" (addr), "+c" (count), "+S" (_port_) :: + "=D" (addr), "=c" (count), "=S" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); #endif } @@ -396,7 +398,8 @@ stosw \n\ addl $2,%2 \n\ loop 1b" : - "+D" (addr), "+c" (count), "+d" (_port_) :: + "=D" (addr), "=c" (count), "=d" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); #endif } else { @@ -406,7 +409,8 @@ cld \n\ repne \n\ movsw" : - "+D" (addr), "+c" (count), "+S" (_port_) :: + "=D" (addr), "=c" (count), "=S" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); #endif } @@ -426,7 +430,8 @@ stosl \n\ addl $4,%2 \n\ loop 1b" : - "+D" (addr), "+c" (count), "+d" (_port_) :: + "=D" (addr), "=c" (count), "=d" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); #endif } else { @@ -436,7 +441,8 @@ cld \n\ repne \n\ movsl" : - "+D" (addr), "+c" (count), "+S" (_port_) :: + "=D" (addr), "=c" (count), "=S" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); #endif } @@ -536,8 +542,8 @@ 1: lodsb \n\ movb %%al,(%2) \n\ loop 1b" : - "+S" (addr), "+c" (count) : - "r" (bsh + offset) : + "=S" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); #endif } @@ -557,8 +563,8 @@ 1: lodsw \n\ movw %%ax,(%2) \n\ loop 1b" : - "+S" (addr), "+c" (count) : - "r" (bsh + offset) : + "=S" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); #endif } @@ -578,8 +584,8 @@ 1: lodsl \n\ movl %%eax,(%2) \n\ loop 1b" : - "+S" (addr), "+c" (count) : - "r" (bsh + offset) : + "=S" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); #endif } @@ -625,7 +631,8 @@ outb %%al,%w0 \n\ incl %0 \n\ loop 1b" : - "+d" (_port_), "+S" (addr), "+c" (count) :: + "=d" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); #endif } else { @@ -635,7 +642,8 @@ cld \n\ repne \n\ movsb" : - "+D" (_port_), "+S" (addr), "+c" (count) :: + "=D" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); #endif } @@ -655,7 +663,8 @@ outw %%ax,%w0 \n\ addl $2,%0 \n\ loop 1b" : - "+d" (_port_), "+S" (addr), "+c" (count) :: + "=d" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); #endif } else { @@ -665,7 +674,8 @@ cld \n\ repne \n\ movsw" : - "+D" (_port_), "+S" (addr), "+c" (count) :: + "=D" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); #endif } @@ -685,7 +695,8 @@ outl %%eax,%w0 \n\ addl $4,%0 \n\ loop 1b" : - "+d" (_port_), "+S" (addr), "+c" (count) :: + "=d" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); #endif } else { @@ -695,7 +706,8 @@ cld \n\ repne \n\ movsl" : - "+D" (_port_), "+S" (addr), "+c" (count) :: + "=D" (_port_), "=S" (addr), "=c" (count) : >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 17 21:01:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 794E516A420; Fri, 17 Jun 2005 21:01:09 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0323316A41C for ; Fri, 17 Jun 2005 21:01:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF52E43D1F for ; Fri, 17 Jun 2005 21:01:08 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5HL18HL060166 for ; Fri, 17 Jun 2005 21:01:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5HL18NA060163 for perforce@freebsd.org; Fri, 17 Jun 2005 21:01:08 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Jun 2005 21:01:08 GMT Message-Id: <200506172101.j5HL18NA060163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 78687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2005 21:01:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=78687 Change 78687 by jhb@jhb_slimer on 2005/06/17 21:00:50 Roadmap for atomic changes. Affected files ... .. //depot/projects/smpng/sys/notes#42 edit Differences ... ==== //depot/projects/smpng/sys/notes#42 (text+ko) ==== @@ -40,6 +40,21 @@ - not sure powerpc_mb() should clobber memory - sparc64 - sys + + start over saving current state in the ktrace branch so I can break this up + - use more macros and duplicate less identical functions + - implement + - test + - commit + - stop using '+' with "m" arguments + - implement + - test + - commit + - change atomic_ptr() to use uintptr_t and change sparc64 and arm to treat + memory modified in _swp and casa as input and output + - implement + - test + - commit + - see what's left of the diff after these - Fixup td_ucred of thread doing execve() to re-sync with process ucred after single threading during an exec. - Untested