From owner-p4-projects@FreeBSD.ORG Sat May 31 19:18:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC1137B404; Sat, 31 May 2003 19:18:42 -0700 (PDT) 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 12D1D37B401 for ; Sat, 31 May 2003 19:18:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E4AF43F85 for ; Sat, 31 May 2003 19:18:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h512If0U077491 for ; Sat, 31 May 2003 19:18:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h512If36077488 for perforce@freebsd.org; Sat, 31 May 2003 19:18:41 -0700 (PDT) Date: Sat, 31 May 2003 19:18:41 -0700 (PDT) Message-Id: <200306010218.h512If36077488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 02:18:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=32255 Change 32255 by peter@peter_hammer on 2003/05/31 19:17:57 build size configuration Affected files ... .. //depot/projects/hammer/release/Makefile#24 edit Differences ... ==== //depot/projects/hammer/release/Makefile#24 (text+ko) ==== @@ -214,6 +214,13 @@ MFSINODE= 8192 MFSLABEL= auto MFSSIZE= 8192 +.elif ${TARGET_ARCH} == "amd64" +BIGBOOTSIZE= 4096 +MFSSIZE= 4096 +BOOTINODE= 8192 +MFSINODE= 8192 +BIGBOOTLABEL= auto +MFSLABEL= auto .endif .if exists(/sbin/bsdlabel) From owner-p4-projects@FreeBSD.ORG Sat May 31 19:19:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81C1737B404; Sat, 31 May 2003 19:19:45 -0700 (PDT) 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 5F4D437B401 for ; Sat, 31 May 2003 19:19:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A2EB43F75 for ; Sat, 31 May 2003 19:19:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h512Jh0U077511 for ; Sat, 31 May 2003 19:19:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h512JhhW077508 for perforce@freebsd.org; Sat, 31 May 2003 19:19:43 -0700 (PDT) Date: Sat, 31 May 2003 19:19:43 -0700 (PDT) Message-Id: <200306010219.h512JhhW077508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 02:19:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=32256 Change 32256 by peter@peter_hammer on 2003/05/31 19:19:01 IFC @32254 Affected files ... .. //depot/projects/hammer/etc/pam.d/README#2 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/hammer/lib/Makefile#16 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#7 integrate .. //depot/projects/hammer/sys/kern/sysv_ipc.c#3 integrate Differences ... ==== //depot/projects/hammer/etc/pam.d/README#2 (text+ko) ==== @@ -30,12 +30,14 @@ password: update authentication tokens. control-flag: How libpam handles success or failure of the module. - required: success is required, and on failure all remaining - modules are run. + required: success is required; on failure all remaining + modules are run, but the request will be denied. requisite: success is required, and on failure no remaining modules are run. sufficient: success is sufficient, and if no previous required module failed, no remaining modules are run. + binding: success is sufficient; on failure all remaining + modules are run, but the request will be denied. optional: ignored unless the other modules return PAM_IGNORE. arguments: Module-specific options, plus some generic ones: @@ -57,4 +59,4 @@ To get the intended semantics, add a "required" entry listing the pam_deny module at the end of the chain. -$FreeBSD: src/etc/pam.d/README,v 1.3 2001/12/05 21:26:00 des Exp $ +$FreeBSD: src/etc/pam.d/README,v 1.4 2003/06/01 00:34:38 des Exp $ ==== //depot/projects/hammer/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.4 2003/06/01 00:32:03 gordon Exp $ # # PROVIDE: mountcritlocal @@ -20,7 +20,7 @@ FreeBSD) # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. - networkfs_types='nfs:NFS smbfs:SMB portalfs:PORTAL' + networkfs_types='nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS' case ${extra_netfs_types} in [Nn][Oo]) ;; ==== //depot/projects/hammer/lib/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.158 2003/05/31 18:43:17 mtm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.159 2003/06/01 00:32:21 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -70,6 +70,12 @@ .endif .endif +.if ${MACHINE_ARCH} == "ia64" +.if !defined(NOLIBTHR) +_libthr= libthr +.endif +.endif + .if ${MACHINE_ARCH} == "alpha" _libio= libio _compat= compat ==== //depot/projects/hammer/lib/libpam/libpam/Makefile#7 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.45 2003/05/31 23:38:16 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -80,8 +80,7 @@ pam_vinfo.c \ pam_vprompt.c # Local additions -SRCS+= pam_debug_log.c \ - pam_std_option.c +SRCS+= pam_debug_log.c MAN= openpam.3 \ openpam_borrow_cred.3 \ ==== //depot/projects/hammer/sys/kern/sysv_ipc.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/kern/sysv_ipc.c,v 1.24 2003/01/13 23:04:31 dillon Exp $ */ +/* $FreeBSD: src/sys/kern/sysv_ipc.c,v 1.26 2003/05/31 23:31:51 rwatson Exp $ */ /* $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */ /* @@ -76,21 +76,41 @@ int mode; { struct ucred *cred = td->td_ucred; + int error; - /* Check for user match. */ if (cred->cr_uid != perm->cuid && cred->cr_uid != perm->uid) { - if (mode & IPC_M) - return (suser(td) == 0 ? 0 : EPERM); - /* Check for group match. */ + /* + * For a non-create/owner, we require privilege to + * modify the object protections. Note: some other + * implementations permit IPC_M to be delegated to + * unprivileged non-creator/owner uids/gids. + */ + if (mode & IPC_M) { + error = suser(td); + if (error) + return (error); + } + /* + * Try to match against creator/owner group; if not, fall + * back on other. + */ mode >>= 3; if (!groupmember(perm->gid, cred) && !groupmember(perm->cgid, cred)) - /* Check for `other' match. */ mode >>= 3; + } else { + /* + * Always permit the creator/owner to update the object + * protections regardless of whether the object mode + * permits it. + */ + if (mode & IPC_M) + return (0); } - if (mode & IPC_M) - return (0); - return ((mode & perm->mode) == mode || - suser(td) == 0 ? 0 : EACCES); + if ((mode & perm->mode) != mode) { + if (suser(td) != 0) + return (EACCES); + } + return (0); } From owner-p4-projects@FreeBSD.ORG Sat May 31 19:30:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0C1037B404; Sat, 31 May 2003 19:30:58 -0700 (PDT) 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 7154637B401 for ; Sat, 31 May 2003 19:30:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAC0043F93 for ; Sat, 31 May 2003 19:30:57 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h512Uv0U077996 for ; Sat, 31 May 2003 19:30:57 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h512UvTq077993 for perforce@freebsd.org; Sat, 31 May 2003 19:30:57 -0700 (PDT) Date: Sat, 31 May 2003 19:30:57 -0700 (PDT) Message-Id: <200306010230.h512UvTq077993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 02:30:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=32257 Change 32257 by jmallett@jmallett_dalek on 2003/05/31 19:30:13 Abstract out vector installing code, and print information as they are getting installed. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#29 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#29 (text+ko) ==== @@ -583,6 +583,22 @@ }; static void +mips64_vector_install(vm_offset_t addr, char *begin, char *end) +{ + size_t len, max; + + max = 0x80; + len = end - begin; + + if (len > max) + panic("Exception code too big for vector %lx\n", addr); + + printf("Installing exception code %p:%p at %lx, %zu bytes (%zu free)\n", + begin, end, addr, len, max - len); + memcpy((void *)addr, begin, len); +} + +static void mips64_vector_init(void) { /* r4000 exception handler address and end */ @@ -599,29 +615,17 @@ * Copy down exception vector code. */ - if (TLBMissVectorEnd - TLBMissVector > 0x80) - panic("startup: UTLB vector code too large"); - memcpy((void *)MIPS_UTLB_MISS_EXC_VEC, TLBMissVector, - TLBMissVectorEnd - TLBMissVector); - - if (XTLBMissVectorEnd - XTLBMissVector > 0x80) - panic("startup: XTLB vector code too large"); - memcpy((void *)MIPS3_XTLB_MISS_EXC_VEC, XTLBMissVector, - XTLBMissVectorEnd - XTLBMissVector); - - if (CacheVectorEnd - CacheVector > 0x80) - panic("startup: Cache error vector code too large"); - memcpy((void *)MIPS3_CACHE_ERR_EXC_VEC, CacheVector, - CacheVectorEnd - CacheVector); - - if (ExceptionVectorEnd - ExceptionVector > 0x80) - panic("startup: General exception vector code too large"); - memcpy((void *)MIPS3_GEN_EXC_VEC, ExceptionVector, - ExceptionVectorEnd - ExceptionVector); - + mips64_vector_install(MIPS_UTLB_MISS_EXC_VEC, + TLBMissVector, TLBMissVectorEnd); + mips64_vector_install(MIPS3_XTLB_MISS_EXC_VEC, + XTLBMissVector, XTLBMissVectorEnd); + mips64_vector_install(MIPS3_CACHE_ERR_EXC_VEC, + CacheVector, CacheVectorEnd); + mips64_vector_install(MIPS3_GEN_EXC_VEC, + ExceptionVector, ExceptionVectorEnd); /* XXX do a real interrupt vector for the mips32/64? */ - memcpy((void *)MIPS3_INTR_EXC_VEC, ExceptionVector, - ExceptionVectorEnd - ExceptionVector); + mips64_vector_install(MIPS3_INTR_EXC_VEC, + ExceptionVector, ExceptionVectorEnd); /* * Copy locore-function vector. From owner-p4-projects@FreeBSD.ORG Sat May 31 22:16:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AE0B37B404; Sat, 31 May 2003 22:16:28 -0700 (PDT) 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 D563437B401 for ; Sat, 31 May 2003 22:16:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69AC543F85 for ; Sat, 31 May 2003 22:16:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h515GR0U093684 for ; Sat, 31 May 2003 22:16:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h515GQTg093681 for perforce@freebsd.org; Sat, 31 May 2003 22:16:26 -0700 (PDT) Date: Sat, 31 May 2003 22:16:26 -0700 (PDT) Message-Id: <200306010516.h515GQTg093681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 05:16:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=32268 Change 32268 by marcel@marcel_nfs on 2003/05/31 22:16:20 We need to disable both atkbd and psm besides also atkbdc for GENERIC to be bootable on both Intel and HP machines. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#6 (text+ko) ==== @@ -3,6 +3,8 @@ hint.atkbdc.0.disabled="1" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" +hint.atkbd.0.disabled="1" hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" +hint.psm.0.disabled="1" hint.psm.0.irq="12" From owner-p4-projects@FreeBSD.ORG Sat May 31 23:42:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34F5F37B404; Sat, 31 May 2003 23:42:20 -0700 (PDT) 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 C49AD37B401 for ; Sat, 31 May 2003 23:42:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B42843F3F for ; Sat, 31 May 2003 23:42:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h516gJ0U097960 for ; Sat, 31 May 2003 23:42:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h516gIo6097957 for perforce@freebsd.org; Sat, 31 May 2003 23:42:18 -0700 (PDT) Date: Sat, 31 May 2003 23:42:18 -0700 (PDT) Message-Id: <200306010642.h516gIo6097957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 06:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=32273 Change 32273 by peter@peter_overcee on 2003/05/31 23:41:31 Bah! Affected files ... .. //depot/projects/hammer/usr.sbin/crunch/crunchide/Makefile#2 edit Differences ... ==== //depot/projects/hammer/usr.sbin/crunch/crunchide/Makefile#2 (text+ko) ==== @@ -11,7 +11,7 @@ .endif .if ${TARGET_ARCH} == alpha || ${TARGET_ARCH} == ia64 || \ - ${TARGET_ARCH} == sparc64 + ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 CFLAGS+=-DNLIST_ELF64 SRCS+= exec_elf64.c exec_elf64.o: exec_elf32.c From owner-p4-projects@FreeBSD.ORG Sat May 31 23:53:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 433ED37B409; Sat, 31 May 2003 23:53:36 -0700 (PDT) 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 E28FC37B419 for ; Sat, 31 May 2003 23:53:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7968943F85 for ; Sat, 31 May 2003 23:53:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h516rZ0U098759 for ; Sat, 31 May 2003 23:53:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h516rYVu098753 for perforce@freebsd.org; Sat, 31 May 2003 23:53:34 -0700 (PDT) Date: Sat, 31 May 2003 23:53:34 -0700 (PDT) Message-Id: <200306010653.h516rYVu098753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 06:53:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=32275 Change 32275 by peter@peter_hammer on 2003/05/31 23:53:28 crunchide - meet EM_X86_64. EM_X86_64, this is crunchide. Affected files ... .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#5 edit Differences ... ==== //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#5 (text+ko) ==== @@ -164,6 +164,10 @@ #define EM_SPARCV9 43 #endif case EM_SPARCV9: break; +#ifndef EM_X86_64 +#define EM_X86_64 62 +#endif + case EM_X86_64: break; /* ELFDEFNNAME(MACHDEP_ID_CASES) */ default: From owner-p4-projects@FreeBSD.ORG Sun Jun 1 00:15:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B390A37B404; Sun, 1 Jun 2003 00:15:02 -0700 (PDT) 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 4E18737B401 for ; Sun, 1 Jun 2003 00:15:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB77C43F85 for ; Sun, 1 Jun 2003 00:15:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h517F10U000760 for ; Sun, 1 Jun 2003 00:15:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h517F1EX000757 for perforce@freebsd.org; Sun, 1 Jun 2003 00:15:01 -0700 (PDT) Date: Sun, 1 Jun 2003 00:15:01 -0700 (PDT) Message-Id: <200306010715.h517F1EX000757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 07:15:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=32276 Change 32276 by peter@peter_hammer on 2003/06/01 00:14:26 Dont build a fixit floppy for amd64. Sorry David, the chroot ${CHROOTDIR} vs ${_MK} thing doesn't work. "chroot home scratch mk" isn't valid here. Affected files ... .. //depot/projects/hammer/release/Makefile#25 edit Differences ... ==== //depot/projects/hammer/release/Makefile#25 (text+ko) ==== @@ -272,6 +272,9 @@ FIXIT_TARGET= .elif ${TARGET} == "pc98" CRUNCH_TARGETS= boot fixit fixit-small +.elif ${TARGET_ARCH} == "amd64" +CRUNCH_TARGETS= boot +FIXIT_TARGET= .endif .if !defined(CRUNCH_TARGETS) @@ -480,7 +483,7 @@ chmod 755 ${_MK} # Ensure md.ko is loaded if md(4) is not statically compiled into the kernel -mdconfig 2>/dev/null - env -i /usr/sbin/chroot ${_MK:S/\// /g} + env -i /usr/sbin/chroot ${CHROOTDIR} /mk clean: rm -rf boot_crunch release.[0-9] From owner-p4-projects@FreeBSD.ORG Sun Jun 1 01:29:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A163B37B404; Sun, 1 Jun 2003 01:29:34 -0700 (PDT) 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 503E937B401 for ; Sun, 1 Jun 2003 01:29:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAA1043F3F for ; Sun, 1 Jun 2003 01:29:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h518TX0U009704 for ; Sun, 1 Jun 2003 01:29:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h518TX4u009701 for perforce@freebsd.org; Sun, 1 Jun 2003 01:29:33 -0700 (PDT) Date: Sun, 1 Jun 2003 01:29:33 -0700 (PDT) Message-Id: <200306010829.h518TX4u009701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 08:29:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=32279 Change 32279 by peter@peter_hammer on 2003/06/01 01:28:51 add cut/pasted copies from i386, with trivial tweaks Affected files ... .. //depot/projects/hammer/release/amd64/boot_crunch.conf#1 add .. //depot/projects/hammer/release/amd64/dokern.sh#1 add .. //depot/projects/hammer/release/amd64/fixit_crunch.conf#1 add .. //depot/projects/hammer/release/amd64/mkisoimages.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 1 05:06:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B9E337B404; Sun, 1 Jun 2003 05:06:02 -0700 (PDT) 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 E538137B401 for ; Sun, 1 Jun 2003 05:06:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C77F43FDD for ; Sun, 1 Jun 2003 05:06:01 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51C610U027789 for ; Sun, 1 Jun 2003 05:06:01 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51C61x6027786 for perforce@freebsd.org; Sun, 1 Jun 2003 05:06:01 -0700 (PDT) Date: Sun, 1 Jun 2003 05:06:01 -0700 (PDT) Message-Id: <200306011206.h51C61x6027786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 12:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=32290 Change 32290 by des@des.at.des.thinksec.com on 2003/06/01 05:05:15 Cross-reference openpam_{get,set}_option(3). Affected files ... .. //depot/projects/openpam/lib/openpam_get_option.c#9 edit .. //depot/projects/openpam/lib/openpam_set_option.c#12 edit Differences ... ==== //depot/projects/openpam/lib/openpam_get_option.c#9 (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/lib/openpam_get_option.c#8 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#9 $ */ #include @@ -77,4 +77,6 @@ * The =openpam_get_option function returns the value of the specified * option in the context of the currently executing service module, or * =NULL if the option is not set or no module is currently executing. + * + * >openpam_set_option */ ==== //depot/projects/openpam/lib/openpam_set_option.c#12 (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/lib/openpam_set_option.c#11 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#12 $ */ #include @@ -113,4 +113,6 @@ /** * The =openpam_set_option function sets the specified option in the * context of the currently executing service module. + * + * >openpam_get_option */ From owner-p4-projects@FreeBSD.ORG Sun Jun 1 05:24:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 307AD37B401; Sun, 1 Jun 2003 05:24:28 -0700 (PDT) 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 56F9837B409 for ; Sun, 1 Jun 2003 05:24:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22C3443FE0 for ; Sun, 1 Jun 2003 05:24:25 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51COO0U028726 for ; Sun, 1 Jun 2003 05:24:24 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51COO2D028723 for perforce@freebsd.org; Sun, 1 Jun 2003 05:24:24 -0700 (PDT) Date: Sun, 1 Jun 2003 05:24:24 -0700 (PDT) Message-Id: <200306011224.h51COO2D028723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 12:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=32292 Change 32292 by des@des.at.des.thinksec.com on 2003/06/01 05:23:25 Incorporate patches from Dmitry V. Levin which improve the policy loader, reducing the number of times each file is read. Also fix a few minor nits (such as making facility names and control flags case insensitive like they are in Solaris). Affected files ... .. //depot/projects/openpam/lib/openpam_configure.c#10 edit .. //depot/projects/openpam/lib/openpam_impl.h#27 edit Differences ... ==== //depot/projects/openpam/lib/openpam_configure.c#10 (text+ko) ==== @@ -31,9 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_configure.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#10 $ */ +#include #include #include #include @@ -58,7 +59,7 @@ [PAM_SUFFICIENT] = "sufficient", }; -static int openpam_load_chain(pam_chain_t **, const char *, const char *); +static int openpam_load_chain(pam_handle_t *, const char *, pam_facility_t); /* * Matches a word against the first one in a string. @@ -68,7 +69,7 @@ match_word(const char *str, const char *word) { - while (*str && *str == *word) + while (*str && tolower(*str) == tolower(*word)) ++str, ++word; return (*str == ' ' && *word == '\0'); } @@ -121,18 +122,20 @@ typedef enum { pam_conf_style, pam_d_style } openpam_style_t; /* - * Extracts a given chain from a policy file. + * Extracts given chains from a policy file. */ static int -openpam_read_chain(pam_chain_t **chain, +openpam_read_chain(pam_handle_t *pamh, const char *service, - const char *facility, + pam_facility_t facility, const char *filename, openpam_style_t style) { pam_chain_t *this, **next; const char *p, *q; int count, i, lineno, ret; + pam_facility_t fclt; + pam_control_t ctlf; char *line, *name; FILE *f; @@ -141,8 +144,7 @@ "%s: %m", filename); return (0); } - next = chain; - this = *next = NULL; + this = NULL; count = lineno = 0; while ((line = openpam_readline(f, &lineno, NULL)) != NULL) { p = line; @@ -157,15 +159,16 @@ } /* match facility name */ - for (i = 0; i < PAM_NUM_FACILITIES; ++i) - if (match_word(p, _pam_facility_name[i])) + for (fclt = 0; fclt < PAM_NUM_FACILITIES; ++fclt) + if (match_word(p, _pam_facility_name[fclt])) break; - if (i == PAM_NUM_FACILITIES) { + if (fclt == PAM_NUM_FACILITIES) { openpam_log(PAM_LOG_NOTICE, "%s(%d): invalid facility '%.*s' (ignored)", filename, lineno, wordlen(p), p); + goto fail; } - if (!match_word(p, facility)) { + if (facility != fclt && facility != PAM_FACILITY_ANY) { FREE(line); continue; } @@ -180,15 +183,13 @@ filename, lineno); if ((name = dup_word(p)) == NULL) goto syserr; - ret = openpam_load_chain(next, name, facility); + ret = openpam_load_chain(pamh, name, fclt); + fprintf(stderr, "include %s returned %d\n", name, ret); FREE(name); - while (*next != NULL) { - next = &(*next)->next; - ++count; - } - FREE(line); if (ret < 0) goto fail; + count += ret; + FREE(line); continue; } @@ -197,16 +198,16 @@ goto syserr; /* control flag */ - for (i = 0; i < PAM_NUM_CONTROL_FLAGS; ++i) - if (match_word(p, _pam_control_flag_name[i])) + for (ctlf = 0; ctlf < PAM_NUM_CONTROL_FLAGS; ++ctlf) + if (match_word(p, _pam_control_flag_name[ctlf])) break; - if (i == PAM_NUM_CONTROL_FLAGS) { + if (ctlf == PAM_NUM_CONTROL_FLAGS) { openpam_log(PAM_LOG_ERROR, "%s(%d): invalid control flag '%.*s'", filename, lineno, wordlen(p), p); goto fail; } - this->flag = i; + this->flag = ctlf; /* module name */ p = next_word(p); @@ -239,8 +240,10 @@ } /* hook it up */ + for (next = &pamh->chains[fclt]; *next != NULL; + next = &(*next)->next) + /* nothing */ ; *next = this; - next = &this->next; this = NULL; ++count; @@ -269,13 +272,13 @@ }; /* - * Locates the policy file for a given service and reads the given chain + * Locates the policy file for a given service and reads the given chains * from it. */ static int -openpam_load_chain(pam_chain_t **chain, +openpam_load_chain(pam_handle_t *pamh, const char *service, - const char *facility) + pam_facility_t facility) { const char **path; char *filename; @@ -289,11 +292,11 @@ openpam_log(PAM_LOG_ERROR, "asprintf(): %m"); return (-PAM_BUF_ERR); } - r = openpam_read_chain(chain, service, facility, + r = openpam_read_chain(pamh, service, facility, filename, pam_d_style); FREE(filename); } else { - r = openpam_read_chain(chain, service, facility, + r = openpam_read_chain(pamh, service, facility, *path, pam_conf_style); } if (r != 0) @@ -312,20 +315,21 @@ openpam_configure(pam_handle_t *pamh, const char *service) { - int i, ret; + pam_facility_t fclt; + + if (openpam_load_chain(pamh, service, PAM_FACILITY_ANY) < 0) + goto load_err; - for (i = 0; i < PAM_NUM_FACILITIES; ++i) { - ret = openpam_load_chain(&pamh->chains[i], - service, _pam_facility_name[i]); - if (ret == 0) - ret = openpam_load_chain(&pamh->chains[i], - PAM_OTHER, _pam_facility_name[i]); - if (ret < 0) { - openpam_clear_chains(pamh->chains); - return (PAM_SYSTEM_ERR); - } + for (fclt = 0; fclt < PAM_NUM_FACILITIES; ++fclt) { + if (pamh->chains[fclt] != NULL) + continue; + if (openpam_load_chain(pamh, PAM_OTHER, fclt) < 0) + goto load_err; } return (PAM_SUCCESS); + load_err: + openpam_clear_chains(pamh->chains); + return (PAM_SYSTEM_ERR); } /* ==== //depot/projects/openpam/lib/openpam_impl.h#27 (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/lib/openpam_impl.h#26 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#27 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -49,21 +49,26 @@ /* * Control flags */ -#define PAM_BINDING 0 -#define PAM_REQUIRED 1 -#define PAM_REQUISITE 2 -#define PAM_SUFFICIENT 3 -#define PAM_OPTIONAL 4 -#define PAM_NUM_CONTROL_FLAGS 5 +typedef enum { + PAM_BINDING, + PAM_REQUIRED, + PAM_REQUISITE, + PAM_SUFFICIENT, + PAM_OPTIONAL, + PAM_NUM_CONTROL_FLAGS +} pam_control_t; /* * Facilities */ -#define PAM_AUTH 0 -#define PAM_ACCOUNT 1 -#define PAM_SESSION 2 -#define PAM_PASSWORD 3 -#define PAM_NUM_FACILITIES 4 +typedef enum { + PAM_FACILITY_ANY = -1, + PAM_AUTH = 0, + PAM_ACCOUNT, + PAM_SESSION, + PAM_PASSWORD, + PAM_NUM_FACILITIES +} pam_facility_t; typedef struct pam_chain pam_chain_t; struct pam_chain { From owner-p4-projects@FreeBSD.ORG Sun Jun 1 05:28:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17E9B37B401; Sun, 1 Jun 2003 05:28:32 -0700 (PDT) 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 1F97B37B405 for ; Sun, 1 Jun 2003 05:28:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B914243FBD for ; Sun, 1 Jun 2003 05:28:30 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51CSU0U028888 for ; Sun, 1 Jun 2003 05:28:30 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51CSUFP028882 for perforce@freebsd.org; Sun, 1 Jun 2003 05:28:30 -0700 (PDT) Date: Sun, 1 Jun 2003 05:28:30 -0700 (PDT) Message-Id: <200306011228.h51CSUFP028882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 12:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=32293 Change 32293 by des@des.at.des.thinksec.com on 2003/06/01 05:28:03 The next release will be Digitalis. Affected files ... .. //depot/projects/openpam/include/security/openpam_version.h#9 edit Differences ... ==== //depot/projects/openpam/include/security/openpam_version.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -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#8 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#9 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20030502 -#define _OPENPAM_RELEASE "Dianthus" +#define _OPENPAM_VERSION 20030601 +#define _OPENPAM_RELEASE "Digitalis" #endif From owner-p4-projects@FreeBSD.ORG Sun Jun 1 05:46:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0FDF37B404; Sun, 1 Jun 2003 05:46:55 -0700 (PDT) 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 6620537B401 for ; Sun, 1 Jun 2003 05:46:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ACC743FF3 for ; Sun, 1 Jun 2003 05:46:55 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51Cks0U029677 for ; Sun, 1 Jun 2003 05:46:54 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51Ckskb029674 for perforce@freebsd.org; Sun, 1 Jun 2003 05:46:54 -0700 (PDT) Date: Sun, 1 Jun 2003 05:46:54 -0700 (PDT) Message-Id: <200306011246.h51Ckskb029674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 12:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=32296 Change 32296 by des@des.at.des.thinksec.com on 2003/06/01 05:46:10 Release documentation for OpenPAM Digitalis. Affected files ... .. //depot/projects/openpam/HISTORY#19 edit .. //depot/projects/openpam/RELNOTES#18 edit Differences ... ==== //depot/projects/openpam/HISTORY#19 (text+ko) ==== @@ -1,3 +1,22 @@ +OpenPAM Digitalis 2003-06-01 + + - ENHANCE: Completely rewrite the configuration parser and add + support for the "include" control flag. + + - ENHANCE: Improve portability to NetBSD, OpenBSD and Linux. + + - ENHANCE: Lots of additional paranoia. + + - BUGFIX: The sample su(1) application dropped privileges before + forking instead of after. + + - ENHANCE: Document openpam_log(3). + + - ENHANCE: Other minor documentation fixes. + +Thanks to Dmitry V. Levin for considerable +assistance with this release. +============================================================================ OpenPAM Dianthus 2003-05-02 - BUGFIX: Initialize some potentially uninitialized variables. @@ -223,4 +242,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#18 $ +$P4: //depot/projects/openpam/HISTORY#19 $ ==== //depot/projects/openpam/RELNOTES#18 (text+ko) ==== @@ -1,9 +1,9 @@ - Release notes for OpenPAM Dianthus - ================================== + Release notes for OpenPAM Digitalis + =================================== -This is a maintenance release incorporating a number of minor patches -accumulated since the previous release. +This release incorporates several major changes and improvements and +should be considered BETA QUALITY. This release corresponds to the code used in FreeBSD-CURRENT as of the release date. It is also known to build cleanly on NetBSD 1.6, @@ -31,4 +31,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/RELNOTES#17 $ +$P4: //depot/projects/openpam/RELNOTES#18 $ From owner-p4-projects@FreeBSD.ORG Sun Jun 1 05:50:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3974337B404; Sun, 1 Jun 2003 05:50:00 -0700 (PDT) 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 CE18A37B401 for ; Sun, 1 Jun 2003 05:49:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 632EC44003 for ; Sun, 1 Jun 2003 05:49:59 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51Cnx0U029730 for ; Sun, 1 Jun 2003 05:49:59 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51CnwGU029727 for perforce@freebsd.org; Sun, 1 Jun 2003 05:49:58 -0700 (PDT) Date: Sun, 1 Jun 2003 05:49:58 -0700 (PDT) Message-Id: <200306011249.h51CnwGU029727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 12:50:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=32297 Change 32297 by des@des.at.des.thinksec.com on 2003/06/01 05:49:20 Include openpam_readline.3 in the tarball. Affected files ... .. //depot/projects/openpam/MANIFEST#16 edit Differences ... ==== //depot/projects/openpam/MANIFEST#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#15 $ +# $P4: //depot/projects/openpam/MANIFEST#16 $ # CREDITS HISTORY @@ -23,6 +23,7 @@ doc/man/openpam_get_option.3 doc/man/openpam_log.3 doc/man/openpam_nullconv.3 +doc/man/openpam_readline.3 doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 From owner-p4-projects@FreeBSD.ORG Sun Jun 1 08:12:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9239237B404; Sun, 1 Jun 2003 08:12:17 -0700 (PDT) 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 2B36737B401 for ; Sun, 1 Jun 2003 08:12:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C028544035 for ; Sun, 1 Jun 2003 08:12:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51FCG0U038920 for ; Sun, 1 Jun 2003 08:12:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51FCF4I038917 for perforce@freebsd.org; Sun, 1 Jun 2003 08:12:15 -0700 (PDT) Date: Sun, 1 Jun 2003 08:12:15 -0700 (PDT) Message-Id: <200306011512.h51FCF4I038917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 15:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=32304 Change 32304 by rwatson@rwatson_paprika on 2003/06/01 08:11:43 Manually integrate MAC kernel config to match recent GENERIC changes (all driver additions). Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#45 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#45 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.384 2003/05/18 20:39:15 ru Exp $ machine i386 cpu I486_CPU @@ -133,6 +133,7 @@ device aacp # SCSI passthrough for aac (requires CAM) device amr # AMI MegaRAID device ida # Compaq Smart RAID +device ips # IBM (Adaptec) ServeRAID device mlx # Mylex DAC960 family device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID @@ -198,7 +199,9 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x and SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) +device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II From owner-p4-projects@FreeBSD.ORG Sun Jun 1 09:30:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA79337B404; Sun, 1 Jun 2003 09:30:06 -0700 (PDT) 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 51FFA37B401 for ; Sun, 1 Jun 2003 09:30:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4E6243F75 for ; Sun, 1 Jun 2003 09:30:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51GU50U048067 for ; Sun, 1 Jun 2003 09:30:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51GU5x8048064 for perforce@freebsd.org; Sun, 1 Jun 2003 09:30:05 -0700 (PDT) Date: Sun, 1 Jun 2003 09:30:05 -0700 (PDT) Message-Id: <200306011630.h51GU5x8048064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 16:30:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=32307 Change 32307 by rwatson@rwatson_paprika on 2003/06/01 09:29:34 Add a MACALL config file, branched from MAC, which will have all MAC modules enabled. Sometimes we have to link modules into the kernel so that we get INVARIANTS support, until the kernel build is fixed not to need that anyway. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 1 09:32:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA28337B404; Sun, 1 Jun 2003 09:32:09 -0700 (PDT) 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 589AA37B401 for ; Sun, 1 Jun 2003 09:32:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F316343F85 for ; Sun, 1 Jun 2003 09:32:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51GW80U048223 for ; Sun, 1 Jun 2003 09:32:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51GW8Bc048220 for perforce@freebsd.org; Sun, 1 Jun 2003 09:32:08 -0700 (PDT) Date: Sun, 1 Jun 2003 09:32:08 -0700 (PDT) Message-Id: <200306011632.h51GW8Bc048220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 16:32:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=32308 Change 32308 by rwatson@rwatson_paprika on 2003/06/01 09:31:13 Add a lot of modules to MACALL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#2 (text+ko) ==== @@ -35,6 +35,18 @@ options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART +options MAC_BIBA +options MAC_BSDEXTENDED +options MAC_IFOFF +options MAC_LOMAC +options MAC_MLS +options MAC_NONE +options MAC_PARTITION +options MAC_PORTACL +options MAC_SEEOTHERUIDS +options MAC_TEST +#options SEBSD + options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols From owner-p4-projects@FreeBSD.ORG Sun Jun 1 11:19:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFFF237B404; Sun, 1 Jun 2003 11:19:25 -0700 (PDT) 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 7B68937B401; Sun, 1 Jun 2003 11:19:25 -0700 (PDT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B3FD43F93; Sun, 1 Jun 2003 11:19:24 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h51IJHVm073917; Sun, 1 Jun 2003 11:19:21 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h51IJH8U073916; Sun, 1 Jun 2003 11:19:17 -0700 (PDT) Date: Sun, 1 Jun 2003 11:19:17 -0700 From: "David O'Brien" To: Peter Wemm Message-ID: <20030601181917.GA73855@dragon.nuxi.com> References: <200306010715.h517F1EX000757@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200306010715.h517F1EX000757@repoman.freebsd.org> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.1-BETA Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: Perforce Change Reviews Subject: Re: PERFORCE change 32276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 18:19:27 -0000 On Sun, Jun 01, 2003 at 12:15:01AM -0700, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=32276 > > Change 32276 by peter@peter_hammer on 2003/06/01 00:14:26 > > Dont build a fixit floppy for amd64. > Sorry David, the chroot ${CHROOTDIR} vs ${_MK} thing > doesn't work. "chroot home scratch mk" isn't valid here. It certainly worked for me on two different machines. One using CHROOT=/files/release, the other using /usr/release. Though looking at this, the right bit here didn't get committed. > - env -i /usr/sbin/chroot ${_MK:S/\// /g} > + env -i /usr/sbin/chroot ${CHROOTDIR} /mk From owner-p4-projects@FreeBSD.ORG Sun Jun 1 11:20:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 802BE37B404; Sun, 1 Jun 2003 11:20:30 -0700 (PDT) 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 1EF2837B401; Sun, 1 Jun 2003 11:20:30 -0700 (PDT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F7F543F3F; Sun, 1 Jun 2003 11:20:29 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h51IKMVm073935; Sun, 1 Jun 2003 11:20:22 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h51IKMwB073934; Sun, 1 Jun 2003 11:20:22 -0700 (PDT) Date: Sun, 1 Jun 2003 11:20:22 -0700 From: "David O'Brien" To: Peter Wemm Message-ID: <20030601182022.GB73855@dragon.nuxi.com> References: <200306010829.h518TX4u009701@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200306010829.h518TX4u009701@repoman.freebsd.org> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.1-BETA Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: Perforce Change Reviews Subject: Re: PERFORCE change 32279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 18:20:31 -0000 On Sun, Jun 01, 2003 at 01:29:33AM -0700, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=32279 > > Change 32279 by peter@peter_hammer on 2003/06/01 01:28:51 > > add cut/pasted copies from i386, with trivial tweaks > > Affected files ... > > .. //depot/projects/hammer/release/amd64/boot_crunch.conf#1 add > .. //depot/projects/hammer/release/amd64/dokern.sh#1 add We're going to have install floppies?? sparc64/dokern.sh is the right starting point. From owner-p4-projects@FreeBSD.ORG Sun Jun 1 12:32:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5073D37B404; Sun, 1 Jun 2003 12:32:54 -0700 (PDT) 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 DAA3A37B401 for ; Sun, 1 Jun 2003 12:32:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FEB843FAF for ; Sun, 1 Jun 2003 12:32:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51JWq0U058692 for ; Sun, 1 Jun 2003 12:32:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51JWpua058688 for perforce@freebsd.org; Sun, 1 Jun 2003 12:32:51 -0700 (PDT) Date: Sun, 1 Jun 2003 12:32:51 -0700 (PDT) Message-Id: <200306011932.h51JWpua058688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 19:32:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=32315 Change 32315 by marcel@marcel_nfs on 2003/06/01 12:32:27 IFC @32313 Affected files ... .. //depot/projects/ia64/contrib/openpam/CREDITS#8 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#16 integrate .. //depot/projects/ia64/contrib/openpam/LICENSE#9 integrate .. //depot/projects/ia64/contrib/openpam/MANIFEST#14 integrate .. //depot/projects/ia64/contrib/openpam/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/ia64/contrib/openpam/RELNOTES#16 integrate .. //depot/projects/ia64/contrib/openpam/bin/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/bin/su/su.c#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#6 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#7 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#16 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#16 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam.h#16 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#6 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#10 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#13 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#11 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/Makefile#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#17 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_nullconv.c#6 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#15 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_end.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_error.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#16 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_info.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_start.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#12 integrate .. //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#12 integrate .. //depot/projects/ia64/contrib/openpam/modules/Makefile#10 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#9 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#9 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/pam_unix.c#4 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#32 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#12 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#20 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#13 integrate .. //depot/projects/ia64/lib/libc/locale/gbk.c#1 branch .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#17 integrate .. //depot/projects/ia64/lib/libgeom/geom_ctl.c#3 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.h#6 integrate .. //depot/projects/ia64/lib/libpam/libpam/Makefile#22 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ftp/Makefile#5 delete .. //depot/projects/ia64/lib/libpam/modules/pam_ftp/pam_ftp.8#3 delete .. //depot/projects/ia64/lib/libpam/modules/pam_ftp/pam_ftp.c#6 delete .. //depot/projects/ia64/lib/libpam/modules/pam_wheel/Makefile#5 delete .. //depot/projects/ia64/lib/libpam/modules/pam_wheel/pam_wheel.8#4 delete .. //depot/projects/ia64/lib/libpam/modules/pam_wheel/pam_wheel.c#8 delete .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#8 integrate .. //depot/projects/ia64/sbin/bsdlabel/runtest.sh#3 integrate .. //depot/projects/ia64/sbin/gbde/gbde.c#10 integrate .. //depot/projects/ia64/sbin/sunlabel/sunlabel.c#6 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#15 integrate .. //depot/projects/ia64/share/mklocale/Makefile#9 integrate .. //depot/projects/ia64/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/ia64/sys/cam/cam_periph.c#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#14 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#12 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#22 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#15 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#17 integrate .. //depot/projects/ia64/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/ia64/sys/dev/syscons/scmouse.c#8 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#22 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#12 integrate .. //depot/projects/ia64/sys/geom/geom.h#32 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#36 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.h#3 integrate .. //depot/projects/ia64/sys/geom/geom_ext.h#2 delete .. //depot/projects/ia64/sys/geom/geom_subr.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#24 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#47 integrate .. //depot/projects/ia64/sys/modules/sound/driver/au88x0/Makefile#1 branch .. //depot/projects/ia64/sys/netinet/ip_encap.c#9 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#16 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#19 integrate .. //depot/projects/ia64/sys/pc98/pc98/ppc.c#4 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#23 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/ofw_machdep.c#7 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#26 integrate .. //depot/projects/ia64/usr.bin/checknr/checknr.c#5 integrate .. //depot/projects/ia64/usr.bin/env/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/env/env.1#1 branch .. //depot/projects/ia64/usr.bin/printenv/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/printenv/printenv.1#7 integrate Differences ... ==== //depot/projects/ia64/contrib/openpam/CREDITS#8 (text) ==== @@ -14,15 +14,17 @@ Andrew Morgan Brian Fundakowski Feldman Darren J. Moffat + Dmitry V. Levin Eric Melville Gary Winiger Joe Marcus Clarke Juli Mallett Mark Murray + Mike Petullo Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#6 $ +$P4: //depot/projects/openpam/CREDITS#8 $ ==== //depot/projects/ia64/contrib/openpam/HISTORY#16 (text) ==== @@ -1,3 +1,22 @@ +OpenPAM Digitalis 2003-06-01 + + - ENHANCE: Completely rewrite the configuration parser and add + support for the "include" control flag. + + - ENHANCE: Improve portability to NetBSD, OpenBSD and Linux. + + - ENHANCE: Lots of additional paranoia. + + - BUGFIX: The sample su(1) application dropped privileges before + forking instead of after. + + - ENHANCE: Document openpam_log(3). + + - ENHANCE: Other minor documentation fixes. + +Thanks to Dmitry V. Levin for considerable +assistance with this release. +============================================================================ OpenPAM Dianthus 2003-05-02 - BUGFIX: Initialize some potentially uninitialized variables. @@ -223,4 +242,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#18 $ +$P4: //depot/projects/openpam/HISTORY#19 $ ==== //depot/projects/ia64/contrib/openpam/LICENSE#9 (text) ==== @@ -1,5 +1,5 @@ -Copyright (c) 2002 Networks Associates Technology, Inc. +Copyright (c) 2002-2003 Networks Associates Technology, Inc. All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#5 $ +$P4: //depot/projects/openpam/LICENSE#6 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#14 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#13 $ +# $P4: //depot/projects/openpam/MANIFEST#16 $ # CREDITS HISTORY @@ -7,9 +7,11 @@ LICENSE MANIFEST Makefile +Makefile.inc README RELNOTES bin/Makefile +bin/Makefile.inc bin/su/Makefile bin/su/su.c doc/Makefile @@ -21,6 +23,7 @@ doc/man/openpam_get_option.3 doc/man/openpam_log.3 doc/man/openpam_nullconv.3 +doc/man/openpam_readline.3 doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 @@ -76,6 +79,7 @@ lib/openpam_load.c lib/openpam_log.c lib/openpam_nullconv.c +lib/openpam_readline.c lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c ==== //depot/projects/ia64/contrib/openpam/Makefile#9 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/Makefile#7 $ +# $P4: //depot/projects/openpam/Makefile#8 $ # SUBDIR = ==== //depot/projects/ia64/contrib/openpam/RELNOTES#16 (text) ==== @@ -1,13 +1,18 @@ - Release notes for OpenPAM Dianthus - ================================== + Release notes for OpenPAM Digitalis + =================================== -This is a maintenance release incorporating a number of minor patches -accumulated since the previous release. +This release incorporates several major changes and improvements and +should be considered BETA QUALITY. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It may or may not build on other platforms; previous -releases have been built on NetBSD and (with partial success) MacOS X. +release date. It is also known to build cleanly on NetBSD 1.6, +OpenBSD 3.1, and a number of glibc-based Linux platforms (with BSD +make installed). It may or may not build on other platforms; you will +need a BSD-compatible make(1) (NetBSD's make(1) is easy to port to +most POSIX platforms). Previous versions were successfully built on +MacOS X 10.1, but there seem to be issues with the heavily modified +version of GCC 3.1 that ships with MacOS X 10.2. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -26,4 +31,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/RELNOTES#15 $ +$P4: //depot/projects/openpam/RELNOTES#18 $ ==== //depot/projects/ia64/contrib/openpam/bin/Makefile#9 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/Makefile#6 $ +# $P4: //depot/projects/openpam/bin/Makefile#7 $ # SUBDIR = ==== //depot/projects/ia64/contrib/openpam/bin/su/Makefile#9 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,13 +32,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/su/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#8 $ # PROG = su WARNS ?= 4 CFLAGS += -I${.CURDIR}/../../include -DPADD = ${.OBJDIR}/../../lib/libpam.so +DPADD = ${.OBJDIR}/../../lib/libpam.a LDADD = -L${.OBJDIR}/../../lib -R${.OBJDIR}/../../lib -lpam NOMAN = YES ==== //depot/projects/ia64/contrib/openpam/bin/su/su.c#10 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,13 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/bin/su/su.c#8 $ + * $P4: //depot/projects/openpam/bin/su/su.c#12 $ */ #include #include #include +#include #include #include #include @@ -81,9 +82,17 @@ argc -= optind; argv += optind; + if (argc > 0) { + user = *argv; + --argc; + ++argv; + } else { + user = "root"; + } + /* initialize PAM */ pamc.conv = &openpam_ttyconv; - pam_start("su", argc ? *argv : "root", &pamc, &pamh); + pam_start("su", user, &pamc, &pamh); /* set some items */ gethostname(hostname, sizeof(hostname)); @@ -117,20 +126,6 @@ if (pam_err != PAM_SUCCESS || (pwd = getpwnam(user)) == NULL) goto pamerr; - /* set uid and groups */ - if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) { - warn("initgroups()"); - goto err; - } - if (setgid(pwd->pw_gid) == -1) { - warn("setgid()"); - goto err; - } - if (setuid(pwd->pw_uid) == -1) { - warn("setuid()"); - goto err; - } - /* export PAM environment */ if ((pam_envlist = pam_getenvlist(pamh)) != NULL) { for (pam_env = pam_envlist; *pam_env != NULL; ++pam_env) { @@ -154,7 +149,21 @@ warn("fork()"); goto err; case 0: - /* child: start a shell */ + /* child: give up privs and start a shell */ + + /* set uid and groups */ + if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) { + warn("initgroups()"); + _exit(1); + } + if (setgid(pwd->pw_gid) == -1) { + warn("setgid()"); + _exit(1); + } + if (setuid(pwd->pw_uid) == -1) { + warn("setuid()"); + _exit(1); + } execve(*args, args, environ); warn("execve()"); _exit(1); @@ -170,9 +179,7 @@ } pamerr: - pam_end(pamh, pam_err); fprintf(stderr, "Sorry\n"); - exit(1); err: pam_end(pamh, pam_err); exit(1); ==== //depot/projects/ia64/contrib/openpam/doc/Makefile#9 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/Makefile#4 $ +# $P4: //depot/projects/openpam/doc/Makefile#5 $ # SUBDIR = ==== //depot/projects/ia64/contrib/openpam/doc/man/Makefile#11 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/man/Makefile#11 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#13 $ # GENDOC = ${.CURDIR}/../../misc/gendoc.pl @@ -73,6 +73,7 @@ OMAN += openpam_get_option.3 OMAN += openpam_log.3 OMAN += openpam_nullconv.3 +OMAN += openpam_readline.3 OMAN += openpam_restore_cred.3 OMAN += openpam_set_option.3 OMAN += openpam_ttyconv.3 ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#6 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Nm openpam_get_option , .Nm openpam_log , .Nm openpam_nullconv , +.Nm openpam_readline , .Nm openpam_restore_cred , .Nm openpam_set_option , .Nm openpam_ttyconv , @@ -68,6 +69,8 @@ .Fn openpam_log "int level" "const char *fmt" "..." .Ft int .Fn openpam_nullconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" +.Ft char * +.Fn openpam_readline "FILE *f" "int *lineno" "size_t *lenp" .Ft int .Fn openpam_restore_cred "pam_handle_t *pamh" .Ft int @@ -108,6 +111,7 @@ .Xr openpam_get_option 3 , .Xr openpam_log 3 , .Xr openpam_nullconv 3 , +.Xr openpam_readline 3 , .Xr openpam_restore_cred 3 , .Xr openpam_set_option 3 , .Xr openpam_ttyconv 3 , ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#12 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#12 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME @@ -54,6 +54,7 @@ option in the context of the currently executing service module, or .Dv NULL if the option is not set or no module is currently executing. +.Pp .Sh RETURN VALUES The .Nm @@ -61,6 +62,7 @@ .Dv NULL on failure. .Sh SEE ALSO +.Xr openpam_set_option 3 , .Xr pam 3 .Sh STANDARDS The ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,12 +33,12 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_LOG 3 .Os .Sh NAME .Nm openpam_log -.Nd it). Do the next best thing +.Nd log a message through syslog .Sh LIBRARY .Lb libpam .Sh SYNOPSIS @@ -48,9 +48,56 @@ .Ft void .Fn openpam_log "int level" "const char *fmt" "..." .Sh DESCRIPTION -No description available. +The +.Nm +function logs messages using +.Xr syslog 3 . +It is primarily +intended for internal use by the library and modules. +.Pp +The +.Va level +argument indicates the importance of the message. The +following levels are defined: +.Bl -tag -width 18n +.It Dv PAM_LOG_DEBUG +Debugging messages. These messages are normally not +logged unless the global integer variable +.Va _openpam_debug +is set to a non-zero value, in which case they are logged +with a +.Xr syslog 3 +priority of +.Dv LOG_DEBUG . +.It Dv PAM_LOG_VERBOSE +Information about the progress of the authentication +process, or other non-essential messages. These messages +are logged with a +.Xr syslog 3 +priority of +.Dv LOG_INFO . +.It Dv PAM_LOG_NOTICE +Messages relating to non-fatal errors. These messages are +logged with a +.Xr syslog 3 +priority of +.Dv LOG_NOTICE . +.It Dv PAM_LOG_ERROR +Messages relating to serious errors. These messages are +logged with a +.Xr syslog 3 +priority of +.Dv LOG_ERR . +.El +.Pp +The remaining arguments are a +.Xr printf 3 +format string and the +corresponding arguments. .Sh SEE ALSO -.Xr pam 3 +.Xr pam 3 , +.Xr printf 3 , +.Xr syslog 3 .Sh STANDARDS The .Nm ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#7 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME @@ -79,6 +79,7 @@ .Sh SEE ALSO .Xr openpam_ttyconv 3 , .Xr pam 3 , +.Xr pam_authenticate 3 , .Xr pam_chauthtok 3 , .Xr pam_prompt 3 , .Xr pam_set_item 3 , ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#12 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME @@ -52,6 +52,7 @@ .Nm function sets the specified option in the context of the currently executing service module. +.Pp .Sh RETURN VALUES The .Nm @@ -63,6 +64,7 @@ System error. .El .Sh SEE ALSO +.Xr openpam_get_option 3 , .Xr pam 3 , .Xr pam_strerror 3 .Sh STANDARDS ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME @@ -57,7 +57,7 @@ The .Nm function allows the application to specify a -timeout for user input by setting the global variable +timeout for user input by setting the global integer variable .Va openpam_ttyconv_timeout to the length of the timeout in seconds. .Pp ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME @@ -64,7 +64,7 @@ .El .Pp If any other bits are set, -.Xr pam_authenticate 3 +.Nm will return .Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES @@ -95,7 +95,6 @@ .El .Sh SEE ALSO .Xr pam 3 , -.Xr pam_authenticate 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd May 2, 2003 +.Dd June 1, 2003 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_conv.3#3 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2002-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -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#2 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#3 $ .\" .Dd May 27, 2002 .Dt PAM_CONV 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#16 (text) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ .\" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 1 13:42:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACB2E37B404; Sun, 1 Jun 2003 13:42:20 -0700 (PDT) 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 6463637B401 for ; Sun, 1 Jun 2003 13:42:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E95443FB1 for ; Sun, 1 Jun 2003 13:42:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51KgJ0U069323 for ; Sun, 1 Jun 2003 13:42:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51KgJkS069320 for perforce@freebsd.org; Sun, 1 Jun 2003 13:42:19 -0700 (PDT) Date: Sun, 1 Jun 2003 13:42:19 -0700 (PDT) Message-Id: <200306012042.h51KgJkS069320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 20:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=32320 Change 32320 by peter@peter_hammer on 2003/06/01 13:42:17 initial workaround for ERESTART causing suscall args to be trashed. I've got to do this better and make fast_syscall() do the register unwinding itself on the way to doreti since we shouldn't depend on having arrived via fast_syscall here. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#22 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#22 (text+ko) ==== @@ -760,10 +760,14 @@ case ERESTART: /* - * Reconstruct pc, assuming lcall $X,y is 7 bytes, - * int 0x80 is 2 bytes. We saved this in tf_err. + * Reconstruct pc, we know that 'syscall' is 2 bytes. + * We have to do a full context restore so that %r10 + * (which was holding the value of %rcx) is restored for + * the next iteration. */ frame.tf_rip -= frame.tf_err; + frame.tf_r10 = frame.tf_rcx; + td->td_pcb->pcb_flags |= PCB_FULLCTX; break; case EJUSTRETURN: From owner-p4-projects@FreeBSD.ORG Sun Jun 1 13:45:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60B8537B404; Sun, 1 Jun 2003 13:45:25 -0700 (PDT) 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 0190F37B401 for ; Sun, 1 Jun 2003 13:45:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E61043F93 for ; Sun, 1 Jun 2003 13:45:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51KjO0U069527 for ; Sun, 1 Jun 2003 13:45:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51KjNLa069524 for perforce@freebsd.org; Sun, 1 Jun 2003 13:45:23 -0700 (PDT) Date: Sun, 1 Jun 2003 13:45:23 -0700 (PDT) Message-Id: <200306012045.h51KjNLa069524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 20:45:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=32321 Change 32321 by peter@peter_daintree on 2003/06/01 13:45:03 GRRR! I'm sick of kdump being so lousy. add a -p pid argument so kdump can single out a particular pid from a ktrace -i dump. hexdump the binary genio data instead of strvis. strvis for binary sucks. Affected files ... .. //depot/projects/hammer/usr.bin/kdump/kdump.c#3 edit Differences ... ==== //depot/projects/hammer/usr.bin/kdump/kdump.c#3 (text+ko) ==== @@ -72,6 +72,7 @@ void ktrsyscall(struct ktr_syscall *); void ktrsysret(struct ktr_sysret *); void ktrnamei(char *, int); +void hd(void *, int); void ktrgenio(struct ktr_genio *, int); void ktrpsig(struct ktr_psig *); void ktrcsw(struct ktr_csw *); @@ -91,10 +92,11 @@ void *m; int trpoints = ALL_POINTS; int drop_logged; + pid_t pid = 0; (void) setlocale(LC_CTYPE, ""); - while ((ch = getopt(argc,argv,"f:dlm:nRTt:")) != -1) + while ((ch = getopt(argc,argv,"f:dlm:np:RTt:")) != -1) switch((char)ch) { case 'f': tracefile = optarg; @@ -111,6 +113,9 @@ case 'n': fancy = 0; break; + case 'p': + pid = atoi(optarg); + break; case 'R': timestamp = 2; /* relative timestamp */ break; @@ -146,7 +151,8 @@ } } if (trpoints & (1< size) { @@ -157,6 +163,8 @@ } if (ktrlen && fread_tail(m, ktrlen, 1) == 0) errx(1, "data too short"); + if (pid && ktr_header.ktr_pid != pid) + continue; if ((trpoints & (1<= len) + break; + if (p[i] >= ' ' && p[i] <= '~') + printf("%c", p[i]); + else + printf("."); + } + printf("\n"); + } + if ((i % 16) != 0) { + printf("\n"); + } +} + +void ktrgenio(struct ktr_genio *ktr, int len) { int datalen = len - sizeof (struct ktr_genio); @@ -397,6 +441,7 @@ int width; char visbuf[5]; static int screenwidth = 0; + int i, binary; if (screenwidth == 0) { struct winsize ws; @@ -412,42 +457,54 @@ datalen == 1 ? "" : "s"); if (maxdata && datalen > maxdata) datalen = maxdata; - (void)printf(" \""); - col = 8; - for (;datalen > 0; datalen--, dp++) { - (void) vis(visbuf, *dp, VIS_CSTYLE, *(dp+1)); - cp = visbuf; - /* - * Keep track of printables and - * space chars (like fold(1)). - */ - if (col == 0) { - (void)putchar('\t'); - col = 8; - } - switch(*cp) { - case '\n': - col = 0; - (void)putchar('\n'); + + for (i = 0, binary = 0; i < datalen && binary == 0; i++) { + if (dp[i] >= 32 && dp[i] < 127) + continue; + if (dp[i] == 10 || dp[i] == 13 || dp[i] == 0 || dp[i] == 9) continue; - case '\t': - width = 8 - (col&07); - break; - default: - width = strlen(cp); + binary = 1; + } + if (binary) { + hd(dp, datalen); + } else { + (void)printf(" \""); + col = 8; + for (;datalen > 0; datalen--, dp++) { + (void) vis(visbuf, *dp, VIS_CSTYLE, *(dp+1)); + cp = visbuf; + /* + * Keep track of printables and + * space chars (like fold(1)). + */ + if (col == 0) { + (void)putchar('\t'); + col = 8; + } + switch(*cp) { + case '\n': + col = 0; + (void)putchar('\n'); + continue; + case '\t': + width = 8 - (col&07); + break; + default: + width = strlen(cp); + } + if (col + width > (screenwidth-2)) { + (void)printf("\\\n\t"); + col = 8; + } + col += width; + do { + (void)putchar(*cp++); + } while (*cp); } - if (col + width > (screenwidth-2)) { - (void)printf("\\\n\t"); - col = 8; - } - col += width; - do { - (void)putchar(*cp++); - } while (*cp); + if (col == 0) + (void)printf(" "); + (void)printf("\"\n"); } - if (col == 0) - (void)printf(" "); - (void)printf("\"\n"); } const char *signames[] = { From owner-p4-projects@FreeBSD.ORG Sun Jun 1 14:12:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB5FC37B404; Sun, 1 Jun 2003 14:11:59 -0700 (PDT) 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 4C23037B401 for ; Sun, 1 Jun 2003 14:11:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB22143F3F for ; Sun, 1 Jun 2003 14:11:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51LBw0U071655 for ; Sun, 1 Jun 2003 14:11:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51LBwDp071652 for perforce@freebsd.org; Sun, 1 Jun 2003 14:11:58 -0700 (PDT) Date: Sun, 1 Jun 2003 14:11:58 -0700 (PDT) Message-Id: <200306012111.h51LBwDp071652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 21:12:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=32324 Change 32324 by peter@peter_hammer on 2003/06/01 14:11:21 autosense the width of the screen. I'm not sure if this is a good idea or not. Affected files ... .. //depot/projects/hammer/usr.bin/kdump/kdump.c#4 edit Differences ... ==== //depot/projects/hammer/usr.bin/kdump/kdump.c#4 (text+ko) ==== @@ -72,7 +72,8 @@ void ktrsyscall(struct ktr_syscall *); void ktrsysret(struct ktr_sysret *); void ktrnamei(char *, int); -void hd(void *, int); +void hexdump(char *, int, int); +void visdump(char *, int, int); void ktrgenio(struct ktr_genio *, int); void ktrpsig(struct ktr_psig *); void ktrcsw(struct ktr_csw *); @@ -396,27 +397,38 @@ } void -hd(void *buf, int len) +hexdump(char *p, int len, int screenwidth) { - unsigned char *p; int n, i; + int width; - p = buf; - for (n = 0; n < len; n += 16) { - for (i = n; i < n + 16; i++) { - if ((i % 16) == 0) { /* beginning of line */ - printf(" 0x%04x\t", i); + width = 0; + do { + width += 2; + i = 13; /* base offset */ + i += (width / 2) + 1; /* spaces every second byte */ + i += (width * 2); /* width of bytes */ + i += 3; /* " |" */ + i += width; /* each byte */ + i += 1; /* "|" */ + } while (i < screenwidth); + width -= 2; + + for (n = 0; n < len; n += width) { + for (i = n; i < n + width; i++) { + if ((i % width) == 0) { /* beginning of line */ + printf(" 0x%04x", i); } if ((i % 2) == 0) { printf(" "); } if (i < len) - printf("%02x", p[i]); + printf("%02x", p[i] & 0xff); else printf(" "); } - printf("\t"); - for (i = n; i < n + 16; i++) { + printf(" |"); + for (i = n; i < n + width; i++) { if (i >= len) break; if (p[i] >= ' ' && p[i] <= '~') @@ -424,11 +436,56 @@ else printf("."); } - printf("\n"); + printf("|\n"); } - if ((i % 16) != 0) { + if ((i % width) != 0) printf("\n"); +} + +void +visdump(char *dp, int datalen, int screenwidth) +{ + int col = 0; + char *cp; + int width; + char visbuf[5]; + + (void)printf(" \""); + col = 8; + for (;datalen > 0; datalen--, dp++) { + (void) vis(visbuf, *dp, VIS_CSTYLE, *(dp+1)); + cp = visbuf; + /* + * Keep track of printables and + * space chars (like fold(1)). + */ + if (col == 0) { + (void)putchar('\t'); + col = 8; + } + switch(*cp) { + case '\n': + col = 0; + (void)putchar('\n'); + continue; + case '\t': + width = 8 - (col&07); + break; + default: + width = strlen(cp); + } + if (col + width > (screenwidth-2)) { + (void)printf("\\\n\t"); + col = 8; + } + col += width; + do { + (void)putchar(*cp++); + } while (*cp); } + if (col == 0) + (void)printf(" "); + (void)printf("\"\n"); } void @@ -436,10 +493,6 @@ { int datalen = len - sizeof (struct ktr_genio); char *dp = (char *)ktr + sizeof (struct ktr_genio); - char *cp; - int col = 0; - int width; - char visbuf[5]; static int screenwidth = 0; int i, binary; @@ -465,46 +518,10 @@ continue; binary = 1; } - if (binary) { - hd(dp, datalen); - } else { - (void)printf(" \""); - col = 8; - for (;datalen > 0; datalen--, dp++) { - (void) vis(visbuf, *dp, VIS_CSTYLE, *(dp+1)); - cp = visbuf; - /* - * Keep track of printables and - * space chars (like fold(1)). - */ - if (col == 0) { - (void)putchar('\t'); - col = 8; - } - switch(*cp) { - case '\n': - col = 0; - (void)putchar('\n'); - continue; - case '\t': - width = 8 - (col&07); - break; - default: - width = strlen(cp); - } - if (col + width > (screenwidth-2)) { - (void)printf("\\\n\t"); - col = 8; - } - col += width; - do { - (void)putchar(*cp++); - } while (*cp); - } - if (col == 0) - (void)printf(" "); - (void)printf("\"\n"); - } + if (binary) + hexdump(dp, datalen, screenwidth); + else + visdump(dp, datalen, screenwidth); } const char *signames[] = { From owner-p4-projects@FreeBSD.ORG Sun Jun 1 14:17:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9476D37B404; Sun, 1 Jun 2003 14:17:06 -0700 (PDT) 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 34B8C37B401 for ; Sun, 1 Jun 2003 14:17:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BED2B43F3F for ; Sun, 1 Jun 2003 14:17:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51LH50U071905 for ; Sun, 1 Jun 2003 14:17:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51LH5NW071902 for perforce@freebsd.org; Sun, 1 Jun 2003 14:17:05 -0700 (PDT) Date: Sun, 1 Jun 2003 14:17:05 -0700 (PDT) Message-Id: <200306012117.h51LH5NW071902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 21:17:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=32325 Change 32325 by peter@peter_hammer on 2003/06/01 14:16:25 ARGH!!!!! fix sigsetjmp(). Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#6 (text+ko) ==== @@ -62,6 +62,7 @@ testl %esi,%esi jz 2f pushq %rdi + movq %rdi,%rcx movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ leaq 72(%rcx),%rdx /* (sigset_t*)oset */ From owner-p4-projects@FreeBSD.ORG Sun Jun 1 15:19:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B925E37B404; Sun, 1 Jun 2003 15:19:24 -0700 (PDT) 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 6EC5337B401 for ; Sun, 1 Jun 2003 15:19:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19BCE43F85 for ; Sun, 1 Jun 2003 15:19:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51MJN0U076002 for ; Sun, 1 Jun 2003 15:19:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51MJN5c075999 for perforce@freebsd.org; Sun, 1 Jun 2003 15:19:23 -0700 (PDT) Date: Sun, 1 Jun 2003 15:19:23 -0700 (PDT) Message-Id: <200306012219.h51MJN5c075999@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 22:19:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=32329 Change 32329 by peter@peter_hammer on 2003/06/01 15:19:22 GRRR. make jmpbuf be more compatable with libc_r Affected files ... .. //depot/projects/hammer/sys/amd64/include/setjmp.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/setjmp.h#6 (text+ko) ==== @@ -37,7 +37,7 @@ #include -#define _JBLEN 22 /* Size of the jmp_buf on x86. */ +#define _JBLEN 11 /* Size of the jmp_buf on AMD64. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force @@ -45,9 +45,9 @@ * internally to avoid some run-time errors for mismatches. */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE -typedef struct _sigjmp_buf { int _sjb[_JBLEN + 1]; } sigjmp_buf[1]; +typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1]; } sigjmp_buf[1]; #endif -typedef struct _jmp_buf { int _jb[_JBLEN + 1]; } jmp_buf[1]; +typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1]; #endif /* !_MACHINE_SETJMP_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jun 1 15:55:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86A5337B404; Sun, 1 Jun 2003 15:55:09 -0700 (PDT) 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 2025037B401 for ; Sun, 1 Jun 2003 15:55:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B101F43F75 for ; Sun, 1 Jun 2003 15:55:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51Mt80U077502 for ; Sun, 1 Jun 2003 15:55:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51Mt7rV077499 for perforce@freebsd.org; Sun, 1 Jun 2003 15:55:07 -0700 (PDT) Date: Sun, 1 Jun 2003 15:55:07 -0700 (PDT) Message-Id: <200306012255.h51Mt7rV077499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 22:55:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=32331 Change 32331 by peter@peter_hammer on 2003/06/01 15:54:57 document offsets within jmpbuf Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#5 edit .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#7 edit .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#7 edit .. //depot/projects/hammer/sys/amd64/include/setjmp.h#7 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#5 (text+ko) ==== @@ -53,15 +53,15 @@ ENTRY(_setjmp) movq %rdi,%rax movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rax) /* retval */ - movq %rbx, 8(%rax) - movq %rsp,16(%rax) - movq %rbp,24(%rax) - movq %r12,32(%rax) - movq %r13,40(%rax) - movq %r14,48(%rax) - movq %r15,56(%rax) - fnstcw 64(%rax) + movq %rdx, 0(%rax) /* 0; retval */ + movq %rbx, 8(%rax) /* 1; rbx */ + movq %rsp,16(%rax) /* 2; rsp */ + movq %rbp,24(%rax) /* 3; rbp */ + movq %r12,32(%rax) /* 4; r12 */ + movq %r13,40(%rax) /* 5; r13 */ + movq %r14,48(%rax) /* 6; r14 */ + movq %r15,56(%rax) /* 7; r15 */ + fnstcw 64(%rax) /* 8; fpu cw */ xorq %rax,%rax ret ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#7 (text+ko) ==== @@ -57,20 +57,20 @@ movq %rdi,%rcx movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - leaq 72(%rcx),%rdx /* (sigset_t*)oset */ + leaq 72(%rcx),%rdx /* 9,10; (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rcx) /* retval */ - movq %rbx, 8(%rcx) - movq %rsp,16(%rcx) - movq %rbp,24(%rcx) - movq %r12,32(%rcx) - movq %r13,40(%rcx) - movq %r14,48(%rcx) - movq %r15,56(%rcx) - fnstcw 64(%rcx) + movq %rdx, 0(%rcx) /* 0; retval */ + movq %rbx, 8(%rcx) /* 1; rbx */ + movq %rsp,16(%rcx) /* 2; rsp */ + movq %rbp,24(%rcx) /* 3; rbp */ + movq %r12,32(%rcx) /* 4; r12 */ + movq %r13,40(%rcx) /* 5; r13 */ + movq %r14,48(%rcx) /* 6; r14 */ + movq %r15,56(%rcx) /* 7; r15 */ + fnstcw 64(%rcx) /* 8; fpu cw */ xorq %rax,%rax ret ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#7 (text+ko) ==== @@ -58,27 +58,27 @@ */ ENTRY(sigsetjmp) - movl %esi,88(%rdi) + movl %esi,88(%rdi) /* 11; savemask */ testl %esi,%esi jz 2f pushq %rdi movq %rdi,%rcx movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - leaq 72(%rcx),%rdx /* (sigset_t*)oset */ + leaq 72(%rcx),%rdx /* 9,10 (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi 2: movq %rdi,%rcx movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rcx) /* retval */ - movq %rbx, 8(%rcx) - movq %rsp,16(%rcx) - movq %rbp,24(%rcx) - movq %r12,32(%rcx) - movq %r13,40(%rcx) - movq %r14,48(%rcx) - movq %r15,56(%rcx) - fnstcw 64(%rcx) + movq %rdx, 0(%rcx) /* 0; retval */ + movq %rbx, 8(%rcx) /* 1; rbx */ + movq %rsp,16(%rcx) /* 2; rsp */ + movq %rbp,24(%rcx) /* 3; rbp */ + movq %r12,32(%rcx) /* 4; r12 */ + movq %r13,40(%rcx) /* 5; r13 */ + movq %r14,48(%rcx) /* 6; r14 */ + movq %r15,56(%rcx) /* 7; r15 */ + fnstcw 64(%rcx) /* 8; fpu cw */ xorq %rax,%rax ret ==== //depot/projects/hammer/sys/amd64/include/setjmp.h#7 (text+ko) ==== @@ -37,7 +37,7 @@ #include -#define _JBLEN 11 /* Size of the jmp_buf on AMD64. */ +#define _JBLEN 12 /* Size of the jmp_buf on AMD64. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force @@ -45,9 +45,9 @@ * internally to avoid some run-time errors for mismatches. */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE -typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1]; } sigjmp_buf[1]; +typedef struct _sigjmp_buf { long _sjb[_JBLEN]; } sigjmp_buf[1]; #endif -typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1]; +typedef struct _jmp_buf { long _jb[_JBLEN]; } jmp_buf[1]; #endif /* !_MACHINE_SETJMP_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jun 1 16:13:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46C5737B404; Sun, 1 Jun 2003 16:13:33 -0700 (PDT) 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 D824A37B401 for ; Sun, 1 Jun 2003 16:13:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8256543F85 for ; Sun, 1 Jun 2003 16:13:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51NDW0U079233 for ; Sun, 1 Jun 2003 16:13:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51NDVBT079230 for perforce@freebsd.org; Sun, 1 Jun 2003 16:13:31 -0700 (PDT) Date: Sun, 1 Jun 2003 16:13:31 -0700 (PDT) Message-Id: <200306012313.h51NDVBT079230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 23:13:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=32333 Change 32333 by peter@peter_hammer on 2003/06/01 16:13:17 make libc_r work (at least as well as on i386) Affected files ... .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#6 edit Differences ... ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#6 (text+ko) ==== @@ -1043,7 +1043,7 @@ /* Get the top of the threads stack: */ stackp = GET_STACK_JB(thread->ctx.jb); -#if !defined(__ia64__) && !defined(__amd64__) +#if !defined(__ia64__) /* * Leave a little space on the stack and round down to the * nearest aligned word: @@ -1056,8 +1056,6 @@ stackp -= sizeof(struct pthread_signal_frame); #if defined(__ia64__) stackp &= ~0xFUL; -#elif defined(__amd64__) - stackp -= 128; #endif psf = (struct pthread_signal_frame *) stackp; @@ -1087,7 +1085,7 @@ /* * Set up the context: */ -#if !defined(__ia64__) && !defined(__amd64__) +#if !defined(__ia64__) stackp -= sizeof(double); #endif _setjmp(thread->ctx.jb); From owner-p4-projects@FreeBSD.ORG Sun Jun 1 16:29:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F34037B404; Sun, 1 Jun 2003 16:29:55 -0700 (PDT) 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 A0C4437B401 for ; Sun, 1 Jun 2003 16:29:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35D6243F75 for ; Sun, 1 Jun 2003 16:29:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51NTs0U080014 for ; Sun, 1 Jun 2003 16:29:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51NTr0a080011 for perforce@freebsd.org; Sun, 1 Jun 2003 16:29:53 -0700 (PDT) Date: Sun, 1 Jun 2003 16:29:53 -0700 (PDT) Message-Id: <200306012329.h51NTr0a080011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 23:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=32336 Change 32336 by peter@peter_hammer on 2003/06/01 16:29:05 return to vendor version Affected files ... .. //depot/projects/hammer/lib/libc_r/uthread/uthread_kern.c#7 edit Differences ... ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_kern.c#7 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include "pthread_private.h" -#define DEBUG_THREAD_KERN +/* #define DEBUG_THREAD_KERN */ #ifdef DEBUG_THREAD_KERN #define DBG_MSG stdout_debug #else From owner-p4-projects@FreeBSD.ORG Sun Jun 1 16:58:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BC5B37B401; Sun, 1 Jun 2003 16:58:38 -0700 (PDT) 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 259CF37B401 for ; Sun, 1 Jun 2003 16:58:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C509643F75 for ; Sun, 1 Jun 2003 16:58:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51Nwb0U086501 for ; Sun, 1 Jun 2003 16:58:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51NwbJ7086498 for perforce@freebsd.org; Sun, 1 Jun 2003 16:58:37 -0700 (PDT) Date: Sun, 1 Jun 2003 16:58:37 -0700 (PDT) Message-Id: <200306012358.h51NwbJ7086498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2003 23:58:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=32340 Change 32340 by peter@peter_hammer on 2003/06/01 16:57:47 save fpu state Affected files ... .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#8 edit Differences ... ==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#8 (text+ko) ==== @@ -95,8 +95,14 @@ #define SET_STACK_SJB(sjb, stk) (sjb)[0]._sjb[2] = (long)(stk) #define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_rsp = (long)(stk) #define FP_SAVE_UC(ucp) do { \ + char *fdata; \ + fdata = (char *) (ucp)->uc_mcontext.mc_fpstate; \ + __asm__("fxsave %0": :"m"(*fdata)); \ } while (0) #define FP_RESTORE_UC(ucp) do { \ + char *fdata; \ + fdata = (char *) (ucp)->uc_mcontext.mc_fpstate; \ + __asm__("fxrstor %0": :"m"(*fdata)); \ } while (0) #define SET_RETURN_ADDR_JB(jb, ra) (jb)[0]._jb[0] = (long)(ra) #elif defined(__alpha__) From owner-p4-projects@FreeBSD.ORG Sun Jun 1 17:46:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D754E37B404; Sun, 1 Jun 2003 17:46:43 -0700 (PDT) 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 6AED937B401 for ; Sun, 1 Jun 2003 17:46:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FAA043F75 for ; Sun, 1 Jun 2003 17:46:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h520ke0U089655 for ; Sun, 1 Jun 2003 17:46:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h520kdcc089652 for perforce@freebsd.org; Sun, 1 Jun 2003 17:46:39 -0700 (PDT) Date: Sun, 1 Jun 2003 17:46:39 -0700 (PDT) Message-Id: <200306020046.h520kdcc089652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 00:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=32345 Change 32345 by marcel@marcel_nfs on 2003/06/01 17:46:11 IFC @32344 Affected files ... .. //depot/projects/ia64/gnu/lib/csu/Makefile#13 integrate .. //depot/projects/ia64/lib/libalias/alias.h#4 integrate .. //depot/projects/ia64/lib/libalias/alias_db.c#6 integrate .. //depot/projects/ia64/lib/libalias/libalias.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/dlinfo.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/fpclassify.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#5 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/makecontext.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/ia64/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/ia64/lib/libc_r/test/guard_b.c#3 integrate .. //depot/projects/ia64/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/ia64/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/ia64/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/ia64/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/ia64/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/ia64/libexec/ftpd/ftpchroot.5#3 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#15 integrate .. //depot/projects/ia64/release/i386/drivers.conf#20 integrate .. //depot/projects/ia64/release/pc98/drivers.conf#10 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#19 integrate .. //depot/projects/ia64/share/man/man4/mac.4#8 integrate .. //depot/projects/ia64/share/man/man4/mac_biba.4#13 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#9 integrate .. //depot/projects/ia64/share/man/man4/mac_ifoff.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_lomac.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_mls.4#12 integrate .. //depot/projects/ia64/share/man/man4/mac_none.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_partition.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#7 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#16 integrate .. //depot/projects/ia64/share/mk/sys.mk#8 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/ia64/sys/amd64/include/profile.h#2 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#15 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#30 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#36 integrate .. //depot/projects/ia64/sys/i386/include/profile.h#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#76 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#27 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#36 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#56 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#22 integrate .. //depot/projects/ia64/usr.bin/lorder/lorder.sh#3 integrate Differences ... ==== //depot/projects/ia64/gnu/lib/csu/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.16 2003/02/27 09:19:31 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.17 2003/06/01 22:18:05 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -9,6 +9,7 @@ SRCS= crtstuff.c tconfig.h OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So +CSTD= gnu89 CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-omit-frame-pointer ==== //depot/projects/ia64/lib/libalias/alias.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libalias/alias.h,v 1.23 2002/07/01 11:19:40 brian Exp $ + * $FreeBSD: src/lib/libalias/alias.h,v 1.24 2003/06/01 23:15:00 ru Exp $ */ /*- @@ -69,6 +69,7 @@ struct alias_link * PacketAliasRedirectAddr(struct in_addr _src_addr, struct in_addr _alias_addr); +int PacketAliasRedirectDynamic(struct alias_link *_link); void PacketAliasRedirectDelete(struct alias_link *_link); struct alias_link * PacketAliasRedirectPort(struct in_addr _src_addr, ==== //depot/projects/ia64/lib/libalias/alias_db.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.51 2002/07/18 05:18:41 luigi Exp $"); +__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.53 2003/06/01 23:15:00 ru Exp $"); /* Alias_db.c encapsulates all data structures used for storing @@ -1239,7 +1239,7 @@ specified as using the default source address (i.e. device interface address) without knowing in advance what that address is. */ - if (aliasAddress.s_addr != 0 && + if (aliasAddress.s_addr != INADDR_ANY && src_addr.s_addr == aliasAddress.s_addr) { link = _FindLinkOut(nullAddress, dst_addr, src_port, dst_port, @@ -1395,7 +1395,7 @@ specified as using the default aliasing address (i.e. device interface address) without knowing in advance what that address is. */ - if (aliasAddress.s_addr != 0 && + if (aliasAddress.s_addr != INADDR_ANY && alias_addr.s_addr == aliasAddress.s_addr) { link = _FindLinkIn(dst_addr, nullAddress, dst_port, alias_port, @@ -1805,7 +1805,8 @@ if (targetAddress.s_addr == INADDR_ANY) return alias_addr; else if (targetAddress.s_addr == INADDR_NONE) - return aliasAddress; + return (aliasAddress.s_addr != INADDR_ANY) ? + aliasAddress : alias_addr; else return targetAddress; } @@ -1818,7 +1819,8 @@ link->server = link->server->next; return (src_addr); } else if (link->src_addr.s_addr == INADDR_ANY) - return aliasAddress; + return (aliasAddress.s_addr != INADDR_ANY) ? + aliasAddress : alias_addr; else return link->src_addr; } @@ -1834,12 +1836,14 @@ 0, 0, LINK_ADDR, 0); if (link == NULL) { - return aliasAddress; + return (aliasAddress.s_addr != INADDR_ANY) ? + aliasAddress : original_addr; } else { if (link->alias_addr.s_addr == INADDR_ANY) - return aliasAddress; + return (aliasAddress.s_addr != INADDR_ANY) ? + aliasAddress : original_addr; else return link->alias_addr; } @@ -2354,6 +2358,7 @@ PacketAliasAddServer() PacketAliasRedirectProto() PacketAliasRedirectAddr() + PacketAliasRedirectDynamic() PacketAliasRedirectDelete() PacketAliasSetAddress() PacketAliasInit() @@ -2495,6 +2500,20 @@ } +/* Mark the aliasing link dynamic */ +int +PacketAliasRedirectDynamic(struct alias_link *link) +{ + + if (link->flags & LINK_PARTIALLY_SPECIFIED) + return (-1); + else { + link->flags &= ~LINK_PERMANENT; + return (0); + } +} + + void PacketAliasRedirectDelete(struct alias_link *link) { ==== //depot/projects/ia64/lib/libalias/libalias.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.41 2001/11/03 11:34:09 brian Exp $ +.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.43 2003/06/01 23:15:00 ru Exp $ .\" .Dd April 13, 2000 .Dt LIBALIAS 3 @@ -66,11 +66,12 @@ of the kernel, without any access to private kernel data structure, but the source code can also be ported to a kernel environment. .Sh INITIALIZATION AND CONTROL -Two special functions, -.Fn PacketAliasInit -and -.Fn PacketAliasSetAddress , +One special function, +.Fn PacketAliasInit , must always be called before any packet handling may be performed. +Normally, the +.Fn PacketAliasSetAddress +function is called afterwards, to set the default aliasing address. In addition, the operating mode of the packet aliasing engine can be customized by calling .Fn PacketAliasSetMode . @@ -98,7 +99,7 @@ This function will always return the packet aliasing engine to the same initial state. .Fn PacketAliasSetAddress -must be called afterwards, and any desired changes from the default mode +is normally called afterwards, and any desired changes from the default mode bits listed above require a call to .Fn PacketAliasSetMode . .Pp @@ -130,6 +131,8 @@ All outgoing packets are re-mapped to this address unless overridden by a static address mapping established by .Fn PacketAliasRedirectAddr . +If this function is not called, and no static rules match, an outgoing +packet retains its source address. .Pp If the .Dv PKT_ALIAS_RESET_ON_ADDR_CHANGE @@ -542,7 +545,26 @@ .Fa port argument is ignored and could have any value, e.g. htons(~0). .Pp -This function returns 0 on success, -1 otherwise. +This function returns 0 on success, \-1 otherwise. +.Ed +.Pp +.Ft int +.Fn PacketAliasRedirectDynamic "struct alias_link *link" +.Bd -ragged -offset indent +This function marks the specified static redirect rule entered by +.Fn PacketAliasRedirectPort +as dynamic. +This can be used to e.g. dynamically redirect a single TCP connection, +after which the rule is removed. +Only fully specified links can be made dynamic. +(See the +.Sx STATIC AND DYNAMIC LINKS +and +.Sx PARTIALLY SPECIFIED ALIASING LINKS +sections below for a definition of static vs. dynamic, +and partially vs. fully specified links.) +.Pp +This function returns 0 on success, \-1 otherwise. .Ed .Pp .Ft void ==== //depot/projects/ia64/lib/libc/gen/dlinfo.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.5 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.6 2003/06/01 19:19:59 ru Exp $ .\" .Dd February 14, 2003 .Os @@ -37,7 +37,7 @@ .In link.h .In dlfcn.h .Ft int -.Fn dlinfo "void * __restrict handle" "int request" "void * __restrict p" +.Fn dlinfo "void * restrict handle" "int request" "void * restrict p" .Sh DESCRIPTION The .Fn dlinfo @@ -50,154 +50,168 @@ .Fa request argument provided by caller. .Pp -A +The .Fa handle -argument is either the value returned from a -.Fn dlopen +argument is either the value returned from the +.Xr dlopen 3 function call or special handle .Dv RTLD_SELF . -If handle is the value returned from -.Fn dlopen -call, the information returned by the +If +.Fa handle +is the value returned from +.Xr dlopen 3 , +the information returned by the .Fn dlinfo -function is pertains the specified object. +function pertains to the specified object. If handle is the special handle .Dv RTLD_SELF , the information returned pertains to the caller itself. .Pp -The following are possible values for +Possible values for the .Fa request -argument to be passed into -.Fn dlinfo : -.Bl -tag -width Ds -.It RTLD_DI_LINKMAP -Retrieve the Link_map (or -.Ft struct link_map ) -structure pointer for -.Fa handle -specified. -On successful return the +argument are: +.Bl -tag -width indent +.It Dv RTLD_DI_LINKMAP +Retrieve the +.Vt Link_map +.Pq Vt "struct link_map" +structure pointer for the specified +.Fa handle . +On successful return, the .Fa p -argument is filled with pointer to Link_map structure -.Ft ( Link_map **p ) -describing shared object specified by +argument is filled with the pointer to the +.Vt Link_map +structure +.Pq Fa "Link_map **p" +describing a shared object specified by the .Fa handle argument. -.Ft Link_map -stuctures are maintained as double-linked list by -.Xr ld.so 1 -in same order as -.Fn dlopen +The +.Vt Link_map +stuctures are maintained as a doubly linked list by +.Xr ld.so 1 , +in the same order as +.Xr dlopen 3 and -.Fn dlclose +.Xr dlclose 3 are called. See -.Sx EXAMPLES -(Example 1.) +.Sx EXAMPLES , +example 1. .Pp The -.Ft Link_map -structure is defined in and have following members: -.Pp -.Bd -literal - caddr_t l_addr; /* Base Address of library */ - const char *l_name; /* Absolute Path to Library */ - const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, /* linked list of of mapped libs */ - *l_prev; +.Vt Link_map +structure is defined in +.Aq Pa link.h +and has the following members: +.Bd -literal -offset indent +caddr_t l_addr; /* Base Address of library */ +const char *l_name; /* Absolute Path to Library */ +const void *l_ld; /* Pointer to .dynamic in memory */ +struct link_map *l_next, /* linked list of mapped libs */ + *l_prev; .Ed -.Bl -tag -width Ds -.It l_addr +.Bl -tag -width ".Va l_addr" +.It Va l_addr The base address of the object loaded into memory. -.It l_name -The full name of loaded shared object. -.It l_ld -The address of dynamic linking information segment -.Dv ( PT_DYNAMIC ) +.It Va l_name +The full name of the loaded shared object. +.It Va l_ld +The address of the dynamic linking information segment +.Pq Dv PT_DYNAMIC loaded into memory. -.It l_next -The next Link_map structure on the link-map list. -.It l_prev -The previous Link_map structure on the link-map list. +.It Va l_next +The next +.Vt Link_map +structure on the link-map list. +.It Va l_prev +The previous +.Vt Link_map +structure on the link-map list. .El -.It RTLD_DI_SERINFO -Retrieve the library search paths associated with given +.It Dv RTLD_DI_SERINFO +Retrieve the library search paths associated with the given .Fa handle argument. The .Fa p argument should point to -.Ft Dl_serinfo +.Vt Dl_serinfo structure buffer -.Fa ( Dl_serinfo *p ) . -.Ft Dl_serinfo -structure must be initialized first with a +.Pq Fa "Dl_serinfo *p" . +The +.Vt Dl_serinfo +structure must be initialized first with the .Dv RTLD_DI_SERINFOSIZE request. .Pp The returned -.Ft Dl_serinfo +.Vt Dl_serinfo structure contains -.Dv dls_cnt -.Ft Dl_serpath +.Va dls_cnt +.Vt Dl_serpath entries. Each entry's -.Dv dlp_name +.Va dlp_name field points to the search path. The corresponding -.Dv dlp_info +.Va dlp_info field contains one of more flags indicating the origin of the path (see the .Dv LA_SER_* -flags defined in header file.) +flags defined in the +.Aq Pa link.h +header file). See -.Sx EXAMPLES -(Example 2) for usage example. -.It RTLD_DI_SERINFOSIZE +.Sx EXAMPLES , +example 2, for a usage example. +.It Dv RTLD_DI_SERINFOSIZE Initialize a -.Ft Dl_serinfo +.Vt Dl_serinfo structure for use in a .Dv RTLD_DI_SERINFO request. Both the -.Dv dls_cnt +.Va dls_cnt and -.Dv dls_size +.Va dls_size fields are returned to indicate the number of search paths applicable to the handle, and the total size of a -.Ft Dl_serinfo +.Vt Dl_serinfo buffer required to hold -.Dv dls_cnt -.Ft Dl_serpath +.Va dls_cnt +.Vt Dl_serpath entries and the associated search path strings. See -.Sx EXAMPLES -(Example 2) for usage example. -.It RTLD_DI_ORIGIN +.Sx EXAMPLES , +example 2, for a usage example. +.It Va RTLD_DI_ORIGIN Retrieve the origin of the dynamic object associated with the handle. -On successful return +On successful return, .Fa p -argument is filled with -.Ft char +argument is filled with the +.Vt char pointer -.Ft ( char *p ) . +.Pq Fa "char *p" . .El .Sh EXAMPLES Example 1: Using .Fn dlinfo -to retrieve Link_map structure. +to retrieve +.Vt Link_map +structure. .Pp The following example shows how dynamic library can detect the list of shared libraries loaded after caller's one. For simplicity, error checking has been omitted. -.Bd -literal - Link_map *map; +.Bd -literal -offset indent +Link_map *map; - dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map); +dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map); - while (map != NULL) { - printf("%p: %s\\n", map->l_addr, map->l_name); - map = map->l_next; - } +while (map != NULL) { + printf("%p: %s\\n", map->l_addr, map->l_name); + map = map->l_next; +} .Ed .Pp Example 2: Using @@ -206,37 +220,37 @@ .Pp The following example shows how a dynamic object can inspect the library search paths that would be used to locate a simple filename with -.Fn dlopen . +.Xr dlopen 3 . For simplicity, error checking has been omitted. -.Bd -literal - Dl_serinfo _info, *info = &_info; - Dl_serpath *path; - unsigned int cnt; +.Bd -literal -offset indent +Dl_serinfo _info, *info = &_info; +Dl_serpath *path; +unsigned int cnt; - /* determine search path count and required buffer size */ - dlinfo(RTLD_SELF, RTLD_DI_SERINFOSIZE, (void *)info); +/* determine search path count and required buffer size */ +dlinfo(RTLD_SELF, RTLD_DI_SERINFOSIZE, (void *)info); - /* allocate new buffer and initialize */ - info = malloc(_info.dls_size); - info->dls_size = _info.dls_size; - info->dls_cnt = _info.dls_cnt; +/* allocate new buffer and initialize */ +info = malloc(_info.dls_size); +info->dls_size = _info.dls_size; +info->dls_cnt = _info.dls_cnt; - /* obtain sarch path information */ - dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info); +/* obtain sarch path information */ +dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info); - path = &info->dls_serpath[0]; +path = &info->dls_serpath[0]; - for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) { - (void) printf("%2d: %s\\n", cnt, path->dls_name); - } +for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) { + (void) printf("%2d: %s\\n", cnt, path->dls_name); +} .Ed .Sh RETURN VALUES The .Fn dlinfo -function returns 0 on success, or -1 if error occured. +function returns 0 on success, or \-1 if an error occured. Whenever an error has been detected, a message detailing it can be retrieved via a call to -.Fn dlerror . +.Xr dlerror 3 . .Sh SEE ALSO .Xr rtld 1 , .Xr dladdr 3 , @@ -247,13 +261,14 @@ .Fn dlinfo function first appeared in the Solaris operating system. In -.Fx +.Fx , it first appeared in .Fx 4.8 . .Sh AUTHORS +.An -nosplit The .Fx -implementation of +implementation of the .Fn dlinfo function was originally written by .An Alexey Zelkin ==== //depot/projects/ia64/lib/libc/gen/fpclassify.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.2 2003/02/12 20:03:40 mike Exp $ +.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.3 2003/06/01 19:19:59 ru Exp $ .\" .Dd February 12, 2003 .Dt FPCLASSIFY 3 @@ -48,41 +48,42 @@ The .Fn fpclassify macro takes an argument of -.Va x +.Fa x and returns one of the following manifest constants. .Bl -tag -width ".Dv FP_SUBNORMAL" .It Dv FP_INFINITE Indicates that -.Va x +.Fa x is an infinite number. .It Dv FP_NAN Indicates that -.Va x +.Fa x is not a number (NaN). .It Dv FP_NORMAL Indicates that -.Va x +.Fa x is a normalized number. .It Dv FP_SUBNORMAL Indicates that -.Va x +.Fa x is a denormalized number. .It Dv FP_ZERO Indicates that -.Va x -is zero (0 or -0). +.Fa x +is zero (0 or \-0). .El .Pp The .Fn isfinite macro returns a non-zero value if and only if its argument has -a finite (zero, subnormal, or normal) value. The +a finite (zero, subnormal, or normal) value. +The .Fn isinf , .Fn isnan , and .Fn isnormal macros return non-zero if and only if -.Va x +.Fa x is an infinity, NaN, or a non-zero normalized number, respectively. .Pp @@ -121,7 +122,7 @@ and .Fn isnan functions, which accepted -.Ft double +.Vt double arguments; these have been superseded by the macros described above. .Sh BUGS ==== //depot/projects/ia64/lib/libc/gen/fts.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.17 2003/06/01 06:43:39 jmallett Exp $ +.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.18 2003/06/01 21:35:27 jmallett Exp $ .\" .Dd September 15, 2002 .Dt FTS 3 @@ -45,7 +45,7 @@ .In sys/stat.h .In fts.h .Ft FTS * -.Fn fts_open "char * const *path_argv" "int options" "int (*compar)(const FTSENT *const *, const FTSENT *const *)" +.Fn fts_open "char * const *path_argv" "int options" "int (*compar)(const FTSENT * const *, const FTSENT * const *)" .Ft FTSENT * .Fn fts_read "FTS *ftsp" .Ft FTSENT * ==== //depot/projects/ia64/lib/libc/gen/isgreater.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.1 2003/02/12 20:03:40 mike Exp $ +.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.2 2003/06/01 19:19:59 ru Exp $ .\" .Dd February 12, 2003 .Dt ISGREATER 3 @@ -56,29 +56,29 @@ and .Fn islessgreater take arguments -.Va x +.Fa x and -.Va y +.Fa y and return a non-zero value if and only if its nominal relation on -.Va x +.Fa x and -.Va y +.Fa y is true. These macros always return zero if either -argument is a not a number (NaN), but unlike the corresponding C +argument is not a number (NaN), but unlike the corresponding C operators, they never raise a floating point exception. .Pp The .Fn isunordered macro takes arguments -.Va x +.Fa x and -.Va y +.Fa y and returns non-zero if and only if neither -.Va x +.Fa x nor -.Va y +.Fa y are NaNs. For any pair of floating-point values, one of the relationships (less, greater, equal, unordered) holds. @@ -93,7 +93,7 @@ .Fn isless , .Fn islessequal , .Fn islessgreater , -and +and .Fn isunordered macros conform to .St -isoC-99 . ==== //depot/projects/ia64/lib/libc/gen/wordexp.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.4 2003/03/13 11:18:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.5 2003/06/01 19:19:59 ru Exp $ .\" .Dd December 27, 2002 .Dt WORDEXP 3 @@ -36,15 +36,9 @@ .Sh SYNOPSIS .In wordexp.h .Ft int -.Fo wordexp -.Fa "const char * restrict words" -.Fa "wordexp_t * restrict we" -.Fa "int flags" -.Fc +.Fn wordexp "const char * restrict words" "wordexp_t * restrict we" "int flags" .Ft void -.Fo wordfree -.Fa "wordexp_t *we" -.Fc +.Fn wordfree "wordexp_t *we" .Sh DESCRIPTION The .Fn wordexp @@ -53,16 +47,16 @@ and places the list of words into the .Va we_wordv member of -.Va we , +.Fa we , and the number of words into .Va we_wordc . .Pp The -.Va flags +.Fa flags argument is the bitwise inclusive OR of any of the following constants: .Bl -tag -width ".Dv WRDE_SHOWERR" .It Dv WRDE_APPEND -Append the words to those generate by a previous call to +Append the words to those generated by a previous call to .Fn wordexp . .It Dv WRDE_DOOFS As many @@ -70,7 +64,7 @@ pointers as are specified by the .Va we_offs member of -.Va we +.Fa we are added to the front of .Va we_wordv . .It Dv WRDE_NOCMD @@ -81,7 +75,7 @@ before using this. .It Dv WRDE_REUSE The -.Va we +.Fa we argument was passed to a previous successful call to .Fn wordexp but has not been passed to @@ -97,13 +91,13 @@ The .Vt wordexp_t structure is defined in -.Pa wordexp.h +.Aq Pa wordexp.h as: .Bd -literal -offset indent typedef struct { - size_t we_wordc; /* count of words matched */ - char **we_wordv; /* pointer to list of words */ - size_t we_offs; /* slots to reserve in we_wordv */ + size_t we_wordc; /* count of words matched */ + char **we_wordv; /* pointer to list of words */ + size_t we_offs; /* slots to reserve in we_wordv */ } wordexp_t; .Ed .Pp @@ -127,7 +121,7 @@ The .Fa words argument contains one of the following unquoted characters: -, +.Aq newline , .Ql | , .Ql & , .Ql \&; , @@ -164,8 +158,8 @@ .El .Sh EXAMPLES Invoke the editor on all -.Dq Li \&.c -files in the current directory, +.Pa .c +files in the current directory and .Pa /etc/motd (error checking omitted): ==== //depot/projects/ia64/lib/libc/ia64/gen/makecontext.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/makecontext.c,v 1.2 2003/06/02 00:16:39 marcel Exp $"); #include #include @@ -113,9 +113,9 @@ memset(&ucp->uc_mcontext, 0, sizeof(ucp->uc_mcontext)); ucp->uc_mcontext.mc_special.sp = (intptr_t)args - 16; ucp->uc_mcontext.mc_special.bspstore = (intptr_t)bsp; - ucp->uc_mcontext.mc_special.pfs = 3; + ucp->uc_mcontext.mc_special.pfs = (3 << 7) | 3; ucp->uc_mcontext.mc_special.rsc = 0xf; ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->ip; - ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->gp; + ucp->uc_mcontext.mc_special.gp = ((struct fdesc*)ctx_wrapper)->gp; ucp->uc_mcontext.mc_special.fpsr = IA64_FPSR_DEFAULT; } ==== //depot/projects/ia64/lib/libc/stdlib/grantpt.3#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" 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/stdlib/grantpt.3,v 1.1 2003/01/02 20:44:41 jmallett Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/grantpt.3,v 1.2 2003/06/01 19:19:59 ru Exp $ .\" .Dd December 23, 2002 .Os @@ -46,7 +46,7 @@ .In stdlib.h .Ft int .Fn grantpt "int fildes" -.Ft char * +.Ft "char *" .Fn ptsname "int fildes" .Ft int .Fn unlockpt "int fildes" @@ -71,19 +71,21 @@ function is used to establish ownership and permissions of the slave device counterpart to the master device specified with -.Va fildes . +.Fa fildes . The slave device's ownership is set to the real user ID of the calling process, and the permissions are set to user readable-writable and group writable. The group owner of the slave device is also set to the -group "tty" if it exists on the system; otherwise, it +group +.Dq Li tty +if it exists on the system; otherwise, it is left untouched. .Pp The .Fn ptsname function returns the full pathname of the slave device counterpart to the master device specified with -.Va fildes . +.Fa fildes . This value can be used to subsequently open the appropriate slave after .Fn posix_openpt @@ -95,15 +97,17 @@ .Fn unlockpt function clears the lock held on the pseudo-terminal pair for the master device specified with -.Va fildes . +.Fa fildes . .Pp The .Fn posix_openpt function opens the first available master pseudo-terminal device and returns a descriptor to it. -.Va mode +The +.Fa mode +argument specifies the flags used for opening the device: -.Bl -tag -width O_NOCTTY +.Bl -tag -width ".Dv O_NOCTTY" .It Dv O_RDWR Open for reading and writing. .It Dv O_NOCTTY @@ -111,19 +115,14 @@ the controlling terminal for the calling process. .El .Sh RETURN VALUES -The -.Fn grantpt -and -.Fn unlockpt -functions return 0 on success; otherwise -1 is returned and -.Va errno -is set to indicate the error. +.Rv -std grantpt unlockpt .Pp The .Fn ptsname function returns a pointer to the name -of the slave device on success; -otherwise a NULL pointer is returned and +of the slave device on success; otherwise a +.Dv NULL +pointer is returned and the global variable .Va errno is set to indicate the error. .Pp @@ -131,7 +130,7 @@ .Fn posix_openpt function returns a file descriptor to the first available master pseudo-terminal device on success; -otherwise -1 is returned and +otherwise \-1 is returned and the global variable .Va errno is set to indicate the error. .Sh ERRORS @@ -144,8 +143,8 @@ .Va errno >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 1 19:32:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A86437B404; Sun, 1 Jun 2003 19:32:50 -0700 (PDT) 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 09A5637B401 for ; Sun, 1 Jun 2003 19:32:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F69043F85 for ; Sun, 1 Jun 2003 19:32:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h522Wn0U097272 for ; Sun, 1 Jun 2003 19:32:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h522Wm09097269 for perforce@freebsd.org; Sun, 1 Jun 2003 19:32:48 -0700 (PDT) Date: Sun, 1 Jun 2003 19:32:48 -0700 (PDT) Message-Id: <200306020232.h522Wm09097269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 02:32:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=32347 Change 32347 by marcel@marcel_nfs on 2003/06/01 19:32:44 IFC @32346 Affected files ... .. //depot/projects/ia64/share/mk/bsd.sys.mk#17 integrate Differences ... ==== //depot/projects/ia64/share/mk/bsd.sys.mk#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.23 2003/06/02 00:11:07 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.24 2003/06/02 01:01:42 obrien Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -8,7 +8,7 @@ # for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 -#CSTD ?= c99 +CSTD ?= .if ${CSTD} != "" . if ${CSTD} == "k&r" CFLAGS += -traditional From owner-p4-projects@FreeBSD.ORG Sun Jun 1 22:52:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0551737B40A; Sun, 1 Jun 2003 22:52:59 -0700 (PDT) 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 903E037B404 for ; Sun, 1 Jun 2003 22:52:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C21343F85 for ; Sun, 1 Jun 2003 22:52:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h525qv0U013763 for ; Sun, 1 Jun 2003 22:52:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h525qvRU013760 for perforce@freebsd.org; Sun, 1 Jun 2003 22:52:57 -0700 (PDT) Date: Sun, 1 Jun 2003 22:52:57 -0700 (PDT) Message-Id: <200306020552.h525qvRU013760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 05:53:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=32358 Change 32358 by peter@peter_hammer on 2003/06/01 22:52:46 now that libc_r works again, turn it and its one consumer back on. Affected files ... .. //depot/projects/hammer/lib/Makefile#17 edit .. //depot/projects/hammer/usr.sbin/Makefile#18 edit Differences ... ==== //depot/projects/hammer/lib/Makefile#17 (text+ko) ==== @@ -40,11 +40,9 @@ _csu=csu .endif -.if ${MACHINE_ARCH} != "amd64" .if !defined(NOLIBC_R) _libc_r= libc_r .endif -.endif .if !defined(NO_BIND) _libbind= libbind ==== //depot/projects/hammer/usr.sbin/Makefile#18 (text+ko) ==== @@ -141,7 +141,7 @@ iptest .endif -.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "amd64" +.if !defined(NOLIBC_R) SUBDIR+=pppctl .endif From owner-p4-projects@FreeBSD.ORG Mon Jun 2 00:03:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3096B37B404; Mon, 2 Jun 2003 00:03:41 -0700 (PDT) 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 CEC1137B401 for ; Mon, 2 Jun 2003 00:03:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8946A43F3F for ; Mon, 2 Jun 2003 00:03:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5273c0U019073 for ; Mon, 2 Jun 2003 00:03:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5273U4L019070 for perforce@freebsd.org; Mon, 2 Jun 2003 00:03:30 -0700 (PDT) Date: Mon, 2 Jun 2003 00:03:30 -0700 (PDT) Message-Id: <200306020703.h5273U4L019070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 07:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=32369 Change 32369 by marcel@marcel_nfs on 2003/06/02 00:02:45 IFC @32362 Affected files ... .. //depot/projects/sio/Makefile.inc1#4 integrate .. //depot/projects/sio/bin/chflags/chflags.1#2 integrate .. //depot/projects/sio/bin/echo/echo.1#2 integrate .. //depot/projects/sio/bin/ed/Makefile#2 integrate .. //depot/projects/sio/bin/pwd/pwd.1#2 integrate .. //depot/projects/sio/bin/sh/expand.c#2 integrate .. //depot/projects/sio/bin/sh/sh.1#2 integrate .. //depot/projects/sio/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/sio/contrib/binutils/bfd/elf64-alpha.c#2 integrate .. //depot/projects/sio/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/sio/contrib/groff/tmac/doc.tmac#3 integrate .. //depot/projects/sio/contrib/openpam/CREDITS#2 integrate .. //depot/projects/sio/contrib/openpam/HISTORY#3 integrate .. //depot/projects/sio/contrib/openpam/INSTALL#2 integrate .. //depot/projects/sio/contrib/openpam/LICENSE#2 integrate .. //depot/projects/sio/contrib/openpam/MANIFEST#2 integrate .. //depot/projects/sio/contrib/openpam/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/sio/contrib/openpam/README#3 integrate .. //depot/projects/sio/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/sio/contrib/openpam/bin/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/sio/contrib/openpam/bin/su/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/sio/contrib/openpam/doc/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/sio/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/sio/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/sio/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/sio/contrib/openpam/include/security/pam_appl.h#3 integrate .. //depot/projects/sio/contrib/openpam/include/security/pam_constants.h#3 integrate .. //depot/projects/sio/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/sio/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/sio/contrib/openpam/lib/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_dispatch.c#3 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_dynamic.c#3 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_impl.h#3 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/sio/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_getenv.c#3 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/sio/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/sio/contrib/openpam/modules/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_deny/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_dummy/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_dummy/pam_dummy.c#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_permit/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/sio/crypto/openssh/log.h#2 integrate .. //depot/projects/sio/crypto/openssh/sshd.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/commands.c#3 integrate .. //depot/projects/sio/crypto/telnet/telnet/externs.h#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/main.c#3 integrate .. //depot/projects/sio/crypto/telnet/telnet/telnet.c#3 integrate .. //depot/projects/sio/crypto/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/sio/etc/defaults/rc.conf#3 integrate .. //depot/projects/sio/etc/devd.conf#4 integrate .. //depot/projects/sio/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/sio/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/sio/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/sio/etc/network.subr#2 integrate .. //depot/projects/sio/etc/pam.d/README#2 integrate .. //depot/projects/sio/etc/pccard_ether#3 integrate .. //depot/projects/sio/etc/rc.d/Makefile#2 integrate .. //depot/projects/sio/etc/rc.d/ldconfig#2 integrate .. //depot/projects/sio/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/sio/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/sio/etc/rc.d/network_ipv6#2 integrate .. //depot/projects/sio/games/caesar/caesar.6#2 integrate .. //depot/projects/sio/games/factor/Makefile#2 integrate .. //depot/projects/sio/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/sio/games/grdc/grdc.6#2 integrate .. //depot/projects/sio/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/sio/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/sio/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/cc/cc_int/amd64.patch#1 branch .. //depot/projects/sio/kerberos5/include/config.h#2 integrate .. //depot/projects/sio/kerberos5/usr.bin/kadmin/Makefile#2 integrate .. //depot/projects/sio/kerberos5/usr.sbin/ktutil/Makefile#2 integrate .. //depot/projects/sio/lib/Makefile#4 integrate .. //depot/projects/sio/lib/libalias/alias.h#2 integrate .. //depot/projects/sio/lib/libalias/alias_db.c#2 integrate .. //depot/projects/sio/lib/libalias/libalias.3#2 integrate .. //depot/projects/sio/lib/libc/alpha/arith.h#2 integrate .. //depot/projects/sio/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/sio/lib/libc/amd64/arith.h#3 integrate .. //depot/projects/sio/lib/libc/amd64/gen/Makefile.inc#3 integrate .. //depot/projects/sio/lib/libc/amd64/gen/ldexp.c#1 branch .. //depot/projects/sio/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/sio/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/sio/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/sio/lib/libc/gen/arc4random.3#3 integrate .. //depot/projects/sio/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/sio/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/sio/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/sio/lib/libc/gen/fts.3#2 integrate .. //depot/projects/sio/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/sio/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/sio/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/sio/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/sio/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/sio/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/sio/lib/libc/i386/arith.h#2 integrate .. //depot/projects/sio/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/sio/lib/libc/i386/sys/i386_vm86.2#2 integrate .. //depot/projects/sio/lib/libc/ia64/arith.h#2 integrate .. //depot/projects/sio/lib/libc/ia64/gen/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libc/ia64/gen/makecontext.c#1 branch .. //depot/projects/sio/lib/libc/ia64/sys/brk.S#2 integrate .. //depot/projects/sio/lib/libc/ia64/sys/pipe.S#2 integrate .. //depot/projects/sio/lib/libc/ia64/sys/sbrk.S#2 integrate .. //depot/projects/sio/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libc/locale/gbk.c#1 branch .. //depot/projects/sio/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/sio/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/sio/lib/libc/locale/wcstod.3#2 integrate .. //depot/projects/sio/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/sio/lib/libc/posix1e/mac.3#2 integrate .. //depot/projects/sio/lib/libc/posix1e/mac.conf.5#2 integrate .. //depot/projects/sio/lib/libc/powerpc/arith.h#2 integrate .. //depot/projects/sio/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/sio/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/sio/lib/libc/sparc64/arith.h#2 integrate .. //depot/projects/sio/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/sio/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/sio/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/sio/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/sio/lib/libc/stdlib/realpath.c#3 integrate .. //depot/projects/sio/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/sio/lib/libc/sys/jail.2#2 integrate .. //depot/projects/sio/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/sio/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/sio/lib/libc/sys/stat.2#2 integrate .. //depot/projects/sio/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/sio/lib/libc_r/man/pthread_getconcurrency.3#2 integrate .. //depot/projects/sio/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/sio/lib/libc_r/test/guard_b.c#2 integrate .. //depot/projects/sio/lib/libc_r/uthread/uthread_close.c#2 integrate .. //depot/projects/sio/lib/libcrypt/Makefile#2 integrate .. //depot/projects/sio/lib/libdevstat/devstat.3#2 integrate .. //depot/projects/sio/lib/libfetch/Makefile#3 integrate .. //depot/projects/sio/lib/libfetch/fetch.3#2 integrate .. //depot/projects/sio/lib/libgeom/Makefile#2 integrate .. //depot/projects/sio/lib/libgeom/geom_ctl.c#2 integrate .. //depot/projects/sio/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/sio/lib/libkvm/kvm_ia64.c#2 integrate .. //depot/projects/sio/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/sio/lib/libpam/libpam/Makefile#4 integrate .. //depot/projects/sio/lib/libpam/libpam/pam_debug_log.c#2 integrate .. //depot/projects/sio/lib/libpam/libpam/pam_std_option.c#2 integrate .. //depot/projects/sio/lib/libpam/libpam/security/pam_mod_misc.h#3 integrate .. //depot/projects/sio/lib/libpam/modules/modules.inc#3 integrate .. //depot/projects/sio/lib/libpam/modules/pam_chroot/pam_chroot.8#2 integrate .. //depot/projects/sio/lib/libpam/modules/pam_ftp/Makefile#2 delete .. //depot/projects/sio/lib/libpam/modules/pam_ftp/pam_ftp.8#2 delete .. //depot/projects/sio/lib/libpam/modules/pam_ftp/pam_ftp.c#2 delete .. //depot/projects/sio/lib/libpam/modules/pam_guest/Makefile#1 branch .. //depot/projects/sio/lib/libpam/modules/pam_guest/pam_guest.8#1 branch .. //depot/projects/sio/lib/libpam/modules/pam_guest/pam_guest.c#1 branch .. //depot/projects/sio/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/sio/lib/libpam/modules/pam_opie/pam_opie.c#2 integrate .. //depot/projects/sio/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/sio/lib/libpam/modules/pam_tacplus/pam_tacplus.c#2 integrate .. //depot/projects/sio/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/sio/lib/libpam/modules/pam_wheel/Makefile#2 delete .. //depot/projects/sio/lib/libpam/modules/pam_wheel/pam_wheel.8#2 delete .. //depot/projects/sio/lib/libpam/modules/pam_wheel/pam_wheel.c#2 delete .. //depot/projects/sio/lib/libpthread/Makefile#2 integrate .. //depot/projects/sio/lib/libpthread/arch/i386/i386/ksd.c#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_attr_get_np.3#2 integrate .. //depot/projects/sio/lib/libpthread/pthread.map#1 branch .. //depot/projects/sio/lib/libpthread/support/Makefile.inc#1 branch .. //depot/projects/sio/lib/libpthread/support/thr_support.c#1 branch .. //depot/projects/sio/lib/libpthread/sys/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libpthread/sys/lock.c#3 integrate .. //depot/projects/sio/lib/libpthread/sys/lock.h#3 integrate .. //depot/projects/sio/lib/libpthread/thread/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_cancel.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_create.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_detach.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_exit.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_find_thread.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_join.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_mutex.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_nanosleep.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_pselect.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_rtld.c#1 branch .. //depot/projects/sio/lib/libpthread/thread/thr_rwlock.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sigwait.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_yield.c#2 integrate .. //depot/projects/sio/lib/libthr/Makefile#2 integrate .. //depot/projects/sio/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/sio/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/sio/lib/libthr/arch/ia64/ia64/_curthread.c#2 integrate .. //depot/projects/sio/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_autoinit.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_cancel.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_detach.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_find_thread.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_gc.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_info.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_kern.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/sio/lib/libthr/thread/thr_printf.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_resume_np.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/sio/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_stack.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/sio/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/sio/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/sio/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/sio/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/sio/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/sio/lib/libusbhid/usbhid.3#2 integrate .. //depot/projects/sio/lib/libwrap/Makefile#2 integrate .. //depot/projects/sio/lib/msun/src/math.h#2 integrate .. //depot/projects/sio/libexec/Makefile#5 integrate .. //depot/projects/sio/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/sio/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/sio/libexec/rpc.rstatd/rstat_proc.c#2 integrate .. //depot/projects/sio/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/sio/libexec/rtld-elf/alpha/rtld_machdep.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/alpha/rtld_start.S#2 integrate .. //depot/projects/sio/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/amd64/rtld_machdep.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/amd64/rtld_start.S#2 integrate .. //depot/projects/sio/libexec/rtld-elf/i386/lockdflt.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/ia64/reloc.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/ia64/rtld_start.S#2 integrate .. //depot/projects/sio/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/sio/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/powerpc/rtld_machdep.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/powerpc/rtld_start.S#2 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld_lock.c#1 branch .. //depot/projects/sio/libexec/rtld-elf/rtld_lock.h#1 branch .. //depot/projects/sio/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/sio/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/sio/libexec/tcpd/Makefile#2 integrate .. //depot/projects/sio/libexec/telnetd/global.c#2 integrate .. //depot/projects/sio/libexec/telnetd/slc.c#2 integrate .. //depot/projects/sio/libexec/telnetd/state.c#2 integrate .. //depot/projects/sio/libexec/telnetd/sys_term.c#2 integrate .. //depot/projects/sio/libexec/telnetd/telnetd.c#2 integrate .. //depot/projects/sio/libexec/telnetd/termstat.c#2 integrate .. //depot/projects/sio/libexec/telnetd/utility.c#2 integrate .. //depot/projects/sio/release/Makefile#4 integrate .. //depot/projects/sio/release/Makefile.inc.docports#2 integrate .. //depot/projects/sio/release/alpha/dokern.sh#3 integrate .. //depot/projects/sio/release/alpha/drivers.conf#2 integrate .. //depot/projects/sio/release/alpha/fixit_crunch.conf#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/sio/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/sio/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/hardware/common/intro.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate .. //depot/projects/sio/release/doc/ja_JP.eucJP/share/sgml/release.dsl#2 integrate .. //depot/projects/sio/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/sio/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/sio/release/i386/dokern.sh#4 integrate .. //depot/projects/sio/release/i386/drivers.conf#2 integrate .. //depot/projects/sio/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/sio/release/ia64/doFS.sh#2 integrate .. //depot/projects/sio/release/pc98/dokern.sh#2 integrate .. //depot/projects/sio/release/pc98/drivers.conf#2 integrate .. //depot/projects/sio/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/sio/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/sio/release/scripts/doFS.sh#3 integrate .. //depot/projects/sio/release/scripts/print-cdrom-packages.sh#2 integrate .. //depot/projects/sio/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/sio/sbin/Makefile#3 integrate .. //depot/projects/sio/sbin/bsdlabel/Makefile#5 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.c#5 integrate .. //depot/projects/sio/sbin/bsdlabel/runtest.sh#3 integrate .. //depot/projects/sio/sbin/devd/devd.8#2 integrate .. //depot/projects/sio/sbin/devd/parse.y#2 integrate .. //depot/projects/sio/sbin/disklabel/disklabel.8#2 integrate .. //depot/projects/sio/sbin/gbde/Makefile#2 integrate .. //depot/projects/sio/sbin/gbde/gbde.c#2 integrate .. //depot/projects/sio/sbin/growfs/growfs.c#2 integrate .. //depot/projects/sio/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/sio/sbin/ldconfig/ldconfig.8#2 integrate .. //depot/projects/sio/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/sio/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/sio/sbin/mount/mount.8#2 integrate .. //depot/projects/sio/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/sio/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/sio/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/sio/sbin/raidctl/raidctl.8#2 integrate .. //depot/projects/sio/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/sio/sbin/sunlabel/Makefile#3 integrate .. //depot/projects/sio/sbin/sunlabel/sunlabel.c#2 integrate .. //depot/projects/sio/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/sio/sbin/umount/umount.8#2 integrate .. //depot/projects/sio/sbin/vinum/vinum.8#3 integrate .. //depot/projects/sio/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/sio/share/examples/etc/make.conf#4 integrate .. //depot/projects/sio/share/examples/netgraph/bluetooth/rc.bluetooth#1 branch .. //depot/projects/sio/share/man/man4/Makefile#3 integrate .. //depot/projects/sio/share/man/man4/acpi.4#2 integrate .. //depot/projects/sio/share/man/man4/agp.4#2 integrate .. //depot/projects/sio/share/man/man4/axe.4#2 integrate .. //depot/projects/sio/share/man/man4/bge.4#2 integrate .. //depot/projects/sio/share/man/man4/dc.4#2 integrate .. //depot/projects/sio/share/man/man4/dpt.4#2 integrate .. //depot/projects/sio/share/man/man4/ehci.4#1 branch .. //depot/projects/sio/share/man/man4/em.4#2 integrate .. //depot/projects/sio/share/man/man4/geom.4#3 integrate .. //depot/projects/sio/share/man/man4/iir.4#2 integrate .. //depot/projects/sio/share/man/man4/ip.4#2 integrate .. //depot/projects/sio/share/man/man4/kame.4#2 integrate .. //depot/projects/sio/share/man/man4/mac.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_lomac.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_none.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_portacl.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_test.4#2 integrate .. //depot/projects/sio/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/sio/share/man/man4/man4.i386/gsc.4#2 integrate .. //depot/projects/sio/share/man/man4/man4.i386/pae.4#2 integrate .. //depot/projects/sio/share/man/man4/man4.i386/sbni.4#2 integrate .. //depot/projects/sio/share/man/man4/man4.i386/vpd.4#2 integrate .. //depot/projects/sio/share/man/man4/my.4#1 branch .. //depot/projects/sio/share/man/man4/ng_bluetooth.4#2 integrate .. //depot/projects/sio/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/sio/share/man/man4/ng_btsocket.4#2 integrate .. //depot/projects/sio/share/man/man4/ng_h4.4#2 integrate .. //depot/projects/sio/share/man/man4/ng_hci.4#2 integrate .. //depot/projects/sio/share/man/man4/ng_l2cap.4#2 integrate .. //depot/projects/sio/share/man/man4/ng_ubt.4#2 integrate .. //depot/projects/sio/share/man/man4/oldcard.4#2 integrate .. //depot/projects/sio/share/man/man4/raid.4#2 integrate .. //depot/projects/sio/share/man/man4/rndtest.4#2 integrate .. //depot/projects/sio/share/man/man4/rue.4#2 integrate .. //depot/projects/sio/share/man/man4/sbsh.4#2 integrate .. //depot/projects/sio/share/man/man4/syscons.4#2 integrate .. //depot/projects/sio/share/man/man4/ubtbcmfw.4#1 branch .. //depot/projects/sio/share/man/man4/umass.4#2 integrate .. //depot/projects/sio/share/man/man4/usb.4#2 integrate .. //depot/projects/sio/share/man/man4/wi.4#2 integrate .. //depot/projects/sio/share/man/man5/fs.5#2 integrate .. //depot/projects/sio/share/man/man5/libmap.conf.5#2 integrate .. //depot/projects/sio/share/man/man5/make.conf.5#3 integrate .. //depot/projects/sio/share/man/man5/procfs.5#2 integrate .. //depot/projects/sio/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/sio/share/man/man7/development.7#2 integrate .. //depot/projects/sio/share/man/man7/maclabel.7#2 integrate .. //depot/projects/sio/share/man/man7/release.7#3 integrate .. //depot/projects/sio/share/man/man7/tuning.7#2 integrate .. //depot/projects/sio/share/man/man8/MAKEDEV.8#2 integrate .. //depot/projects/sio/share/man/man8/Makefile#2 integrate .. //depot/projects/sio/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/sio/share/man/man9/CTASSERT.9#1 branch .. //depot/projects/sio/share/man/man9/KASSERT.9#2 integrate .. //depot/projects/sio/share/man/man9/Makefile#2 integrate .. //depot/projects/sio/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_START.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/sio/share/man/man9/VFS_VPTOFH.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/sio/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/sio/share/man/man9/atomic.9#2 integrate .. //depot/projects/sio/share/man/man9/bus_activate_resource.9#2 integrate .. //depot/projects/sio/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/sio/share/man/man9/bus_child_present.9#2 integrate .. //depot/projects/sio/share/man/man9/bus_dma.9#1 branch .. //depot/projects/sio/share/man/man9/bus_set_resource.9#2 integrate .. //depot/projects/sio/share/man/man9/byteorder.9#2 integrate .. //depot/projects/sio/share/man/man9/devclass.9#2 integrate .. //depot/projects/sio/share/man/man9/devclass_find.9#2 integrate .. //depot/projects/sio/share/man/man9/device.9#2 integrate .. //depot/projects/sio/share/man/man9/device_get_ivars.9#2 integrate .. //depot/projects/sio/share/man/man9/device_get_name.9#2 integrate .. //depot/projects/sio/share/man/man9/device_get_parent.9#2 integrate .. //depot/projects/sio/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/sio/share/man/man9/device_printf.9#2 integrate .. //depot/projects/sio/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/sio/share/man/man9/kobj.9#2 integrate .. //depot/projects/sio/share/man/man9/ktr.9#2 integrate .. //depot/projects/sio/share/man/man9/make_dev.9#2 integrate .. //depot/projects/sio/share/man/man9/malloc.9#3 integrate .. //depot/projects/sio/share/man/man9/mbuf.9#2 integrate .. //depot/projects/sio/share/man/man9/mutex.9#2 integrate .. //depot/projects/sio/share/man/man9/namei.9#2 integrate .. //depot/projects/sio/share/man/man9/rman.9#1 branch .. //depot/projects/sio/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/sio/share/man/man9/signal.9#2 integrate .. //depot/projects/sio/share/man/man9/sleep.9#2 integrate .. //depot/projects/sio/share/man/man9/vget.9#2 integrate .. //depot/projects/sio/share/man/man9/vnode.9#2 integrate .. //depot/projects/sio/share/man/man9/vput.9#2 integrate .. //depot/projects/sio/share/man/man9/vref.9#2 integrate .. //depot/projects/sio/share/man/man9/vrele.9#2 integrate .. //depot/projects/sio/share/man/man9/zone.9#2 integrate .. //depot/projects/sio/share/mk/bsd.README#3 integrate .. //depot/projects/sio/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/sio/share/mk/bsd.info.mk#2 integrate .. //depot/projects/sio/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/sio/share/mk/sys.mk#2 integrate .. //depot/projects/sio/share/mklocale/Makefile#2 integrate .. //depot/projects/sio/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/sio/share/syscons/keymaps/INDEX.keymaps#3 integrate .. //depot/projects/sio/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/sio/share/syscons/keymaps/be.iso.kbd#2 integrate .. //depot/projects/sio/share/syscons/keymaps/fr.dvorak.kbd#1 branch .. //depot/projects/sio/share/syscons/keymaps/norwegian.dvorak.kbd#2 integrate .. //depot/projects/sio/share/termcap/termcap.src#2 integrate .. //depot/projects/sio/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/sio/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/sio/sys/alpha/include/bus.h#2 integrate .. //depot/projects/sio/sys/alpha/include/limits.h#2 integrate .. //depot/projects/sio/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/sio/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/sio/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/sio/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/sio/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/sio/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/sio/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/sio/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/locore.S#2 integrate .. //depot/projects/sio/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/sio/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/sio/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/sio/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/sio/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/amd64/ia32/Makefile#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32.h#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_genassym.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_proto.h#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_signal.h#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_syscall.h#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_syscalls.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_sysent.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/sio/sys/amd64/ia32/ia32_util.h#1 branch .. //depot/projects/sio/sys/amd64/ia32/syscalls.conf#1 branch .. //depot/projects/sio/sys/amd64/ia32/syscalls.master#1 branch .. //depot/projects/sio/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/sio/sys/amd64/include/_types.h#2 integrate .. //depot/projects/sio/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/sio/sys/amd64/include/asm.h#2 integrate .. //depot/projects/sio/sys/amd64/include/bus.h#2 integrate .. //depot/projects/sio/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/sio/sys/amd64/include/bus_at386.h#2 delete .. //depot/projects/sio/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/sio/sys/amd64/include/bus_memio.h#2 integrate .. //depot/projects/sio/sys/amd64/include/bus_pio.h#2 integrate .. //depot/projects/sio/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/sio/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/sio/sys/amd64/include/elf.h#2 integrate .. //depot/projects/sio/sys/amd64/include/frame.h#2 integrate .. //depot/projects/sio/sys/amd64/include/limits.h#2 integrate .. //depot/projects/sio/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/sio/sys/amd64/include/npx.h#2 integrate .. //depot/projects/sio/sys/amd64/include/param.h#2 integrate .. //depot/projects/sio/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/sio/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/sio/sys/amd64/include/profile.h#2 integrate .. //depot/projects/sio/sys/amd64/include/reg.h#2 integrate .. //depot/projects/sio/sys/amd64/include/segments.h#2 integrate .. //depot/projects/sio/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/sio/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/sio/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/sio/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/sio/sys/amd64/isa/icu_vector.S#2 integrate .. //depot/projects/sio/sys/arm/include/_limits.h#3 integrate .. //depot/projects/sio/sys/arm/include/limits.h#2 integrate .. //depot/projects/sio/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/sio/sys/boot/common/loader.8#3 integrate .. //depot/projects/sio/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/sio/sys/boot/forth/frames.4th#1 branch .. //depot/projects/sio/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/sio/sys/boot/forth/screen.4th#1 branch .. //depot/projects/sio/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/sio/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate .. //depot/projects/sio/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/sio/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/sio/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/sio/sys/cam/cam.c#2 integrate .. //depot/projects/sio/sys/cam/cam_periph.c#2 integrate .. //depot/projects/sio/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/sio/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4.h#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/sio/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/sio/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/sio/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/sio/sys/conf/NOTES#5 integrate .. //depot/projects/sio/sys/conf/files#6 integrate .. //depot/projects/sio/sys/conf/files.amd64#4 integrate .. //depot/projects/sio/sys/conf/files.i386#4 integrate .. //depot/projects/sio/sys/conf/files.ia64#4 integrate .. //depot/projects/sio/sys/conf/files.pc98#4 integrate .. //depot/projects/sio/sys/conf/kern.mk#3 integrate .. //depot/projects/sio/sys/conf/kern.post.mk#2 integrate .. //depot/projects/sio/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/sio/sys/conf/majors#2 integrate .. //depot/projects/sio/sys/conf/newvers.sh#3 integrate .. //depot/projects/sio/sys/conf/options#2 integrate .. //depot/projects/sio/sys/conf/options.amd64#3 integrate .. //depot/projects/sio/sys/conf/options.ia64#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/Makefile#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_bstream.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_bstream.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_context.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_context.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_env.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_env.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_self.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_self.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_self_context.s#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_step.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_str.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_str.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_swap.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_swap.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_trace.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_trace.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_utable.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/src/uwx_utable.h#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/test/Makefile#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/test/dump_context.c#1 branch .. //depot/projects/sio/sys/contrib/ia64/libuwx/test/dumpmyself.c#1 branch .. //depot/projects/sio/sys/ddb/db_break.c#2 integrate .. //depot/projects/sio/sys/ddb/db_command.c#4 integrate .. //depot/projects/sio/sys/ddb/db_input.c#2 integrate .. //depot/projects/sio/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/sio/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/sio/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/sio/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/sio/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/sio/sys/dev/aha/aha.c#2 integrate .. //depot/projects/sio/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_inline.h#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.reg#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/sio/sys/dev/amd/amd.c#2 integrate .. //depot/projects/sio/sys/dev/an/if_an.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/sio/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/sio/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/sio/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/sio/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/sio/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/sio/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/sio/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/sio/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/sio/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/sio/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/sio/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/sio/sys/dev/ccd/ccd.c#2 integrate .. //depot/projects/sio/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/sio/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/sio/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/sio/sys/dev/en/midway.c#3 integrate .. //depot/projects/sio/sys/dev/exca/exca.c#2 integrate .. //depot/projects/sio/sys/dev/fb/vga.c#4 integrate .. //depot/projects/sio/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/sio/sys/dev/firewire/fwdma.h#2 integrate .. //depot/projects/sio/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/sio/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/sio/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/sio/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/sio/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/sio/sys/dev/ida/ida.c#2 integrate .. //depot/projects/sio/sys/dev/ips/ips.c#1 branch .. //depot/projects/sio/sys/dev/ips/ips.h#1 branch .. //depot/projects/sio/sys/dev/ips/ips_commands.c#1 branch .. //depot/projects/sio/sys/dev/ips/ips_disk.c#1 branch .. //depot/projects/sio/sys/dev/ips/ips_disk.h#1 branch .. //depot/projects/sio/sys/dev/ips/ips_ioctl.c#1 branch .. //depot/projects/sio/sys/dev/ips/ips_ioctl.h#1 branch .. //depot/projects/sio/sys/dev/ips/ips_pci.c#1 branch .. //depot/projects/sio/sys/dev/isp/isp.c#2 integrate .. //depot/projects/sio/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/sio/sys/dev/kbd/atkbdc.c#3 integrate .. //depot/projects/sio/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/sio/sys/dev/md/md.c#3 integrate .. //depot/projects/sio/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/sio/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/sio/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/sio/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/sio/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/sio/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/sio/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpt_freebsd.c#2 integrate .. //depot/projects/sio/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/sio/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/sio/sys/dev/pci/pci.c#2 integrate .. //depot/projects/sio/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/sio/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/sio/sys/dev/sio/sio.c#9 integrate .. //depot/projects/sio/sys/dev/sio/sio_isa.c#3 integrate .. //depot/projects/sio/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/sio/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/sio/sys/dev/streams/streams.c#2 integrate .. //depot/projects/sio/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/sio/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/sio/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/sio/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/sio/sys/dev/trm/trm.c#2 integrate .. //depot/projects/sio/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/sio/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/sio/sys/dev/usb/umass.c#2 integrate .. //depot/projects/sio/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs.h#4 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs_data.h#4 integrate .. //depot/projects/sio/sys/dev/vinum/vinum.c#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinumconfig.c#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinumext.h#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinumio.c#4 integrate .. //depot/projects/sio/sys/dev/vinum/vinumioctl.c#4 integrate .. //depot/projects/sio/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinummemory.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumobj.h#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/sio/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/sio/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/sio/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/sio/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/sio/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/sio/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/sio/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/sio/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/sio/sys/geom/bde/g_bde.c#3 integrate .. //depot/projects/sio/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/sio/sys/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/sio/sys/geom/geom.h#5 integrate .. //depot/projects/sio/sys/geom/geom_aes.c#5 integrate .. //depot/projects/sio/sys/geom/geom_apple.c#3 integrate .. //depot/projects/sio/sys/geom/geom_bsd.c#6 integrate .. //depot/projects/sio/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/sio/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/sio/sys/geom/geom_dev.c#3 integrate .. //depot/projects/sio/sys/geom/geom_disk.c#3 integrate .. //depot/projects/sio/sys/geom/geom_ext.h#2 delete .. //depot/projects/sio/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/sio/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/sio/sys/geom/geom_mirror.c#3 integrate .. //depot/projects/sio/sys/geom/geom_pc98.c#4 integrate .. //depot/projects/sio/sys/geom/geom_slice.c#3 integrate .. //depot/projects/sio/sys/geom/geom_slice.h#3 integrate .. //depot/projects/sio/sys/geom/geom_subr.c#4 integrate .. //depot/projects/sio/sys/geom/geom_sunlabel.c#4 integrate .. //depot/projects/sio/sys/geom/geom_vol_ffs.c#3 integrate .. //depot/projects/sio/sys/gnu/i386/fpemul/fpu_trig.c#2 integrate .. //depot/projects/sio/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/sio/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/sio/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/sio/sys/i386/bios/apm.c#2 integrate .. //depot/projects/sio/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/sio/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/sio/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/sio/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/sio/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/i386/conf/NOTES#2 integrate .. //depot/projects/sio/sys/i386/conf/PAE#2 integrate .. //depot/projects/sio/sys/i386/i386/bios.c#2 integrate .. //depot/projects/sio/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/sio/sys/i386/i386/i386-gdbstub.c#3 branch .. //depot/projects/sio/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/sio/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/sio/sys/i386/i386/math_emulate.c#2 integrate .. //depot/projects/sio/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/sio/sys/i386/i386/trap.c#2 integrate .. //depot/projects/sio/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/include/_limits.h#3 integrate .. //depot/projects/sio/sys/i386/include/asm.h#2 integrate .. //depot/projects/sio/sys/i386/include/bus_dma.h#2 integrate .. //depot/projects/sio/sys/i386/include/limits.h#2 integrate .. //depot/projects/sio/sys/i386/include/profile.h#2 integrate .. //depot/projects/sio/sys/i386/isa/clock.c#2 integrate .. //depot/projects/sio/sys/i386/isa/ctx.c#2 integrate .. //depot/projects/sio/sys/i386/isa/gpib.c#2 integrate .. //depot/projects/sio/sys/i386/isa/if_cx.c#2 integrate .. //depot/projects/sio/sys/i386/isa/wt.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/sio/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/sio/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/sio/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/sio/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/sio/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/sio/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/sio/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/sio/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/sio/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/sio/sys/ia64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/sio/sys/ia64/ia32/ia32_util.h#2 integrate .. //depot/projects/sio/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/context.s#1 branch .. //depot/projects/sio/sys/ia64/ia64/db_interface.c#5 integrate .. //depot/projects/sio/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/exception.s#2 integrate .. //depot/projects/sio/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/locore.s#3 integrate .. //depot/projects/sio/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/sio/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/support.s#2 integrate .. //depot/projects/sio/sys/ia64/ia64/swtch.s#2 delete .. //depot/projects/sio/sys/ia64/ia64/syscall.s#1 branch .. //depot/projects/sio/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/unwind.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/sio/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/sio/sys/ia64/include/_regset.h#1 branch .. //depot/projects/sio/sys/ia64/include/asm.h#2 integrate .. //depot/projects/sio/sys/ia64/include/bus.h#2 integrate .. //depot/projects/sio/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/sio/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/sio/sys/ia64/include/db_machdep.h#4 integrate .. //depot/projects/sio/sys/ia64/include/frame.h#2 integrate .. //depot/projects/sio/sys/ia64/include/limits.h#2 integrate .. //depot/projects/sio/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/sio/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/sio/sys/ia64/include/proc.h#2 integrate .. //depot/projects/sio/sys/ia64/include/reg.h#2 integrate .. //depot/projects/sio/sys/ia64/include/rse.h#2 delete .. //depot/projects/sio/sys/ia64/include/signal.h#2 integrate .. //depot/projects/sio/sys/ia64/include/smp.h#2 integrate .. //depot/projects/sio/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/sio/sys/ia64/include/unwind.h#2 integrate .. //depot/projects/sio/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/sio/sys/isa/fd.c#2 integrate .. //depot/projects/sio/sys/isa/pnp.c#2 integrate .. //depot/projects/sio/sys/isa/ppc.c#2 integrate .. //depot/projects/sio/sys/isa/psm.c#2 integrate .. //depot/projects/sio/sys/isa/vga_isa.c#3 integrate .. //depot/projects/sio/sys/isofs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/sio/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/sio/sys/kern/init_main.c#3 integrate .. //depot/projects/sio/sys/kern/kern_alq.c#2 integrate .. //depot/projects/sio/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/sio/sys/kern/kern_conf.c#2 integrate .. //depot/projects/sio/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/sio/sys/kern/kern_exec.c#2 integrate .. //depot/projects/sio/sys/kern/kern_exit.c#3 integrate .. //depot/projects/sio/sys/kern/kern_fork.c#3 integrate .. //depot/projects/sio/sys/kern/kern_intr.c#3 integrate .. //depot/projects/sio/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/sio/sys/kern/kern_mac.c#3 integrate .. //depot/projects/sio/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/sio/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/sio/sys/kern/kern_proc.c#3 integrate .. //depot/projects/sio/sys/kern/kern_sig.c#3 integrate .. //depot/projects/sio/sys/kern/kern_switch.c#2 integrate .. //depot/projects/sio/sys/kern/kern_synch.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 2 00:06:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C29CB37B404; Mon, 2 Jun 2003 00:06:53 -0700 (PDT) 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 5E4A337B401 for ; Mon, 2 Jun 2003 00:06:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 729A043F85 for ; Mon, 2 Jun 2003 00:06:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5276o0U019218 for ; Mon, 2 Jun 2003 00:06:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5276gcG019215 for perforce@freebsd.org; Mon, 2 Jun 2003 00:06:42 -0700 (PDT) Date: Mon, 2 Jun 2003 00:06:42 -0700 (PDT) Message-Id: <200306020706.h5276gcG019215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 07:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=32370 Change 32370 by marcel@marcel_nfs on 2003/06/02 00:05:42 IFC @32362 Affected files ... .. //depot/projects/tty/Makefile.inc1#7 integrate .. //depot/projects/tty/bin/chflags/chflags.1#3 integrate .. //depot/projects/tty/bin/echo/echo.1#3 integrate .. //depot/projects/tty/bin/ed/Makefile#2 integrate .. //depot/projects/tty/bin/pwd/pwd.1#3 integrate .. //depot/projects/tty/bin/sh/expand.c#3 integrate .. //depot/projects/tty/bin/sh/sh.1#4 integrate .. //depot/projects/tty/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-alpha.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc.tmac#3 integrate .. //depot/projects/tty/contrib/openpam/CREDITS#2 integrate .. //depot/projects/tty/contrib/openpam/HISTORY#3 integrate .. //depot/projects/tty/contrib/openpam/INSTALL#2 integrate .. //depot/projects/tty/contrib/openpam/LICENSE#2 integrate .. //depot/projects/tty/contrib/openpam/MANIFEST#2 integrate .. //depot/projects/tty/contrib/openpam/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/tty/contrib/openpam/README#3 integrate .. //depot/projects/tty/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/tty/contrib/openpam/bin/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/tty/contrib/openpam/bin/su/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/tty/contrib/openpam/doc/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/tty/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_appl.h#3 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_constants.h#3 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/tty/contrib/openpam/lib/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_borrow_cred.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_dispatch.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_dynamic.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_findenv.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_get_option.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_impl.h#4 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/tty/contrib/openpam/lib/openpam_restore_cred.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_set_option.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_acct_mgmt.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_authenticate.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_chauthtok.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_close_session.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_authtok.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_data.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_item.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_user.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_getenv.c#4 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_open_session.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_set_data.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_set_item.c#4 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_setcred.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_vprompt.c#3 integrate .. //depot/projects/tty/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/tty/contrib/openpam/modules/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_deny/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_dummy/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_dummy/pam_dummy.c#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_permit/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/tty/crypto/openssh/log.h#2 integrate .. //depot/projects/tty/crypto/openssh/sshd.c#3 integrate .. //depot/projects/tty/crypto/telnet/telnet/commands.c#3 integrate .. //depot/projects/tty/crypto/telnet/telnet/externs.h#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/main.c#3 integrate .. //depot/projects/tty/crypto/telnet/telnet/telnet.c#3 integrate .. //depot/projects/tty/crypto/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/tty/etc/defaults/rc.conf#5 integrate .. //depot/projects/tty/etc/devd.conf#5 integrate .. //depot/projects/tty/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/tty/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/tty/etc/network.subr#2 integrate .. //depot/projects/tty/etc/pam.d/README#2 integrate .. //depot/projects/tty/etc/pccard_ether#3 integrate .. //depot/projects/tty/etc/rc.d/Makefile#3 integrate .. //depot/projects/tty/etc/rc.d/ldconfig#3 integrate .. //depot/projects/tty/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/tty/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/tty/etc/rc.d/network_ipv6#3 integrate .. //depot/projects/tty/games/caesar/caesar.6#3 integrate .. //depot/projects/tty/games/factor/Makefile#2 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/tty/games/grdc/grdc.6#3 integrate .. //depot/projects/tty/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/tty/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/tty/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_int/amd64.patch#1 branch .. //depot/projects/tty/kerberos5/include/config.h#2 integrate .. //depot/projects/tty/kerberos5/usr.bin/kadmin/Makefile#2 integrate .. //depot/projects/tty/kerberos5/usr.sbin/ktutil/Makefile#3 integrate .. //depot/projects/tty/lib/Makefile#8 integrate .. //depot/projects/tty/lib/libalias/alias.h#2 integrate .. //depot/projects/tty/lib/libalias/alias_db.c#2 integrate .. //depot/projects/tty/lib/libalias/libalias.3#2 integrate .. //depot/projects/tty/lib/libc/alpha/arith.h#2 integrate .. //depot/projects/tty/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/tty/lib/libc/amd64/arith.h#3 integrate .. //depot/projects/tty/lib/libc/amd64/gen/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/amd64/gen/ldexp.c#1 branch .. //depot/projects/tty/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/tty/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/tty/lib/libc/db/btree/bt_put.c#3 integrate .. //depot/projects/tty/lib/libc/gen/arc4random.3#3 integrate .. //depot/projects/tty/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/tty/lib/libc/gen/dlinfo.3#4 integrate .. //depot/projects/tty/lib/libc/gen/fpclassify.3#3 integrate .. //depot/projects/tty/lib/libc/gen/fts.3#2 integrate .. //depot/projects/tty/lib/libc/gen/getfsent.3#3 integrate .. //depot/projects/tty/lib/libc/gen/getpwent.3#3 integrate .. //depot/projects/tty/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/tty/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/tty/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/tty/lib/libc/gmon/gmon.c#3 integrate .. //depot/projects/tty/lib/libc/i386/arith.h#2 integrate .. //depot/projects/tty/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_vm86.2#3 integrate .. //depot/projects/tty/lib/libc/ia64/arith.h#2 integrate .. //depot/projects/tty/lib/libc/ia64/gen/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/ia64/gen/makecontext.c#1 branch .. //depot/projects/tty/lib/libc/ia64/sys/brk.S#3 integrate .. //depot/projects/tty/lib/libc/ia64/sys/pipe.S#3 integrate .. //depot/projects/tty/lib/libc/ia64/sys/sbrk.S#3 integrate .. //depot/projects/tty/lib/libc/locale/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/locale/gbk.c#1 branch .. //depot/projects/tty/lib/libc/locale/setlocale.3#3 integrate .. //depot/projects/tty/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/tty/lib/libc/locale/wcstod.3#3 integrate .. //depot/projects/tty/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/tty/lib/libc/posix1e/mac.3#4 integrate .. //depot/projects/tty/lib/libc/posix1e/mac.conf.5#2 integrate .. //depot/projects/tty/lib/libc/powerpc/arith.h#2 integrate .. //depot/projects/tty/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/tty/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/tty/lib/libc/sparc64/arith.h#2 integrate .. //depot/projects/tty/lib/libc/stdio/fputws.3#3 integrate .. //depot/projects/tty/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/tty/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/tty/lib/libc/stdlib/realpath.c#4 integrate .. //depot/projects/tty/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/tty/lib/libc/sys/jail.2#3 integrate .. //depot/projects/tty/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/tty/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/tty/lib/libc/sys/stat.2#2 integrate .. //depot/projects/tty/lib/libc/xdr/xdr_rec.c#4 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_getconcurrency.3#2 integrate .. //depot/projects/tty/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/tty/lib/libc_r/test/guard_b.c#2 integrate .. //depot/projects/tty/lib/libc_r/uthread/uthread_close.c#2 integrate .. //depot/projects/tty/lib/libcrypt/Makefile#2 integrate .. //depot/projects/tty/lib/libdevstat/devstat.3#4 integrate .. //depot/projects/tty/lib/libfetch/Makefile#4 integrate .. //depot/projects/tty/lib/libfetch/fetch.3#3 integrate .. //depot/projects/tty/lib/libgeom/Makefile#4 integrate .. //depot/projects/tty/lib/libgeom/geom_ctl.c#2 integrate .. //depot/projects/tty/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/tty/lib/libkvm/kvm_ia64.c#2 integrate .. //depot/projects/tty/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/tty/lib/libpam/libpam/Makefile#5 integrate .. //depot/projects/tty/lib/libpam/libpam/pam_debug_log.c#2 integrate .. //depot/projects/tty/lib/libpam/libpam/pam_std_option.c#2 integrate .. //depot/projects/tty/lib/libpam/libpam/security/pam_mod_misc.h#3 integrate .. //depot/projects/tty/lib/libpam/modules/modules.inc#6 integrate .. //depot/projects/tty/lib/libpam/modules/pam_chroot/pam_chroot.8#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ftp/Makefile#3 delete .. //depot/projects/tty/lib/libpam/modules/pam_ftp/pam_ftp.8#2 delete .. //depot/projects/tty/lib/libpam/modules/pam_ftp/pam_ftp.c#2 delete .. //depot/projects/tty/lib/libpam/modules/pam_guest/Makefile#1 branch .. //depot/projects/tty/lib/libpam/modules/pam_guest/pam_guest.8#1 branch .. //depot/projects/tty/lib/libpam/modules/pam_guest/pam_guest.c#1 branch .. //depot/projects/tty/lib/libpam/modules/pam_krb5/pam_krb5.c#4 integrate .. //depot/projects/tty/lib/libpam/modules/pam_opie/pam_opie.c#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_tacplus/pam_tacplus.c#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_unix/pam_unix.c#3 integrate .. //depot/projects/tty/lib/libpam/modules/pam_wheel/Makefile#3 delete .. //depot/projects/tty/lib/libpam/modules/pam_wheel/pam_wheel.8#2 delete .. //depot/projects/tty/lib/libpam/modules/pam_wheel/pam_wheel.c#3 delete .. //depot/projects/tty/lib/libpthread/Makefile#3 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/i386/ksd.c#2 integrate .. //depot/projects/tty/lib/libpthread/man/pthread_attr_get_np.3#2 integrate .. //depot/projects/tty/lib/libpthread/pthread.map#1 branch .. //depot/projects/tty/lib/libpthread/support/Makefile.inc#1 branch .. //depot/projects/tty/lib/libpthread/support/thr_support.c#1 branch .. //depot/projects/tty/lib/libpthread/sys/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libpthread/sys/lock.c#3 integrate .. //depot/projects/tty/lib/libpthread/sys/lock.h#3 integrate .. //depot/projects/tty/lib/libpthread/thread/Makefile.inc#6 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_cancel.c#5 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_create.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_detach.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_exit.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_find_thread.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_init.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_join.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#5 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_nanosleep.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_private.h#5 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_pselect.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_rtld.c#1 branch .. //depot/projects/tty/lib/libpthread/thread/thr_rwlock.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sig.c#5 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigwait.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_spinlock.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_yield.c#3 integrate .. //depot/projects/tty/lib/libthr/Makefile#2 integrate .. //depot/projects/tty/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/tty/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/tty/lib/libthr/arch/ia64/ia64/_curthread.c#2 integrate .. //depot/projects/tty/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_autoinit.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_cancel.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_detach.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_find_thread.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_gc.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_info.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_kern.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/tty/lib/libthr/thread/thr_printf.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_resume_np.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/tty/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_stack.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/tty/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/tty/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/tty/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/tty/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/tty/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/tty/lib/libusbhid/usbhid.3#3 integrate .. //depot/projects/tty/lib/libwrap/Makefile#2 integrate .. //depot/projects/tty/lib/msun/src/math.h#6 integrate .. //depot/projects/tty/libexec/Makefile#4 integrate .. //depot/projects/tty/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.8#5 integrate .. //depot/projects/tty/libexec/rpc.rstatd/rstat_proc.c#4 integrate .. //depot/projects/tty/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/Makefile#4 integrate .. //depot/projects/tty/libexec/rtld-elf/alpha/rtld_machdep.h#2 integrate .. //depot/projects/tty/libexec/rtld-elf/alpha/rtld_start.S#2 integrate .. //depot/projects/tty/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/amd64/rtld_machdep.h#2 integrate .. //depot/projects/tty/libexec/rtld-elf/amd64/rtld_start.S#2 integrate .. //depot/projects/tty/libexec/rtld-elf/i386/lockdflt.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate .. //depot/projects/tty/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/tty/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/tty/libexec/rtld-elf/ia64/rtld_start.S#2 integrate .. //depot/projects/tty/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/map_object.c#4 integrate .. //depot/projects/tty/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/tty/libexec/rtld-elf/powerpc/rtld_machdep.h#2 integrate .. //depot/projects/tty/libexec/rtld-elf/powerpc/rtld_start.S#2 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.1#4 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld_lock.c#1 branch .. //depot/projects/tty/libexec/rtld-elf/rtld_lock.h#1 branch .. //depot/projects/tty/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/tty/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/tty/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/tty/libexec/tcpd/Makefile#2 integrate .. //depot/projects/tty/libexec/telnetd/global.c#2 integrate .. //depot/projects/tty/libexec/telnetd/slc.c#2 integrate .. //depot/projects/tty/libexec/telnetd/state.c#2 integrate .. //depot/projects/tty/libexec/telnetd/sys_term.c#2 integrate .. //depot/projects/tty/libexec/telnetd/telnetd.c#2 integrate .. //depot/projects/tty/libexec/telnetd/termstat.c#2 integrate .. //depot/projects/tty/libexec/telnetd/utility.c#2 integrate .. //depot/projects/tty/release/Makefile#7 integrate .. //depot/projects/tty/release/Makefile.inc.docports#3 integrate .. //depot/projects/tty/release/alpha/dokern.sh#4 integrate .. //depot/projects/tty/release/alpha/drivers.conf#3 integrate .. //depot/projects/tty/release/alpha/fixit_crunch.conf#3 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#3 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/tty/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#4 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/tty/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/early-adopter/article.sgml#3 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/common/intro.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/share/sgml/release.dsl#2 integrate .. //depot/projects/tty/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/tty/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/tty/release/i386/dokern.sh#5 integrate .. //depot/projects/tty/release/i386/drivers.conf#5 integrate .. //depot/projects/tty/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/tty/release/ia64/doFS.sh#3 integrate .. //depot/projects/tty/release/pc98/dokern.sh#5 integrate .. //depot/projects/tty/release/pc98/drivers.conf#4 integrate .. //depot/projects/tty/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/tty/release/pc98/fixit_crunch.conf#3 integrate .. //depot/projects/tty/release/scripts/doFS.sh#5 integrate .. //depot/projects/tty/release/scripts/print-cdrom-packages.sh#3 integrate .. //depot/projects/tty/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/tty/sbin/Makefile#5 integrate .. //depot/projects/tty/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/tty/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/tty/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/tty/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/tty/sbin/devd/devd.8#5 integrate .. //depot/projects/tty/sbin/devd/parse.y#2 integrate .. //depot/projects/tty/sbin/disklabel/disklabel.8#5 integrate .. //depot/projects/tty/sbin/gbde/Makefile#3 integrate .. //depot/projects/tty/sbin/gbde/gbde.c#4 integrate .. //depot/projects/tty/sbin/growfs/growfs.c#3 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/tty/sbin/ldconfig/ldconfig.8#2 integrate .. //depot/projects/tty/sbin/mdmfs/mdmfs.8#4 integrate .. //depot/projects/tty/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/tty/sbin/mount/mount.8#4 integrate .. //depot/projects/tty/sbin/mount_nfs/mount_nfs.8#4 integrate .. //depot/projects/tty/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/tty/sbin/newfs/mkfs.c#6 integrate .. //depot/projects/tty/sbin/raidctl/raidctl.8#2 integrate .. //depot/projects/tty/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/tty/sbin/sunlabel/Makefile#3 integrate .. //depot/projects/tty/sbin/sunlabel/sunlabel.c#3 integrate .. //depot/projects/tty/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/tty/sbin/umount/umount.8#3 integrate .. //depot/projects/tty/sbin/vinum/vinum.8#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/Makefile#6 integrate .. //depot/projects/tty/share/examples/etc/make.conf#6 integrate .. //depot/projects/tty/share/examples/netgraph/bluetooth/rc.bluetooth#1 branch .. //depot/projects/tty/share/man/man4/Makefile#5 integrate .. //depot/projects/tty/share/man/man4/acpi.4#3 integrate .. //depot/projects/tty/share/man/man4/agp.4#2 integrate .. //depot/projects/tty/share/man/man4/axe.4#2 integrate .. //depot/projects/tty/share/man/man4/bge.4#4 integrate .. //depot/projects/tty/share/man/man4/dc.4#3 integrate .. //depot/projects/tty/share/man/man4/dpt.4#3 integrate .. //depot/projects/tty/share/man/man4/ehci.4#1 branch .. //depot/projects/tty/share/man/man4/em.4#2 integrate .. //depot/projects/tty/share/man/man4/geom.4#4 integrate .. //depot/projects/tty/share/man/man4/iir.4#4 integrate .. //depot/projects/tty/share/man/man4/ip.4#4 integrate .. //depot/projects/tty/share/man/man4/kame.4#2 integrate .. //depot/projects/tty/share/man/man4/mac.4#5 integrate .. //depot/projects/tty/share/man/man4/mac_biba.4#4 integrate .. //depot/projects/tty/share/man/man4/mac_bsdextended.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_ifoff.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_lomac.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_mls.4#4 integrate .. //depot/projects/tty/share/man/man4/mac_none.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_partition.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_portacl.4#2 integrate .. //depot/projects/tty/share/man/man4/mac_seeotheruids.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_test.4#3 integrate .. //depot/projects/tty/share/man/man4/man4.i386/cx.4#3 integrate .. //depot/projects/tty/share/man/man4/man4.i386/gsc.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/pae.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/sbni.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/vpd.4#2 integrate .. //depot/projects/tty/share/man/man4/my.4#1 branch .. //depot/projects/tty/share/man/man4/ng_bluetooth.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_btsocket.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_h4.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_hci.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_l2cap.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_ubt.4#2 integrate .. //depot/projects/tty/share/man/man4/oldcard.4#3 integrate .. //depot/projects/tty/share/man/man4/raid.4#2 integrate .. //depot/projects/tty/share/man/man4/rndtest.4#2 integrate .. //depot/projects/tty/share/man/man4/rue.4#2 integrate .. //depot/projects/tty/share/man/man4/sbsh.4#2 integrate .. //depot/projects/tty/share/man/man4/syscons.4#3 integrate .. //depot/projects/tty/share/man/man4/ubtbcmfw.4#1 branch .. //depot/projects/tty/share/man/man4/umass.4#4 integrate .. //depot/projects/tty/share/man/man4/usb.4#3 integrate .. //depot/projects/tty/share/man/man4/wi.4#6 integrate .. //depot/projects/tty/share/man/man5/fs.5#3 integrate .. //depot/projects/tty/share/man/man5/libmap.conf.5#2 integrate .. //depot/projects/tty/share/man/man5/make.conf.5#6 integrate .. //depot/projects/tty/share/man/man5/procfs.5#2 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/tty/share/man/man7/development.7#2 integrate .. //depot/projects/tty/share/man/man7/maclabel.7#2 integrate .. //depot/projects/tty/share/man/man7/release.7#5 integrate .. //depot/projects/tty/share/man/man7/tuning.7#3 integrate .. //depot/projects/tty/share/man/man8/MAKEDEV.8#2 integrate .. //depot/projects/tty/share/man/man8/Makefile#3 integrate .. //depot/projects/tty/share/man/man9/BUS_SETUP_INTR.9#3 integrate .. //depot/projects/tty/share/man/man9/CTASSERT.9#1 branch .. //depot/projects/tty/share/man/man9/KASSERT.9#2 integrate .. //depot/projects/tty/share/man/man9/Makefile#3 integrate .. //depot/projects/tty/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_START.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_VPTOFH.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/tty/share/man/man9/atomic.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_activate_resource.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_alloc_resource.9#3 integrate .. //depot/projects/tty/share/man/man9/bus_child_present.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_dma.9#1 branch .. //depot/projects/tty/share/man/man9/bus_set_resource.9#2 integrate .. //depot/projects/tty/share/man/man9/byteorder.9#3 integrate .. //depot/projects/tty/share/man/man9/devclass.9#2 integrate .. //depot/projects/tty/share/man/man9/devclass_find.9#2 integrate .. //depot/projects/tty/share/man/man9/device.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_ivars.9#3 integrate .. //depot/projects/tty/share/man/man9/device_get_name.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_parent.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_softc.9#3 integrate .. //depot/projects/tty/share/man/man9/device_printf.9#2 integrate .. //depot/projects/tty/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/tty/share/man/man9/kobj.9#2 integrate .. //depot/projects/tty/share/man/man9/ktr.9#2 integrate .. //depot/projects/tty/share/man/man9/make_dev.9#2 integrate .. //depot/projects/tty/share/man/man9/malloc.9#6 integrate .. //depot/projects/tty/share/man/man9/mbuf.9#4 integrate .. //depot/projects/tty/share/man/man9/mutex.9#3 integrate .. //depot/projects/tty/share/man/man9/namei.9#3 integrate .. //depot/projects/tty/share/man/man9/rman.9#1 branch .. //depot/projects/tty/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/tty/share/man/man9/signal.9#2 integrate .. //depot/projects/tty/share/man/man9/sleep.9#4 integrate .. //depot/projects/tty/share/man/man9/vget.9#2 integrate .. //depot/projects/tty/share/man/man9/vnode.9#3 integrate .. //depot/projects/tty/share/man/man9/vput.9#2 integrate .. //depot/projects/tty/share/man/man9/vref.9#2 integrate .. //depot/projects/tty/share/man/man9/vrele.9#2 integrate .. //depot/projects/tty/share/man/man9/zone.9#2 integrate .. //depot/projects/tty/share/mk/bsd.README#4 integrate .. //depot/projects/tty/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/tty/share/mk/bsd.info.mk#2 integrate .. //depot/projects/tty/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/tty/share/mk/sys.mk#3 integrate .. //depot/projects/tty/share/mklocale/Makefile#2 integrate .. //depot/projects/tty/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/tty/share/syscons/keymaps/INDEX.keymaps#3 integrate .. //depot/projects/tty/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/tty/share/syscons/keymaps/be.iso.kbd#2 integrate .. //depot/projects/tty/share/syscons/keymaps/fr.dvorak.kbd#1 branch .. //depot/projects/tty/share/syscons/keymaps/norwegian.dvorak.kbd#2 integrate .. //depot/projects/tty/share/termcap/termcap.src#3 integrate .. //depot/projects/tty/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/tty/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/tty/sys/alpha/conf/GENERIC#6 integrate .. //depot/projects/tty/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/tty/sys/alpha/include/bus.h#5 integrate .. //depot/projects/tty/sys/alpha/include/limits.h#3 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_signal.c#4 integrate .. //depot/projects/tty/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/tty/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/tty/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/locore.S#2 integrate .. //depot/projects/tty/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/tty/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/tty/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/tty/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/tty/sys/amd64/ia32/Makefile#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32.h#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_genassym.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_proto.h#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_signal.h#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_syscall.h#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_syscalls.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_sysent.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/tty/sys/amd64/ia32/ia32_util.h#1 branch .. //depot/projects/tty/sys/amd64/ia32/syscalls.conf#1 branch .. //depot/projects/tty/sys/amd64/ia32/syscalls.master#1 branch .. //depot/projects/tty/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/tty/sys/amd64/include/_types.h#2 integrate .. //depot/projects/tty/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/tty/sys/amd64/include/asm.h#2 integrate .. //depot/projects/tty/sys/amd64/include/bus.h#2 integrate .. //depot/projects/tty/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/tty/sys/amd64/include/bus_at386.h#2 delete .. //depot/projects/tty/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/tty/sys/amd64/include/bus_memio.h#2 integrate .. //depot/projects/tty/sys/amd64/include/bus_pio.h#2 integrate .. //depot/projects/tty/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/tty/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/tty/sys/amd64/include/elf.h#2 integrate .. //depot/projects/tty/sys/amd64/include/frame.h#2 integrate .. //depot/projects/tty/sys/amd64/include/limits.h#2 integrate .. //depot/projects/tty/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/tty/sys/amd64/include/npx.h#2 integrate .. //depot/projects/tty/sys/amd64/include/param.h#2 integrate .. //depot/projects/tty/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/tty/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/tty/sys/amd64/include/profile.h#2 integrate .. //depot/projects/tty/sys/amd64/include/reg.h#2 integrate .. //depot/projects/tty/sys/amd64/include/segments.h#2 integrate .. //depot/projects/tty/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/tty/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/tty/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/tty/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/tty/sys/amd64/isa/icu_vector.S#2 integrate .. //depot/projects/tty/sys/arm/include/_limits.h#3 integrate .. //depot/projects/tty/sys/arm/include/limits.h#3 integrate .. //depot/projects/tty/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/tty/sys/boot/common/loader.8#5 integrate .. //depot/projects/tty/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/tty/sys/boot/forth/frames.4th#1 branch .. //depot/projects/tty/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/tty/sys/boot/forth/screen.4th#1 branch .. //depot/projects/tty/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/tty/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/tty/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/tty/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/tty/sys/boot/i386/libi386/i386_module.c#3 integrate .. //depot/projects/tty/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/tty/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/tty/sys/cam/cam.c#2 integrate .. //depot/projects/tty/sys/cam/cam_periph.c#4 integrate .. //depot/projects/tty/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/tty/sys/compat/svr4/svr4.h#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_filio.c#4 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/tty/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/tty/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/tty/sys/conf/NOTES#9 integrate .. //depot/projects/tty/sys/conf/files#7 integrate .. //depot/projects/tty/sys/conf/files.amd64#2 integrate .. //depot/projects/tty/sys/conf/files.i386#7 integrate .. //depot/projects/tty/sys/conf/files.ia64#6 integrate .. //depot/projects/tty/sys/conf/files.pc98#6 integrate .. //depot/projects/tty/sys/conf/kern.mk#4 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#6 integrate .. //depot/projects/tty/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/tty/sys/conf/majors#4 integrate .. //depot/projects/tty/sys/conf/newvers.sh#3 integrate .. //depot/projects/tty/sys/conf/options#6 integrate .. //depot/projects/tty/sys/conf/options.amd64#2 integrate .. //depot/projects/tty/sys/conf/options.ia64#4 integrate .. //depot/projects/tty/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/tty/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/Makefile#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_bstream.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_bstream.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_context.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_context.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_env.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_env.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_self_context.s#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_step.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_str.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_str.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_swap.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_swap.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_trace.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_trace.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_utable.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/src/uwx_utable.h#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/test/Makefile#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/test/dump_context.c#1 branch .. //depot/projects/tty/sys/contrib/ia64/libuwx/test/dumpmyself.c#1 branch .. //depot/projects/tty/sys/ddb/db_break.c#2 integrate .. //depot/projects/tty/sys/ddb/db_command.c#3 integrate .. //depot/projects/tty/sys/ddb/db_input.c#3 integrate .. //depot/projects/tty/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/tty/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/tty/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/tty/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/tty/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/tty/sys/dev/aha/aha.c#4 integrate .. //depot/projects/tty/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.reg#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.seq#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_inline.h#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_pci.c#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.reg#3 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/tty/sys/dev/amd/amd.c#3 integrate .. //depot/projects/tty/sys/dev/an/if_an.c#5 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/tty/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/tty/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/tty/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/tty/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/tty/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/tty/sys/dev/cardbus/cardbus_cis.c#5 integrate .. //depot/projects/tty/sys/dev/ccd/ccd.c#6 integrate .. //depot/projects/tty/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/tty/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/tty/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/tty/sys/dev/en/midway.c#6 integrate .. //depot/projects/tty/sys/dev/exca/exca.c#3 integrate .. //depot/projects/tty/sys/dev/fb/vga.c#4 integrate .. //depot/projects/tty/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/tty/sys/dev/firewire/fwdma.h#2 integrate .. //depot/projects/tty/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/tty/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/tty/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/tty/sys/dev/ida/ida.c#5 integrate .. //depot/projects/tty/sys/dev/ips/ips.c#1 branch .. //depot/projects/tty/sys/dev/ips/ips.h#1 branch .. //depot/projects/tty/sys/dev/ips/ips_commands.c#1 branch .. //depot/projects/tty/sys/dev/ips/ips_disk.c#1 branch .. //depot/projects/tty/sys/dev/ips/ips_disk.h#1 branch .. //depot/projects/tty/sys/dev/ips/ips_ioctl.c#1 branch .. //depot/projects/tty/sys/dev/ips/ips_ioctl.h#1 branch .. //depot/projects/tty/sys/dev/ips/ips_pci.c#1 branch .. //depot/projects/tty/sys/dev/isp/isp.c#3 integrate .. //depot/projects/tty/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/tty/sys/dev/kbd/atkbdc.c#3 integrate .. //depot/projects/tty/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/tty/sys/dev/md/md.c#6 integrate .. //depot/projects/tty/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/tty/sys/dev/mii/dcphy.c#3 integrate .. //depot/projects/tty/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/tty/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/tty/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/tty/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/tty/sys/dev/mii/pnphy.c#3 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_freebsd.c#3 integrate .. //depot/projects/tty/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/tty/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/tty/sys/dev/pci/pci.c#4 integrate .. //depot/projects/tty/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/tty/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/tty/sys/dev/sio/sio.c#7 integrate .. //depot/projects/tty/sys/dev/sio/sio_isa.c#3 integrate .. //depot/projects/tty/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/tty/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/tty/sys/dev/streams/streams.c#4 integrate .. //depot/projects/tty/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/tty/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/tty/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/tty/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/tty/sys/dev/trm/trm.c#4 integrate .. //depot/projects/tty/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/tty/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/tty/sys/dev/usb/umass.c#6 integrate .. //depot/projects/tty/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/tty/sys/dev/vinum/vinum.c#6 integrate .. //depot/projects/tty/sys/dev/vinum/vinumconfig.c#4 integrate .. //depot/projects/tty/sys/dev/vinum/vinumext.h#6 integrate .. //depot/projects/tty/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/tty/sys/dev/vinum/vinumioctl.c#6 integrate .. //depot/projects/tty/sys/dev/vinum/vinumlock.c#4 integrate .. //depot/projects/tty/sys/dev/vinum/vinummemory.c#4 integrate .. //depot/projects/tty/sys/dev/vinum/vinumobj.h#3 integrate .. //depot/projects/tty/sys/dev/vinum/vinumvar.h#3 integrate .. //depot/projects/tty/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/tty/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/tty/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/tty/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/tty/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/tty/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/tty/sys/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/tty/sys/geom/bde/g_bde.c#6 integrate .. //depot/projects/tty/sys/geom/bde/g_bde_crypt.c#4 integrate .. //depot/projects/tty/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/tty/sys/geom/geom.h#6 integrate .. //depot/projects/tty/sys/geom/geom_aes.c#5 integrate .. //depot/projects/tty/sys/geom/geom_apple.c#4 integrate .. //depot/projects/tty/sys/geom/geom_bsd.c#6 integrate .. //depot/projects/tty/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/tty/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/tty/sys/geom/geom_dev.c#6 integrate .. //depot/projects/tty/sys/geom/geom_disk.c#7 integrate .. //depot/projects/tty/sys/geom/geom_ext.h#2 delete .. //depot/projects/tty/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/tty/sys/geom/geom_mbr.c#4 integrate .. //depot/projects/tty/sys/geom/geom_mirror.c#4 integrate .. //depot/projects/tty/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/tty/sys/geom/geom_slice.c#5 integrate .. //depot/projects/tty/sys/geom/geom_slice.h#3 integrate .. //depot/projects/tty/sys/geom/geom_subr.c#7 integrate .. //depot/projects/tty/sys/geom/geom_sunlabel.c#4 integrate .. //depot/projects/tty/sys/geom/geom_vol_ffs.c#3 integrate .. //depot/projects/tty/sys/gnu/i386/fpemul/fpu_trig.c#2 integrate .. //depot/projects/tty/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/tty/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/tty/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/tty/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/tty/sys/i386/bios/apm.c#2 integrate .. //depot/projects/tty/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/tty/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/tty/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/tty/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/tty/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/tty/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/tty/sys/i386/conf/NOTES#8 integrate .. //depot/projects/tty/sys/i386/conf/PAE#2 integrate .. //depot/projects/tty/sys/i386/i386/bios.c#4 integrate .. //depot/projects/tty/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/tty/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/tty/sys/i386/i386/i386-gdbstub.c#3 integrate .. //depot/projects/tty/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/tty/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/tty/sys/i386/i386/math_emulate.c#2 integrate .. //depot/projects/tty/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/tty/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/tty/sys/i386/i386/trap.c#6 integrate .. //depot/projects/tty/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/tty/sys/i386/include/_limits.h#3 integrate .. //depot/projects/tty/sys/i386/include/asm.h#2 integrate .. //depot/projects/tty/sys/i386/include/bus_dma.h#4 integrate .. //depot/projects/tty/sys/i386/include/limits.h#3 integrate .. //depot/projects/tty/sys/i386/include/profile.h#2 integrate .. //depot/projects/tty/sys/i386/isa/clock.c#4 integrate .. //depot/projects/tty/sys/i386/isa/ctx.c#4 integrate .. //depot/projects/tty/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/tty/sys/i386/isa/if_cx.c#3 integrate .. //depot/projects/tty/sys/i386/isa/wt.c#4 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/tty/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/tty/sys/i386/svr4/svr4_machdep.c#3 integrate .. //depot/projects/tty/sys/i4b/driver/i4b_trace.c#4 integrate .. //depot/projects/tty/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/tty/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/tty/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/tty/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/tty/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/tty/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/tty/sys/ia64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/tty/sys/ia64/ia32/ia32_util.h#2 integrate .. //depot/projects/tty/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/tty/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/tty/sys/ia64/ia64/context.s#1 branch .. //depot/projects/tty/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/tty/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/tty/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/tty/sys/ia64/ia64/exception.s#4 integrate .. //depot/projects/tty/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/tty/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/tty/sys/ia64/ia64/locore.s#4 integrate .. //depot/projects/tty/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/tty/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/tty/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/tty/sys/ia64/ia64/support.s#3 integrate .. //depot/projects/tty/sys/ia64/ia64/swtch.s#3 delete .. //depot/projects/tty/sys/ia64/ia64/syscall.s#1 branch .. //depot/projects/tty/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/tty/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/tty/sys/ia64/ia64/unwind.c#2 integrate .. //depot/projects/tty/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/tty/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/tty/sys/ia64/include/_regset.h#1 branch .. //depot/projects/tty/sys/ia64/include/asm.h#2 integrate .. //depot/projects/tty/sys/ia64/include/bus.h#4 integrate .. //depot/projects/tty/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/tty/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/tty/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/tty/sys/ia64/include/frame.h#2 integrate .. //depot/projects/tty/sys/ia64/include/limits.h#3 integrate .. //depot/projects/tty/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/tty/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/tty/sys/ia64/include/proc.h#2 integrate .. //depot/projects/tty/sys/ia64/include/reg.h#2 integrate .. //depot/projects/tty/sys/ia64/include/rse.h#2 delete .. //depot/projects/tty/sys/ia64/include/signal.h#2 integrate .. //depot/projects/tty/sys/ia64/include/smp.h#2 integrate .. //depot/projects/tty/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/tty/sys/ia64/include/unwind.h#2 integrate .. //depot/projects/tty/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/tty/sys/isa/fd.c#4 integrate .. //depot/projects/tty/sys/isa/pnp.c#2 integrate .. //depot/projects/tty/sys/isa/ppc.c#4 integrate .. //depot/projects/tty/sys/isa/psm.c#4 integrate .. //depot/projects/tty/sys/isa/vga_isa.c#5 integrate .. //depot/projects/tty/sys/isofs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/tty/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/tty/sys/kern/init_main.c#6 integrate .. //depot/projects/tty/sys/kern/kern_alq.c#3 integrate .. //depot/projects/tty/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/tty/sys/kern/kern_conf.c#6 integrate .. //depot/projects/tty/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#6 integrate .. //depot/projects/tty/sys/kern/kern_exit.c#6 integrate .. //depot/projects/tty/sys/kern/kern_fork.c#6 integrate .. //depot/projects/tty/sys/kern/kern_intr.c#6 integrate .. //depot/projects/tty/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/tty/sys/kern/kern_mac.c#6 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/tty/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/tty/sys/kern/kern_proc.c#5 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#7 integrate .. //depot/projects/tty/sys/kern/kern_switch.c#6 integrate .. //depot/projects/tty/sys/kern/kern_synch.c#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 2 08:03:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D14C37B404; Mon, 2 Jun 2003 08:03:29 -0700 (PDT) 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 A9B8737B401 for ; Mon, 2 Jun 2003 08:03:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 560C743F75 for ; Mon, 2 Jun 2003 08:03:28 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52F3S0U056718 for ; Mon, 2 Jun 2003 08:03:28 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52F3R0A056715 for perforce@freebsd.org; Mon, 2 Jun 2003 08:03:27 -0700 (PDT) Date: Mon, 2 Jun 2003 08:03:27 -0700 (PDT) Message-Id: <200306021503.h52F3R0A056715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 15:03:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=32378 Change 32378 by des@des.at.des.thinksec.com on 2003/06/02 08:03:15 Remove debugging output. Affected files ... .. //depot/projects/openpam/lib/openpam_configure.c#11 edit Differences ... ==== //depot/projects/openpam/lib/openpam_configure.c#11 (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/lib/openpam_configure.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#11 $ */ #include @@ -184,7 +184,6 @@ if ((name = dup_word(p)) == NULL) goto syserr; ret = openpam_load_chain(pamh, name, fclt); - fprintf(stderr, "include %s returned %d\n", name, ret); FREE(name); if (ret < 0) goto fail; From owner-p4-projects@FreeBSD.ORG Mon Jun 2 09:29:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 203CA37B404; Mon, 2 Jun 2003 09:29:15 -0700 (PDT) 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 C48D337B401 for ; Mon, 2 Jun 2003 09:29:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31E9443FA3 for ; Mon, 2 Jun 2003 09:29:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52GTE0U066943 for ; Mon, 2 Jun 2003 09:29:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52GTDAo066940 for perforce@freebsd.org; Mon, 2 Jun 2003 09:29:13 -0700 (PDT) Date: Mon, 2 Jun 2003 09:29:13 -0700 (PDT) Message-Id: <200306021629.h52GTDAo066940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 16:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=32381 Change 32381 by rwatson@rwatson_tislabs on 2003/06/02 09:28:57 Integrate change to how mbuf defragmentation occurs in if_fxp; this may resolve a bug involving m_tag chain corruption in the fxp driver, so give it a spin. Affected files ... .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#25 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#25 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.180 2003/05/25 05:04:26 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.181 2003/06/02 05:16:42 silby Exp $"); #include #include @@ -1396,24 +1396,13 @@ * mbuf chain first. Bail out if we can't get the * new buffers. */ - MGETHDR(mn, M_DONTWAIT, MT_DATA); + mn = m_defrag(mb_head, M_DONTWAIT); if (mn == NULL) { m_freem(mb_head); break; + } else { + mb_head = mn; } - if (mb_head->m_pkthdr.len > MHLEN) { - MCLGET(mn, M_DONTWAIT); - if ((mn->m_flags & M_EXT) == 0) { - m_freem(mn); - m_freem(mb_head); - break; - } - } - m_copydata(mb_head, 0, mb_head->m_pkthdr.len, - mtod(mn, caddr_t)); - mn->m_pkthdr.len = mn->m_len = mb_head->m_pkthdr.len; - m_freem(mb_head); - mb_head = mn; error = bus_dmamap_load_mbuf(sc->fxp_mtag, txp->tx_map, mb_head, fxp_dma_map_txbuf, sc, 0); if (error) { From owner-p4-projects@FreeBSD.ORG Mon Jun 2 09:30:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C99B337B404; Mon, 2 Jun 2003 09:30:16 -0700 (PDT) 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 7F29C37B401 for ; Mon, 2 Jun 2003 09:30:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 203E543FD7 for ; Mon, 2 Jun 2003 09:30:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52GUF0U067095 for ; Mon, 2 Jun 2003 09:30:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52GUFD1067091 for perforce@freebsd.org; Mon, 2 Jun 2003 09:30:15 -0700 (PDT) Date: Mon, 2 Jun 2003 09:30:15 -0700 (PDT) Message-Id: <200306021630.h52GUFD1067091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 16:30:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=32382 Change 32382 by rwatson@rwatson_tislabs on 2003/06/02 09:29:24 Integrate change to how mbuf defragmentation occurs in if_fxp; this may resolve a bug involving m_tag chain corruption in the fxp driver, so give it a spin. Affected files ... .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#23 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#23 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.180 2003/05/25 05:04:26 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.181 2003/06/02 05:16:42 silby Exp $"); #include #include @@ -1396,24 +1396,13 @@ * mbuf chain first. Bail out if we can't get the * new buffers. */ - MGETHDR(mn, M_DONTWAIT, MT_DATA); + mn = m_defrag(mb_head, M_DONTWAIT); if (mn == NULL) { m_freem(mb_head); break; + } else { + mb_head = mn; } - if (mb_head->m_pkthdr.len > MHLEN) { - MCLGET(mn, M_DONTWAIT); - if ((mn->m_flags & M_EXT) == 0) { - m_freem(mn); - m_freem(mb_head); - break; - } - } - m_copydata(mb_head, 0, mb_head->m_pkthdr.len, - mtod(mn, caddr_t)); - mn->m_pkthdr.len = mn->m_len = mb_head->m_pkthdr.len; - m_freem(mb_head); - mb_head = mn; error = bus_dmamap_load_mbuf(sc->fxp_mtag, txp->tx_map, mb_head, fxp_dma_map_txbuf, sc, 0); if (error) { From owner-p4-projects@FreeBSD.ORG Mon Jun 2 09:46:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 197AD37B405; Mon, 2 Jun 2003 09:46:39 -0700 (PDT) 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 C2C2E37B401 for ; Mon, 2 Jun 2003 09:46:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C7BF43F93 for ; Mon, 2 Jun 2003 09:46:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52Gkc0U068082 for ; Mon, 2 Jun 2003 09:46:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52GkbRf068079 for perforce@freebsd.org; Mon, 2 Jun 2003 09:46:37 -0700 (PDT) Date: Mon, 2 Jun 2003 09:46:37 -0700 (PDT) Message-Id: <200306021646.h52GkbRf068079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 16:46:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=32385 Change 32385 by rwatson@rwatson_tislabs on 2003/06/02 09:46:15 Hook up mpo_copy_mbuf_label for Biba and MLS; this got lost in the earlier merge from the m_tag development branch, and can result in labels being improperly copied across some classes of mbuf operations (such as defragmentation). Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#213 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#171 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#213 (text+ko) ==== @@ -2699,6 +2699,7 @@ .mpo_destroy_socket_label = mac_biba_destroy_label, .mpo_destroy_socket_peer_label = mac_biba_destroy_label, .mpo_destroy_vnode_label = mac_biba_destroy_label, + .mpo_copy_mbuf_label = mac_biba_copy_label, .mpo_copy_pipe_label = mac_biba_copy_label, .mpo_copy_vnode_label = mac_biba_copy_label, .mpo_externalize_cred_label = mac_biba_externalize_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#171 (text+ko) ==== @@ -2470,6 +2470,7 @@ .mpo_destroy_socket_label = mac_mls_destroy_label, .mpo_destroy_socket_peer_label = mac_mls_destroy_label, .mpo_destroy_vnode_label = mac_mls_destroy_label, + .mpo_copy_mbuf_label = mac_mls_copy_label, .mpo_copy_pipe_label = mac_mls_copy_label, .mpo_copy_vnode_label = mac_mls_copy_label, .mpo_externalize_cred_label = mac_mls_externalize_label, From owner-p4-projects@FreeBSD.ORG Mon Jun 2 12:27:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B507D37B404; Mon, 2 Jun 2003 12:27:03 -0700 (PDT) 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 4F43637B401 for ; Mon, 2 Jun 2003 12:27:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 656BF43F3F for ; Mon, 2 Jun 2003 12:27:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52JR20U081819 for ; Mon, 2 Jun 2003 12:27:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52JR15P081816 for perforce@freebsd.org; Mon, 2 Jun 2003 12:27:01 -0700 (PDT) Date: Mon, 2 Jun 2003 12:27:01 -0700 (PDT) Message-Id: <200306021927.h52JR15P081816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 19:27:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=32400 Change 32400 by rwatson@rwatson_tislabs on 2003/06/02 12:26:58 Redesign the externalization APIs from the MAC Framework to the MAC policy modules to improve robustness against C string bugs and vulnerabilities. Following these revisions, all string construction of labels for export to userspace (or elsewhere) is performed using the sbuf API, which prevents the consumer from having to perform laborious and intricate pointer and buffer checks. This substantially simplifies the externalization logic, both at the MAC Framework level, and in individual policies; this becomes especially useful when policies export more complex label data, such as with compartments in Biba and MLS. Bundled in here are some other minor fixes associated with externalization: including avoiding malloc while holding the process mutex in mac_lomac, and hence avoid a failure mode when printing labels during a downgrade operation due to the removal of the M_NOWAIT case. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#389 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#214 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#61 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#172 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#122 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#25 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#106 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#67 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#189 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#389 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -398,65 +399,44 @@ #define MAC_EXTERNALIZE(type, label, elementlist, outbuf, \ outbuflen) do { \ - char *curptr, *curptr_start, *element_name, *element_temp; \ - size_t left, left_start, len; \ - int claimed, first, first_start, ignorenotfound; \ + int claimed, first, ignorenotfound, savedlen; \ + char *element_name, *element_temp; \ + struct sbuf sb; \ \ error = 0; \ + first = 1; \ + sbuf_new(&sb, outbuf, outbuflen, SBUF_FIXEDLEN); \ element_temp = elementlist; \ - curptr = outbuf; \ - curptr[0] = '\0'; \ - left = outbuflen; \ - first = 1; \ while ((element_name = strsep(&element_temp, ",")) != NULL) { \ - curptr_start = curptr; \ - left_start = left; \ - first_start = first; \ if (element_name[0] == '?') { \ element_name++; \ ignorenotfound = 1; \ - } else \ + } else \ ignorenotfound = 0; \ - claimed = 0; \ + savedlen = sbuf_len(&sb); \ if (first) { \ - len = snprintf(curptr, left, "%s/", \ - element_name); \ + error = sbuf_printf(&sb, "%s/", element_name); \ first = 0; \ } else \ - len = snprintf(curptr, left, ",%s/", \ - element_name); \ - if (len >= left) { \ - error = EINVAL; /* XXXMAC: E2BIG */ \ + error = sbuf_printf(&sb, ",%s/", element_name); \ + if (error == -1) { \ + error = EINVAL; /* XXX: E2BIG? */ \ break; \ } \ - curptr += len; \ - left -= len; \ - \ + claimed = 0; \ MAC_CHECK(externalize_ ## type, label, element_name, \ - curptr, left, &len, &claimed); \ + &sb, &claimed); \ if (error) \ break; \ - if (claimed == 1) { \ - if (len >= outbuflen) { \ - error = EINVAL; /* XXXMAC: E2BIG */ \ - break; \ - } \ - curptr += len; \ - left -= len; \ - } else if (claimed == 0 && ignorenotfound) { \ - /* \ - * Revert addition of the label element \ - * name. \ - */ \ - curptr = curptr_start; \ - *curptr = '\0'; \ - left = left_start; \ - first = first_start; \ - } else { \ - error = EINVAL; /* XXXMAC: ENOLABEL */ \ + if (claimed == 0 && ignorenotfound) { \ + /* Revert last label name. */ \ + sbuf_setpos(&sb, savedlen); \ + } else if (claimed != 1) { \ + error = EINVAL; /* XXX: ENOLABEL? */ \ break; \ } \ } \ + sbuf_finish(&sb); \ } while (0) #define MAC_INTERNALIZE(type, label, instring) do { \ ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#214 (text+ko) ==== @@ -622,57 +622,49 @@ } /* - * mac_biba_to_string() converts an Biba label to a string, placing the - * results in the passed string buffer. It returns 0 on success, - * or EINVAL if there isn't room in the buffer. The size of the - * string appended, leaving out the nul termination, is returned to - * the caller via *caller_len. Eventually, we should expose the - * sbuf to the caller rather than using C strings at this layer. + * mac_biba_to_string() converts a Biba label to a string, and places + * the results in the passed sbuf. It returns 0 on success, or EINVAL + * if there isn't room in the sbuf. Note: the sbuf will be modified + * even in a failure case, so the caller may need to revert the sbuf + * by restoring the offset if that's undesired. */ static int -mac_biba_to_string(char *string, size_t size, size_t *caller_len, - struct mac_biba *mac_biba) +mac_biba_to_string(struct sbuf *sb, struct mac_biba *mac_biba) { - struct sbuf sb; - sbuf_new(&sb, string, size, SBUF_FIXEDLEN); - if (mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) { - if (mac_biba_element_to_string(&sb, &mac_biba->mb_single) + if (mac_biba_element_to_string(sb, &mac_biba->mb_single) == -1) return (EINVAL); } if (mac_biba->mb_flags & MAC_BIBA_FLAG_RANGE) { - if (sbuf_putc(&sb, '(') == -1) + if (sbuf_putc(sb, '(') == -1) return (EINVAL); - if (mac_biba_element_to_string(&sb, &mac_biba->mb_rangelow) + if (mac_biba_element_to_string(sb, &mac_biba->mb_rangelow) == -1) return (EINVAL); - if (sbuf_putc(&sb, '-') == -1) + if (sbuf_putc(sb, '-') == -1) return (EINVAL); - if (mac_biba_element_to_string(&sb, &mac_biba->mb_rangehigh) + if (mac_biba_element_to_string(sb, &mac_biba->mb_rangehigh) == -1) return (EINVAL); - if (sbuf_putc(&sb, ')') == -1) + if (sbuf_putc(sb, ')') == -1) return (EINVAL); } - sbuf_finish(&sb); - *caller_len = strlen(string); return (0); } static int mac_biba_externalize_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { struct mac_biba *mac_biba; - int error; if (strcmp(MAC_BIBA_LABEL_NAME, element_name) != 0) return (0); @@ -681,11 +673,7 @@ mac_biba = SLOT(label); - error = mac_biba_to_string(element_data, size, len, mac_biba); - if (error) - return (error); - - return (0); + return (mac_biba_to_string(sb, mac_biba)); } static int ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#61 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -494,21 +495,23 @@ mac_lomac_copy_range(source, dest); } -static int mac_lomac_to_string(char *string, size_t size, - size_t *caller_len, struct mac_lomac *mac_lomac); +static int mac_lomac_to_string(struct sbuf *sb, + struct mac_lomac *mac_lomac); static int maybe_demote(struct mac_lomac *subjlabel, struct mac_lomac *objlabel, const char *actionname, const char *objname, struct vnode *vpq) { + struct sbuf subjlabel_sb, subjtext_sb, objlabel_sb; + char *subjlabeltext, *objlabeltext, *subjtext; + struct mac_lomac cached_subjlabel; + struct mac_lomac_proc *subj; struct vattr va; - static char xxx[] = "<>"; - struct mac_lomac_proc *subj = PSLOT(&curthread->td_proc->p_label); - char *subjlabeltext, *objlabeltext, *subjtext, *text; struct proc *p; - size_t len; pid_t pgid; + subj = PSLOT(&curthread->td_proc->p_label); + p = curthread->td_proc; mtx_lock(&subj->mtx); if (subj->mac_lomac.ml_flags & MAC_LOMAC_FLAG_UPDATE) { @@ -542,32 +545,29 @@ curthread->td_flags |= TDF_ASTPENDING; curthread->td_proc->p_sflag |= PS_MACPEND; mtx_unlock_spin(&sched_lock); - subjtext = subjlabeltext = objlabeltext = xxx; - if (mac_lomac_to_string(NULL, 0, &len, &subj->mac_lomac) == 0 && - (text = malloc(len + 1, M_MACLOMAC, M_NOWAIT)) != NULL) { - if (mac_lomac_to_string(text, len + 1, &len, - &subj->mac_lomac) == 0) - subjtext = text; - else - free(text, M_MACLOMAC); - } + + /* + * Avoid memory allocation while holding a mutex; cache the + * label. + */ + mac_lomac_copy_single(&subj->mac_lomac, &cached_subjlabel); mtx_unlock(&subj->mtx); - if (mac_lomac_to_string(NULL, 0, &len, subjlabel) == 0 && - (text = malloc(len + 1, M_MACLOMAC, M_NOWAIT)) != NULL) { - if (mac_lomac_to_string(text, len + 1, &len, - subjlabel) == 0) - subjlabeltext = text; - else - free(text, M_MACLOMAC); - } - if (mac_lomac_to_string(NULL, 0, &len, objlabel) == 0 && - (text = malloc(len + 1, M_MACLOMAC, M_NOWAIT)) != NULL) { - if (mac_lomac_to_string(text, len + 1, &len, - objlabel) == 0) - objlabeltext = text; - else - free(text, M_MACLOMAC); - } + + sbuf_new(&subjlabel_sb, NULL, 0, SBUF_AUTOEXTEND); + mac_lomac_to_string(&subjlabel_sb, subjlabel); + sbuf_finish(&subjlabel_sb); + subjlabeltext = sbuf_data(&subjlabel_sb); + + sbuf_new(&subjtext_sb, NULL, 0, SBUF_AUTOEXTEND); + mac_lomac_to_string(&subjtext_sb, &subj->mac_lomac); + sbuf_finish(&subjtext_sb); + subjtext = sbuf_data(&subjtext_sb); + + sbuf_new(&objlabel_sb, NULL, 0, SBUF_AUTOEXTEND); + mac_lomac_to_string(&objlabel_sb, objlabel); + sbuf_finish(&objlabel_sb); + objlabeltext = sbuf_data(&objlabel_sb); + pgid = p->p_pgrp->pg_id; /* XXX could be stale? */ if (vpq != NULL && VOP_GETATTR(vpq, &va, curthread->td_ucred, curthread) == 0) { @@ -583,13 +583,11 @@ subjlabeltext, p->p_pid, pgid, curthread->td_ucred->cr_uid, p->p_comm, subjtext, actionname, objlabeltext, objname); } + + sbuf_delete(&subjlabel_sb); + sbuf_delete(&subjtext_sb); + sbuf_delete(&objlabel_sb); - if (subjlabeltext != xxx) - free(subjlabeltext, M_MACLOMAC); - if (objlabeltext != xxx) - free(objlabeltext, M_MACLOMAC); - if (subjtext != xxx) - free(subjtext, M_MACLOMAC); return (0); } @@ -670,28 +668,22 @@ PSLOT(label) = NULL; } -/* - * mac_lomac_element_to_string() is basically an snprintf wrapper with - * the same properties as snprintf(). It returns the length it would - * have added to the string in the event the string is too short. - */ -static size_t -mac_lomac_element_to_string(char *string, size_t size, - struct mac_lomac_element *element) +static int +mac_lomac_element_to_string(struct sbuf *sb, struct mac_lomac_element *element) { switch (element->mle_type) { case MAC_LOMAC_TYPE_HIGH: - return (snprintf(string, size, "high")); + return (sbuf_printf(sb, "high")); case MAC_LOMAC_TYPE_LOW: - return (snprintf(string, size, "low")); + return (sbuf_printf(sb, "low")); case MAC_LOMAC_TYPE_EQUAL: - return (snprintf(string, size, "equal")); + return (sbuf_printf(sb, "equal")); case MAC_LOMAC_TYPE_GRADE: - return (snprintf(string, size, "%d", element->mle_grade)); + return (sbuf_printf(sb, "%d", element->mle_grade)); default: panic("mac_lomac_element_to_string: invalid type (%d)", @@ -700,81 +692,54 @@ } static int -mac_lomac_to_string(char *string, size_t size, size_t *caller_len, - struct mac_lomac *mac_lomac) +mac_lomac_to_string(struct sbuf *sb, struct mac_lomac *mac_lomac) { - size_t left, len, curlen; - char *curptr; - - /* - * Also accept NULL string to allow for predetermination of total - * string length. - */ - if (string != NULL) - bzero(string, size); - else if (size != 0) - return (EINVAL); - curptr = string; - left = size; - curlen = 0; -#define INCLEN(length, leftover) do { \ - if (string != NULL) { \ - if (length >= leftover) \ - return (EINVAL); \ - leftover -= length; \ - curptr += length; \ - } \ - curlen += length; \ -} while (0) if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_SINGLE) { - len = mac_lomac_element_to_string(curptr, left, - &mac_lomac->ml_single); - INCLEN(len, left); + if (mac_lomac_element_to_string(sb, &mac_lomac->ml_single) + == -1) + return (EINVAL); } if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_AUX) { - len = snprintf(curptr, left, "["); - INCLEN(len, left); + if (sbuf_putc(sb, '[') == -1) + return (EINVAL); - len = mac_lomac_element_to_string(curptr, left, - &mac_lomac->ml_auxsingle); - INCLEN(len, left); + if (mac_lomac_element_to_string(sb, &mac_lomac->ml_auxsingle) + == -1) + return (EINVAL); - len = snprintf(curptr, left, "]"); - INCLEN(len, left); + if (sbuf_putc(sb, ']') == -1) + return (EINVAL); } if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_RANGE) { - len = snprintf(curptr, left, "("); - INCLEN(len, left); + if (sbuf_putc(sb, '(') == -1) + return (EINVAL); - len = mac_lomac_element_to_string(curptr, left, - &mac_lomac->ml_rangelow); - INCLEN(len, left); + if (mac_lomac_element_to_string(sb, &mac_lomac->ml_rangelow) + == -1) + return (EINVAL); - len = snprintf(curptr, left, "-"); - INCLEN(len, left); + if (sbuf_putc(sb, '-') == -1) + return (EINVAL); - len = mac_lomac_element_to_string(curptr, left, - &mac_lomac->ml_rangehigh); - INCLEN(len, left); + if (mac_lomac_element_to_string(sb, &mac_lomac->ml_rangehigh) + == -1) + return (EINVAL); - len = snprintf(curptr, left, ")"); - INCLEN(len, left); + if (sbuf_putc(sb, '-') == -1) + return (EINVAL); } -#undef INCLEN - *caller_len = curlen; return (0); } static int mac_lomac_externalize_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { struct mac_lomac *mac_lomac; - int error; if (strcmp(MAC_LOMAC_LABEL_NAME, element_name) != 0) return (0); @@ -782,12 +747,8 @@ (*claimed)++; mac_lomac = SLOT(label); - error = mac_lomac_to_string(element_data, size, len, mac_lomac); - if (error) - return (error); - *len = strlen(element_data); - return (0); + return (mac_lomac_to_string(sb, mac_lomac)); } static int ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#172 (text+ko) ==== @@ -586,57 +586,49 @@ } /* - * mac_mls_to_string() converts an MLS label to a string, placing the - * results in the passed string buffer. It returns 0 on success, - * or EINVAL if there isn't room in the buffer. The size of the - * string appended, leaving out the nul termination, is returned to - * the caller via *caller_len. Eventually, we should expose the - * sbuf to the caller rather than using C strings at this layer. + * mac_mls_to_string() converts an MLS label to a string, and places + * the results in the passed sbuf. It returns 0 on success, or EINVAL + * if there isn't room in the sbuf. Note: the sbuf will be modified + * even in a failure case, so the caller may need to revert the sbuf + * by restoring the offset if that's undesired. */ static int -mac_mls_to_string(char *string, size_t size, size_t *caller_len, - struct mac_mls *mac_mls) +mac_mls_to_string(struct sbuf *sb, struct mac_mls *mac_mls) { - struct sbuf sb; - sbuf_new(&sb, string, size, SBUF_FIXEDLEN); - if (mac_mls->mm_flags & MAC_MLS_FLAG_SINGLE) { - if (mac_mls_element_to_string(&sb, &mac_mls->mm_single) + if (mac_mls_element_to_string(sb, &mac_mls->mm_single) == -1) return (EINVAL); } if (mac_mls->mm_flags & MAC_MLS_FLAG_RANGE) { - if (sbuf_putc(&sb, '(') == -1) + if (sbuf_putc(sb, '(') == -1) return (EINVAL); - if (mac_mls_element_to_string(&sb, &mac_mls->mm_rangelow) + if (mac_mls_element_to_string(sb, &mac_mls->mm_rangelow) == -1) return (EINVAL); - if (sbuf_putc(&sb, '-') == -1) + if (sbuf_putc(sb, '-') == -1) return (EINVAL); - if (mac_mls_element_to_string(&sb, &mac_mls->mm_rangehigh) + if (mac_mls_element_to_string(sb, &mac_mls->mm_rangehigh) == -1) return (EINVAL); - if (sbuf_putc(&sb, ')') == -1) + if (sbuf_putc(sb, ')') == -1) return (EINVAL); } - sbuf_finish(&sb); - *caller_len = strlen(string); return (0); } static int mac_mls_externalize_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { struct mac_mls *mac_mls; - int error; if (strcmp(MAC_MLS_LABEL_NAME, element_name) != 0) return (0); @@ -645,11 +637,7 @@ mac_mls = SLOT(label); - error = mac_mls_to_string(element_data, size, len, mac_mls); - if (error) - return (error); - - return (0); + return (mac_mls_to_string(sb, mac_mls)); } static int ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#122 (text+ko) ==== @@ -127,7 +127,7 @@ static int mac_none_externalize_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#25 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -102,15 +103,18 @@ static int mac_partition_externalize_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { if (strcmp(MAC_PARTITION_LABEL_NAME, element_name) != 0) return (0); (*claimed)++; - *len = snprintf(element_data, size, "%ld", SLOT(label)); - return (0); + + if (sbuf_printf(sb, "%ld", SLOT(label)) == -1) + return (EINVAL); + else + return (0); } static int ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#106 (text+ko) ==== @@ -555,7 +555,7 @@ static int mac_test_externalize_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { atomic_add_int(&externalize_count, 1); ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#67 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1434,7 +1435,7 @@ static int sebsd_externalize_sid(security_id_t sid, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { security_context_t context; u_int32_t context_len; @@ -1449,36 +1450,30 @@ if (error) return (error); - if (size <= context_len) { + if (sbuf_cat(sb, context) == -1) error = EINVAL; - } else { - *len = strlcpy(element_data, context, size); - error = 0; - } security_free_context(context); return (error); } static int sebsd_externalize_cred_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { struct task_security_struct *task; task = SLOT(label); - return (sebsd_externalize_sid(task->sid, element_name, element_data, - size, len, claimed)); + return (sebsd_externalize_sid(task->sid, element_name, sb, claimed)); } static int sebsd_externalize_vnode_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + struct sbuf *sb, int *claimed) { struct vnode_security_struct *vsec; vsec = SLOT(label); - return (sebsd_externalize_sid(vsec->sid, element_name, element_data, - size, len, claimed)); + return (sebsd_externalize_sid(vsec->sid, element_name, sb, claimed)); } static void ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#189 (text+ko) ==== @@ -52,6 +52,7 @@ * alphabetically. */ struct mac_policy_conf; +struct sbuf; struct mac_policy_ops { /* * Policy module operations. @@ -102,23 +103,17 @@ void (*mpo_copy_vnode_label)(struct label *src, struct label *dest); int (*mpo_externalize_cred_label)(struct label *label, - char *element_name, char *buffer, size_t buflen, - size_t *len, int *claimed); + char *element_name, struct sbuf *sb, int *claimed); int (*mpo_externalize_ifnet_label)(struct label *label, - char *element_name, char *buffer, size_t buflen, - size_t *len, int *claimed); + char *element_name, struct sbuf *sb, int *claimed); int (*mpo_externalize_pipe_label)(struct label *label, - char *element_name, char *buffer, size_t buflen, - size_t *len, int *claimed); + char *element_name, struct sbuf *sb, int *claimed); int (*mpo_externalize_socket_label)(struct label *label, - char *element_name, char *buffer, size_t buflen, - size_t *len, int *claimed); + char *element_name, struct sbuf *sb, int *claimed); int (*mpo_externalize_socket_peer_label)(struct label *label, - char *element_name, char *buffer, size_t buflen, - size_t *len, int *claimed); + char *element_name, struct sbuf *sb, int *claimed); int (*mpo_externalize_vnode_label)(struct label *label, - char *element_name, char *buffer, size_t buflen, - size_t *len, int *claimed); + char *element_name, struct sbuf *sb, int *claimed); int (*mpo_internalize_cred_label)(struct label *label, char *element_name, char *element_data, int *claimed); int (*mpo_internalize_ifnet_label)(struct label *label, From owner-p4-projects@FreeBSD.ORG Mon Jun 2 12:42:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 778BF37B404; Mon, 2 Jun 2003 12:42:23 -0700 (PDT) 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 F388837B401 for ; Mon, 2 Jun 2003 12:42:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46A6543FBD for ; Mon, 2 Jun 2003 12:42:22 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52JgM0U082743 for ; Mon, 2 Jun 2003 12:42:22 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52JgLux082740 for perforce@freebsd.org; Mon, 2 Jun 2003 12:42:21 -0700 (PDT) Date: Mon, 2 Jun 2003 12:42:21 -0700 (PDT) Message-Id: <200306021942.h52JgLux082740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 19:42:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=32402 Change 32402 by des@des.at.des.thinksec.com on 2003/06/02 12:41:24 Fix some markup issues pointed out by ru@. Affected files ... .. //depot/projects/openpam/doc/man/pam.man#2 edit .. //depot/projects/openpam/misc/gendoc.pl#26 edit Differences ... ==== //depot/projects/openpam/doc/man/pam.man#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.man#1 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.man#2 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number @@ -13,7 +13,7 @@ .Pp The user requesting authentication is called the applicant, while the user (usually, root) charged with verifying his identity and granting -him the requested credentials is called the arbitrator. +him the requested credentials is called the arbitrator. .Pp The sequence of operations the server goes through to authenticate a user and perform whatever task he requested is a PAM transaction; the @@ -32,7 +32,7 @@ See .Xr pam_conv 3 for details. -.Ss Initialization And Cleanup +.Ss Initialization and Cleanup The .Fn pam_start function initializes the PAM library and returns a handle which must @@ -44,7 +44,7 @@ The .Fn pam_end function releases all resources associated with the specified context, -and can be called at any time to terminate a PAM transaction. +and can be called at any time to terminate a PAM transaction. .Ss Storage The .Fn pam_set_item @@ -54,12 +54,12 @@ service name, the names of the requesting and target users, the conversation function, and prompts. .Pp -The +The .Fn pam_set_data and .Fn pam_get_data -manage named chunks of free-form data, generally used by modules to -store state from one invocation to another. +functions manage named chunks of free-form data, generally used by +modules to store state from one invocation to another. .Ss Authentication There are two authentication primitives: .Fn pam_authenticate @@ -84,7 +84,7 @@ function allows the server to change the user's password, either at the user's request or because the password has expired. .Ss Miscellaneous -The +The .Fn pam_putenv , .Fn pam_getenv and @@ -94,5 +94,5 @@ .Pp The .Fn pam_strerror -function returns a pointer to a string describing a the specified PAM +function returns a pointer to a string describing the specified PAM error code. ==== //depot/projects/openpam/misc/gendoc.pl#26 (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#25 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#26 $ # use strict; @@ -360,7 +360,7 @@ if ($func->{'name'} =~ m/openpam/) { $mdoc .= ".In security/openpam.h\n" } - $mdoc .= ".Ft $func->{'type'} + $mdoc .= ".Ft \"$func->{'type'}\" .Fn $func->{'name'} $func->{'args'} .Sh DESCRIPTION $func->{'man'} @@ -411,10 +411,11 @@ $mdoc .= ".Sh AUTHORS The .Nm -function 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 DARPA/SPAWAR -contract N66001-01-C-8035 +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 +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. "; @@ -511,7 +512,7 @@ } print FILE ".Sh SEE ALSO "; - print FILE ".Xr openpam 3\n" + print FILE ".Xr openpam 3 ,\n" if ($page eq 'pam'); foreach $func (keys(%FUNCTIONS)) { $xref{$func} = 3; @@ -530,8 +531,9 @@ .Re .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 +.Fx +Project by ThinkSec AS and Network Associates Laboratories, 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 Mon Jun 2 12:54:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB8A537B404; Mon, 2 Jun 2003 12:54:47 -0700 (PDT) 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 502E337B401 for ; Mon, 2 Jun 2003 12:54:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3E3D43F75 for ; Mon, 2 Jun 2003 12:54:45 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52Jsj0U088606 for ; Mon, 2 Jun 2003 12:54:45 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52Jshhi088596 for perforce@freebsd.org; Mon, 2 Jun 2003 12:54:43 -0700 (PDT) Date: Mon, 2 Jun 2003 12:54:43 -0700 (PDT) Message-Id: <200306021954.h52Jshhi088596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 32404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 19:54:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=32404 Change 32404 by jhb@jhb_laptop on 2003/06/02 12:53:55 IFC @32401. Affected files ... .. //depot/projects/smpng/sys/alpha/include/bus.h#10 integrate .. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/locore.S#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/smpng/sys/amd64/ia32/Makefile#2 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscalls.c#1 branch .. //depot/projects/smpng/sys/amd64/ia32/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/smpng/sys/amd64/include/asm.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/profile.h#2 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/frames.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/screen.4th#1 branch .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/smpng/sys/cam/cam.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#10 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#12 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/smpng/sys/conf/files.amd64#4 integrate .. //depot/projects/smpng/sys/conf/files.i386#41 integrate .. //depot/projects/smpng/sys/conf/files.pc98#42 integrate .. //depot/projects/smpng/sys/conf/kern.mk#6 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#21 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#5 integrate .. //depot/projects/smpng/sys/ddb/db_break.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#11 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#6 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#11 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#4 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#30 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#28 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#13 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#9 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#15 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#25 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#15 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#9 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#13 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#7 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#37 integrate .. //depot/projects/smpng/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#28 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#9 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#37 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphy.c#4 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/mlphy.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/pnphy.c#8 integrate .. //depot/projects/smpng/sys/dev/musycc/musycc.c#5 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#28 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#24 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#30 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/smpng/sys/dev/streams/streams.c#13 integrate .. //depot/projects/smpng/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#9 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#14 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#8 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#9 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#14 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#11 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#12 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#10 integrate .. //depot/projects/smpng/sys/geom/geom.h#28 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.h#5 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_ext.h#3 delete .. //depot/projects/smpng/sys/geom/geom_gpt.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_slice.h#14 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#5 integrate .. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_trig.c#2 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#6 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#16 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#3 integrate .. //depot/projects/smpng/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/smpng/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/smpng/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/smpng/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#60 integrate .. //depot/projects/smpng/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/autoconf.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/critical.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/db_disasm.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/i386-gdbstub.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#60 integrate .. //depot/projects/smpng/sys/i386/i386/math_emulate.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/mp_clock.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#46 integrate .. //depot/projects/smpng/sys/i386/i386/mpapic.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/perfmon.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#58 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#36 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_errno.c#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_msg.c#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_other.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#14 integrate .. //depot/projects/smpng/sys/i386/include/asm.h#4 integrate .. //depot/projects/smpng/sys/i386/include/bus_dma.h#6 integrate .. //depot/projects/smpng/sys/i386/include/profile.h#7 integrate .. //depot/projects/smpng/sys/i386/isa/asc.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#25 integrate .. //depot/projects/smpng/sys/i386/isa/cronyx.c#2 integrate .. //depot/projects/smpng/sys/i386/isa/ctx.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/cx.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/cy.c#18 integrate .. //depot/projects/smpng/sys/i386/isa/elink.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/gpib.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/gsc.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/if_cx.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/if_el.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/if_le.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.c#20 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/smpng/sys/i386/isa/isa_dma.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/istallion.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/ithread.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/loran.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#34 integrate .. //depot/projects/smpng/sys/i386/isa/pcaudio.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/pcf.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/pmtimer.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/spic.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/spkr.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/wt.c#7 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#12 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#9 integrate .. //depot/projects/smpng/sys/i386/linux/linux_genassym.c#4 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#10 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#33 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#14 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#18 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#57 integrate .. //depot/projects/smpng/sys/ia64/ia64/syscall.s#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#49 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#25 integrate .. //depot/projects/smpng/sys/ia64/include/_regset.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#10 integrate .. //depot/projects/smpng/sys/isa/fd.c#21 integrate .. //depot/projects/smpng/sys/isa/pnp.c#7 integrate .. //depot/projects/smpng/sys/isa/ppc.c#7 integrate .. //depot/projects/smpng/sys/isa/psm.c#14 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#7 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#6 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#27 integrate .. //depot/projects/smpng/sys/kern/init_main.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#33 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#98 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#11 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#55 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#56 integrate .. //depot/projects/smpng/sys/modules/Makefile#53 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_apple/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_bde/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_bsd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_gpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_mbr/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_pc98/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_sunlabel/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/au88x0/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_atmsubr.c#10 integrate .. //depot/projects/smpng/sys/net/if_ef.c#11 integrate .. //depot/projects/smpng/sys/net/if_media.h#8 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.c#11 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#38 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#19 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#25 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#16 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#17 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#23 integrate .. //depot/projects/smpng/sys/pc98/pc98/ppc.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#28 integrate .. //depot/projects/smpng/sys/pci/alpm.c#5 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#38 integrate .. //depot/projects/smpng/sys/pci/if_de.c#10 integrate .. //depot/projects/smpng/sys/pci/if_devar.h#4 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#17 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#29 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#19 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#18 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#21 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#27 integrate .. //depot/projects/smpng/sys/pci/ncr.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#7 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#15 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#7 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#15 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#4 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#22 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/sparcbus_if.m#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#11 integrate .. //depot/projects/smpng/sys/sys/buf.h#19 integrate .. //depot/projects/smpng/sys/sys/chio.h#2 integrate .. //depot/projects/smpng/sys/sys/devicestat.h#7 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#17 integrate .. //depot/projects/smpng/sys/sys/param.h#41 integrate .. //depot/projects/smpng/sys/sys/proc.h#88 integrate .. //depot/projects/smpng/sys/sys/sem.h#6 integrate .. //depot/projects/smpng/sys/sys/uuid.h#3 integrate .. //depot/projects/smpng/sys/sys/vnode.h#33 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#22 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#41 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#27 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#13 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#28 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#37 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#19 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/include/bus.h#10 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.20 2003/05/27 04:59:56 scottl Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.21 2003/05/30 20:40:32 hmp Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -469,7 +469,7 @@ #define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */ +#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ #define BUS_DMA_ISA 0x10 /* map memory for ISA dma */ #define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */ #define BUS_DMA_BUS3 0x40 ==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.8 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $ */ /* @@ -36,9 +36,9 @@ #include "acpi.h" -u_long i386_acpi_root; +u_long amd64_acpi_root; -SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &i386_acpi_root, 0, +SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0, "The physical address of the RSDP"); ACPI_STATUS @@ -59,7 +59,7 @@ ACPI_POINTER ptr; ACPI_STATUS status; - if (i386_acpi_root == 0) { + if (amd64_acpi_root == 0) { /* * The loader passes the physical address at which it found the * RSDP in a hint. We could recover this rather than searching @@ -67,11 +67,11 @@ */ status = AcpiFindRootPointer(Flags, &ptr); if (status == AE_OK) - i386_acpi_root = ptr.Pointer.Physical; + amd64_acpi_root = ptr.Pointer.Physical; } else status = AE_OK; RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER; - RsdpPhysicalAddress->Pointer.Physical = i386_acpi_root; + RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root; return (status); } ==== //depot/projects/smpng/sys/amd64/amd64/locore.S#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.174 2003/05/23 05:04:53 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.175 2003/05/31 06:54:28 peter Exp $ */ #include @@ -69,17 +69,15 @@ /* Find the metadata pointers before we lose them */ movq %rsp, %rbp - xorq %rax, %rax - movl 4(%rbp),%eax /* modulep */ - movq %rax,modulep - movl 8(%rbp),%eax /* kernend */ - movq %rax,physfree + movl 4(%rbp),%edi /* modulep (arg 1) */ + movl 8(%rbp),%esi /* kernend (arg 2) */ /* Get onto a stack that we can trust - there is no going back now. */ movq $bootstack,%rsp - xorq %rbp, %rbp + xorl %ebp, %ebp call hammer_time /* set up cpu for unix operation */ + movq %rax,%rsp /* set up kstack for mi_startup() */ call mi_startup /* autoconfiguration, mountroot etc */ 0: hlt jmp 0b ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.580 2003/05/23 05:04:53 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.582 2003/05/31 07:00:08 peter Exp $ */ #include "opt_atalk.h" @@ -112,7 +112,7 @@ #include #include -extern void hammer_time(void); +extern u_int64_t hammer_time(u_int64_t, u_int64_t); extern void dblfault_handler(void); extern void printcpuinfo(void); /* XXX header file */ @@ -131,9 +131,6 @@ int _udatasel, _ucodesel, _ucode32sel; u_long atdevbase; -u_int64_t modulep; /* phys addr of metadata table */ -u_int64_t physfree; /* first free page after kernel */ - int cold = 1; long Maxmem = 0; @@ -1070,19 +1067,8 @@ avail_end = phys_avail[pa_indx]; } -static u_int64_t -allocpages(int n) -{ - u_int64_t ret; - - ret = physfree; - bzero((void *)ret, n * PAGE_SIZE); - physfree += n * PAGE_SIZE; - return (ret); -} - -void -hammer_time(void) +u_int64_t +hammer_time(u_int64_t modulep, u_int64_t physfree) { caddr_t kmdp; int gsel_tss, off, x; @@ -1095,10 +1081,15 @@ msr = rdmsr(MSR_EFER) | EFER_NXE; wrmsr(MSR_EFER, msr); - proc0.p_uarea = (struct user *)(allocpages(UAREA_PAGES) + KERNBASE); - thread0.td_kstack = allocpages(KSTACK_PAGES) + KERNBASE; + proc0.p_uarea = (struct user *)(physfree + KERNBASE); + bzero(proc0.p_uarea, UAREA_PAGES * PAGE_SIZE); + physfree += UAREA_PAGES * PAGE_SIZE; + thread0.td_kstack = physfree + KERNBASE; + bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE); + physfree += KSTACK_PAGES * PAGE_SIZE; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + atdevbase = ISA_HOLE_START + KERNBASE; /* @@ -1244,6 +1235,9 @@ env = getenv("kernelname"); if (env != NULL) strlcpy(kernelname, env, sizeof(kernelname)); + + /* Location of kernel stack for locore */ + return ((u_int64_t)thread0.td_pcb); } void @@ -1651,5 +1645,3 @@ } #endif /* DDB */ - -MODULE_VERSION(acpi, 100); ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.52 2003/05/23 05:04:53 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $ */ /* @@ -411,7 +411,6 @@ nexus_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, void (*ihand)(void *), void *arg, void **cookiep) { - driver_t *driver; int error; /* somebody tried to setup an irq that failed to allocate! */ @@ -422,8 +421,6 @@ if ((irq->r_flags & RF_SHAREABLE) == 0) flags |= INTR_EXCL; - driver = device_get_driver(child); - /* * We depend here on rman_activate_resource() being idempotent. */ ==== //depot/projects/smpng/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -30,9 +30,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.100 2003/05/14 03:38:13 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.101 2003/05/30 00:58:48 peter Exp $ */ +#include "opt_ddb.h" + #include #include @@ -624,3 +626,36 @@ pushq $KCSEL pushq %rax lretq + +#ifdef DDB +/*****************************************************************************/ +/* setjump, longjump */ +/*****************************************************************************/ + +ENTRY(setjmp) + movq %rbx,0(%rdi) /* save rbx */ + movq %rsp,8(%rdi) /* save rsp */ + movq %rbp,16(%rdi) /* save rbp */ + movq %r12,24(%rdi) /* save r12 */ + movq %r13,32(%rdi) /* save r13 */ + movq %r14,40(%rdi) /* save r14 */ + movq %r15,48(%rdi) /* save r15 */ + movq 0(%rsp),%rdx /* get rta */ + movq %rdx,56(%rdi) /* save rip */ + xorl %eax,%eax /* return(0); */ + ret + +ENTRY(longjmp) + movq 0(%rdi),%rbx /* restore rbx */ + movq 8(%rdi),%rsp /* restore rsp */ + movq 16(%rdi),%rbp /* restore rbp */ + movq 24(%rdi),%r12 /* restore r12 */ + movq 32(%rdi),%r13 /* restore r13 */ + movq 40(%rdi),%r14 /* restore r14 */ + movq 48(%rdi),%r15 /* restore r15 */ + movq 56(%rdi),%rdx /* get rta */ + movq %rdx,0(%rsp) /* put in return frame */ + xorl %eax,%eax /* return(1); */ + incl %eax + ret +#endif ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,46 +16,51 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.385 2003/05/14 04:10:48 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.387 2003/06/01 20:26:38 obrien Exp $ machine amd64 cpu HAMMER ident GENERIC -maxusers 0 -options IA32 -options COMPAT_FREEBSD4 -makeoptions NO_MODULES=not_yet - #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +#makeoptions DEBUG=-g +makeoptions NO_MODULES=not_yet + options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client -options NFSSERVER -options NFS_ROOT #NFS usable as root device, requires NFSCLIENT +options NFSSERVER #Network Filesystem Server +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options COMPAT_FREEBSD4 #Compatible with FreeBSD4 +options IA32 +options KTRACE +options SYSVSHM #SYSV-style shared memory +options SYSVMSG #SYSV-style message queues +options SYSVSEM #SYSV-style semaphores + # Debugging for use in -current +#options DDB +#options ALT_BREAK_TO_DEBUGGER options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS - -options SYSVMSG -options SYSVSEM -options SYSVSHM +#options WITNESS device isa device pci +device acpi +#options ACPI_DEBUG # ATA and ATAPI devices device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives - -options KTRACE +options ATA_STATIC_ID #Static device numbering # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller @@ -91,8 +96,11 @@ device loop # Network loopback device ether # Ethernet support device md # Memory "disks" -device pty -device bpf +device pty # Pseudo-ttys (telnet etc) + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +device bpf # Berkeley packet filter # USB support #device uhci # UHCI PCI->USB interface ==== //depot/projects/smpng/sys/amd64/ia32/Makefile#2 (text+ko) ==== @@ -1,15 +1,16 @@ # Makefile for syscall tables # -# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.1 2002/04/10 19:34:51 dfr Exp $ +# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.2 2003/05/31 06:49:53 peter Exp $ all: @echo "make sysent only" sysent: ia32_sysent.c ia32_syscall.h ia32_proto.h -ia32_sysent.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \ +ia32_sysent.c ia32_syscalls.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \ syscalls.master syscalls.conf -mv -f ia32_sysent.c ia32_sysent.c.bak + -mv -f ia32_syscalls.c ia32_syscalls.c.bak -mv -f ia32_syscall.h ia32_syscall.h.bak -mv -f ia32_proto.h ia32_proto.h.bak sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.1 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.2 2003/05/31 06:49:53 peter Exp $ */ /* @@ -83,6 +83,7 @@ #define IDTVEC(name) __CONCAT(X,name) extern inthand_t IDTVEC(int0x80_syscall), IDTVEC(rsvd); +extern const char *ia32_syscallnames[]; void ia32_syscall(struct trapframe frame); /* Called from asm code */ @@ -251,7 +252,7 @@ cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + (code >= 0 && code < SYS_MAXSYSCALL) ? ia32_syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/amd64/ia32/syscalls.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.1 2002/04/10 19:34:51 dfr Exp $ -sysnames="/dev/null" +# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.2 2003/05/31 06:49:53 peter Exp $ +sysnames="ia32_syscalls.c" sysproto="ia32_proto.h" sysproto_h=_IA32_SYSPROTO_H_ syshdr="ia32_syscall.h" ==== //depot/projects/smpng/sys/amd64/include/asm.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.13 2003/05/24 18:24:03 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.14 2003/06/02 05:59:35 peter Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -58,7 +58,7 @@ * to a possibly-modified form that will be invisible to C programs. */ #define CNAME(csym) csym -#define HIDENAME(asmsym) __CONCAT(.,asmsym) +#define HIDENAME(asmsym) .asmsym /* XXX should use .p2align 4,0x90 for -m486. */ #define _START_ENTRY .text; .p2align 2,0x90 ==== //depot/projects/smpng/sys/amd64/include/bus_dma.h#4 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.21 2003/05/27 04:59:56 scottl Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.22 2003/05/30 20:40:33 hmp Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ @@ -78,7 +78,7 @@ #define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */ +#define BUS_DMA_COHERENT 0x04 /* hint map memory in a coherent way */ #define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x20 #define BUS_DMA_BUS3 0x40 ==== //depot/projects/smpng/sys/amd64/include/db_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.18 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.19 2003/05/30 01:01:07 peter Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -33,12 +33,12 @@ #include #include -#define i386_saved_state trapframe +#define amd64_saved_state trapframe typedef vm_offset_t db_addr_t; /* address - unsigned */ typedef long db_expr_t; /* expression - signed */ -typedef struct i386_saved_state db_regs_t; +typedef struct amd64_saved_state db_regs_t; extern db_regs_t ddb_regs; /* register state */ #define DDB_REGS (&ddb_regs) @@ -48,12 +48,12 @@ #define BKPT_SIZE (1) /* size of breakpoint inst */ #define BKPT_SET(inst) (BKPT_INST) -#define BKPT_SKIP ddb_regs.tf_eip += 1 +#define BKPT_SKIP ddb_regs.tf_rip += 1 -#define FIXUP_PC_AFTER_BREAK ddb_regs.tf_eip -= 1; +#define FIXUP_PC_AFTER_BREAK ddb_regs.tf_rip -= 1; -#define db_clear_single_step(regs) ((regs)->tf_eflags &= ~PSL_T) -#define db_set_single_step(regs) ((regs)->tf_eflags |= PSL_T) +#define db_clear_single_step(regs) ((regs)->tf_rflags &= ~PSL_T) +#define db_set_single_step(regs) ((regs)->tf_rflags |= PSL_T) #define IS_BREAKPOINT_TRAP(type, code) ((type) == T_BPTFLT) /* ==== //depot/projects/smpng/sys/amd64/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.31 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.32 2003/06/02 00:28:39 obrien Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -94,14 +94,14 @@ * \ * selfpc = pc pushed by call to mcount \ */ \ - asm("movq 8(%%rbp),%0" : "=r" (selfpc)); \ + __asm("movq 8(%%rbp),%0" : "=r" (selfpc)); \ /* \ * frompc = pc pushed by call to mcount's caller. \ * The caller's stack frame has already been built, so %ebp is \ * the caller's frame pointer. The caller's raddr is in the \ * caller's frame following the caller's caller's frame pointer.\ */ \ - asm("movq (%%rbp),%0" : "=r" (frompc)); \ + __asm("movq (%%rbp),%0" : "=r" (frompc)); \ frompc = ((uintfptr_t *)frompc)[1]; \ _mcount(frompc, selfpc); \ } ==== //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.25 2000/12/19 00:17:36 rnordier Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.26 2003/06/01 20:41:04 obrien Exp $ # A 512-byte boot manager. @@ -32,6 +32,7 @@ .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code # # Addresses in the sector of embedded data values. @@ -228,6 +229,9 @@ # subb $KEY_F1,%al # Less F1 scan code cmpb $0x4,%al # F1..F5? + jna main.12 # Yes + subb $(KEY_1 - KEY_F1),%al # Less #1 scan code + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -364,7 +368,7 @@ # # These values indicate bootable types we know the names of # - .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83 + .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 # # These are offsets that match the known names above and point to the strings @@ -377,7 +381,6 @@ .byte os_dos-. # Windows .byte os_dos-. # Windows .byte os_dos-. # Windows - .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsd-. # BSD/OS .byte os_freebsd-. # FreeBSD @@ -389,7 +392,6 @@ # os_misc: .ascii "?"; .byte '?'|0x80 os_dos: .ascii "DO"; .byte 'S'|0x80 -os_unix: .ascii "UNI"; .byte 'X'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" os_bsd: .ascii "BS"; .byte 'D'|0x80 ==== //depot/projects/smpng/sys/boot/i386/libi386/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.29 2003/05/01 03:56:29 peter Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.30 2003/06/02 02:37:27 obrien Exp $ # LIB= i386 INTERNALLIB= true @@ -7,7 +7,7 @@ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ comconsole.c devicename.c elf32_freebsd.c \ elf64_freebsd.c gatea20.c \ - i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ + i386_copy.c i386_module.c nullconsole.c pxe.c \ time.c vidconsole.c amd64_tramp.S CFLAGS+= -ffreestanding @@ -39,11 +39,14 @@ .if exists(${.CURDIR}/../../../i386/include) beforedepend ${OBJS}: machine +CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine .endif -CLEANFILES+= machine +OBJS+= pxetramp.o +pxetramp.o: pxetramp.s + as -o ${.TARGET} ${.ALLSRC:M*pxetramp*} .include ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.63 2003/01/18 23:09:56 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.65 2003/05/31 05:25:17 scottl Exp $ PROG= loader STRIP= @@ -102,10 +102,11 @@ .PATH: ${.CURDIR}/../../forth FILES= ${PROG}.help loader.4th support.4th loader.conf +FILES+= screen.4th frames.4th beastie.4th FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc +FILES+= ${.CURDIR}/loader.rc .endif .include <${.CURDIR}/../Makefile.inc> ==== //depot/projects/smpng/sys/cam/cam.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.c,v 1.5 2002/01/09 03:38:58 msmith Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 2 15:05:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 197DC37B423; Mon, 2 Jun 2003 15:05:51 -0700 (PDT) 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 26E1437B49D for ; Mon, 2 Jun 2003 15:05:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98CC343F85 for ; Mon, 2 Jun 2003 15:05:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52M5m0U097688 for ; Mon, 2 Jun 2003 15:05:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52M5kUB097676 for perforce@freebsd.org; Mon, 2 Jun 2003 15:05:46 -0700 (PDT) Date: Mon, 2 Jun 2003 15:05:46 -0700 (PDT) Message-Id: <200306022205.h52M5kUB097676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 22:05:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=32422 Change 32422 by peter@peter_daintree on 2003/06/02 15:05:37 IFC @32421 Affected files ... .. //depot/projects/hammer/bin/ed/Makefile#3 integrate .. //depot/projects/hammer/bin/ed/cbc.c#2 integrate .. //depot/projects/hammer/bin/ed/ed.h#2 integrate .. //depot/projects/hammer/contrib/openpam/CREDITS#4 integrate .. //depot/projects/hammer/contrib/openpam/HISTORY#5 integrate .. //depot/projects/hammer/contrib/openpam/LICENSE#3 integrate .. //depot/projects/hammer/contrib/openpam/MANIFEST#4 integrate .. //depot/projects/hammer/contrib/openpam/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/hammer/contrib/openpam/RELNOTES#5 integrate .. //depot/projects/hammer/contrib/openpam/bin/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/hammer/contrib/openpam/bin/su/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/bin/su/su.c#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam.h#3 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#4 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_constants.h#5 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_modules.h#3 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_types.h#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_configure.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dispatch.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dynamic.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_findenv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_free_data.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_get_option.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_load.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_log.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_nullconv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/hammer/contrib/openpam/lib/openpam_restore_cred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_set_option.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_static.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_authenticate.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_chauthtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_close_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_end.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_error.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_data.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_item.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_user.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenv.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenvlist.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_info.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_open_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_prompt.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_putenv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_data.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_item.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_setcred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_setenv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_close_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_open_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_setcred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_start.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_strerror.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_verror.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_vinfo.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_vprompt.c#4 integrate .. //depot/projects/hammer/contrib/openpam/misc/gendoc.pl#4 integrate .. //depot/projects/hammer/contrib/openpam/modules/Makefile#4 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_deny/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_permit/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_unix/pam_unix.c#4 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#11 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#4 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/hammer/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/hammer/lib/libalias/alias.h#2 integrate .. //depot/projects/hammer/lib/libalias/alias_db.c#2 integrate .. //depot/projects/hammer/lib/libalias/libalias.3#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#8 integrate .. //depot/projects/hammer/lib/libc/gen/dlinfo.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/makecontext.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.c#1 branch .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/hammer/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/hammer/lib/libc_r/test/guard_b.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#3 integrate .. //depot/projects/hammer/lib/libcrypt/crypt-md5.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/crypt-nthash.c#1 branch .. //depot/projects/hammer/lib/libcrypt/crypt.3#3 integrate .. //depot/projects/hammer/lib/libcrypt/crypt.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/crypt.h#2 integrate .. //depot/projects/hammer/lib/libgeom/geom_ctl.c#3 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#4 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ftp/Makefile#3 delete .. //depot/projects/hammer/lib/libpam/modules/pam_ftp/pam_ftp.8#3 delete .. //depot/projects/hammer/lib/libpam/modules/pam_ftp/pam_ftp.c#2 delete .. //depot/projects/hammer/lib/libpam/modules/pam_wheel/Makefile#3 delete .. //depot/projects/hammer/lib/libpam/modules/pam_wheel/pam_wheel.8#4 delete .. //depot/projects/hammer/lib/libpam/modules/pam_wheel/pam_wheel.c#4 delete .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/hammer/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/rstat_proc.c#6 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#6 integrate .. //depot/projects/hammer/libexec/tcpd/Makefile#2 integrate .. //depot/projects/hammer/release/Makefile#26 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#11 integrate .. //depot/projects/hammer/release/i386/drivers.conf#11 integrate .. //depot/projects/hammer/release/pc98/drivers.conf#8 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#8 integrate .. //depot/projects/hammer/sbin/bsdlabel/runtest.sh#3 integrate .. //depot/projects/hammer/sbin/ccdconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#4 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#6 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#2 integrate .. //depot/projects/hammer/sbin/ping/ping.c#11 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#4 integrate .. //depot/projects/hammer/secure/lib/Makefile#6 integrate .. //depot/projects/hammer/secure/lib/libcrypt/blowfish.c#2 integrate .. //depot/projects/hammer/secure/lib/libcrypt/blowfish.h#2 integrate .. //depot/projects/hammer/secure/lib/libcrypt/crypt-blowfish.c#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.1#3 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/hammer/share/colldef/Makefile#4 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#9 integrate .. //depot/projects/hammer/share/man/man4/en.4#1 branch .. //depot/projects/hammer/share/man/man4/mac.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_ifoff.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_lomac.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_mls.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_none.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_partition.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_test.4#4 integrate .. //depot/projects/hammer/share/man/man4/raid.4#4 integrate .. //depot/projects/hammer/share/man/man4/sem.4#2 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/hammer/share/man/man7/maclabel.7#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_SET.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#4 integrate .. //depot/projects/hammer/share/man/man9/devclass.9#3 integrate .. //depot/projects/hammer/share/man/man9/devclass_find.9#3 integrate .. //depot/projects/hammer/share/man/man9/ktr.9#4 integrate .. //depot/projects/hammer/share/man/man9/namei.9#4 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#8 integrate .. //depot/projects/hammer/share/mk/sys.mk#5 integrate .. //depot/projects/hammer/share/mklocale/Makefile#4 integrate .. //depot/projects/hammer/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/hammer/sys/amd64/amd64/trap.c#23 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/setjmp.h#8 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#9 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#9 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#4 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#5 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#8 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/hammer/sys/dev/ccd/ccd.c#8 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#7 integrate .. //depot/projects/hammer/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/scmouse.c#5 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#9 integrate .. //depot/projects/hammer/sys/geom/geom.h#17 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_ext.h#2 delete .. //depot/projects/hammer/sys/geom/geom_subr.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#14 integrate .. //depot/projects/hammer/sys/i386/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/hammer/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/critical.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/i386-gdbstub.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/math_emulate.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/mpapic.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/perfmon.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/vm86.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_errno.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_ioctl.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_signal.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_stat.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/hammer/sys/i386/include/asm.h#4 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/asc.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#9 integrate .. //depot/projects/hammer/sys/i386/isa/cronyx.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/ctx.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/cx.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/elink.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/gsc.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/if_cx.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/intr_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/isa.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/isa_dma.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/istallion.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/ithread.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/loran.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/mse.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#10 integrate .. //depot/projects/hammer/sys/i386/isa/pcaudio.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/pcf.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/spic.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/spigot.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/spkr.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/stallion.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/wt.c#4 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#10 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#8 integrate .. //depot/projects/hammer/sys/kern/init_main.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#27 integrate .. //depot/projects/hammer/sys/modules/sound/driver/au88x0/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_media.h#4 integrate .. //depot/projects/hammer/sys/netinet/ip_encap.c#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#8 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#15 integrate .. //depot/projects/hammer/sys/sys/ccdvar.h#3 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#4 integrate .. //depot/projects/hammer/sys/sys/param.h#13 integrate .. //depot/projects/hammer/sys/sys/proc.h#24 integrate .. //depot/projects/hammer/sys/sys/sem.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#10 integrate .. //depot/projects/hammer/tools/regression/ccd/layout/ccd.sh#2 integrate .. //depot/projects/hammer/usr.bin/checknr/checknr.c#2 integrate .. //depot/projects/hammer/usr.bin/env/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/env/env.1#1 branch .. //depot/projects/hammer/usr.bin/lorder/lorder.sh#3 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#4 integrate .. //depot/projects/hammer/usr.bin/printenv/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/printenv/printenv.1#3 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#5 integrate .. //depot/projects/hammer/usr.sbin/chroot/chroot.c#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#4 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#8 integrate Differences ... ==== //depot/projects/hammer/bin/ed/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.23 2003/06/02 19:06:28 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,8 +8,8 @@ .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES -DPADD= ${LIBCIPHER} -LDADD= -lcipher +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto .endif .include ==== //depot/projects/hammer/bin/ed/cbc.c#2 (text+ko) ==== @@ -36,13 +36,15 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.18 2003/06/02 19:06:28 markm Exp $"); #include #include #include #ifdef DES #include +#include +#define ED_DES_INCLUDES #endif #include "ed.h" @@ -56,12 +58,9 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ - des_error("des_setkey"); #define DES_XFORM(buf) \ - if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ - des_error("des_cipher"); + DES_ecb_encrypt(buf, buf, &schedule, \ + inverse ? DES_DECRYPT : DES_ENCRYPT); /* * read/write - no error checking @@ -70,15 +69,6 @@ #define WRITE(buf, n, fp) fwrite(buf, sizeof(char), n, fp) /* - * some things to make references easier - */ -typedef char Desbuf[8]; -#define CHAR(x,i) (x[i]) -#define UCHAR(x,i) (x[i]) -#define BUFFER(x) (x) -#define UBUFFER(x) (x) - -/* * global variables and related macros */ @@ -86,18 +76,21 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; -Desbuf ivec; /* initialization vector */ -Desbuf pvec; /* padding vector */ +DES_cblock ivec; /* initialization vector */ +DES_cblock pvec; /* padding vector */ + char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' }; + int pflag; /* 1 to preserve parity bits */ +DES_key_schedule schedule; /* expanded DES key */ + unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */ int des_n = 0; /* index for put_des_char/get_des_char */ - /* init_des_cipher: initialize DES */ void init_des_cipher(void) @@ -112,7 +105,7 @@ /* initialize the padding vector */ for (i = 0; i < 8; i++) - CHAR(pvec, i) = (char) (arc4random() % 256); + pvec[i] = (char) (arc4random() % 256); #endif } @@ -172,7 +165,7 @@ get_keyword(void) { char *p; /* used to obtain the key */ - Desbuf msgbuf; /* I/O buffer */ + DES_cblock msgbuf; /* I/O buffer */ /* * get the key @@ -182,9 +175,9 @@ /* * copy it, nul-padded, into the key area */ - expand_des_key(BUFFER(msgbuf), p); + expand_des_key(msgbuf, p); MEMZERO(p, _PASSWORD_LEN); - set_des_key(msgbuf); + set_des_key(&msgbuf); MEMZERO(msgbuf, sizeof msgbuf); return 1; } @@ -303,7 +296,7 @@ * DES ignores the low order bit of each character. */ void -set_des_key(Desbuf buf) /* key block */ +set_des_key(DES_cblock *buf) /* key block */ { int i, j; /* counter in a for loop */ int par; /* parity counter */ @@ -315,16 +308,17 @@ for (i = 0; i < 8; i++) { par = 0; for (j = 1; j < 8; j++) - if ((bits[j]&UCHAR(buf, i)) != 0) + if ((bits[j] & (*buf)[i]) != 0) par++; - if ((par&01) == 01) - UCHAR(buf, i) = UCHAR(buf, i)&0177; + if ((par & 0x01) == 0x01) + (*buf)[i] &= 0x7f; else - UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200; + (*buf)[i] = ((*buf)[i] & 0x7f) | 0x80; } } - DES_KEY(UBUFFER(buf)); + DES_set_odd_parity(buf); + DES_set_key(buf, &schedule); } @@ -341,10 +335,10 @@ */ if (n == 8) { for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + MEMCPY(ivec, msgbuf, 8); + return WRITE(msgbuf, 8, fp); } /* * at EOF or last block -- in either case, the last byte contains @@ -356,12 +350,12 @@ /* * Pad the last block randomly */ - (void)MEMCPY(BUFFER(msgbuf + n), BUFFER(pvec), 8 - n); - CHAR(msgbuf, 7) = n; + (void)MEMCPY(msgbuf + n, pvec, 8 - n); + msgbuf[7] = n; for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + return WRITE(msgbuf, 8, fp); } /* @@ -372,25 +366,25 @@ int cbc_decode(unsigned char *msgbuf, FILE *fp) { - Desbuf tbuf; /* temp buffer for initialization vector */ + DES_cblock tbuf; /* temp buffer for initialization vector */ int n; /* number of bytes actually read */ int c; /* used to test for EOF */ int inverse = 1; /* 0 to encrypt, 1 to decrypt */ - if ((n = READ(BUFFER(msgbuf), 8, fp)) == 8) { + if ((n = READ(msgbuf, 8, fp)) == 8) { /* * do the transformation */ - MEMCPY(BUFFER(tbuf), BUFFER(msgbuf), 8); - DES_XFORM(UBUFFER(msgbuf)); + MEMCPY(tbuf, msgbuf, 8); + DES_XFORM((DES_cblock *)msgbuf); for (c = 0; c < 8; c++) - UCHAR(msgbuf, c) ^= UCHAR(ivec, c); - MEMCPY(BUFFER(ivec), BUFFER(tbuf), 8); + msgbuf[c] ^= ivec[c]; + MEMCPY(ivec, tbuf, 8); /* * if the last one, handle it specially */ if ((c = fgetc(fp)) == EOF) { - n = CHAR(msgbuf, 7); + n = msgbuf[7]; if (n < 0 || n > 7) { des_error("decryption failed (block corrupted)"); return EOF; ==== //depot/projects/hammer/bin/ed/ed.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.19 2003/06/02 19:06:28 markm Exp $ */ #include @@ -175,6 +175,18 @@ /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */ #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0') +#ifdef ED_DES_INCLUDES +void des_error(const char *); +void expand_des_key(char *, char *); +void set_des_key(DES_cblock *); +#endif + +/* Other DES support stuff */ +void init_des_cipher(void); +int flush_des_file(FILE *); +int get_des_char(FILE *); +int put_des_char(int, FILE *); + /* Local Function Declarations */ void add_line_node(line_t *); int append_lines(long); @@ -188,21 +200,17 @@ int close_sbuf(void); int copy_lines(long); int delete_lines(long, long); -void des_error(const char *); int display_lines(long, long, int); line_t *dup_line_node(line_t *); int exec_command(void); long exec_global(int, int); -void expand_des_key(char *, char *); int extract_addr_range(void); char *extract_pattern(int); int extract_subst_tail(int *, long *); char *extract_subst_template(void); int filter_lines(long, long, char *); -int flush_des_file(FILE *); line_t *get_addressed_line_node(long); pattern_t *get_compiled_pattern(void); -int get_des_char(FILE *); char *get_extended_line(int *, int); char *get_filename(void); int get_keyword(void); @@ -219,7 +227,6 @@ int has_trailing_escape(char *, char *); int hex_to_binary(int, int); void init_buffers(void); -void init_des_cipher(void); int is_legal_filename(char *); int join_lines(long, long); int mark_line_node(line_t *, int); @@ -230,7 +237,6 @@ char *parse_char_class(char *); int pop_undo_stack(void); undo_t *push_undo_stack(int, long, long); -int put_des_char(int, FILE *); const char *put_sbuf_line(const char *); int put_stream_line(FILE *, const char *, int); int put_tty_line(const char *, int, long, int); @@ -239,7 +245,6 @@ long read_stream(FILE *, long); int search_and_replace(pattern_t *, int, int); int set_active_node(line_t *); -void set_des_key(char *); void signal_hup(int); void signal_int(int); char *strip_escapes(char *); ==== //depot/projects/hammer/contrib/openpam/CREDITS#4 (text) ==== @@ -14,15 +14,17 @@ Andrew Morgan Brian Fundakowski Feldman Darren J. Moffat + Dmitry V. Levin Eric Melville Gary Winiger Joe Marcus Clarke Juli Mallett Mark Murray + Mike Petullo Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#6 $ +$P4: //depot/projects/openpam/CREDITS#8 $ ==== //depot/projects/hammer/contrib/openpam/HISTORY#5 (text) ==== @@ -1,3 +1,22 @@ +OpenPAM Digitalis 2003-06-01 + + - ENHANCE: Completely rewrite the configuration parser and add + support for the "include" control flag. + + - ENHANCE: Improve portability to NetBSD, OpenBSD and Linux. + + - ENHANCE: Lots of additional paranoia. + + - BUGFIX: The sample su(1) application dropped privileges before + forking instead of after. + + - ENHANCE: Document openpam_log(3). + + - ENHANCE: Other minor documentation fixes. + +Thanks to Dmitry V. Levin for considerable +assistance with this release. +============================================================================ OpenPAM Dianthus 2003-05-02 - BUGFIX: Initialize some potentially uninitialized variables. @@ -223,4 +242,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#18 $ +$P4: //depot/projects/openpam/HISTORY#19 $ ==== //depot/projects/hammer/contrib/openpam/LICENSE#3 (text) ==== @@ -1,5 +1,5 @@ -Copyright (c) 2002 Networks Associates Technology, Inc. +Copyright (c) 2002-2003 Networks Associates Technology, Inc. All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#5 $ +$P4: //depot/projects/openpam/LICENSE#6 $ ==== //depot/projects/hammer/contrib/openpam/MANIFEST#4 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#13 $ +# $P4: //depot/projects/openpam/MANIFEST#16 $ # CREDITS HISTORY @@ -7,9 +7,11 @@ LICENSE MANIFEST Makefile +Makefile.inc README RELNOTES bin/Makefile +bin/Makefile.inc bin/su/Makefile bin/su/su.c doc/Makefile @@ -21,6 +23,7 @@ doc/man/openpam_get_option.3 doc/man/openpam_log.3 doc/man/openpam_nullconv.3 +doc/man/openpam_readline.3 doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 @@ -76,6 +79,7 @@ lib/openpam_load.c lib/openpam_log.c lib/openpam_nullconv.c +lib/openpam_readline.c lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c ==== //depot/projects/hammer/contrib/openpam/Makefile#3 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/Makefile#7 $ +# $P4: //depot/projects/openpam/Makefile#8 $ # SUBDIR = ==== //depot/projects/hammer/contrib/openpam/RELNOTES#5 (text) ==== @@ -1,13 +1,18 @@ - Release notes for OpenPAM Dianthus - ================================== + Release notes for OpenPAM Digitalis + =================================== -This is a maintenance release incorporating a number of minor patches -accumulated since the previous release. +This release incorporates several major changes and improvements and +should be considered BETA QUALITY. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It may or may not build on other platforms; previous -releases have been built on NetBSD and (with partial success) MacOS X. +release date. It is also known to build cleanly on NetBSD 1.6, +OpenBSD 3.1, and a number of glibc-based Linux platforms (with BSD +make installed). It may or may not build on other platforms; you will +need a BSD-compatible make(1) (NetBSD's make(1) is easy to port to +most POSIX platforms). Previous versions were successfully built on +MacOS X 10.1, but there seem to be issues with the heavily modified +version of GCC 3.1 that ships with MacOS X 10.2. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -26,4 +31,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/RELNOTES#15 $ +$P4: //depot/projects/openpam/RELNOTES#18 $ ==== //depot/projects/hammer/contrib/openpam/bin/Makefile#3 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/Makefile#6 $ +# $P4: //depot/projects/openpam/bin/Makefile#7 $ # SUBDIR = ==== //depot/projects/hammer/contrib/openpam/bin/su/Makefile#3 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,13 +32,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/su/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#8 $ # PROG = su WARNS ?= 4 CFLAGS += -I${.CURDIR}/../../include -DPADD = ${.OBJDIR}/../../lib/libpam.so +DPADD = ${.OBJDIR}/../../lib/libpam.a LDADD = -L${.OBJDIR}/../../lib -R${.OBJDIR}/../../lib -lpam NOMAN = YES ==== //depot/projects/hammer/contrib/openpam/bin/su/su.c#3 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,13 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/bin/su/su.c#8 $ + * $P4: //depot/projects/openpam/bin/su/su.c#12 $ */ #include #include #include +#include #include #include #include @@ -81,9 +82,17 @@ argc -= optind; argv += optind; + if (argc > 0) { + user = *argv; + --argc; + ++argv; + } else { + user = "root"; + } + /* initialize PAM */ pamc.conv = &openpam_ttyconv; - pam_start("su", argc ? *argv : "root", &pamc, &pamh); + pam_start("su", user, &pamc, &pamh); /* set some items */ gethostname(hostname, sizeof(hostname)); @@ -117,20 +126,6 @@ if (pam_err != PAM_SUCCESS || (pwd = getpwnam(user)) == NULL) goto pamerr; - /* set uid and groups */ - if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) { - warn("initgroups()"); - goto err; - } - if (setgid(pwd->pw_gid) == -1) { - warn("setgid()"); - goto err; - } - if (setuid(pwd->pw_uid) == -1) { - warn("setuid()"); - goto err; - } - /* export PAM environment */ if ((pam_envlist = pam_getenvlist(pamh)) != NULL) { for (pam_env = pam_envlist; *pam_env != NULL; ++pam_env) { @@ -154,7 +149,21 @@ warn("fork()"); goto err; case 0: - /* child: start a shell */ + /* child: give up privs and start a shell */ + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 2 15:27:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A66FE37B404; Mon, 2 Jun 2003 15:27:16 -0700 (PDT) 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 43B7C37B401 for ; Mon, 2 Jun 2003 15:27:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D02D743F3F for ; Mon, 2 Jun 2003 15:27:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52MRF0U098683 for ; Mon, 2 Jun 2003 15:27:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52MRFRm098680 for perforce@freebsd.org; Mon, 2 Jun 2003 15:27:15 -0700 (PDT) Date: Mon, 2 Jun 2003 15:27:15 -0700 (PDT) Message-Id: <200306022227.h52MRFRm098680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 22:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=32424 Change 32424 by peter@peter_hammer on 2003/06/02 15:26:56 Whoops, add _atomic_lock.S from my tree. Affected files ... .. //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 2 15:35:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A28D837B404; Mon, 2 Jun 2003 15:35:27 -0700 (PDT) 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 59B3537B401 for ; Mon, 2 Jun 2003 15:35:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F21CC43F3F for ; Mon, 2 Jun 2003 15:35:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52MZQ0U099409 for ; Mon, 2 Jun 2003 15:35:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52MZQjD099406 for perforce@freebsd.org; Mon, 2 Jun 2003 15:35:26 -0700 (PDT) Date: Mon, 2 Jun 2003 15:35:26 -0700 (PDT) Message-Id: <200306022235.h52MZQjD099406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2003 22:35:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=32426 Change 32426 by peter@peter_hammer on 2003/06/02 15:35:08 IFC @32425 Affected files ... .. //depot/projects/hammer/lib/Makefile#18 integrate .. //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#9 integrate .. //depot/projects/hammer/usr.sbin/Makefile#19 integrate Differences ... ==== //depot/projects/hammer/lib/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.159 2003/06/01 00:32:21 marcel Exp $ +# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: ==== //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD" + .asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.6 2003/06/02 22:30:59 peter Exp $" #endif /* LIBC_RCS and not lint */ #include ==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.79 2003/03/05 04:39:24 marcel Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.80 2003/06/02 22:22:52 peter Exp $ */ #ifndef _PTHREAD_PRIVATE_H ==== //depot/projects/hammer/usr.sbin/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.254 2003/05/25 07:39:06 peter Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.255 2003/06/02 22:22:52 peter Exp $ .if ${MACHINE_ARCH} != "powerpc" _sysinstall=sysinstall From owner-p4-projects@FreeBSD.ORG Mon Jun 2 17:08:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99EA437B404; Mon, 2 Jun 2003 17:08:25 -0700 (PDT) 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 3919C37B401 for ; Mon, 2 Jun 2003 17:08:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C40E343F3F for ; Mon, 2 Jun 2003 17:08:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5308O0U011062 for ; Mon, 2 Jun 2003 17:08:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5308OXH011059 for perforce@freebsd.org; Mon, 2 Jun 2003 17:08:24 -0700 (PDT) Date: Mon, 2 Jun 2003 17:08:24 -0700 (PDT) Message-Id: <200306030008.h5308OXH011059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 00:08:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=32432 Change 32432 by peter@peter_hammer on 2003/06/02 17:07:59 Fix a bug in obrien's commit, this broke amd64. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#10 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#10 (text+ko) ==== @@ -47,6 +47,6 @@ OBJS+= pxetramp.o pxetramp.o: pxetramp.s - as -o ${.TARGET} ${.ALLSRC:M*pxetramp*} + as ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*} .include From owner-p4-projects@FreeBSD.ORG Mon Jun 2 17:09:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE17737B401; Mon, 2 Jun 2003 17:09:27 -0700 (PDT) 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 59E3137B405 for ; Mon, 2 Jun 2003 17:09:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2A5D43F85 for ; Mon, 2 Jun 2003 17:09:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5309Q0U011123 for ; Mon, 2 Jun 2003 17:09:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5309QpZ011115 for perforce@freebsd.org; Mon, 2 Jun 2003 17:09:26 -0700 (PDT) Date: Mon, 2 Jun 2003 17:09:26 -0700 (PDT) Message-Id: <200306030009.h5309QpZ011115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 00:09:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=32433 Change 32433 by peter@peter_hammer on 2003/06/02 17:09:04 cleanfiles must be missing vers.o - fix this so it compiles again. I had added -m32 to CC in a previous life. Affected files ... .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#6 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/loader/Makefile#6 (text+ko) ==== @@ -85,7 +85,7 @@ vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} - ${CC} -c vers.c + ${CC} ${CFLAGS} -c vers.c ${PROG}: ${PROG}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ From owner-p4-projects@FreeBSD.ORG Mon Jun 2 21:14:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C50A637B404; Mon, 2 Jun 2003 21:14:30 -0700 (PDT) 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 6164837B401 for ; Mon, 2 Jun 2003 21:14:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA33943F93 for ; Mon, 2 Jun 2003 21:14:29 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h534ET0U033781 for ; Mon, 2 Jun 2003 21:14:29 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h534ET3L033778 for perforce@freebsd.org; Mon, 2 Jun 2003 21:14:29 -0700 (PDT) Date: Mon, 2 Jun 2003 21:14:29 -0700 (PDT) Message-Id: <200306030414.h534ET3L033778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 04:14:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=32444 Change 32444 by jmallett@jmallett_dalek on 2003/06/02 21:14:04 New style switch/throw, for -std=c99. Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#6 (text+ko) ==== @@ -65,14 +65,14 @@ } void -cpu_switch(void) +cpu_switch(struct thread *old, struct thread *new) { } void -cpu_throw(void) +cpu_throw(struct thread *old, struct thread *new) { - panic("cpu_throw: called.\n"); + panic("cpu_throw"); } void From owner-p4-projects@FreeBSD.ORG Mon Jun 2 21:14:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2CD837B404; Mon, 2 Jun 2003 21:14:31 -0700 (PDT) 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 DC02937B40C for ; Mon, 2 Jun 2003 21:14:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C27743F93 for ; Mon, 2 Jun 2003 21:14:30 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h534EU0U033787 for ; Mon, 2 Jun 2003 21:14:30 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h534ETRa033784 for perforce@freebsd.org; Mon, 2 Jun 2003 21:14:29 -0700 (PDT) Date: Mon, 2 Jun 2003 21:14:29 -0700 (PDT) Message-Id: <200306030414.h534ETRa033784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 04:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=32445 Change 32445 by jmallett@jmallett_dalek on 2003/06/02 21:14:28 Fix typo. Affected files ... .. //depot/projects/mips/sys/sys/user.h#7 edit Differences ... ==== //depot/projects/mips/sys/sys/user.h#7 (text+ko) ==== @@ -75,7 +75,7 @@ * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist. */ #if defined(__alpha__) || defined(__ia64__) || defined(__mips__) || \ - defined(__sparc64_ || defined(__amd64__) + defined(__sparc64_) || defined(__amd64__) #define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */ #endif #ifdef __i386__ From owner-p4-projects@FreeBSD.ORG Mon Jun 2 21:35:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B135037B404; Mon, 2 Jun 2003 21:35:57 -0700 (PDT) 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 6632D37B401 for ; Mon, 2 Jun 2003 21:35:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE17943F3F for ; Mon, 2 Jun 2003 21:35:56 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h534Zu0U035366 for ; Mon, 2 Jun 2003 21:35:56 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h534ZuB7035363 for perforce@freebsd.org; Mon, 2 Jun 2003 21:35:56 -0700 (PDT) Date: Mon, 2 Jun 2003 21:35:56 -0700 (PDT) Message-Id: <200306030435.h534ZuB7035363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 04:35:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=32446 Change 32446 by jmallett@jmallett_dalek on 2003/06/02 21:35:17 Catch up with C99. $ is no longer valid in an identifier, and as such may split tokens, meaning that $ ## n is no longer a requirement to get $n from a macro. This possibly is not the case outside of C99??? Affected files ... .. //depot/projects/mips/sys/mips/include/cpuregs.h#10 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpuregs.h#10 (text+ko) ==== @@ -445,7 +445,7 @@ * 31 MIPS_COP_0_DESAVE .... DESAVE JTAG register. */ #ifdef LOCORE -#define _(n) __CONCAT($,n) +#define _(n) $n #else #define _(n) n #endif From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:29:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4EEA37B404; Mon, 2 Jun 2003 22:29:05 -0700 (PDT) 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 4553537B401 for ; Mon, 2 Jun 2003 22:29:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E568743F93 for ; Mon, 2 Jun 2003 22:29:04 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535T40U040323 for ; Mon, 2 Jun 2003 22:29:04 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535T4uv040320 for perforce@freebsd.org; Mon, 2 Jun 2003 22:29:04 -0700 (PDT) Date: Mon, 2 Jun 2003 22:29:04 -0700 (PDT) Message-Id: <200306030529.h535T4uv040320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:29:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=32451 Change 32451 by jmallett@jmallett_dalek on 2003/06/02 22:28:50 Use a better pagesize for hardware. Affected files ... .. //depot/projects/mips/sys/mips/include/param.h#11 edit Differences ... ==== //depot/projects/mips/sys/mips/include/param.h#11 (text+ko) ==== @@ -10,10 +10,11 @@ #endif /* - * We use an 8K page on MIPS systems. Override PAGE_* definitions - * to compile-time constants. + * We use a 4K page on MIPS systems. Override PAGE_* definitions + * to compile-time constants. 4K means we don't have to set up + * PageMask, and our VPNs line up nicely. */ -#define PAGE_SHIFT 13 +#define PAGE_SHIFT 12 #define PAGE_SIZE (1 << PAGE_SHIFT) #define PAGE_MASK (PAGE_SIZE - 1) From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:32:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1271D37B401; Mon, 2 Jun 2003 22:32:10 -0700 (PDT) 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 A6A9D37B404 for ; Mon, 2 Jun 2003 22:32:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F52543FA3 for ; Mon, 2 Jun 2003 22:32:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535W90U040494 for ; Mon, 2 Jun 2003 22:32:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535W8NR040490 for perforce@freebsd.org; Mon, 2 Jun 2003 22:32:08 -0700 (PDT) Date: Mon, 2 Jun 2003 22:32:08 -0700 (PDT) Message-Id: <200306030532.h535W8NR040490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:32:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=32452 Change 32452 by jmallett@jmallett_dalek on 2003/06/02 22:31:25 Remove stuff to hold hand of Alpha pmap and NetBSD. Affected files ... .. //depot/projects/mips/sys/mips/include/vmparam.h#9 edit Differences ... ==== //depot/projects/mips/sys/mips/include/vmparam.h#9 (text+ko) ==== @@ -131,26 +131,11 @@ #define VM_MAXUSER_ADDRESS ((vm_offset_t)0x0000010000000000) #define VM_MAX_ADDRESS ((vm_offset_t)0x0000010000000000) #define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_XKSEG_START) -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)VPTBASE-1) +#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_XKSEG_END) #define KERNBASE (VM_MIN_KERNEL_ADDRESS) -#define VPTBASE (MIPS_XKSEG_START+0xffffffff) /* virtual sizes (bytes) for various kernel submaps */ #define VM_KMEM_SIZE (16*1024*1024) /* XXX ??? */ #define VM_PHYS_SIZE (USRIOSIZE*NBPG) -/* VM_PHYSSEG_MAX defined by platform-dependent code. */ -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH -#define VM_PHYSSEG_NOADD /* can add RAM after vm_mem_init */ - -#define __HAVE_PMAP_PHYSSEG - -/* - * pmap-specific data stored in the vm_physmem[] array. - */ -struct pmap_physseg { - struct pv_entry *pvent; /* pv table for this seg */ - char *attrs; /* page attributes for this seg */ -}; - #endif /* ! _MIPS_VMPARAM_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:32:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D46B37B401; Mon, 2 Jun 2003 22:32:11 -0700 (PDT) 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 2B35C37B40C for ; Mon, 2 Jun 2003 22:32:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C588143FA3 for ; Mon, 2 Jun 2003 22:32:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535W90U040500 for ; Mon, 2 Jun 2003 22:32:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535W9Sp040497 for perforce@freebsd.org; Mon, 2 Jun 2003 22:32:09 -0700 (PDT) Date: Mon, 2 Jun 2003 22:32:09 -0700 (PDT) Message-Id: <200306030532.h535W9Sp040497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:32:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=32453 Change 32453 by jmallett@jmallett_dalek on 2003/06/02 22:32:06 Support for reading/writing 64-bit CP0 registers. Add use of such for TLB. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#11 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#11 (text+ko) ==== @@ -39,6 +39,32 @@ __asm __volatile ("sync" : : : "memory"); } +#define MIPS_RDRW64_COP0(n,r) \ +static __inline u_int64_t \ +mips_rd_ ## n (void) \ +{ \ + int v0; \ + __asm __volatile ("dmfc0 %[v0], $"__XSTRING(r)";" \ + : [v0] "=&r"(v0)); \ + return (v0); \ +} \ +static __inline void \ +mips_wr_ ## n (u_int64_t a0) \ +{ \ + __asm __volatile ("dmtc0 %[a0], $"__XSTRING(r)";" \ + __XSTRING(COP0_SYNC)";" \ + "nop;" \ + "nop;" \ + : \ + : [a0] "r"(a0)); \ +} + +MIPS_RDRW64_COP0(entrylo0, MIPS_COP_0_TLB_LO0) +MIPS_RDRW64_COP0(entrylo1, MIPS_COP_0_TLB_LO1) +MIPS_RDRW64_COP0(entryhi, MIPS_COP_0_TLB_HI) + +#undef MIPS_RDRW64_COP0 + #define MIPS_RDRW32_COP0(n,r) \ static __inline u_int32_t \ mips_rd_ ## n (void) \ @@ -66,6 +92,8 @@ MIPS_RDRW32_COP0(cause, MIPS_COP_0_CAUSE) MIPS_RDRW32_COP0(status, MIPS_COP_0_STATUS) +#undef MIPS_RDRW32_COP0 + static __inline register_t intr_disable(void) { From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:34:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE12D37B401; Mon, 2 Jun 2003 22:34:13 -0700 (PDT) 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 A163C37B407 for ; Mon, 2 Jun 2003 22:34:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0185043F75 for ; Mon, 2 Jun 2003 22:34:13 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535YC0U040636 for ; Mon, 2 Jun 2003 22:34:12 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535YCVN040633 for perforce@freebsd.org; Mon, 2 Jun 2003 22:34:12 -0700 (PDT) Date: Mon, 2 Jun 2003 22:34:12 -0700 (PDT) Message-Id: <200306030534.h535YCVN040633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=32454 Change 32454 by jmallett@jmallett_dalek on 2003/06/02 22:33:44 Clean, new PTE header which describes things simply from a 64-bit point of view, suitable for use with simple MMU management code. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#5 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#5 (text+ko) ==== @@ -1,266 +1,121 @@ -/* $NetBSD: pte.h,v 1.13 2002/10/14 05:11:23 chs Exp $ */ -/* $NetBSD: mips3_pte.h,v 1.15 2002/06/24 05:46:47 simonb Exp $ */ - /*- - * Copyright (c) 1997 The NetBSD Foundation, Inc. - * All rights reserved. + * Author: Juli Mallett + * Date: June 02, 2003 + * Description: + * Header describing page table entries and the TLB of the MIPS. * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center. + * This file is in the public domain. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * $FreeBSD$ */ -/* - * Copyright 1996 The Board of Trustees of The Leland Stanford - * Junior University. All Rights Reserved. - * - * Permission to use, copy, modify, and distribute this - * software and its documentation for any purpose and without - * fee is hereby granted, provided that the above copyright - * notice appear in all copies. Stanford University - * makes no representations about the suitability of this - * software for any purpose. It is provided "as is" without - * express or implied warranty. - */ -/* - * Copyright (c) 1988 University of Utah. - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department and Ralph Campbell. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: Utah Hdr: pte.h 1.11 89/09/03 - * - * from: @(#)pte.h 8.1 (Berkeley) 6/10/93 - */ - -#ifndef __MIPS_PTE_H__ -#define __MIPS_PTE_H__ +#ifndef _MACHINE_PTE_H_ +#define _MACHINE_PTE_H_ /* - * R4000 hardware page table entry + * 64-bit PTE. */ - -#ifndef LOCORE -#if 0/*DOCUMENTATION&OLD*/ -struct mips3_pte { -#if BYTE_ORDER == BIG_ENDIAN -unsigned int pg_prot:3, /* SW: access control */ - pg_pfnum:23, /* HW: core page frame number or 0 */ - pg_attr:3, /* HW: cache attribute */ - pg_m:1, /* HW: dirty bit */ - pg_v:1, /* HW: valid bit */ - pg_g:1; /* HW: ignore asid bit */ -#endif -#if BYTE_ORDER == LITTLE_ENDIAN -unsigned int pg_g:1, /* HW: ignore asid bit */ - pg_v:1, /* HW: valid bit */ - pg_m:1, /* HW: dirty bit */ - pg_attr:3, /* HW: cache attribute */ - pg_pfnum:23, /* HW: core page frame number or 0 */ - pg_prot:3; /* SW: access control */ +#ifndef LOCORE +typedef unsigned long pt_entry_t; +#else +#define PTESIZE 64 #endif -}; -#endif +#ifndef LOCORE /* - * Structure defining an tlb entry data set. + * Structure defining the whole of the TLB. + * XXX This is for NetBSD compat, and I really want to move away from + * this sort of thing. Badly. */ - struct tlb { - int tlb_mask; - int tlb_hi; /* XXX should be 64 bits */ - int tlb_lo0; /* XXX maybe 64 bits (only 32 really used) */ - int tlb_lo1; /* XXX maybe 64 bits (only 32 really used) */ + uint32_t tlb_mask; /* PageMask */ + uint32_t tlb_padding; /* alignment :( */ + register_t tlb_hi; /* EntryHi */ + register_t tlb_lo0; /* EntryLo0 */ + register_t tlb_lo1; /* EntryLo1 */ }; #endif /* LOCORE */ -#define MIPS3_PG_WIRED 0x80000000 /* SW */ -#define MIPS3_PG_RO 0x40000000 /* SW */ -#define MIPS3_PG_M 0x20000000 /* SW */ +/* + * TLB and PTE management. Most things operate within the context of + * EntryLo0,1. Things which work with EntryHi have a HI in their name + * somewhere obvious: usually after PG_ or MIPS_. + */ -#define MIPS3_PG_SVPN 0xfffff000 /* Software page no mask */ -#define MIPS3_PG_HVPN 0xffffe000 /* Hardware page no mask */ -#define MIPS3_PG_ODDPG 0x00001000 /* Odd even pte entry */ -#define MIPS3_PG_ASID 0x000000ff /* Address space ID */ -#define MIPS3_PG_G 0x00000001 /* Global; ignore ASID if in lo0 & lo1 */ -#define MIPS3_PG_V 0x00000002 /* Valid */ -#define MIPS3_PG_NV 0x00000000 -#define MIPS3_PG_D 0x00000004 /* Dirty */ -#define MIPS3_PG_ATTR 0x0000003f +/* + * PFN for EntryLo register. Upper bits are 0, which is to say that + * bit 29 is the last hardware bit; Bits 30 and upwards (EntryLo is + * 64 bit though it can be referred to in 32-bits providing 2 software + * bits safely. We use it as 64 bits to get many software bits, and + * god knows what else.) are unacknowledged by hardware. They may be + * written as anything, but otherwise they have as much meaning as + * other 0 fields. + * + * Given this, we just shift the PA right a little. + */ +#define MIPS_TLB_SWSHIFT 30 +#define MIPS_PFN_SHIFT 6 +#define MIPS_PFN_MASK 0x3FFFFFC0 +#define MIPS_PA_TO_PFN(pa) ((pa) >> MIPS_PFN_SHIFT) +#define MIPS_PFN_TO_PA(pfn) ((pfn) << MIPS_PFN_SHIFT) +#define MIPS_PTE_TO_PFN(pte) ((pte) & MIPS_PFN_MASK) +#define MIPS_PTE_TO_PA(pte) (MIPS_PFN_TO_PA(MIPS_PTE_TO_PFN((pte)))) -#define MIPS3_CCA_TO_PG(cca) ((cca) << 3) +/* + * VPN for EntryHi register. Upper two bits select user, supervisor, + * or kernel. Bits 61 to 40 copy bit 63. VPN2 is bits 39 to 13. From + * bit 12 to bit 8 there is a 5-bit 0 field. Low byte is ASID. + */ +#define MIPS_HI_R_SHIFT 62 +#define MIPS_HI_FILL_SHIFT 40 +#define MIPS_HI_VPN2_SHIFT 13 +#define MIPS_HI_VPN2_BMASK 0xFFFFFFE +#define MIPS_HI_VPN2_MASK (MIPS_HI_VPN2_BMASK << MIPS_HI_VPN2_SHIFT) +#define MIPS_HI_VA_TO_VPN2(va) (((va) & MIPS_HI_VPN2_BMASK) << MIPS_HI_VPN2_SHIFT) -#define MIPS3_PG_UNCACHED MIPS3_CCA_TO_PG(2) -#ifdef HPCMIPS_L1CACHE_DISABLE /* MIPS3_L1CACHE_DISABLE */ -#define MIPS3_PG_CACHED MIPS3_PG_UNCACHED /* XXX: brain damaged!!! */ -#else /* HPCMIPS_L1CACHE_DISABLE */ -#define MIPS3_PG_CACHED mips3_pg_cached -#define MIPS3_DEFAULT_PG_CACHED MIPS3_CCA_TO_PG(3) -#endif /* ! HPCMIPS_L1CACHE_DISABLE */ -#define MIPS3_PG_CACHEMODE MIPS3_CCA_TO_PG(7) - -/* Write protected */ -#define MIPS3_PG_ROPAGE (MIPS3_PG_V | MIPS3_PG_RO | MIPS3_PG_CACHED) - -/* Not wr-prot not clean */ -#define MIPS3_PG_RWPAGE (MIPS3_PG_V | MIPS3_PG_D | MIPS3_PG_CACHED) - -/* Not wr-prot but clean */ -#define MIPS3_PG_CWPAGE (MIPS3_PG_V | MIPS3_PG_CACHED) -#define MIPS3_PG_IOPAGE(cca) \ - (MIPS3_PG_G | MIPS3_PG_V | MIPS3_PG_D | MIPS3_CCA_TO_PG(cca)) -#define MIPS3_PG_FRAME 0x3fffffc0 -#ifdef MIPS3_4100 /* VR4100 core */ -#define MIPS3_PG_SHIFT 4 -#else -#define MIPS3_PG_SHIFT 6 -#endif - -/* pte accessor macros */ - -#define mips3_pfn_is_ext(x) ((x) & 0x3c000000) -#define mips3_paddr_to_tlbpfn(x) \ - (((vm_paddr_t)(x) >> MIPS3_PG_SHIFT) & MIPS3_PG_FRAME) -#define mips3_tlbpfn_to_paddr(x) \ - ((vm_paddr_t)((x) & MIPS3_PG_FRAME) << MIPS3_PG_SHIFT) -#define mips3_vad_to_vpn(x) ((vm_offset_t)(x) & MIPS3_PG_SVPN) -#define mips3_vpn_to_vad(x) ((x) & MIPS3_PG_SVPN) - -#define MIPS3_PTE_TO_PADDR(pte) (mips3_tlbpfn_to_paddr(pte)) -#define MIPS3_PAGE_IS_RDONLY(pte,va) \ - (pmap_is_page_ro(pmap_kernel(), mips_trunc_page(va), (pte))) - - -#define MIPS3_PG_SIZE_4K 0x00000000 -#define MIPS3_PG_SIZE_16K 0x00006000 -#define MIPS3_PG_SIZE_64K 0x0001e000 -#define MIPS3_PG_SIZE_256K 0x0007e000 -#define MIPS3_PG_SIZE_1M 0x001fe000 -#define MIPS3_PG_SIZE_4M 0x007fe000 -#define MIPS3_PG_SIZE_16M 0x01ffe000 -#define MIPS3_PG_SIZE_64M 0x07ffe000 -#define MIPS3_PG_SIZE_256M 0x1fffe000 - -#define PG_ASID 0x000000ff /* Address space ID */ +/* + * TLB page bits that aren't really flags: + * ODDPG: Is this page odd? ! XXX NetBSD compat + * HVPN: Hardware VPN mask ! XXX NetBSD compat + * ASID: Address space ID + */ +#define PG_ODDPG 0x00001000 +#define PG_HVPN MIPS_HI_VPN2_MASK +#define PG_ASID 0x000000ff -#ifndef LOCORE -#include - -typedef unsigned long pt_entry_t; -#if 0 -typedef union pt_entry { - unsigned int pt_entry; /* for copying, etc. */ - struct mips3_pte pt_mips3_pte; -} pt_entry_t; -#endif - -#define mips_pg_nv_bit() (MIPS1_PG_NV) /* same on mips1 and mips3 */ - -#define mips_pg_v(entry) ((entry) & MIPS3_PG_V) -#define mips_pg_wired(entry) ((entry) & MIPS3_PG_WIRED) - -#define mips_pg_m_bit() (MIPS3_PG_D) -#define mips_pg_rw_bit() (MIPS3_PG_D) -#define mips_pg_ro_bit() (MIPS3_PG_RO) -#define mips_pg_ropage_bit() (MIPS3_PG_ROPAGE) -#define mips_pg_rwpage_bit() (MIPS3_PG_RWPAGE) -#define mips_pg_cwpage_bit() (MIPS3_PG_CWPAGE) -#define mips_pg_global_bit() (MIPS3_PG_G) -#define mips_pg_wired_bit() (MIPS3_PG_WIRED) - -#define PTE_TO_PADDR(pte) MIPS3_PTE_TO_PADDR((pte)) -#define PAGE_IS_RDONLY(pte, va) MIPS3_PAGE_IS_RDONLY((pte), (va)) - -#define mips_tlbpfn_to_paddr(x) mips3_tlbpfn_to_paddr((vm_offset_t)(x)) -#define mips_paddr_to_tlbpfn(x) mips3_paddr_to_tlbpfn((x)) - /* - * Address of current address space page table maps + * TLB flags managed in hardware: + * C: We ignore this field, as it will only give us a + * headache in certain CPUs. Better not to bother for + * now, though in time we may want to support multiple + * cache schemes for VM. + * D: Dirty bit. This means a page is writable. It is not + * set at first, and a write is trapped, and the dirty + * bit is set. See also PG_RO. + * V: Valid bit. Obvious, isn't it? + * G: Global bit. This means that this mapping is present + * in EVERY address space, and to ignore the ASID when + * it is matched. */ -#ifdef _KERNEL +#define PG_D 0x04 +#define PG_V 0x02 +#define PG_G 0x01 + /* - * PTmap is recursive pagemap at top of virtual address space. - * Within PTmap, the lev1 and lev0 page tables can be found. + * VM flags managed in software: + * RO: Read only. Never set PG_D on this page, and don't + * listen to requests to write to it. + * W: Wired. + * M: Managed. */ - /* lev3 page tables */ -#define PTmap ((pt_entry_t*)VPTBASE) - /* lev2 page tables */ -#define PTlev2 ((pt_entry_t*)(PTmap+(PTLEV1I< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B15437B404; Mon, 2 Jun 2003 22:35:15 -0700 (PDT) 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 3C0E137B401 for ; Mon, 2 Jun 2003 22:35:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5EB143F75 for ; Mon, 2 Jun 2003 22:35:14 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535ZE0U040739 for ; Mon, 2 Jun 2003 22:35:14 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535ZE2H040736 for perforce@freebsd.org; Mon, 2 Jun 2003 22:35:14 -0700 (PDT) Date: Mon, 2 Jun 2003 22:35:14 -0700 (PDT) Message-Id: <200306030535.h535ZE2H040736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:35:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=32455 Change 32455 by jmallett@jmallett_dalek on 2003/06/02 22:34:43 Update for new PTE header. Affected files ... .. //depot/projects/mips/sys/mips/mips/db_interface.c#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_interface.c#5 (text+ko) ==== @@ -295,17 +295,17 @@ for (i = 0; i < mips_num_tlb_entries; i++) { mips64_TLBRead(i, &tlb); db_printf("TLB%c%2d Hi 0x%016lx ", - (tlb.tlb_lo0 | tlb.tlb_lo1) & MIPS3_PG_V ? ' ' : '*', + (tlb.tlb_lo0 | tlb.tlb_lo1) & PG_V ? ' ' : '*', i, tlb.tlb_hi); db_printf("Lo0=0x%016lx %c%c attr %x ", - mips_tlbpfn_to_paddr(tlb.tlb_lo0), - (tlb.tlb_lo0 & MIPS3_PG_D) ? 'D' : ' ', - (tlb.tlb_lo0 & MIPS3_PG_G) ? 'G' : ' ', + MIPS_PFN_TO_PA(tlb.tlb_lo0), + (tlb.tlb_lo0 & PG_D) ? 'D' : ' ', + (tlb.tlb_lo0 & PG_G) ? 'G' : ' ', (tlb.tlb_lo0 >> 3) & 7); db_printf("Lo1=0x%016lx %c%c attr %x sz=%x\n", - mips_tlbpfn_to_paddr(tlb.tlb_lo1), - (tlb.tlb_lo1 & MIPS3_PG_D) ? 'D' : ' ', - (tlb.tlb_lo1 & MIPS3_PG_G) ? 'G' : ' ', + MIPS_PFN_TO_PA(tlb.tlb_lo1), + (tlb.tlb_lo1 & PG_D) ? 'D' : ' ', + (tlb.tlb_lo1 & PG_G) ? 'G' : ' ', (tlb.tlb_lo1 >> 3) & 7, tlb.tlb_mask); } @@ -345,16 +345,7 @@ do { \ uint64_t __val; \ \ - __asm __volatile( \ - ".set push \n\t" \ - ".set mips3 \n\t" \ - ".set noat \n\t" \ - "dmfc0 $1,$" __STRING(reg) " \n\t" \ - "dsll %L0,$1,32 \n\t" \ - "dsrl %L0,%L0,32 \n\t" \ - "dsrl %M0,$1,32 \n\t" \ - ".set pop" \ - : "=r"(__val)); \ + __asm __volatile("dmfc0 %0,$" __STRING(reg):"=r"(__val)); \ printf(" %s:%*s %#llx\n", name, FLDWIDTH - (int) strlen(name), \ "", __val); \ } while (0) From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:36:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF3CC37B404; Mon, 2 Jun 2003 22:36:17 -0700 (PDT) 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 A593237B401 for ; Mon, 2 Jun 2003 22:36:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B8BF43FB1 for ; Mon, 2 Jun 2003 22:36:17 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535aG0U040810 for ; Mon, 2 Jun 2003 22:36:16 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535aG2i040807 for perforce@freebsd.org; Mon, 2 Jun 2003 22:36:16 -0700 (PDT) Date: Mon, 2 Jun 2003 22:36:16 -0700 (PDT) Message-Id: <200306030536.h535aG2i040807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:36:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=32456 Change 32456 by jmallett@jmallett_dalek on 2003/06/02 22:35:22 Update for C99 CPP. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#8 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#8 (text+ko) ==== @@ -28,7 +28,6 @@ #include #include -#incldue #include "assym.s" @@ -54,48 +53,54 @@ .globl btext btext: ENTRY(start) - # t0: Bits to preserve if set: - # Soft reset - # Boot exception vectors (firmware-provided) + /* + * t0: Bits to preserve if set: + * Soft reset + * Boot exception vectors (firmware-provided) + */ li t0, MIPS_SR_BEV | MIPS3_SR_SR - # t1: Bits to set explicitly: - # Kernel mode is 64-bit - # Enable FPU + /* + * t1: Bits to set explicitly: + * Kernel mode is 64-bit + * Enable FPU + */ li t1, MIPS3_SR_KX | MIPS_SR_COP_1_BIT - # Read coprocessor 0 status register, clear bits not - # preserved (namely, clearing interrupt bits), and set - # bits we want to explicitly set. + /* + * Read coprocessor 0 status register, clear bits not + * preserved (namely, clearing interrupt bits), and set + * bits we want to explicitly set. + */ mfc0 t2, MIPS_COP_0_STATUS and t2, t0 or t2, t1 mtc0 t2, MIPS_COP_0_STATUS COP0_SYNC - # Extra nops for the FPU to spin up. + /* Extra nops for the FPU to spin up. */ - # Clear cause register. + /* Clear cause register. */ mtc0 zero, MIPS_COP_0_CAUSE COP0_SYNC - # Read and store the PrID FPU ID for CPU identification. + /* Read and store the PrID FPU ID for CPU identification. */ mfc0 t0, MIPS_COP_0_PRID cfc1 t1, MIPS_FPU_ID sw t0, cpu_id sw t1, fpu_id - # Set up the GP. + /* Set up the GP. */ la gp, _gp - # Set up our temporary stack. + /* Set up our temporary stack. */ la sp, topstack - # Call the platform-specific startup code. + /* Call the platform-specific startup code. */ jal platform_start nop - # Start MI things rolling. + /* Start MI things rolling. */ jal mi_startup nop - # NOTREACHED + /* NOTREACHED */ END(start) From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:36:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09C4237B410; Mon, 2 Jun 2003 22:36:19 -0700 (PDT) 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 9541737B40F for ; Mon, 2 Jun 2003 22:36:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C358843F3F for ; Mon, 2 Jun 2003 22:36:17 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535aH0U040816 for ; Mon, 2 Jun 2003 22:36:17 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535aHDi040813 for perforce@freebsd.org; Mon, 2 Jun 2003 22:36:17 -0700 (PDT) Date: Mon, 2 Jun 2003 22:36:17 -0700 (PDT) Message-Id: <200306030536.h535aHDi040813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:36:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=32457 Change 32457 by jmallett@jmallett_dalek on 2003/06/02 22:36:00 Not bothering with CCA right now, hide it under SUPPORT_SB1. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#30 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#30 (text+ko) ==== @@ -174,7 +174,9 @@ int mips_cpu_flags; int mips_has_r4k_mmu; int mips_has_llsc; +#ifdef SUPPORT_SB1 int mips3_pg_cached; +#endif int mips_num_tlb_entries; @@ -536,11 +538,13 @@ MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, "Au1100 (Rev 2 core)" }, +#ifdef SUPPORT_SB1 /* The SB1 CPUs use a CCA of 5 - "Cacheable Coherent Shareable" */ { MIPS_PRID_CID_SIBYTE, MIPS_SB1, -1, -1, -1, 0, MIPS64_FLAGS | CPU_MIPS_D_CACHE_COHERENT | CPU_MIPS_HAVE_SPECIAL_CCA | (5 << CPU_MIPS_CACHED_CCA_SHIFT), "SB1" }, +#endif /* SUPPORT_SB1 */ { 0, 0, 0, 0, 0, 0, 0, NULL } @@ -736,6 +740,7 @@ mips_has_r4k_mmu = mips_cpu_flags & CPU_MIPS_R4K_MMU; mips_has_llsc = (mips_cpu_flags & CPU_MIPS_NO_LLSC) == 0; +#ifdef SUPPORT_SB1 if (mycpu->cpu_flags & CPU_MIPS_HAVE_SPECIAL_CCA) { uint32_t cca; @@ -744,6 +749,7 @@ mips3_pg_cached = MIPS3_CCA_TO_PG(cca); } else mips3_pg_cached = MIPS3_DEFAULT_PG_CACHED; +#endif SUPPORT_SB1 #ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG mips_machdep_cache_config(); From owner-p4-projects@FreeBSD.ORG Mon Jun 2 22:37:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F23AE37B404; Mon, 2 Jun 2003 22:37:20 -0700 (PDT) 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 7C1B837B401 for ; Mon, 2 Jun 2003 22:37:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1237C43F75 for ; Mon, 2 Jun 2003 22:37:20 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h535bJ0U040861 for ; Mon, 2 Jun 2003 22:37:19 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535bJ6p040858 for perforce@freebsd.org; Mon, 2 Jun 2003 22:37:19 -0700 (PDT) Date: Mon, 2 Jun 2003 22:37:19 -0700 (PDT) Message-Id: <200306030537.h535bJ6p040858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 05:37:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=32458 Change 32458 by jmallett@jmallett_dalek on 2003/06/02 22:36:34 Update for new PTE header & C99. Affected files ... .. //depot/projects/mips/sys/mips/mips/mips_subr.S#8 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#8 (text+ko) ==== @@ -226,13 +226,13 @@ mfc0 v1, MIPS_COP_0_STATUS # Save the status register. mtc0 zero, MIPS_COP_0_STATUS # Disable interrupts COP0_SYNC - and t1, a0, MIPS3_PG_ODDPG # t1 = Even/Odd flag - li v0, (MIPS3_PG_HVPN | MIPS3_PG_ASID) + and t1, a0, PG_ODDPG # t1 = Even/Odd flag + li v0, (PG_HVPN | PG_ASID) and a0, a0, v0 _MFC0 t0, MIPS_COP_0_TLB_HI # Save current PID _MTC0 a0, MIPS_COP_0_TLB_HI # Init high reg COP0_SYNC - and a2, a1, MIPS3_PG_G # Copy global bit + and a2, a1, PG_G # Copy global bit nop nop tlbp # Probe for the entry. @@ -241,7 +241,7 @@ _SRL a1, a1, WIRED_SHIFT bne t1, zero, 2f # Decide even odd mfc0 v0, MIPS_COP_0_TLB_INDEX # See what we got -# EVEN +/* EVEN */ nop bltz v0, 1f # index < 0 => !found nop @@ -284,7 +284,7 @@ nop # required for QED5230 b 4f nop -# ODD +/* ODD */ 2: nop bltz v0, 3f # index < 0 => !found @@ -388,11 +388,11 @@ mtc0 v1, MIPS_COP_0_STATUS # Restore the status register COP0_SYNC nop - sw t2, 0(a1) - sw t3, 4(a1) - sw ta0, 8(a1) - j ra - sw ta1, 12(a1) + sd t2, 0(a1) # Store PageMask + sd t3, 8(a1) # Store EntryHi + sd ta0, 16(a1) # Store EntryLo0 + j ra # Stand there where you are + sd ta1, 24(a1) # Store EntryLo1 END(MIPSX(TLBRead)) /* @@ -407,12 +407,12 @@ jal ra, s0 move a0, s1 .set noat - # - # Make sure to disable interrupts here, as otherwise - # we can take an interrupt *after* EXL is set, and - # end up returning to a bogus PC since the PC is not - # saved if EXL=1. - # + /* + * Make sure to disable interrupts here, as otherwise + * we can take an interrupt *after* EXL is set, and + * end up returning to a bogus PC since the PC is not + * saved if EXL=1. + */ mtc0 zero, MIPS_COP_0_STATUS # disable int COP0_SYNC nop # 3 op delay @@ -424,7 +424,7 @@ nop nop addu a1, sp, CALLFRAME_SIZ - # REG_L a0, FRAME_SR(a1) + /* REG_L a0, FRAME_SR(a1) */ REG_L t0, FRAME_MULLO(a1) REG_L t1, FRAME_MULHI(a1) REG_L v0, FRAME_EPC(a1) @@ -497,7 +497,7 @@ blt v0, s0, resume nop - and s0, v0, MIPS3_PG_ODDPG + and s0, v0, PG_ODDPG beq s0, zero, entry0 nop @@ -534,10 +534,10 @@ entry0set: mtc0 zero, MIPS_COP_0_TLB_INDEX # TLB entry #0 COP0_SYNC - or a1, MIPS3_PG_G + or a1, PG_G _MTC0 a1, MIPS_COP_0_TLB_LO0 # upte[0] | PG_G COP0_SYNC - or a2, MIPS3_PG_G + or a2, PG_G _MTC0 a2, MIPS_COP_0_TLB_LO1 # upte[1] | PG_G COP0_SYNC nop @@ -562,7 +562,7 @@ mtc0 zero, MIPS_COP_0_STATUS # disable interrupts COP0_SYNC - li v0, (MIPS3_PG_HVPN | MIPS3_PG_ASID) + li v0, (PG_HVPN | PG_ASID) _MFC0 t0, MIPS_COP_0_TLB_HI # save current ASID mfc0 t3, MIPS_COP_0_TLB_PG_MASK # save current pgMask and a0, a0, v0 # make sure valid entryHi @@ -575,8 +575,8 @@ nop nop mfc0 v0, MIPS_COP_0_TLB_INDEX # see what we got - #nop # -slip- - #nop # -slip- + /*nop # -slip-*/ + /*nop # -slip-*/ bltz v0, 1f # index < 0 then skip li t1, MIPS_KSEG0_START # invalid address sll v0, v0, 13 # PAGE_SHIFT + 1 @@ -623,7 +623,7 @@ li v0, MIPS_KSEG0_START # invalid address mfc0 t3, MIPS_COP_0_TLB_PG_MASK # save current pgMask - # do {} while (t1 < t2) + /* do {} while (t1 < t2) */ 1: mtc0 t1, MIPS_COP_0_TLB_INDEX # set index COP0_SYNC @@ -638,7 +638,7 @@ nop nop _MFC0 a0, MIPS_COP_0_TLB_LO1 - and a0, a0, MIPS3_PG_G # check to see it has G bit + and a0, a0, PG_G # check to see it has G bit bnez a0, 2f addu ta0, ta0, v0 @@ -692,7 +692,7 @@ mtc0 zero, MIPS_COP_0_TLB_PG_MASK # zero out pageMask COP0_SYNC - # do {} while (t1 < a0) + /* do {} while (t1 < a0) */ 1: mtc0 t1, MIPS_COP_0_TLB_INDEX # set TLBindex COP0_SYNC From owner-p4-projects@FreeBSD.ORG Tue Jun 3 00:04:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4084137B404; Tue, 3 Jun 2003 00:04:07 -0700 (PDT) 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 B705037B401 for ; Tue, 3 Jun 2003 00:04:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5772943F75 for ; Tue, 3 Jun 2003 00:04:05 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h537450U046473 for ; Tue, 3 Jun 2003 00:04:05 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h53744WG046470 for perforce@freebsd.org; Tue, 3 Jun 2003 00:04:04 -0700 (PDT) Date: Tue, 3 Jun 2003 00:04:04 -0700 (PDT) Message-Id: <200306030704.h53744WG046470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 07:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=32460 Change 32460 by jmallett@jmallett_dalek on 2003/06/03 00:03:33 Simplify into a single level page table, which would really like to be in tlb.c and have clean hooks here. Remove a lot of stuff related to pagetables being done like on the Alpha. Catch up with the PTE / TLB format for MIPS. Put in a function which, again, belongs in tlb.c, for servicing a TLBMod exception. This would work but for TLBUpdate being seemingly broken. Marking newly entered pages as dirty gets a bit further. Various hooks into ASID stuff. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#15 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#15 (text+ko) ==== @@ -74,81 +74,14 @@ */ /* - * Notes for alpha pmap. - * - * On alpha, pm_pdeobj will hold lev1, lev2 and lev3 page tables. - * Indices from 0 to NUSERLEV3MAPS-1 will map user lev3 page tables, - * indices from NUSERLEV3MAPS to NUSERLEV3MAPS+NUSERLEV2MAPS-1 will - * map user lev2 page tables and index NUSERLEV3MAPS+NUSERLEV2MAPS - * will map the lev1 page table. The lev1 table will self map at - * address VADDR(PTLEV1I,0,0). - * - * The vm_object kptobj holds the kernel page tables on i386 (62 or 63 - * of them, depending on whether the system is SMP). On alpha, kptobj - * will hold the lev3 and lev2 page tables for K1SEG. Indices 0 to - * NKLEV3MAPS-1 will map kernel lev3 page tables and indices - * NKLEV3MAPS to NKLEV3MAPS+NKLEV2MAPS will map lev2 page tables. (XXX - * should the kernel Lev1map be inserted into this object?). - * - * pvtmmap is not needed for alpha since K0SEG maps all of physical - * memory. - * - * - * alpha virtual memory map: - * - * - * Address Lev1 index - * - * --------------------------------- - * 0000000000000000 | | 0 - * | | - * | | - * | | - * | | - * --- --- - * User space (USEG) - * --- --- - * | | - * | | - * | | - * | | - * 000003ffffffffff | | 511=UMAXLEV1I - * --------------------------------- - * fffffc0000000000 | | 512=K0SEGLEV1I - * | Kernel code/data/bss | - * | | - * | | - * | | - * --- --- - * K0SEG - * --- --- - * | | - * | 1-1 physical/virtual | - * | | - * | | - * fffffdffffffffff | | - * --------------------------------- - * fffffe0000000000 | | 768=K1SEGLEV1I - * | Kernel dynamic data | - * | | - * | | - * | | - * --- --- - * K1SEG - * --- --- - * | | - * | mapped by ptes | - * | | - * | | - * fffffff7ffffffff | | - * --------------------------------- - * fffffffe00000000 | | 1023=PTLEV1I - * | PTmap (pte self map) | - * ffffffffffffffff | | - * --------------------------------- - * - * On the MIPS, K0SEG here is KSEG0, and K1SEG is XKSEG. - * + * Notes on MIPS pmap: + * o) Unlike the Alpha, we don't put pages directly into the TLB. + * We use a PFN (which can be hidden by using PTE_TO_PA or + * PA_TO_PTE) which is the TLB's idea of a page, more or less. + * Don't be confused by PageMask, though, that just defines + * how big of an area each mapping masks. The addresses we + * take and put into the TLB are physical addresses, converted + * to a PFN. * XXX Should we use XKPHYS instead of KSEG0 ? */ @@ -182,22 +115,12 @@ #include /* - * Map MIPS_PG definitions to PG ones. + * The joy of indexing. + * + * User addresses don't have the bits set that XKSEG has, best way to + * index the page table is to remove those bits, and get a page number. */ -#define PG_D MIPS3_PG_D -#define PG_G MIPS3_PG_G -#define PG_V MIPS3_PG_V -/* SW bits. */ -#define PG_W MIPS3_PG_WIRED -#define PG_MANAGED MIPS3_PG_M -#define PG_RO MIPS3_PG_RO -#define PG_PROT (PG_D | PG_RO) - -/* - * Handy macros for PTE<->PFN. - */ -#define MIPS_PTE_TO_PFN(pte) ((pte) >> 32) -#define MIPS_PTE_FROM_PFN(pfn) ((pfn) << 32) +#define pmap_index(va) (((va) & ~VM_MIN_KERNEL_ADDRESS) >> PAGE_SHIFT) #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 @@ -221,21 +144,13 @@ #endif /* - * Some macros for manipulating virtual addresses - */ -#define MIPS_L1SIZE (1L << MIPS_L1SHIFT) -#define MIPS_L2SIZE (1L << MIPS_L2SHIFT) - -#define mips_l1trunc(va) ((va) & ~(MIPS_L1SIZE-1)) -#define mips_l2trunc(va) ((va) & ~(MIPS_L2SIZE-1)) - -/* * Get PDEs and PTEs for user/kernel address space */ +#define pmap_pte_ro(pte) ((*(pte) & PG_RO) != 0) #define pmap_pte_w(pte) ((*(pte) & PG_W) != 0) -#define pmap_pte_managed(pte) ((*(pte) & PG_MANAGED) != 0) +#define pmap_pte_managed(pte) ((*(pte) & PG_M) != 0) #define pmap_pte_v(pte) ((*(pte) & PG_V) != 0) -#define pmap_pte_pa(pte) ptob(MIPS_PTE_TO_PFN(*(pte))) +#define pmap_pte_pa(pte) MIPS_PTE_TO_PA(*(pte)) #define pmap_pte_prot(pte) (*(pte) & PG_PROT) #define pmap_pte_set_w(pte, v) ((v)?(*pte |= PG_W):(*pte &= ~PG_W)) @@ -259,14 +174,10 @@ */ #define PTMASK ((1 << MIPS_PTSHIFT) - 1) -#define pmap_lev1_index(va) (((va) >> MIPS_L1SHIFT) & PTMASK) -#define pmap_lev2_index(va) (((va) >> MIPS_L2SHIFT) & PTMASK) -#define pmap_lev3_index(va) (((va) >> MIPS_L3SHIFT) & PTMASK) - /* * Given a physical address, construct a pte */ -#define pmap_phys_to_pte(pa) MIPS_PTE_FROM_PFN(btop(pa)) +#define pmap_phys_to_pte(pa) MIPS_PA_TO_PFN(pa) /* * Given a page frame number, construct a k0seg va @@ -276,46 +187,10 @@ /* * Given a pte, construct a k0seg va */ -#define pmap_k0seg_to_pte(va) MIPS_PTE_FROM_PFN(pmap_k0seg_to_pfn(va)) +#define pmap_k0seg_to_pte(va) MIPS_PA_TO_PFN(pmap_k0seg_to_pfn(va)) -/* - * Lev1map: - * - * Kernel level 1 page table. This maps all kernel level 2 - * page table pages, and is used as a template for all user - * pmap level 1 page tables. When a new user level 1 page - * table is allocated, all Lev1map PTEs for kernel addresses - * are copied to the new map. - * - * Lev2map: - * - * Initial set of kernel level 2 page table pages. These - * map the kernel level 3 page table pages. As kernel - * level 3 page table pages are added, more level 2 page - * table pages may be added to map them. These pages are - * never freed. - * - * Lev3map: - * - * Initial set of kernel level 3 page table pages. These - * map pages in K1SEG. More level 3 page table pages may - * be added at run-time if additional K1SEG address space - * is required. These pages are never freed. - * - * Lev2mapsize: - * - * Number of entries in the initial Lev2map. - * - * Lev3mapsize: - * - * Number of entries in the initial Lev3map. - * - * NOTE: When mappings are inserted into the kernel pmap, all - * level 2 and level 3 page table pages must already be allocated - * and mapped into the parent page table. - */ -pt_entry_t *Lev1map, *Lev2map, *Lev3map; -vm_size_t Lev2mapsize, Lev3mapsize; +pt_entry_t *kptmap; +vm_size_t kptsize; /* * Statically allocated kernel pmap @@ -330,7 +205,6 @@ 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; struct msgbuf *msgbufp; @@ -353,80 +227,37 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m); -static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static int pmap_release_free_page(pmap_t pmap, vm_page_t p); -static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); -static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); -static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); -#ifdef SMP -static void pmap_invalidate_page_action(void *arg); -static void pmap_invalidate_all_action(void *arg); -#endif - - /* - * Routine: pmap_lev1pte - * Function: - * Extract the level 1 page table entry associated - * with the given map/virtual_address pair. + * Routine: pmap_pte + * Function: + * Extract the page table entry associated with + * the given map/virtual addresss pair. */ static PMAP_INLINE pt_entry_t* -pmap_lev1pte(pmap_t pmap, vm_offset_t va) +pmap_pte(pmap_t pmap, vm_offset_t va) { - if (!pmap) - return 0; - return &pmap->pm_lev1[pmap_lev1_index(va)]; + if (pmap == NULL || pmap->pm_lev1 == NULL) + return NULL; + return &pmap->pm_lev1[pmap_index(va)]; } -/* - * Routine: pmap_lev2pte - * Function: - * Extract the level 2 page table entry associated - * with the given map/virtual_address pair. - */ -static PMAP_INLINE pt_entry_t* -pmap_lev2pte(pmap_t pmap, vm_offset_t va) -{ - pt_entry_t* l1pte; - pt_entry_t* l2map; - - l1pte = pmap_lev1pte(pmap, va); - if (!pmap_pte_v(l1pte)) - return 0; - l2map = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(pmap_pte_pa(l1pte)); - return &l2map[pmap_lev2_index(va)]; -} - /* - * Routine: pmap_lev3pte - * Function: - * Extract the level 3 page table entry associated - * with the given map/virtual_address pair. + * Routine: pmap_steal_memory + * Function: + * Steal memory from the phys_avail[] array, early + * in the bootup process. It returns zeroed memory + * and looks around for a contiguous segment big + * enough to fill the request, mapped into direct + * memory. */ -static PMAP_INLINE pt_entry_t* -pmap_lev3pte(pmap_t pmap, vm_offset_t va) -{ - pt_entry_t* l2pte; - pt_entry_t* l3map; - - l2pte = pmap_lev2pte(pmap, va); - if (!l2pte || !pmap_pte_v(l2pte)) - return 0; - - l3map = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(pmap_pte_pa(l2pte)); - return &l3map[pmap_lev3_index(va)]; -} - vm_offset_t pmap_steal_memory(vm_size_t size) { @@ -459,95 +290,81 @@ /* * Bootstrap the system enough to run with virtual memory. + * + * This sets up the ASID generator, message buffer, and page + * table. XXX Probably want to move page table and related to + * a TLB-specific file. It also sets up some very important + * values for MI VM code to run. */ void pmap_bootstrap(void) { - pt_entry_t newpte; + pt_entry_t *pte; int i; /* * Setup ASIDs. PCPU_GET(next_asid) and PCPU_GET(current_asidgen) are set * up already. */ - pmap_maxasid = ASID_BITS * 8; + pmap_maxasid = MIPS3_TLB_NUM_ASIDS; /* * Steal the message buffer from the beginning of memory. */ msgbufp = (struct msgbuf *) pmap_steal_memory(MSGBUF_SIZE); + msgbufinit(msgbufp, MSGBUF_SIZE); /* - * Allocate a level 1 map for the kernel. + * Set up kernel page table. */ - Lev1map = (pt_entry_t*) pmap_steal_memory(PAGE_SIZE); - - /* - * Allocate a level 2 map for the kernel - */ - Lev2map = (pt_entry_t*) pmap_steal_memory(PAGE_SIZE); - Lev2mapsize = PAGE_SIZE; + kptsize = physsz >> PAGE_SHIFT; + printf("Kernel page table indexes %ld %dK pages.\n", + kptsize, PAGE_SIZE / 1024); + kptmap = (pt_entry_t *) + pmap_steal_memory(kptsize * sizeof (pt_entry_t)); - /* - * Allocate some level 3 maps for the kernel - */ - Lev3map = (pt_entry_t*) pmap_steal_memory(PAGE_SIZE*NKPT); - Lev3mapsize = NKPT * PAGE_SIZE; - - /* Map all of the level 2 maps */ - for (i = 0; i < howmany(Lev2mapsize, PAGE_SIZE); i++) { - unsigned long pfn = - pmap_k0seg_to_pfn((vm_offset_t) Lev2map) + i; - newpte = MIPS_PTE_FROM_PFN(pfn); - newpte |= PG_V | PG_W; - Lev1map[K1SEGLEV1I + i] = newpte; - } - - /* - * Level 1 self mapping. - * - * Don't use ASID since the self-mapping is different for each - * address space. - */ - newpte = pmap_k0seg_to_pte((vm_offset_t) Lev1map); - newpte |= PG_V | PG_G; - Lev1map[PTLEV1I] = newpte; - - /* Map all of the level 3 maps */ - for (i = 0; i < howmany(Lev3mapsize, PAGE_SIZE); i++) { - unsigned long pfn = - pmap_k0seg_to_pfn((vm_offset_t) Lev3map) + i; - newpte = MIPS_PTE_FROM_PFN(pfn); - newpte |= PG_V | PG_W; - Lev2map[i] = newpte; - } - avail_start = phys_avail[0]; for (i = 0; phys_avail[i+2]; i+= 2) ; avail_end = phys_avail[i+1]; virtual_avail = VM_MIN_KERNEL_ADDRESS; - virtual_end = VPTBASE; + virtual_end = virtual_avail + (avail_end - avail_start); kernel_vm_end = virtual_end; /* * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap->pm_lev1 = Lev1map; + kernel_pmap->pm_lev1 = kptmap; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asid = 0; kernel_pmap->pm_asidgen = 1; TAILQ_INIT(&kernel_pmap->pm_pvlist); - nklev3 = NKPT; - nklev2 = 1; /* * Initialize list of pmaps. */ LIST_INIT(&allpmaps); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); + + /* + * Lock in the current ASID, and set the global bit on each PTE. + */ + mips_wr_entryhi(kernel_pmap->pm_asid); + for (i = 0; i < kptsize; i++) { + pte = &kptmap[i]; + *pte = PG_G; + } + + /* + * Clear the TLB. + */ + MIPS_TBIAP(); } +/* + * Perform a small allocation for UMA, used early in the boot process + * and possibly at other times. + */ void * uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { @@ -583,6 +400,9 @@ return (va); } +/* + * A free function for the above. + */ void uma_small_free(void *mem, int size, u_int8_t flags) { @@ -663,11 +483,6 @@ pmap->pm_asidgen = 0; } -struct pmap_invalidate_page_arg { - pmap_t pmap; - vm_offset_t va; -}; - static void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { @@ -760,7 +575,10 @@ * Routine: pmap_kextract * Function: * Extract the physical page address associated - * kernel virtual address. + * kernel virtual address. If this is a direct- + * mapped piece of memory, just decode that, + * otherwise call pmap_extract which is pretty + * fast. */ vm_offset_t pmap_kextract(vm_offset_t va) @@ -770,8 +588,7 @@ if (va >= MIPS_KSEG0_START && va <= MIPS_KSEG0_END) pa = MIPS_KSEG0_TO_PHYS(va); else - pa = ptob(MIPS_PTE_TO_PFN(*vtopte(va))) - | (va & PAGE_MASK); + pa = pmap_extract(kernel_pmap, va); return pa; } @@ -786,9 +603,9 @@ register pmap_t pmap; vm_offset_t va; { - pt_entry_t* pte = pmap_lev3pte(pmap, va); + pt_entry_t* pte = pmap_pte(pmap, va); if (pte) - return ptob(MIPS_PTE_TO_PFN(*pte)); + return MIPS_PTE_TO_PA(*pte) | (va & PAGE_MASK); else return 0; } @@ -817,10 +634,10 @@ pt_entry_t npte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m[i])) | PG_V; pt_entry_t opte; - pte = vtopte(tva); + pte = pmap_pte(kernel_pmap, tva); opte = *pte; *pte = npte; - if (opte) + if (opte & PG_V) pmap_invalidate_page(kernel_pmap, tva); } } @@ -838,7 +655,7 @@ register pt_entry_t *pte; for (i = 0; i < count; i++) { - pte = vtopte(va); + pte = pmap_pte(kernel_pmap, va); *pte = 0; pmap_invalidate_page(kernel_pmap, va); va += PAGE_SIZE; @@ -857,11 +674,12 @@ pt_entry_t npte, opte; npte = pmap_phys_to_pte(pa) | PG_V; - pte = vtopte(va); + pte = pmap_pte(kernel_pmap, va); opte = *pte; *pte = npte; - if (opte) + if (opte & PG_V) pmap_invalidate_page(kernel_pmap, va); + MachTLBUpdate(va & ~PAGE_MASK, npte); } /* @@ -872,7 +690,7 @@ { register pt_entry_t *pte; - pte = vtopte(va); + pte = pmap_pte(kernel_pmap, va); *pte = 0; pmap_invalidate_page(kernel_pmap, va); } @@ -895,22 +713,6 @@ return MIPS_PHYS_TO_KSEG0(start); } - -static vm_page_t -pmap_page_lookup(vm_object_t object, vm_pindex_t pindex) -{ - vm_page_t m; -retry: - m = vm_page_lookup(object, pindex); - if (m != NULL) { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(m, FALSE, "pplookp")) - goto retry; - vm_page_unlock_queues(); - } - return m; -} - #ifndef KSTACK_MAX_PAGES #define KSTACK_MAX_PAGES 32 #endif @@ -947,10 +749,10 @@ panic("pmap_new_thread: kstack allocation failed"); /* Set the first page to be the unmapped guard page. */ - ptek = vtopte(ks); + ptek = pmap_pte(kernel_pmap, ks); oldpte = *ptek; *ptek = 0; - if (oldpte) + if (oldpte & PG_V) pmap_invalidate_page(kernel_pmap, ks); /* move to the next page, which is where the real stack starts. */ ks += PAGE_SIZE; @@ -962,7 +764,7 @@ if (ks == NULL) panic("pmap_new_thread: kstack allocation failed"); td->td_kstack = ks; - ptek = vtopte(ks); + ptek = pmap_pte(kernel_pmap, ks); #endif /* * Knowing the number of pages allocated is useful when you @@ -987,7 +789,7 @@ oldpte = ptek[i]; ptek[i] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V; - if (oldpte) + if (oldpte & PG_V) pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); vm_page_lock_queues(); @@ -1016,7 +818,7 @@ pages = td->td_kstack_pages; ksobj = td->td_kstack_obj; ks = td->td_kstack; - ptek = vtopte(ks); + ptek = pmap_pte(kernel_pmap, ks); for (i = 0; i < pages; i++) { m = vm_page_lookup(ksobj, i); if (m == NULL) @@ -1139,119 +941,12 @@ } } -/*************************************************** - * Page table page management routines..... - ***************************************************/ - -/* - * This routine unholds page table pages, and if the hold count - * drops to zero, then it decrements the wire count. - */ -static int -_pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) -{ - - while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt")) - vm_page_lock_queues(); - - if (m->hold_count == 0) { - vm_offset_t pteva; - pt_entry_t* pte; - - /* - * unmap the page table page - */ - if (m->pindex >= NUSERLEV3MAPS) { - /* Level 2 page table */ - pte = pmap_lev1pte(pmap, va); - pteva = (vm_offset_t) PTlev2 + ptob(m->pindex - NUSERLEV3MAPS); - } else { - /* Level 3 page table */ - pte = pmap_lev2pte(pmap, va); - pteva = (vm_offset_t) PTmap + ptob(m->pindex); - } - - *pte = 0; - - if (m->pindex < NUSERLEV3MAPS) { - /* unhold the level 2 page table */ - vm_page_t lev2pg; - lev2pg = vm_page_lookup(pmap->pm_pteobj, - NUSERLEV3MAPS + pmap_lev1_index(va)); - while (vm_page_sleep_if_busy(lev2pg, FALSE, "pulook")) - vm_page_lock_queues(); - vm_page_unhold(lev2pg); - if (lev2pg->hold_count == 0) - _pmap_unwire_pte_hold(pmap, va, lev2pg); - } - - --pmap->pm_stats.resident_count; - /* - * Do a invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); - - if (pmap->pm_ptphint == m) - pmap->pm_ptphint = NULL; - - /* - * If the page is finally unwired, simply free it. - */ - --m->wire_count; - if (m->wire_count == 0) { - vm_page_busy(m); - vm_page_free_zero(m); - --cnt.v_wire_count; - } - return 1; - } - return 0; -} - -static PMAP_INLINE int -pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) -{ - vm_page_unhold(m); - if (m->hold_count == 0) - return _pmap_unwire_pte_hold(pmap, va, m); - else - return 0; -} - -/* - * After removing a page table entry, this routine is used to - * conditionally free the page, and manage the hold/wire counts. - */ -static int -pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) -{ - unsigned ptepindex; - if (va >= VM_MAXUSER_ADDRESS) - return 0; - - if (mpte == NULL) { - ptepindex = (va >> MIPS_L2SHIFT); - if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == ptepindex)) { - mpte = pmap->pm_ptphint; - } else { - while ((mpte = vm_page_lookup(pmap->pm_pteobj, ptepindex)) != NULL && - vm_page_sleep_if_busy(mpte, FALSE, "pulook")) - vm_page_lock_queues(); - pmap->pm_ptphint = mpte; - } - } - - return pmap_unwire_pte_hold(pmap, va, mpte); -} - void pmap_pinit0(pmap) struct pmap *pmap; { - pmap->pm_lev1 = Lev1map; + pmap->pm_lev1 = kptmap; pmap->pm_ptphint = NULL; pmap->pm_active = 0; pmap->pm_asid = 0; @@ -1319,194 +1014,8 @@ pmap_pinit2(pmap) struct pmap *pmap; { - bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * sizeof (pt_entry_t)); -} - -static int -pmap_release_free_page(pmap_t pmap, vm_page_t p) -{ - pt_entry_t* pte; - pt_entry_t* l2map; - - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) - /* level 1 page table */ - pte = &pmap->pm_lev1[PTLEV1I]; - else if (p->pindex >= NUSERLEV3MAPS) - /* level 2 page table */ - pte = &pmap->pm_lev1[p->pindex - NUSERLEV3MAPS]; - else { - /* level 3 page table */ - pte = &pmap->pm_lev1[p->pindex >> MIPS_PTSHIFT]; - l2map = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(pmap_pte_pa(pte)); - pte = &l2map[p->pindex & ((1 << MIPS_PTSHIFT) - 1)]; - } - - /* - * This code optimizes the case of freeing non-busy - * page-table pages. Those pages are zero now, and - * might as well be placed directly into the zero queue. - */ - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(p, FALSE, "pmaprl")) - return 0; - - vm_page_busy(p); - - /* - * Remove the page table page from the processes address space. - */ - *pte = 0; - pmap->pm_stats.resident_count--; - -#ifdef PMAP_DEBUG - if (p->hold_count) { - panic("pmap_release: freeing held page table page"); - } -#endif - /* - * Level1 pages need to have the kernel - * stuff cleared, so they can go into the zero queue also. - */ - if (p->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS) - bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * sizeof (pt_entry_t)); - - if (pmap->pm_ptphint == p) - pmap->pm_ptphint = NULL; - -#ifdef PMAP_DEBUG - { - u_long *lp = (u_long*) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(p)); - u_long *ep = (u_long*) ((char*) lp + PAGE_SIZE); - for (; lp < ep; lp++) - if (*lp != 0) - panic("pmap_release_free_page: page not zero"); - } -#endif - - p->wire_count--; - cnt.v_wire_count--; - vm_page_free_zero(p); - vm_page_unlock_queues(); - return 1; -} - -/* - * this routine is called if the page table page is not - * mapped correctly. - */ -static vm_page_t -_pmap_allocpte(pmap, ptepindex) - pmap_t pmap; - unsigned ptepindex; -{ - pt_entry_t* pte; - vm_offset_t ptepa; - vm_page_t m; - - /* - * Find or fabricate a new pagetable page - */ - m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); - - KASSERT(m->queue == PQ_NONE, - ("_pmap_allocpte: %p->queue != PQ_NONE", m)); - - /* - * Increment the hold count for the page table page - * (denoting a new mapping.) - */ - m->hold_count++; - - /* - * Map the pagetable page into the process address space, if - * it isn't already there. - */ - - pmap->pm_stats.resident_count++; - - ptepa = VM_PAGE_TO_PHYS(m); - - if (ptepindex >= NUSERLEV3MAPS) { - pte = &pmap->pm_lev1[ptepindex - NUSERLEV3MAPS]; - } else { - int l1index = ptepindex >> MIPS_PTSHIFT; - pt_entry_t* l1pte = &pmap->pm_lev1[l1index]; - pt_entry_t* l2map; - if (!pmap_pte_v(l1pte)) - _pmap_allocpte(pmap, NUSERLEV3MAPS + l1index); - else { - vm_page_t l2page = - pmap_page_lookup(pmap->pm_pteobj, - NUSERLEV3MAPS + l1index); - l2page->hold_count++; - } - l2map = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(pmap_pte_pa(l1pte)); - pte = &l2map[ptepindex & ((1 << MIPS_PTSHIFT) - 1)]; - } - - *pte = pmap_phys_to_pte(ptepa) | PG_V; - - /* - * Set the page table hint - */ - pmap->pm_ptphint = m; - - if ((m->flags & PG_ZERO) == 0) - bzero((caddr_t) MIPS_PHYS_TO_KSEG0(ptepa), PAGE_SIZE); - - vm_page_lock_queues(); - m->valid = VM_PAGE_BITS_ALL; - vm_page_flag_clear(m, PG_ZERO); - vm_page_wakeup(m); - vm_page_unlock_queues(); - - return m; -} - -static vm_page_t -pmap_allocpte(pmap_t pmap, vm_offset_t va) -{ - unsigned ptepindex; - pt_entry_t* lev2pte; - vm_page_t m; - - /* - * Calculate pagetable page index - */ - ptepindex = va >> (PAGE_SHIFT + MIPS_PTSHIFT); - - /* - * Get the level2 entry - */ - lev2pte = pmap_lev2pte(pmap, va); - - /* - * If the page table page is mapped, we just increment the - * hold count, and activate it. - */ - if (lev2pte && pmap_pte_v(lev2pte)) { - /* - * In order to get the page table page, try the - * hint first. - */ - if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == ptepindex)) { - m = pmap->pm_ptphint; - } else { - m = pmap_page_lookup(pmap->pm_pteobj, ptepindex); - pmap->pm_ptphint = m; - } - m->hold_count++; - return m; - } - /* - * Here if the pte page isn't mapped, or if it has been deallocated. - */ - return _pmap_allocpte(pmap, ptepindex); } - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ @@ -1537,7 +1046,7 @@ continue; } while (1) { - if (!pmap_release_free_page(pmap, p) && + if (/*!pmap_release_free_page(pmap, p) &&*/ (object->generation != curgeneration)) goto retry; } @@ -1553,13 +1062,13 @@ continue; } while (1) { - if (!pmap_release_free_page(pmap, p) && + if (/*!pmap_release_free_page(pmap, p) &&*/ (object->generation != curgeneration)) goto retry; } } - if (lev1pg && !pmap_release_free_page(pmap, lev1pg)) + if (lev1pg/* && !pmap_release_free_page(pmap, lev1pg)*/) goto retry; mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); @@ -1572,93 +1081,7 @@ void pmap_growkernel(vm_offset_t addr) { - /* XXX come back to this */ - struct pmap *pmap; - pt_entry_t* pte; - pt_entry_t newlev1, newlev2; - vm_offset_t pa; - vm_page_t nkpg; - - critical_enter(); - if (kernel_vm_end == 0) { - kernel_vm_end = VM_MIN_KERNEL_ADDRESS; - - /* Count the level 2 page tables */ - nklev2 = 0; - nklev3 = 0; - while (pmap_pte_v(pmap_lev1pte(kernel_pmap, kernel_vm_end))) { - nklev2++; - nklev3 += (1L << MIPS_PTSHIFT); - kernel_vm_end += MIPS_L1SIZE; - } - - /* Count the level 3 page tables in the last level 2 page table */ - kernel_vm_end -= MIPS_L1SIZE; - nklev3 -= (1 << MIPS_PTSHIFT); - while (pmap_pte_v(pmap_lev2pte(kernel_pmap, kernel_vm_end))) { - nklev3++; - kernel_vm_end += MIPS_L2SIZE; - } - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 3 00:11:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B65937B404; Tue, 3 Jun 2003 00:11:16 -0700 (PDT) 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 2479537B401 for ; Tue, 3 Jun 2003 00:11:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADC2143F3F for ; Tue, 3 Jun 2003 00:11:15 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h537BF0U046803 for ; Tue, 3 Jun 2003 00:11:15 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h537BFXc046800 for perforce@freebsd.org; Tue, 3 Jun 2003 00:11:15 -0700 (PDT) Date: Tue, 3 Jun 2003 00:11:15 -0700 (PDT) Message-Id: <200306030711.h537BFXc046800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 07:11:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=32462 Change 32462 by jmallett@jmallett_dalek on 2003/06/03 00:10:56 Call into pmap on TLBMod. Affected files ... .. //depot/projects/mips/sys/mips/mips/trap.c#7 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/trap.c#7 (text+ko) ==== @@ -109,6 +109,10 @@ kdb_trap(code, tf); break; #endif + case T_TLB_MOD: + /* XXX Kernel only. */ + pmap_tlb_modified(badvaddr); + return; default: goto dopanic; } From owner-p4-projects@FreeBSD.ORG Tue Jun 3 00:14:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A44237B404; Tue, 3 Jun 2003 00:14:21 -0700 (PDT) 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 9EAA137B401 for ; Tue, 3 Jun 2003 00:14:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3561143F75 for ; Tue, 3 Jun 2003 00:14:20 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h537EK0U046918 for ; Tue, 3 Jun 2003 00:14:20 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h537EJKT046915 for perforce@freebsd.org; Tue, 3 Jun 2003 00:14:19 -0700 (PDT) Date: Tue, 3 Jun 2003 00:14:19 -0700 (PDT) Message-Id: <200306030714.h537EJKT046915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 07:14:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=32463 Change 32463 by jmallett@jmallett_dalek on 2003/06/03 00:14:11 Fill in VCED handler. Fill in fake interrupt handler (panic). Write something for when we encounter a bad PTE: return to panic. Fill in a cheap attempt at handling 64-bit TLB misses. Fill in a return to panic for 32-bit TLB misses. Clarify that the SP needs fixed up after restoring registers, not before. Pass in the trapframe for restoring registers based on sp, don't rely on a0 being the same. And finally, finish filling up the generic exception vector (0 bytes free) by putting in some code to switch the ExcCode value. Maybe NetBSD's idea of a jump table isn't so bad, but it makes PIC worse. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#4 (text+ko) ==== @@ -12,7 +12,10 @@ #include "opt_ddb.h" #include +#include #include +#include +#include #include "assym.s" @@ -38,6 +41,45 @@ */ LEAF(ExceptionVector) .set noat + /* + * Interrupts are fast. Let everything else go through trap(). + */ + mfc0 k0, MIPS_COP_0_CAUSE + li k1, 31 << 2 + and k0, k1 + beq k0, zero, Interrupt + nop + + /* + * If all the bits were set, it's 31, it's VCED, so go there. + */ + bne k0, k1, 1f + nop + + J VCED + /* No BDSlot, save space by just pulling in the next insn. */ + +1: + /* + * Except stuff the TLB handler really wants. (TLB exceptions + * that are not TLBMod, that goes through trap() and into pmap.) + * This means that if this is one, or has bits outside of the + * three lowest set, we need to go ahead. Otherwise, switch to + * the TLB miss handler. + */ + li k1, 1 << 2 + beq k1, k0, 1f + nop + + li k1, ~(3 << 2) + and k1, k0 + bne k1, zero, 1f + nop + + j XTLBMissVector + nop + +1: dsubu sp, sp, TF_SIZE dla k0, 1f j exception_save_registers @@ -66,6 +108,7 @@ move a0, k1 jal exception_restore_registers + nop daddu sp, sp, TF_SIZE eret .set at @@ -90,6 +133,7 @@ move a0, k1 jal exception_restore_registers + move a0, sp daddu sp, sp, TF_SIZE eret .set at @@ -97,19 +141,110 @@ LEAF(TLBMissVector) .set noat - j ExceptionVector - nop + dla a0, 1f + dla k0, panic + dmtc0 k0, MIPS_COP_0_EXC_PC + eret .set at VEND(TLBMissVector) + .data +1: .asciiz "32-bit TLB miss!?\n" + .text +/* + * XXX kernel only. For now that makes sense. + */ LEAF(XTLBMissVector) .set noat - j ExceptionVector + dmfc0 k0, MIPS_COP_0_BAD_VADDR + li k1, MIPS_XKSEG_START + subu k0, k1 + /* + * Shift right logical to get a page index, but leaving + * enough bits to index an array of 64 bit values. + */ + dsrl k0, PAGE_SHIFT - 3 + dla k1, kptmap + /* + * Find the page table, and index it. + */ + ld k1, 0(k1) + addu k1, k0 + ld k0, 0(k1) /* Even PTE. */ + andi k0, PG_V /* Check validity. */ + beq k0, zero, 1f /* Invalid. */ + nop + /* + * Valid PTE. Write the pair. + */ + ld k0, 0(k1) /* Even PTE. */ + ld k1, 8(k1) /* Odd PTE. */ + /* + * Write TLB entry. + */ + mtc0 k0, MIPS_COP_0_TLB_LO0 + nop + mtc0 k1, MIPS_COP_0_TLB_LO1 + nop + tlbwr + nop + nop + eret +1: j BadPTE nop .set at VEND(XTLBMissVector) /* + * Yell about a bogus PTE, at 0(k1). + */ +ENTRY(BadPTE) + .set noat + dmfc0 a3, MIPS_COP_0_BAD_VADDR + move a1, k1 + ld a2, 0(k1) + dla a0, 1f + dla k0, panic + dmtc0 k0, MIPS_COP_0_EXC_PC + eret + .set at +END(BadPTE) + .data +1: .asciiz "Bad PTE at %p (%16lx), badvaddr %lx" + .text + +/* + * Handle an interrupt. Return into panic, for now. + */ +LEAF(Interrupt) + .set noat + mfc0 k1, MIPS_COP_0_CAUSE + dla k0, panic + dmtc0 k0, MIPS_COP_0_EXC_PC + dla a0, 1f + move a1, k1 + eret + .set at +END(Interrupt) + .data +1: .asciiz "Interrupt, cause: %lx\n" + .text + +/* + * Handle VCED. + */ +LEAF(VCED) + .set noat + dmfc0 k0, MIPS_COP_0_BAD_VADDR + li k1, -16 + and k0, k1 + cache (CACHE_R4K_SD | CACHEOP_R4K_HIT_WB_INV), 0(k0) + cache (CACHE_R4K_D | CACHEOP_R4K_HIT_INV), 0(k0) + eret + .set at +END(VCED) + +/* * Restore registers from a trapframe pointed to in k1, returning to ra * that is passed in, and kept in k0. */ From owner-p4-projects@FreeBSD.ORG Tue Jun 3 06:46:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC5B37B404; Tue, 3 Jun 2003 06:46:19 -0700 (PDT) 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 E4C2037B401 for ; Tue, 3 Jun 2003 06:46:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56C8B43F85 for ; Tue, 3 Jun 2003 06:46:18 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h53DkI0U077675 for ; Tue, 3 Jun 2003 06:46:18 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h53DkHG7077672 for perforce@freebsd.org; Tue, 3 Jun 2003 06:46:17 -0700 (PDT) Date: Tue, 3 Jun 2003 06:46:17 -0700 (PDT) Message-Id: <200306031346.h53DkHG7077672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 32472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 13:46:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=32472 Change 32472 by cvance@cvance_korben on 2003/06/03 06:46:02 - Fix many style issues - Add cred_has_capability() and add some capability-like checks - Add the remaining {process,sysarch,system} access control checks Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#5 (text+ko) ==== @@ -75,15 +75,35 @@ static void sebsd_init(struct mac_policy_conf *mpc) { + printf("sebsd:: init\n"); } static void sebsd_destroy(struct mac_policy_conf *mpc) { + printf("sebsd:: destroy\n"); } +/* + * Check whether a task is allowed to use a capability. + */ +static int +cred_has_capability(struct ucred *cred, int cap) +{ + struct task_security_struct *task; + avc_audit_data_t ad; + + task = SLOT(&cred->cr_label); + + AVC_AUDIT_DATA_INIT(&ad, CAP); + ad.u.cap = cap; + + return avc_has_perm_audit(task->sid, task->sid, + SECCLASS_CAPABILITY, cap, &ad); +} + static int cred_has_perm(struct ucred *cred, struct proc *proc, access_vector_t perm) { @@ -310,6 +330,7 @@ static void sebsd_destroy_label(struct label *label) { + free(SLOT(label), M_SEBSD); SLOT(label) = NULL; } @@ -317,6 +338,7 @@ static void sebsd_relabel_cred(struct ucred *cred, struct label *newlabel) { + printf("sebsd_relabel_cred:: This does nothing\n"); } @@ -556,8 +578,7 @@ if (rc == 0) lnksec->sid = newsid; - /* TBD: debugging */ - if (1 || sebsd_verbose > 1) { + if (sebsd_verbose > 1) { printf("%s(%s): sbsid=%d, mountpoint=%s, rc=%d, sclass=%d, " "computedsid=%d, dirent=%d\n", __func__, path, sbsec->sid, mp->mnt_stat.f_mntonname, rc, @@ -758,6 +779,20 @@ } static int +sebsd_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + + return(cred_has_perm(cred, proc, PROCESS__PTRACE)); +} + +static int +sebsd_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + + return(cred_has_perm(cred, proc, PROCESS__SETSCHED)); +} + +static int sebsd_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) { access_vector_t perm; @@ -782,9 +817,8 @@ static void sebsd_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct label *vnodelabel, - struct label *interpvnodelabel, - struct image_params *imgp, struct label *execlabel) + struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, + struct image_params *imgp, struct label *execlabel) { struct task_security_struct *otask, *ntask; struct vnode_security_struct *file; @@ -1187,35 +1221,39 @@ static int sebsd_check_vnode_poll(struct ucred *cred, struct ucred *file_cred, - struct vnode *vp, struct label *label) + struct vnode *vp, struct label *label) { + return vnode_has_perm(cred, vp, FILE__POLL, NULL); } static int sebsd_check_vnode_read(struct ucred *cred, struct ucred *file_cred, - struct vnode *vp, struct label *label) + struct vnode *vp, struct label *label) { + return vnode_has_perm(cred, vp, FILE__READ, NULL); } static int sebsd_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel) { + return vnode_has_perm(cred, dvp, DIR__READ, NULL); } static int sebsd_check_vnode_readlink(struct ucred *cred, struct vnode *vp, - struct label *label) + struct label *label) { + return vnode_has_perm(cred, vp, FILE__READ, NULL); } static int sebsd_check_vnode_relabel(struct ucred *cred, struct vnode *vp, - struct label *oldlabel, struct label *newlabel) + struct label *oldlabel, struct label *newlabel) { struct task_security_struct *task; struct vnode_security_struct *old, *new; @@ -1255,8 +1293,8 @@ static int sebsd_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, - struct label *label, struct componentname *cnp) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { struct task_security_struct *task; struct vnode_security_struct *old_dir, *old_file; @@ -1291,9 +1329,8 @@ static int sebsd_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, - struct label *label, int samedir, - struct componentname *cnp) + struct label *dlabel, struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp) { struct task_security_struct *task; struct vnode_security_struct *new_dir, *new_file; @@ -1355,74 +1392,142 @@ static int sebsd_check_vnode_revoke(struct ucred *cred, struct vnode *vp, - struct label *label) + struct label *label) { + /* TBD: Not Implemented */ return 0; } static int sebsd_check_vnode_setacl(struct ucred *cred, struct vnode *vp, - struct label *label, acl_type_t type, struct acl *acl) + struct label *label, acl_type_t type, struct acl *acl) { + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int sebsd_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, - struct label *label, int attrnamespace, - const char *name, struct uio *uio) + struct label *label, int attrnamespace, const char *name, struct uio *uio) { + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int sebsd_check_vnode_setflags(struct ucred *cred, struct vnode *vp, - struct label *label, u_long flags) + struct label *label, u_long flags) { + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int sebsd_check_vnode_setmode(struct ucred *cred, struct vnode *vp, - struct label *label, mode_t mode) + struct label *label, mode_t mode) { + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int sebsd_check_vnode_setowner(struct ucred *cred, struct vnode *vp, - struct label *label, uid_t uid, gid_t gid) + struct label *label, uid_t uid, gid_t gid) { + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int sebsd_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, - struct label *label, struct timespec atime, - struct timespec mtime) + struct label *label, struct timespec atime, struct timespec mtime) { + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int sebsd_check_vnode_stat(struct ucred *cred, struct ucred *file_cred, - struct vnode *vp, struct label *vnodelabel) + struct vnode *vp, struct label *vnodelabel) { + return vnode_has_perm(cred, vp, FILE__GETATTR, NULL); } static int +sebsd_check_sysarch_ioperm(struct ucred *cred) +{ + + return(cred_has_capability(cred, CAPABILITY__SYS_RAWIO)); +} + +static int +sebsd_check_system_acct(struct ucred *cred, struct vnode *vp, + struct label *vlabel) +{ + + return(cred_has_capability(cred, CAPABILITY__SYS_PACCT)); +} + +/* + * TBD: LSM/SELinux doesn't have a nfsd hook + */ +static int +sebsd_check_system_nfsd(struct ucred *cred) +{ + + return (0); +} + + +static int +sebsd_check_system_reboot(struct ucred *cred, int howto) +{ + + return(cred_has_capability(cred, CAPABILITY__SYS_BOOT)); +} + +static int +sebsd_check_system_settime(struct ucred *cred) +{ + + return (0); +} + +static int sebsd_check_system_swapon(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel) + struct label *vnodelabel) +{ + + return vnode_has_perm(cred, vp, FILE__SWAPON, NULL); +} + +static int +sebsd_check_system_swapoff(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel) { + return vnode_has_perm(cred, vp, FILE__SWAPON, NULL); } +/* + * TBD: Sysctl access control is not currently implemented + */ static int +sebsd_check_system_sysctl(struct ucred *cred, int *name, + u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, + size_t newlen) +{ + + return (0); +} + +static int sebsd_check_vnode_write(struct ucred *cred, struct ucred *file_cred, - struct vnode *vp, struct label *label) + struct vnode *vp, struct label *label) { + return vnode_has_perm(cred, vp, FILE__WRITE, NULL); } @@ -1431,9 +1536,8 @@ */ static int sebsd_check_vnode_mmap(struct ucred *cred, struct vnode *vp, - struct label *label, int newmapping) + struct label *label, int newmapping) { - access_vector_t av; /* @@ -1506,6 +1610,7 @@ static void sebsd_copy_vnode_label(struct label *src, struct label *dest) { + *(struct vnode_security_struct *)SLOT(dest) = *(struct vnode_security_struct *)SLOT(src); } @@ -1518,16 +1623,13 @@ sebsd_check_kld_load(struct ucred *cred, struct vnode *vp, struct label *vlabel) { - struct task_security_struct *tsec; - tsec = SLOT(&cred->cr_label); /* * The vnode doesn't need to be checked here, since the read * operations inside the kldload(2) implementation are * individually checked against the same thread credentials. */ - return (avc_has_perm_audit(tsec->sid, tsec->sid, SECCLASS_CAPABILITY, - CAPABILITY__SYS_MODULE, NULL)); + return (cred_has_capability(cred, CAPABILITY__SYS_MODULE)); } /* @@ -1537,11 +1639,8 @@ static int sebsd_check_kld_stat(struct ucred *cred) { - struct task_security_struct *tsec; - tsec = SLOT(&cred->cr_label); - return (avc_has_perm_audit(tsec->sid, tsec->sid, SECCLASS_CAPABILITY, - CAPABILITY__SYS_MODULE, NULL)); + return (cred_has_capability(cred, CAPABILITY__SYS_MODULE)); } /* @@ -1551,11 +1650,8 @@ static int sebsd_check_kld_unload(struct ucred *cred) { - struct task_security_struct *tsec; - tsec = SLOT(&cred->cr_label); - return (avc_has_perm_audit(tsec->sid, tsec->sid, SECCLASS_CAPABILITY, - CAPABILITY__SYS_MODULE, NULL)); + return (cred_has_capability(cred, CAPABILITY__SYS_MODULE)); } static int @@ -1707,8 +1803,17 @@ .mpo_check_kld_load = sebsd_check_kld_load, .mpo_check_kld_unload = sebsd_check_kld_unload, .mpo_check_mount_stat = sebsd_check_mount_stat, + .mpo_check_proc_debug = sebsd_check_proc_debug, + .mpo_check_proc_sched = sebsd_check_proc_sched, .mpo_check_proc_signal = sebsd_check_proc_signal, + .mpo_check_sysarch_ioperm = sebsd_check_sysarch_ioperm, + .mpo_check_system_acct = sebsd_check_system_acct, + .mpo_check_system_nfsd = sebsd_check_system_nfsd, + .mpo_check_system_reboot = sebsd_check_system_reboot, + .mpo_check_system_settime = sebsd_check_system_settime, .mpo_check_system_swapon = sebsd_check_system_swapon, + .mpo_check_system_swapoff = sebsd_check_system_swapoff, + .mpo_check_system_sysctl = sebsd_check_system_sysctl, .mpo_check_vnode_access = sebsd_check_vnode_access, .mpo_check_vnode_chdir = sebsd_check_vnode_chdir, .mpo_check_vnode_chroot = sebsd_check_vnode_chroot, From owner-p4-projects@FreeBSD.ORG Tue Jun 3 07:42:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABCEB37B404; Tue, 3 Jun 2003 07:42:44 -0700 (PDT) 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 499A837B401 for ; Tue, 3 Jun 2003 07:42:44 -0700 (PDT) Received: from mail.speakeasy.net (mail9.speakeasy.net [216.254.0.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F14A43F93 for ; Tue, 3 Jun 2003 07:42:43 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 2512 invoked from network); 3 Jun 2003 14:42:42 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 3 Jun 2003 14:42:42 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h53Egep0003495; Tue, 3 Jun 2003 10:42:40 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200306030414.h534ETRa033784@repoman.freebsd.org> Date: Tue, 03 Jun 2003 10:42:40 -0400 (EDT) From: John Baldwin To: Juli Mallett cc: Perforce Change Reviews Subject: RE: PERFORCE change 32445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 14:42:45 -0000 On 03-Jun-2003 Juli Mallett wrote: > http://perforce.freebsd.org/chv.cgi?CH=32445 > > Change 32445 by jmallett@jmallett_dalek on 2003/06/02 21:14:28 > > Fix typo. > > Affected files ... > > .. //depot/projects/mips/sys/sys/user.h#7 edit > > Differences ... > > ==== //depot/projects/mips/sys/sys/user.h#7 (text+ko) ==== > > @@ -75,7 +75,7 @@ > * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist. > */ > #if defined(__alpha__) || defined(__ia64__) || defined(__mips__) || \ > - defined(__sparc64_ || defined(__amd64__) > + defined(__sparc64_) || defined(__amd64__) Shouldn't that be __sparc64__ (two underscores) > #define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */ > #endif > #ifdef __i386__ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Tue Jun 3 08:04:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C92B537B404; Tue, 3 Jun 2003 08:04:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id 68C0A37B401; Tue, 3 Jun 2003 08:04:52 -0700 (PDT) Date: Tue, 3 Jun 2003 10:04:52 -0500 From: Juli Mallett To: John Baldwin Message-ID: <20030603100452.A66704@FreeBSD.org> References: <200306030414.h534ETRa033784@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from jhb@FreeBSD.org on Tue, Jun 03, 2003 at 10:42:40AM -0400 X-Title: Code Maven X-Towel: Yes X-Negacore: Yes X-Authentication-Warning: localhost: juli pwned teh intarweb cc: Perforce Change Reviews Subject: Re: PERFORCE change 32445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 15:04:53 -0000 * John Baldwin [ Date: 2003-06-03 ] [ w.r.t. RE: PERFORCE change 32445 for review ] > > On 03-Jun-2003 Juli Mallett wrote: > > http://perforce.freebsd.org/chv.cgi?CH=32445 > > > > Change 32445 by jmallett@jmallett_dalek on 2003/06/02 21:14:28 > > > > Fix typo. > > > > Affected files ... > > > > .. //depot/projects/mips/sys/sys/user.h#7 edit > > > > Differences ... > > > > ==== //depot/projects/mips/sys/sys/user.h#7 (text+ko) ==== > > > > @@ -75,7 +75,7 @@ > > * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist. > > */ > > #if defined(__alpha__) || defined(__ia64__) || defined(__mips__) || \ > > - defined(__sparc64_ || defined(__amd64__) > > + defined(__sparc64_) || defined(__amd64__) > > Shouldn't that be __sparc64__ (two underscores) Probably :) -- juli mallett. email: jmallett@freebsd.org; efnet: juli; From owner-p4-projects@FreeBSD.ORG Tue Jun 3 08:05:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAC7937B405; Tue, 3 Jun 2003 08:05:57 -0700 (PDT) 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 9D87237B404 for ; Tue, 3 Jun 2003 08:05:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BDD443FA3 for ; Tue, 3 Jun 2003 08:05:57 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h53F5u0U082904 for ; Tue, 3 Jun 2003 08:05:56 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h53F5uhV082901 for perforce@freebsd.org; Tue, 3 Jun 2003 08:05:56 -0700 (PDT) Date: Tue, 3 Jun 2003 08:05:56 -0700 (PDT) Message-Id: <200306031505.h53F5uhV082901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 15:05:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=32477 Change 32477 by jmallett@jmallett_dalek on 2003/06/03 08:05:47 Spel __sparc64__ right; from jhb@. Affected files ... .. //depot/projects/mips/sys/sys/user.h#8 edit Differences ... ==== //depot/projects/mips/sys/sys/user.h#8 (text+ko) ==== @@ -75,7 +75,7 @@ * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist. */ #if defined(__alpha__) || defined(__ia64__) || defined(__mips__) || \ - defined(__sparc64_) || defined(__amd64__) + defined(__sparc64__) || defined(__amd64__) #define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */ #endif #ifdef __i386__ From owner-p4-projects@FreeBSD.ORG Tue Jun 3 08:28:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FDE537B401; Tue, 3 Jun 2003 08:28:33 -0700 (PDT) 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 E727137B405 for ; Tue, 3 Jun 2003 08:28:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1E6B43F3F for ; Tue, 3 Jun 2003 08:28:30 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h53FSU0U083755 for ; Tue, 3 Jun 2003 08:28:30 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h53FSUY0083752 for perforce@freebsd.org; Tue, 3 Jun 2003 08:28:30 -0700 (PDT) Date: Tue, 3 Jun 2003 08:28:30 -0700 (PDT) Message-Id: <200306031528.h53FSUY0083752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 32480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 15:28:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=32480 Change 32480 by jhb@jhb_laptop on 2003/06/03 08:27:49 IFC @32475. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/smpng/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#11 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#26 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#7 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#25 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#25 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#12 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#6 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#37 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/smpng/sys/sys/ccdvar.h#7 integrate .. //depot/projects/smpng/sys/sys/kernel.h#19 integrate .. //depot/projects/smpng/sys/sys/proc.h#89 integrate .. //depot/projects/smpng/sys/sys/umtx.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.259 2003/05/23 05:04:53 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.260 2003/06/02 21:56:08 peter Exp $ */ /* @@ -751,10 +751,14 @@ case ERESTART: /* - * Reconstruct pc, assuming lcall $X,y is 7 bytes, - * int 0x80 is 2 bytes. We saved this in tf_err. + * Reconstruct pc, we know that 'syscall' is 2 bytes. + * We have to do a full context restore so that %r10 + * (which was holding the value of %rcx) is restored for + * the next iteration. */ frame.tf_rip -= frame.tf_err; + frame.tf_r10 = frame.tf_rcx; + td->td_pcb->pcb_flags |= PCB_FULLCTX; break; case EJUSTRETURN: ==== //depot/projects/smpng/sys/amd64/include/setjmp.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.8 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.9 2003/06/02 21:49:35 peter Exp $ */ #ifndef _MACHINE_SETJMP_H_ @@ -37,7 +37,7 @@ #include -#define _JBLEN 22 /* Size of the jmp_buf on x86. */ +#define _JBLEN 12 /* Size of the jmp_buf on AMD64. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force @@ -45,9 +45,9 @@ * internally to avoid some run-time errors for mismatches. */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE -typedef struct _sigjmp_buf { int _sjb[_JBLEN + 1]; } sigjmp_buf[1]; +typedef struct _sigjmp_buf { long _sjb[_JBLEN]; } sigjmp_buf[1]; #endif -typedef struct _jmp_buf { int _jb[_JBLEN + 1]; } jmp_buf[1]; +typedef struct _jmp_buf { long _jb[_JBLEN]; } jmp_buf[1]; #endif /* !_MACHINE_SETJMP_H_ */ ==== //depot/projects/smpng/sys/dev/aac/aac.c#26 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.68 2003/04/28 06:16:20 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.69 2003/06/03 02:10:55 scottl Exp $ */ /* @@ -306,7 +306,7 @@ struct aac_fib *fib; struct aac_mntinfo *mi; struct aac_mntinforesp *mir = NULL; - int i = 0; + int count = 0, i = 0; debug_called(1); @@ -327,14 +327,16 @@ mi->MntCount = i; if (aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_mntinfo))) { - debug(2, "error probing container %d", i); + printf("error probing container %d", i); continue; } mir = (struct aac_mntinforesp *)&fib->data[0]; + /* XXX Need to check if count changed */ + count = mir->MntRespCount; aac_add_container(sc, mir, 0); i++; - } while ((i < mir->MntRespCount) && (i < AAC_MAX_CONTAINERS)); + } while ((i < count) && (i < AAC_MAX_CONTAINERS)); aac_release_sync_fib(sc); @@ -2565,7 +2567,7 @@ struct aac_mntinforesp *mir = NULL; u_int16_t rsize; int next, found; - int added = 0, i = 0; + int count = 0, added = 0, i = 0; debug_called(2); @@ -2600,11 +2602,13 @@ rsize = sizeof(mir); if (aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_mntinfo))) { - debug(2, "Error probing container %d\n", + printf("Error probing container %d\n", i); continue; } mir = (struct aac_mntinforesp *)&fib->data[0]; + /* XXX Need to check if count changed */ + count = mir->MntRespCount; /* * Check the container against our list. * co->co_found was already set to 0 in a @@ -2640,8 +2644,7 @@ added = 1; } i++; - } while ((i < mir->MntRespCount) && - (i < AAC_MAX_CONTAINERS)); + } while ((i < count) && (i < AAC_MAX_CONTAINERS)); aac_release_sync_fib(sc); /* ==== //depot/projects/smpng/sys/dev/ata/ata-card.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.12 2003/05/12 15:26:05 phk Exp $ + * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.13 2003/06/03 01:30:55 imp Exp $ */ #include @@ -50,6 +50,7 @@ PCMCIA_CARD(EXP, EXPMULTIMEDIA, 0), PCMCIA_CARD(IODATA, CBIDE2, 0), PCMCIA_CARD(OEM2, CDROM1, 0), + PCMCIA_CARD(OEM2, IDE, 0), PCMCIA_CARD(PANASONIC, KXLC005, 0), PCMCIA_CARD(TEAC, IDECARDII, 0), {NULL} ==== //depot/projects/smpng/sys/dev/ccd/ccd.c#26 (text+ko) ==== @@ -50,7 +50,7 @@ * * $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ * - * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.135 2003/05/31 18:52:05 phk Exp $ + * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.137 2003/06/02 21:29:04 phk Exp $ */ #include @@ -63,14 +63,93 @@ #include #include #include -#include #include #include #include +#include #include #include +/* + * Component info table. + * Describes a single component of a concatenated disk. + */ +struct ccdcinfo { + struct vnode *ci_vp; /* device's vnode */ + dev_t ci_dev; /* XXX: device's dev_t */ + size_t ci_size; /* size */ + char *ci_path; /* path to component */ + size_t ci_pathlen; /* length of component path */ +}; + +/* + * Interleave description table. + * Computed at boot time to speed irregular-interleave lookups. + * The idea is that we interleave in "groups". First we interleave + * evenly over all component disks up to the size of the smallest + * component (the first group), then we interleave evenly over all + * remaining disks up to the size of the next-smallest (second group), + * and so on. + * + * Each table entry describes the interleave characteristics of one + * of these groups. For example if a concatenated disk consisted of + * three components of 5, 3, and 7 DEV_BSIZE blocks interleaved at + * DEV_BSIZE (1), the table would have three entries: + * + * ndisk startblk startoff dev + * 3 0 0 0, 1, 2 + * 2 9 3 0, 2 + * 1 13 5 2 + * 0 - - - + * + * which says that the first nine blocks (0-8) are interleaved over + * 3 disks (0, 1, 2) starting at block offset 0 on any component disk, + * the next 4 blocks (9-12) are interleaved over 2 disks (0, 2) starting + * at component block 3, and the remaining blocks (13-14) are on disk + * 2 starting at offset 5. + */ +struct ccdiinfo { + int ii_ndisk; /* # of disks range is interleaved over */ + daddr_t ii_startblk; /* starting scaled block # for range */ + daddr_t ii_startoff; /* starting component offset (block #) */ + int *ii_index; /* ordered list of components in range */ +}; + +/* + * Concatenated disk pseudo-geometry information. + */ +struct ccdgeom { + u_int32_t ccg_secsize; /* # bytes per sector */ + u_int32_t ccg_nsectors; /* # data sectors per track */ + u_int32_t ccg_ntracks; /* # tracks per cylinder */ + u_int32_t ccg_ncylinders; /* # cylinders per unit */ +}; + + +/* + * A concatenated disk is described by this structure. + */ +struct ccd_s { + LIST_ENTRY(ccd_s) list; + + int sc_unit; /* logical unit number */ + struct vnode **sc_vpp; /* array of component vnodes */ + int sc_flags; /* flags */ + int sc_cflags; /* configuration flags */ + size_t sc_size; /* size of ccd */ + int sc_ileave; /* interleave */ + u_int sc_nccdisks; /* number of components */ +#define CCD_MAXNDISKS 65536 + struct ccdcinfo *sc_cinfo; /* component info */ + struct ccdiinfo *sc_itable; /* interleave table */ + struct ccdgeom sc_geom; /* pseudo geometry info */ + int sc_pick; /* side of mirror picked */ + daddr_t sc_blk[2]; /* mirror localization */ + struct disk *sc_disk; + struct cdev *__remove00; /* XXX: remove when convenient */ +}; + MALLOC_DEFINE(M_CCD, "CCD driver", "Concatenated Disk driver"); /* @@ -921,7 +1000,6 @@ { struct ccd_ioctl *ccio; u_int unit; - int error; switch (cmd) { case CCDIOCSET: @@ -929,85 +1007,8 @@ ccio = (struct ccd_ioctl *)data; unit = ccio->ccio_size; return (ccdioctltoo(unit, cmd, data, flag, td)); - case CCDCONFINFO: - { - int ninit = 0; - struct ccdconf *conf = (struct ccdconf *)data; - struct ccd_s *tmpcs; - struct ccd_s *ubuf = conf->buffer; - - /* XXX: LOCK(unique unit numbers) */ - LIST_FOREACH(tmpcs, &ccd_softc_list, list) - if (IS_INITED(tmpcs)) - ninit++; - - if (conf->size == 0) { - conf->size = sizeof(struct ccd_s) * ninit; - return (0); - } else if ((conf->size / sizeof(struct ccd_s) != ninit) || - (conf->size % sizeof(struct ccd_s) != 0)) { - /* XXX: UNLOCK(unique unit numbers) */ - return (EINVAL); - } - - ubuf += ninit; - LIST_FOREACH(tmpcs, &ccd_softc_list, list) { - if (!IS_INITED(tmpcs)) - continue; - error = copyout(tmpcs, --ubuf, - sizeof(struct ccd_s)); - if (error != 0) - /* XXX: UNLOCK(unique unit numbers) */ - return (error); - } - /* XXX: UNLOCK(unique unit numbers) */ - return (0); - } - - case CCDCPPINFO: - { - struct ccdcpps *cpps = (struct ccdcpps *)data; - char *ubuf = cpps->buffer; - struct ccd_s *cs; - - - error = copyin(ubuf, &unit, sizeof (unit)); - if (error) - return (error); - - if (!IS_ALLOCATED(unit)) - return (ENXIO); - cs = ccdfind(unit); - if (!IS_INITED(cs)) - return (ENXIO); - - { - int len = 0, i; - struct ccdcpps *cpps = (struct ccdcpps *)data; - char *ubuf = cpps->buffer; - - - for (i = 0; i < cs->sc_nccdisks; ++i) - len += cs->sc_cinfo[i].ci_pathlen; - - if (cpps->size < len) - return (ENOMEM); - - for (i = 0; i < cs->sc_nccdisks; ++i) { - len = cs->sc_cinfo[i].ci_pathlen; - error = copyout(cs->sc_cinfo[i].ci_path, ubuf, - len); - if (error != 0) - return (error); - ubuf += len; - } - return(copyout("", ubuf, 1)); - } - break; - } - default: - return (ENXIO); + return (ENOIOCTL); } } @@ -1264,3 +1265,58 @@ wakeup(cs); } } + +static struct sbuf * +g_ccd_list(int unit) +{ + struct sbuf *sb; + struct ccd_s *cs; + int i; + + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_clear(sb); + LIST_FOREACH(cs, &ccd_softc_list, list) { + if (!IS_INITED(cs)) + continue; + if (unit >= 0 && unit != cs->sc_unit) + continue; + sbuf_printf(sb, "ccd%d\t\t%d\t%d\t", + cs->sc_unit, cs->sc_ileave, cs->sc_cflags & CCDF_USERMASK); + + for (i = 0; i < cs->sc_nccdisks; ++i) { + sbuf_printf(sb, "%s%s", i == 0 ? "" : " ", + cs->sc_cinfo[i].ci_path); + } + sbuf_printf(sb, "\n"); + } + sbuf_finish(sb); + return (sb); +} + +static void +g_ccd_config(struct gctl_req *req, struct g_class *mp, char const *verb) +{ + struct sbuf *sb; + int u, *up; + + g_topology_assert(); + if (!strcmp(verb, "create geom")) { + gctl_error(req, "TBD"); + } else if (!strcmp(verb, "destroy geom")) { + gctl_error(req, "TBD"); + } else if (!strcmp(verb, "list")) { + up = gctl_get_paraml(req, "unit", sizeof (int)); + u = *up; + sb = g_ccd_list(u); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + } else { + gctl_error(req, "unknown verb"); + } +} + +static struct g_class g_ccd_class = { + .name = "CCD", + .ctlreq = g_ccd_config, +}; + +DECLARE_GEOM_CLASS(g_ccd_class, g_ccd); ==== //depot/projects/smpng/sys/dev/hifn/hifn7751.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.13 2003/03/11 22:47:06 sam Exp $ */ +/* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.14 2003/06/02 23:34:59 sam Exp $ */ /* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */ /* @@ -259,7 +259,7 @@ bzero(sc, sizeof (*sc)); sc->sc_dev = dev; - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "crypto driver", MTX_DEF); + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "hifn driver", MTX_DEF); /* XXX handle power management */ @@ -423,7 +423,7 @@ * NB: Network code assumes we are blocked with splimp() * so make sure the IRQ is marked appropriately. */ - if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET, + if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, hifn_intr, sc, &sc->sc_intrhand)) { device_printf(dev, "could not setup interrupt\n"); goto fail_intr2; @@ -524,7 +524,8 @@ KASSERT(sc != NULL, ("hifn_detach: null software carrier!")); - HIFN_LOCK(sc); + /* disable interrupts */ + WRITE_REG_1(sc, HIFN_1_DMA_IER, 0); /*XXX other resources */ callout_stop(&sc->sc_tickto); @@ -550,8 +551,6 @@ bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR1, sc->sc_bar1res); bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR0, sc->sc_bar0res); - HIFN_UNLOCK(sc); - mtx_destroy(&sc->sc_mtx); return (0); @@ -1627,6 +1626,7 @@ * * NB: check this first since it's easy. */ + HIFN_LOCK(sc); if ((dma->cmdu + 1) > HIFN_D_CMD_RSIZE || (dma->resu + 1) > HIFN_D_RES_RSIZE) { #ifdef HIFN_DEBUG @@ -1637,11 +1637,13 @@ } #endif hifnstats.hst_nomem_cr++; + HIFN_UNLOCK(sc); return (ERESTART); } if (bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &cmd->src_map)) { hifnstats.hst_nomem_map++; + HIFN_UNLOCK(sc); return (ENOMEM); } @@ -1912,6 +1914,7 @@ #endif sc->sc_active = 5; + HIFN_UNLOCK(sc); KASSERT(err == 0, ("hifn_crypto: success with error %u", err)); return (err); /* success */ @@ -1929,6 +1932,7 @@ bus_dmamap_unload(sc->sc_dmat, cmd->src_map); err_srcmap1: bus_dmamap_destroy(sc->sc_dmat, cmd->src_map); + HIFN_UNLOCK(sc); return (err); } @@ -1974,11 +1978,16 @@ u_int32_t dmacsr, restart; int i, u; + dmacsr = READ_REG_1(sc, HIFN_1_DMA_CSR); + + /* Nothing in the DMA unit interrupted */ + if ((dmacsr & sc->sc_dmaier) == 0) + return; + HIFN_LOCK(sc); + dma = sc->sc_dma; - dmacsr = READ_REG_1(sc, HIFN_1_DMA_CSR); - #ifdef HIFN_DEBUG if (hifn_debug) { device_printf(sc->sc_dev, @@ -1990,13 +1999,6 @@ } #endif - /* Nothing in the DMA unit interrupted */ - if ((dmacsr & sc->sc_dmaier) == 0) { - hifnstats.hst_noirq++; - HIFN_UNLOCK(sc); - return; - } - WRITE_REG_1(sc, HIFN_1_DMA_CSR, dmacsr & sc->sc_dmaier); if ((sc->sc_flags & HIFN_HAS_PUBLIC) && @@ -2104,6 +2106,8 @@ } dma->cmdk = i; dma->cmdu = u; + HIFN_UNLOCK(sc); + if (sc->sc_needwakeup) { /* XXX check high watermark */ int wakeup = sc->sc_needwakeup & (CRYPTO_SYMQ|CRYPTO_ASYMQ); #ifdef HIFN_DEBUG @@ -2116,7 +2120,6 @@ sc->sc_needwakeup &= ~wakeup; crypto_unblock(sc->sc_cid, wakeup); } - HIFN_UNLOCK(sc); } /* ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs#25 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.50 2003/04/27 03:31:47 imp Exp $ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.51 2003/06/03 01:29:01 imp Exp $ /* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -522,6 +522,7 @@ product NEWMEDIA BASICS_SCSI { "BASICS&spby&spNew&spMedia&spCorporation" "SCSI&spSym53C500", NULL, NULL } New Media Corporation BASICS SCSI product NTT_ME WLAN { "NTT-ME", "11Mbps&spWireless&spLAN&spPC&spCard", NULL, NULL } NTT-ME 11Mbps Wireless LAN PC Card product OEM2 CDROM1 { "PCMCIA", "CD-ROM", NULL, NULL } Generic PCMCIA CD-ROM +product OEM2 IDE { "PCMCIA", "IDE&spCARD", NULL, NULL } Generic PCMCIA IDE CARD product PLANET SMARTCOM2000 { "PCMCIA", "UE2212", NULL, NULL } Planet SmartCOM 2000 /* * vendor ID of both FNW-3600-T and FNW-3700-T is LINKSYS (0x0149) and ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#25 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.50 2003/04/27 03:32:09 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.51 2003/06/03 01:29:58 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.50 2003/04/27 03:31:47 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.51 2003/06/03 01:29:01 imp Exp */ /* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -969,6 +969,9 @@ #define PCMCIA_CIS_OEM2_CDROM1 { "PCMCIA", "CD-ROM", NULL, NULL } #define PCMCIA_PRODUCT_OEM2_CDROM1 0xffffffff #define PCMCIA_STR_OEM2_CDROM1 "Generic PCMCIA CD-ROM" +#define PCMCIA_CIS_OEM2_IDE { "PCMCIA", "IDE CARD", NULL, NULL } +#define PCMCIA_PRODUCT_OEM2_IDE 0xffffffff +#define PCMCIA_STR_OEM2_IDE "Generic PCMCIA IDE CARD" #define PCMCIA_CIS_PLANET_SMARTCOM2000 { "PCMCIA", "UE2212", NULL, NULL } #define PCMCIA_PRODUCT_PLANET_SMARTCOM2000 0xffffffff #define PCMCIA_STR_PLANET_SMARTCOM2000 "Planet SmartCOM 2000" ==== //depot/projects/smpng/sys/dev/ubsec/ubsec.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.21 2003/04/27 04:26:22 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.22 2003/06/02 23:32:03 sam Exp $ */ /* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ /* @@ -260,12 +260,9 @@ u_int32_t cmd, i; int rid; - KASSERT(sc != NULL, ("ubsec_attach: null software carrier!")); bzero(sc, sizeof (*sc)); sc->sc_dev = dev; - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "crypto driver", MTX_DEF); - SIMPLEQ_INIT(&sc->sc_queue); SIMPLEQ_INIT(&sc->sc_qchip); SIMPLEQ_INIT(&sc->sc_queue2); @@ -346,7 +343,7 @@ * NB: Network code assumes we are blocked with splimp() * so make sure the IRQ is mapped appropriately. */ - if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET, + if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, ubsec_intr, sc, &sc->sc_ih)) { device_printf(dev, "could not establish interrupt\n"); goto bad2; @@ -399,6 +396,10 @@ SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next); } + mtx_init(&sc->sc_mcr1lock, device_get_nameunit(dev), + "mcr1 operations", MTX_DEF); + mtx_init(&sc->sc_freeqlock, device_get_nameunit(dev), + "mcr1 free q", MTX_DEF); device_printf(sc->sc_dev, "%s\n", ubsec_partname(sc)); @@ -467,6 +468,8 @@ ; } #endif /* UBSEC_NO_RNG */ + mtx_init(&sc->sc_mcr2lock, device_get_nameunit(dev), + "mcr2 operations", MTX_DEF); if (sc->sc_flags & UBS_FLAGS_KEY) { sc->sc_statmask |= BS_STAT_MCR2_DONE; @@ -488,7 +491,6 @@ bad1: bus_release_resource(dev, SYS_RES_MEMORY, BS_BAR, sc->sc_sr); bad: - mtx_destroy(&sc->sc_mtx); return (ENXIO); } @@ -500,11 +502,11 @@ { struct ubsec_softc *sc = device_get_softc(dev); - KASSERT(sc != NULL, ("ubsec_detach: null software carrier")); - /* XXX wait/abort active ops */ - UBSEC_LOCK(sc); + /* disable interrupts */ + WRITE_REG(sc, BS_CTRL, READ_REG(sc, BS_CTRL) &~ + (BS_CTRL_MCR2INT | BS_CTRL_MCR1INT | BS_CTRL_DMAERR)); callout_stop(&sc->sc_rngto); @@ -523,6 +525,7 @@ ubsec_dma_free(sc, &q->q_dma->d_alloc); free(q, M_DEVBUF); } + mtx_destroy(&sc->sc_mcr1lock); #ifndef UBSEC_NO_RNG if (sc->sc_flags & UBS_FLAGS_RNG) { ubsec_dma_free(sc, &sc->sc_rng.rng_q.q_mcr); @@ -530,6 +533,7 @@ ubsec_dma_free(sc, &sc->sc_rng.rng_buf); } #endif /* UBSEC_NO_RNG */ + mtx_destroy(&sc->sc_mcr2lock); bus_generic_detach(dev); bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih); @@ -538,10 +542,6 @@ bus_dma_tag_destroy(sc->sc_dmat); bus_release_resource(dev, SYS_RES_MEMORY, BS_BAR, sc->sc_sr); - UBSEC_UNLOCK(sc); - - mtx_destroy(&sc->sc_mtx); - return (0); } @@ -565,7 +565,6 @@ { struct ubsec_softc *sc = device_get_softc(dev); - KASSERT(sc != NULL, ("ubsec_suspend: null software carrier")); #ifdef notyet /* XXX stop the device and save PCI settings */ #endif @@ -579,7 +578,6 @@ { struct ubsec_softc *sc = device_get_softc(dev); - KASSERT(sc != NULL, ("ubsec_resume: null software carrier")); #ifdef notyet /* XXX retore PCI settings and start the device */ #endif @@ -599,14 +597,10 @@ struct ubsec_dma *dmap; int npkts = 0, i; - UBSEC_LOCK(sc); - stat = READ_REG(sc, BS_STAT); stat &= sc->sc_statmask; - if (stat == 0) { - UBSEC_UNLOCK(sc); + if (stat == 0) return; - } WRITE_REG(sc, BS_STAT, stat); /* IACK */ @@ -614,6 +608,7 @@ * Check to see if we have any packets waiting for us */ if ((stat & BS_STAT_MCR1_DONE)) { + mtx_lock(&sc->sc_mcr1lock); while (!SIMPLEQ_EMPTY(&sc->sc_qchip)) { q = SIMPLEQ_FIRST(&sc->sc_qchip); dmap = q->q_dma; @@ -639,13 +634,13 @@ } ubsec_callback(sc, q); } - /* * Don't send any more packet to chip if there has been * a DMAERR. */ if (!(stat & BS_STAT_DMAERR)) ubsec_feed(sc); + mtx_unlock(&sc->sc_mcr1lock); } /* @@ -656,6 +651,7 @@ struct ubsec_q2 *q2; struct ubsec_mcr *mcr; + mtx_lock(&sc->sc_mcr2lock); while (!SIMPLEQ_EMPTY(&sc->sc_qchip2)) { q2 = SIMPLEQ_FIRST(&sc->sc_qchip2); @@ -677,6 +673,7 @@ if (!(stat & BS_STAT_DMAERR)) ubsec_feed2(sc); } + mtx_unlock(&sc->sc_mcr2lock); } /* @@ -693,8 +690,10 @@ } #endif /* UBSEC_DEBUG */ ubsecstats.hst_dmaerr++; + mtx_lock(&sc->sc_mcr1lock); ubsec_totalreset(sc); ubsec_feed(sc); + mtx_unlock(&sc->sc_mcr1lock); } if (sc->sc_needwakeup) { /* XXX check high watermark */ @@ -707,8 +706,6 @@ sc->sc_needwakeup &= ~wakeup; crypto_unblock(sc->sc_cid, wakeup); } - - UBSEC_UNLOCK(sc); } /* @@ -843,7 +840,6 @@ SHA1_CTX sha1ctx; int i, sesn; - KASSERT(sc != NULL, ("ubsec_newsession: null softc")); if (sidp == NULL || cri == NULL || sc == NULL) return (EINVAL); @@ -895,9 +891,9 @@ sc->sc_nsessions++; } } - bzero(ses, sizeof(struct ubsec_session)); ses->ses_used = 1; + if (encini) { /* get an IV, network byte order */ /* XXX may read fewer than requested */ @@ -977,19 +973,21 @@ ubsec_freesession(void *arg, u_int64_t tid) { struct ubsec_softc *sc = arg; - int session; + int session, ret; u_int32_t sid = ((u_int32_t) tid) & 0xffffffff; - KASSERT(sc != NULL, ("ubsec_freesession: null softc")); if (sc == NULL) return (EINVAL); session = UBSEC_SESSION(sid); - if (session >= sc->sc_nsessions) - return (EINVAL); + if (session < sc->sc_nsessions) { + bzero(&sc->sc_sessions[session], + sizeof(sc->sc_sessions[session])); + ret = 0; + } else + ret = EINVAL; - bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session])); - return (0); + return (ret); } static void @@ -1032,17 +1030,16 @@ return (EINVAL); } - UBSEC_LOCK(sc); - + mtx_lock(&sc->sc_freeqlock); if (SIMPLEQ_EMPTY(&sc->sc_freequeue)) { ubsecstats.hst_queuefull++; sc->sc_needwakeup |= CRYPTO_SYMQ; - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_freeqlock); return (ERESTART); } q = SIMPLEQ_FIRST(&sc->sc_freequeue); SIMPLEQ_REMOVE_HEAD(&sc->sc_freequeue, q, q_next); - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_freeqlock); dmap = q->q_dma; /* Save dma pointer */ bzero(q, sizeof(struct ubsec_q)); @@ -1509,14 +1506,14 @@ offsetof(struct ubsec_dmachunk, d_ctx), sizeof(struct ubsec_pktctx)); - UBSEC_LOCK(sc); + mtx_lock(&sc->sc_mcr1lock); SIMPLEQ_INSERT_TAIL(&sc->sc_queue, q, q_next); sc->sc_nqueue++; ubsecstats.hst_ipackets++; ubsecstats.hst_ibytes += dmap->d_alloc.dma_size; if ((hint & CRYPTO_HINT_MORE) == 0 || sc->sc_nqueue >= UBS_MAX_AGGR) ubsec_feed(sc); - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr1lock); return (0); errout: @@ -1533,9 +1530,9 @@ bus_dmamap_destroy(sc->sc_dmat, q->q_src_map); } - UBSEC_LOCK(sc); + mtx_lock(&sc->sc_freeqlock); SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next); - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_freeqlock); } if (err != ERESTART) { crp->crp_etype = err; @@ -1606,7 +1603,9 @@ crp->crp_mac, 12); break; } + mtx_lock(&sc->sc_freeqlock); SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next); + mtx_unlock(&sc->sc_freeqlock); crypto_done(crp); } @@ -1778,9 +1777,9 @@ struct ubsec_mcr *mcr; struct ubsec_ctx_rngbypass *ctx; - UBSEC_LOCK(sc); + mtx_lock(&sc->sc_mcr2lock); if (rng->rng_used) { - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr2lock); return; } sc->sc_nqueue2++; @@ -1811,7 +1810,7 @@ rng->rng_used = 1; ubsec_feed2(sc); ubsecstats.hst_rng++; - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr2lock); return; @@ -1820,7 +1819,7 @@ * Something weird happened, generate our own call back. */ sc->sc_nqueue2--; - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr2lock); callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc); } #endif /* UBSEC_NO_RNG */ @@ -2302,11 +2301,11 @@ ubsec_dma_sync(&me->me_epb, BUS_DMASYNC_PREWRITE); /* Enqueue and we're done... */ - UBSEC_LOCK(sc); + mtx_lock(&sc->sc_mcr2lock); SIMPLEQ_INSERT_TAIL(&sc->sc_queue2, &me->me_q, q_next); ubsec_feed2(sc); ubsecstats.hst_modexp++; - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr2lock); return (0); @@ -2504,10 +2503,10 @@ ubsec_dma_sync(&me->me_epb, BUS_DMASYNC_PREWRITE); /* Enqueue and we're done... */ - UBSEC_LOCK(sc); + mtx_lock(&sc->sc_mcr2lock); SIMPLEQ_INSERT_TAIL(&sc->sc_queue2, &me->me_q, q_next); ubsec_feed2(sc); - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr2lock); return (0); @@ -2698,11 +2697,11 @@ ubsec_dma_sync(&rp->rpr_msgout, BUS_DMASYNC_PREREAD); /* Enqueue and we're done... */ - UBSEC_LOCK(sc); + mtx_lock(&sc->sc_mcr2lock); SIMPLEQ_INSERT_TAIL(&sc->sc_queue2, &rp->rpr_q, q_next); ubsec_feed2(sc); ubsecstats.hst_modexpcrt++; - UBSEC_UNLOCK(sc); + mtx_unlock(&sc->sc_mcr2lock); return (0); errout: ==== //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ubsec/ubsecvar.h,v 1.6 2003/03/11 22:47:06 sam Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 3 19:13:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4146137B404; Tue, 3 Jun 2003 19:13:00 -0700 (PDT) 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 CFEBF37B401 for ; Tue, 3 Jun 2003 19:12:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64A0143FA3 for ; Tue, 3 Jun 2003 19:12:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h542Cx0U035917 for ; Tue, 3 Jun 2003 19:12:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h542CwJ7035914 for perforce@freebsd.org; Tue, 3 Jun 2003 19:12:58 -0700 (PDT) Date: Tue, 3 Jun 2003 19:12:58 -0700 (PDT) Message-Id: <200306040212.h542CwJ7035914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 02:13:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=32516 Change 32516 by peter@peter_hammer on 2003/06/03 19:12:22 GRRRR Affected files ... .. //depot/projects/hammer/sys/dev/ips/ips.c#2 edit Differences ... ==== //depot/projects/hammer/sys/dev/ips/ips.c#2 (text+ko) ==== @@ -248,7 +248,7 @@ for(i=0; i < IPS_MAX_NUM_DRIVES; i++){ if(sc->drives[i].state & IPS_LD_OKAY){ sc->diskdev[i] = device_add_child(sc->dev, NULL, -1); - device_set_ivars(sc->diskdev[i],(void *) i); + device_set_ivars(sc->diskdev[i],(void *)(uintptr_t) i); } } if(bus_generic_attach(sc->dev)){ From owner-p4-projects@FreeBSD.ORG Tue Jun 3 19:14:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2446137B404; Tue, 3 Jun 2003 19:14:02 -0700 (PDT) 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 B85AD37B401 for ; Tue, 3 Jun 2003 19:14:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F3EB43F85 for ; Tue, 3 Jun 2003 19:14:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h542E10U036007 for ; Tue, 3 Jun 2003 19:14:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h542E06w036004 for perforce@freebsd.org; Tue, 3 Jun 2003 19:14:00 -0700 (PDT) Date: Tue, 3 Jun 2003 19:14:00 -0700 (PDT) Message-Id: <200306040214.h542E06w036004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 02:14:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=32517 Change 32517 by peter@peter_hammer on 2003/06/03 19:13:36 GRRR. This isn't valid. sizeof((u_int32_t)) is illegal. Affected files ... .. //depot/projects/hammer/sys/amd64/include/param.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/param.h#6 (text+ko) ==== @@ -87,7 +87,7 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) -#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER((p),(t)) +#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) /* Size of the level 1 page table units */ From owner-p4-projects@FreeBSD.ORG Tue Jun 3 22:35:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11A2437B404; Tue, 3 Jun 2003 22:35:30 -0700 (PDT) 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 A25D237B401 for ; Tue, 3 Jun 2003 22:35:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48B0943F75 for ; Tue, 3 Jun 2003 22:35:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h545ZT0U052154 for ; Tue, 3 Jun 2003 22:35:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h545ZScs052151 for perforce@freebsd.org; Tue, 3 Jun 2003 22:35:28 -0700 (PDT) Date: Tue, 3 Jun 2003 22:35:28 -0700 (PDT) Message-Id: <200306040535.h545ZScs052151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 05:35:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=32533 Change 32533 by peter@peter_hammer on 2003/06/03 22:34:48 GRRR. Make this compile on a 64 bit system. Affected files ... .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#2 edit .. //depot/projects/hammer/sys/dev/ips/ips_disk.c#2 edit Differences ... ==== //depot/projects/hammer/sys/dev/ips/ips_commands.c#2 (text+ko) ==== @@ -97,7 +97,7 @@ } command_struct = (ips_io_cmd *)command->command_buffer; command_struct->id = command->id; - command_struct->drivenum = (uint32_t)iobuf->bio_driver1; + command_struct->drivenum = (uintptr_t)iobuf->bio_driver1; if(segnum != 1){ if(ips_read_request(iobuf)) cmdtype = IPS_SG_READ_CMD; ==== //depot/projects/hammer/sys/dev/ips/ips_disk.c#2 (text+ko) ==== @@ -97,7 +97,7 @@ dsc = iobuf->bio_disk->d_drv1; DEVICE_PRINTF(8,dsc->dev,"in strategy\n"); - (uint32_t)iobuf->bio_driver1 = dsc->sc->drives[dsc->disk_number].drivenum; + iobuf->bio_driver1 = (void *)(uintptr_t)dsc->sc->drives[dsc->disk_number].drivenum; ips_start_io_request(dsc->sc, iobuf); } @@ -122,7 +122,7 @@ dsc->dev = dev; dsc->sc = device_get_softc(adapter); dsc->unit = device_get_unit(dev); - dsc->disk_number = (int) device_get_ivars(dev); + dsc->disk_number = (uintptr_t) device_get_ivars(dev); dsc->ipsd_disk.d_drv1 = dsc; dsc->ipsd_disk.d_name = "ipsd"; dsc->ipsd_disk.d_maxsize = IPS_MAX_IO_SIZE; From owner-p4-projects@FreeBSD.ORG Tue Jun 3 22:45:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B64837B404; Tue, 3 Jun 2003 22:45:44 -0700 (PDT) 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 85ED737B401 for ; Tue, 3 Jun 2003 22:45:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 040DF43F3F for ; Tue, 3 Jun 2003 22:45:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h545jg0U052666 for ; Tue, 3 Jun 2003 22:45:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h545jgqM052663 for perforce@freebsd.org; Tue, 3 Jun 2003 22:45:42 -0700 (PDT) Date: Tue, 3 Jun 2003 22:45:42 -0700 (PDT) Message-Id: <200306040545.h545jgqM052663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 05:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=32535 Change 32535 by peter@peter_hammer on 2003/06/03 22:44:55 Sync up with i386 GENERIC (ouch) Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#18 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# ex:ts=8 +# # GENERIC -- Generic kernel configuration file for FreeBSD/amd64 # # For more information on this file, please read the handbook section on @@ -25,43 +25,108 @@ #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#makeoptions DEBUG=-g +#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_MODULES=not_yet options SCHED_4BSD #4BSD scheduler options INET #InterNETworking +options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options MSDOSFS #MSDOS Filesystem +options CD9660 #ISO 9660 Filesystem +options PROCFS #Process filesystem (requires PSEUDOFS) +options PSEUDOFS #Pseudo-filesystem framework +options IA32 #Compatible with i386 binaries options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options IA32 -options KTRACE +options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. +options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. - # Debugging for use in -current -options DDB -options ALT_BREAK_TO_DEBUGGER +options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS +options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device isa device pci device acpi options ACPI_DEBUG + +# Floppy drives +device fdc + # ATA and ATAPI devices device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives options ATA_STATIC_ID #Static device numbering +# SCSI Controllers +device ahb # EISA AHA1742 family +device ahc # AHA2940 and onboard AIC7xxx devices +device ahd # AHA39320/29320 and onboard AIC79xx devices +device amd # AMD 53C974 (Tekram DC-390(T)) +device isp # Qlogic family +device mpt # LSI-Logic MPT-Fusion +#device ncr # NCR/Symbios Logic +#XXX #error unknown architecture +#device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +device trm # Tekram DC395U/UW/F DC315U adapters + +device adv # Advansys SCSI adapters +device adw # Advansys wide SCSI adapters +device aha # Adaptec 154x SCSI adapters +device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. +device bt # Buslogic/Mylex MultiMaster SCSI adapters + +# RAID controllers interfaced to the SCSI subsystem +device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV - See NOTES for options! +device iir # Intel Integrated RAID +device mly # Mylex AcceleRAID/eXtremeRAID + +# SCSI peripherals +device scbus # SCSI bus (required) +device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +device cd # CD +device pass # Passthrough device (direct SCSI access) +device ses # SCSI Environmental Services (and SAF-TE) + +# RAID controllers +#XXX pointer/int warnings +#device aac # Adaptec FSA RAID +#device aacp # SCSI passthrough for aac (requires CAM) +device amr # AMI MegaRAID +device ida # Compaq Smart RAID +device ips # IBM (Adaptec) ServeRAID +device mlx # Mylex DAC960 family +#XXX pointer/int warnings +#device pst # Promise Supertrak SX6000 +device twe # 3ware ATA RAID + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -74,38 +139,111 @@ # syscons is the default console driver, resembling an SCO console device sc -#device agp # support several AGP chipsets +# PCCARD (PCMCIA) support +# Pcmcia and cardbus bridge support +device cbb # cardbus (yenta) bridge +#device pcic # ExCA ISA and PCI bridges +device pccard # PC Card (16-bit) bus +device cardbus # CardBus (32-bit) bus # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports # Parallel port -#device ppc -#device ppbus # Parallel port bus (required) -#device lpt # Printer +device ppc +device ppbus # Parallel port bus (required) +device lpt # Printer +device plip # TCP/IP over parallel +device ppi # Parallel port interface device +#device vpo # Requires scbus and da + + +# PCI Ethernet NICs. +device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel PRO/1000 adapter Gigabit Ethernet Card +device txp # 3Com 3cR990 (``Typhoon'') +device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') +device rl # RealTek 8129/8139 +device sf # Adaptec AIC-6915 (``Starfire'') +device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device ste # Sundance ST201 (D-Link DFE-550TX) +device ti # Alteon Networks Tigon I/II gigabit ethernet +device tl # Texas Instruments ThunderLAN +device tx # SMC EtherPower II (83c170 ``EPIC'') +device vr # VIA Rhine, Rhine II +device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') device bge # Broadcom BCM570xx Gigabit Ethernet +# ISA Ethernet NICs. pccard nics included. +device cs # Crystal Semiconductor CS89x0 NIC +# 'device ed' requires 'device miibus' +# XXX kvtop brokenness, pointer/int warnings +#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +device ex # Intel EtherExpress Pro/10 and Pro/10+ +device ep # Etherlink III based cards +device fe # Fujitsu MB8696x based cards +# XXX kvtop brokenness +#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. +# XXX kvtop brokenness, pointer/int warnings +#device lnc # NE2100, NE32-VL Lance Ethernet cards +device sn # SMC's 9000 series of ethernet chips +device xe # Xircom pccard ethernet + +# ISA devices that use the old ISA shims +#device le + +# Wireless NIC cards +device wlan # 802.11 support +device an # Aironet 4500/4800 802.11 wireless NICs. +device awi # BayStack 660 and others +device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. +#device wl # Older non 802.11 Wavelan wireless NIC. + # Pseudo devices - the number indicates how many units to allocate. device random # Entropy device device loop # Network loopback device ether # Ethernet support +device sl # Kernel SLIP +device ppp # Kernel PPP +device tun # Packet tunnel. +device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" -device pty # Pseudo-ttys (telnet etc) +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! device bpf # Berkeley packet filter # USB support -#device uhci # UHCI PCI->USB interface -#device ohci # OHCI PCI->USB interface -#device usb # USB Bus (required) -#device ugen # Generic -#device uhid # "Human Interface Devices" -#device ukbd # Keyboard +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices +device ugen # Generic +device uhid # "Human Interface Devices" +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +device urio # Diamond Rio 500 MP3 player +device uscanner # Scanners +# USB Ethernet, requires mii +device aue # ADMtek USB ethernet +device axe # ASIX Electronics USB ethernet +device cue # CATC USB ethernet +device kue # Kawasaki LSI USB ethernet + +# FireWire support +device firewire # FireWire bus code +device sbp # SCSI over FireWire (Requires scbus and da) +device fwe # Ethernet over FireWire (non-standard!) From owner-p4-projects@FreeBSD.ORG Wed Jun 4 15:16:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4938837B405; Wed, 4 Jun 2003 15:16:25 -0700 (PDT) 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 D7C4D37B401 for ; Wed, 4 Jun 2003 15:16:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AFC043F93 for ; Wed, 4 Jun 2003 15:16:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54MGM0U042426 for ; Wed, 4 Jun 2003 15:16:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54MGKBw042402 for perforce@freebsd.org; Wed, 4 Jun 2003 15:16:20 -0700 (PDT) Date: Wed, 4 Jun 2003 15:16:20 -0700 (PDT) Message-Id: <200306042216.h54MGKBw042402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 22:16:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=32594 Change 32594 by marcel@marcel_nfs on 2003/06/04 15:15:33 IFC @32592 Affected files ... .. //depot/projects/ia64/MAINTAINERS#26 integrate .. //depot/projects/ia64/bin/df/df.1#6 integrate .. //depot/projects/ia64/bin/df/df.c#15 integrate .. //depot/projects/ia64/bin/ed/Makefile#4 integrate .. //depot/projects/ia64/bin/ed/cbc.c#5 integrate .. //depot/projects/ia64/bin/ed/ed.h#5 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#8 integrate .. //depot/projects/ia64/gnu/lib/csu/Makefile#14 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#6 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#17 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#13 integrate .. //depot/projects/ia64/lib/Makefile#28 integrate .. //depot/projects/ia64/lib/csu/i386-elf/Makefile#7 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/sigsetjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/gmon/gmon.c#7 integrate .. //depot/projects/ia64/lib/libc/i386/gen/ldexp.c#4 integrate .. //depot/projects/ia64/lib/libc/sys/extattr_get_file.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/kldload.2#3 integrate .. //depot/projects/ia64/lib/libc_r/arch/amd64/_atomic_lock.S#1 branch .. //depot/projects/ia64/lib/libc_r/test/guard_b.c#4 integrate .. //depot/projects/ia64/lib/libc_r/test/join_leak_d.c#2 integrate .. //depot/projects/ia64/lib/libc_r/test/mutex_d.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#17 integrate .. //depot/projects/ia64/lib/libcrypt/Makefile#3 integrate .. //depot/projects/ia64/lib/libcrypt/crypt-md5.c#4 integrate .. //depot/projects/ia64/lib/libcrypt/crypt-nthash.c#1 branch .. //depot/projects/ia64/lib/libcrypt/crypt.3#5 integrate .. //depot/projects/ia64/lib/libcrypt/crypt.c#3 integrate .. //depot/projects/ia64/lib/libcrypt/crypt.h#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#18 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/ia64/lib/libwrap/Makefile#5 integrate .. //depot/projects/ia64/libexec/rpc.rstatd/rstat_proc.c#8 integrate .. //depot/projects/ia64/libexec/rpc.rusersd/rusers_proc.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.1#10 integrate .. //depot/projects/ia64/libexec/tcpd/Makefile#2 integrate .. //depot/projects/ia64/release/Makefile#54 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#9 integrate .. //depot/projects/ia64/sbin/bsdlabel/runtest.sh#4 integrate .. //depot/projects/ia64/sbin/ccdconfig/Makefile#4 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#7 integrate .. //depot/projects/ia64/sbin/gpt/gpt.8#2 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/ia64/sbin/ping/ping.c#23 integrate .. //depot/projects/ia64/secure/Makefile#3 integrate .. //depot/projects/ia64/secure/lib/Makefile#7 integrate .. //depot/projects/ia64/secure/lib/libcipher/Makefile#3 delete .. //depot/projects/ia64/secure/lib/libcipher/README#2 delete .. //depot/projects/ia64/secure/lib/libcipher/README.FreeBSD#2 delete .. //depot/projects/ia64/secure/lib/libcipher/cipher.3#2 delete .. //depot/projects/ia64/secure/lib/libcipher/crypt.c#4 delete .. //depot/projects/ia64/secure/lib/libcipher/test/Makefile#2 delete .. //depot/projects/ia64/secure/lib/libcipher/test/README#2 delete .. //depot/projects/ia64/secure/lib/libcipher/test/cert.c#2 delete .. //depot/projects/ia64/secure/lib/libcipher/test/cert.input#2 delete .. //depot/projects/ia64/secure/lib/libcipher/test/speedcrypt.c#2 delete .. //depot/projects/ia64/secure/lib/libcipher/test/speeddes.c#2 delete .. //depot/projects/ia64/secure/lib/libcrypt/blowfish.c#3 integrate .. //depot/projects/ia64/secure/lib/libcrypt/blowfish.h#3 integrate .. //depot/projects/ia64/secure/lib/libcrypt/crypt-blowfish.c#3 integrate .. //depot/projects/ia64/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/ia64/secure/usr.bin/bdes/bdes.1#3 integrate .. //depot/projects/ia64/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/ia64/share/colldef/Makefile#11 integrate .. //depot/projects/ia64/share/man/man4/Makefile#45 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#10 integrate .. //depot/projects/ia64/share/man/man4/cd.4#3 integrate .. //depot/projects/ia64/share/man/man4/en.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#12 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/en.4#3 delete .. //depot/projects/ia64/share/man/man4/raid.4#4 integrate .. //depot/projects/ia64/share/man/man4/sem.4#2 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#39 integrate .. //depot/projects/ia64/share/man/man7/maclabel.7#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_SET.9#5 integrate .. //depot/projects/ia64/share/man/man9/VFS_VGET.9#6 integrate .. //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#8 integrate .. //depot/projects/ia64/share/man/man9/devclass.9#3 integrate .. //depot/projects/ia64/share/man/man9/devclass_find.9#3 integrate .. //depot/projects/ia64/share/man/man9/extattr.9#4 integrate .. //depot/projects/ia64/share/man/man9/ktr.9#5 integrate .. //depot/projects/ia64/share/man/man9/namei.9#6 integrate .. //depot/projects/ia64/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#16 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#18 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#19 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/ia64/sys/amd64/include/asm.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/param.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#31 integrate .. //depot/projects/ia64/sys/conf/newvers.sh#5 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#25 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#10 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#24 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#29 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#16 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#9 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#33 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#33 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#9 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_init.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#9 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.h#5 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#25 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#25 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#21 integrate .. //depot/projects/ia64/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#16 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecvar.h#6 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#12 integrate .. //depot/projects/ia64/sys/geom/geom.h#33 integrate .. //depot/projects/ia64/sys/geom/geom_ccd.c#1 branch .. //depot/projects/ia64/sys/geom/geom_ctl.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#30 integrate .. //depot/projects/ia64/sys/i386/acpica/OsdEnvironment.c#6 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#15 integrate .. //depot/projects/ia64/sys/i386/bios/apm.c#2 integrate .. //depot/projects/ia64/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/ia64/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/ia64/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/ia64/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/ia64/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/autoconf.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/critical.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/db_disasm.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/db_interface.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/i386-gdbstub.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/i686_mem.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/in_cksum.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#40 integrate .. //depot/projects/ia64/sys/i386/i386/math_emulate.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/mem.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/mp_clock.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/mpapic.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/perfmon.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#42 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#32 integrate .. //depot/projects/ia64/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#25 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_errno.c#2 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_fcntl.c#6 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ioctl.c#7 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ipc.c#4 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_isc.c#3 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_other.c#3 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.c#9 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_stat.c#6 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_util.c#5 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix.c#7 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#14 integrate .. //depot/projects/ia64/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/ia64/sys/i386/include/asm.h#4 integrate .. //depot/projects/ia64/sys/i386/isa/asc.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#18 integrate .. //depot/projects/ia64/sys/i386/isa/cronyx.c#2 integrate .. //depot/projects/ia64/sys/i386/isa/ctx.c#8 integrate .. //depot/projects/ia64/sys/i386/isa/cx.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/cy.c#9 integrate .. //depot/projects/ia64/sys/i386/isa/elink.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/gpib.c#10 integrate .. //depot/projects/ia64/sys/i386/isa/gsc.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/if_cx.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/if_el.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/if_le.c#11 integrate .. //depot/projects/ia64/sys/i386/isa/if_rdp.c#9 integrate .. //depot/projects/ia64/sys/i386/isa/intr_machdep.c#9 integrate .. //depot/projects/ia64/sys/i386/isa/isa.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/ia64/sys/i386/isa/isa_dma.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/istallion.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/ithread.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/loran.c#10 integrate .. //depot/projects/ia64/sys/i386/isa/mse.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#16 integrate .. //depot/projects/ia64/sys/i386/isa/pcaudio.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/pcf.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/spic.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/spigot.c#8 integrate .. //depot/projects/ia64/sys/i386/isa/spkr.c#13 integrate .. //depot/projects/ia64/sys/i386/isa/stallion.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/vesa.c#8 integrate .. //depot/projects/ia64/sys/i386/isa/wt.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#11 integrate .. //depot/projects/ia64/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/ia64/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/ia64/sys/i386/linux/linux_ptrace.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#25 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#15 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/mem.c#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#28 integrate .. //depot/projects/ia64/sys/kern/init_main.c#33 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#55 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#48 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#28 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#28 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#29 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#43 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#29 integrate .. //depot/projects/ia64/sys/modules/geom/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/geom/geom_vol_ffs/Makefile#1 branch .. //depot/projects/ia64/sys/net/if_media.h#9 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#17 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#8 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#10 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#19 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#18 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#11 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#18 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#23 integrate .. //depot/projects/ia64/sys/sys/ccdvar.h#7 integrate .. //depot/projects/ia64/sys/sys/extattr.h#6 integrate .. //depot/projects/ia64/sys/sys/filedesc.h#13 integrate .. //depot/projects/ia64/sys/sys/kernel.h#12 integrate .. //depot/projects/ia64/sys/sys/kse.h#10 integrate .. //depot/projects/ia64/sys/sys/param.h#34 integrate .. //depot/projects/ia64/sys/sys/proc.h#66 integrate .. //depot/projects/ia64/sys/sys/sem.h#4 integrate .. //depot/projects/ia64/sys/sys/syscall.h#27 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#27 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#30 integrate .. //depot/projects/ia64/sys/sys/umtx.h#2 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#57 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#23 integrate .. //depot/projects/ia64/tools/regression/ccd/layout/ccd.sh#2 integrate .. //depot/projects/ia64/tools/regression/usr.bin/sed/regress.s3.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/sed/regress.s4.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/sed/regress.s5.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/sed/regress.sg.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/sed/regress.sh#4 integrate .. //depot/projects/ia64/tools/tools/crypto/cryptotest.c#4 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/ia64/usr.bin/mklocale/yacc.y#8 integrate .. //depot/projects/ia64/usr.bin/sed/process.c#13 integrate .. //depot/projects/ia64/usr.bin/stat/stat.1#5 integrate .. //depot/projects/ia64/usr.bin/unifdef/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/Makefile#40 integrate .. //depot/projects/ia64/usr.sbin/chroot/chroot.c#5 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#9 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#7 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#15 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#21 integrate .. //depot/projects/ia64/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/ypbind/ypbind.8#4 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#26 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.64 2003/06/04 16:05:38 markm Exp $ subsystem login notes ----------------------------- @@ -78,3 +78,102 @@ sppp(4) joerg Just keep me informed of changes, try not to break it. libc nectar Opportuntity for pre-commit review appreciated for nsdispatch(3) and its consumers. +unifdef(1) fanf Pre-commit review requested. + +Following are the entries from the Makefiles, and a few other sources. +Please remove stale entries from both their origin, and this file. + +Please also consider removing the lines from the files listed below and +stating your preferences here instead. + +bin/dd/Makefile:MAINTAINER= green@FreeBSD.org +bin/rmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter@FreeBSD.org +games/fortune/datfiles/Makefile:MAINTAINER= jkh@FreeBSD.org +gnu/usr.bin/binutils/Makefile:MAINTAINER= obrien@FreeBSD.org +gnu/usr.bin/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/doc/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/lib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch@FreeBSD.org +lib/libbz2/Makefile:MAINTAINER= obrien@FreeBSD.org +lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org +lib/libcam/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libdevstat/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libmilter/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsm/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmdb/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmutil/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG +lib/libz/Makefile:MAINTAINER= peter@FreeBSD.org +libexec/lukemftpd/Makefile:MAINTAINER= obrien@FreeBSD.org +libexec/mail.local/Makefile:MAINTAINER= gshapiro@FreeBSD.org +libexec/smrsh/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sbin/camcontrol/Makefile:MAINTAINER= ken@FreeBSD.org +sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org +sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/ipf/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipfstat/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipmon/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipnat/Makefile:MAINTAINER= guido@freebsd.org +share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro@FreeBSD.org +share/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/boot/i386/pxeldr/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org +sys/dev/asr/MAINTAINER:MAINTAINER= obrien@freebsd.org, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com +sys/dev/bktr/CHANGELOG.TXT:MAINTAINER= Roger Hardiman +sys/dev/ep/if_ep.c:MAINTAINER= Matthew N. Dodd +sys/dev/ex/if_ex.c:MAINTAINER= Matthew N. Dodd +sys/dev/ie/if_ie.c:MAINTAINER= Matthew N. Dodd +sys/dev/sound/pcm/feeder_rate.c:MAINTAINER= Orion Hodson +sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org +sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org +sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/linux/Makefile:MAINTAINER= emulation@FreeBSD.org +sys/modules/osf1/Makefile:MAINTAINER= gallatin@FreeBSD.org +sys/modules/pecoff/Makefile:MAINTAINER= takawata@FreeBSD.org +sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org +sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org +sys/modules/udbp/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ugen/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uhid/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ukbd/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ulpt/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umass/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umodem/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ums/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi +sys/modules/usb/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org +usr.bin/brandelf/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2recover/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/chat/Makefile:MAINTAINER= peter@freebsd.org +usr.bin/locate/Makefile:MAINTAINER= wosch@FreeBSD.org +usr.bin/vacation/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.bin/whois/Makefile:MAINTAINER= mike@FreeBSD.org +usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org +usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG +usr.sbin/ipftest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipresend/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipsend/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/iptest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org +usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org +usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/makemap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/ntp/Makefile:MAINTAINER= roberto@FreeBSD.org +usr.sbin/ntp/Makefile.inc:MAINTAINER= roberto@FreeBSD.org +usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh@FreeBSD.org +usr.sbin/pppd/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/praliases/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/ia64/bin/df/df.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -148,9 +148,7 @@ .Sh BUGS The .Fl n -and -.Fl t -flags are ignored if a file or file system is specified. +flag is ignored if a file or file system is specified. .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , ==== //depot/projects/ia64/bin/df/df.c#15 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $"); #include #include @@ -271,6 +271,7 @@ } } else mntpt = *argv; + /* * Statfs does not take a `wait' flag, so we cannot * implement nflag here. @@ -280,6 +281,18 @@ rv = 1; continue; } + + /* + * Check to make sure the arguments we've been given are + * satisfied. Return an error if we have been asked to + * list a mount point that does not match the other args + * we've been given (-l, -t, etc.). + */ + if (checkvfsname(statfsbuf.f_fstypename, vfslist)) { + rv = 1; + continue; + } + if (argc == 1) { bzero(&maxwidths, sizeof(maxwidths)); update_maxwidths(&maxwidths, &statfsbuf); ==== //depot/projects/ia64/bin/ed/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.23 2003/06/02 19:06:28 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,8 +8,8 @@ .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES -DPADD= ${LIBCIPHER} -LDADD= -lcipher +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto .endif .include ==== //depot/projects/ia64/bin/ed/cbc.c#5 (text+ko) ==== @@ -36,13 +36,15 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.19 2003/06/03 17:03:48 jhay Exp $"); #include #include #include #ifdef DES #include +#include +#define ED_DES_INCLUDES #endif #include "ed.h" @@ -56,12 +58,9 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ - des_error("des_setkey"); #define DES_XFORM(buf) \ - if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ - des_error("des_cipher"); + DES_ecb_encrypt(buf, buf, &schedule, \ + inverse ? DES_DECRYPT : DES_ENCRYPT); /* * read/write - no error checking @@ -70,15 +69,6 @@ #define WRITE(buf, n, fp) fwrite(buf, sizeof(char), n, fp) /* - * some things to make references easier - */ -typedef char Desbuf[8]; -#define CHAR(x,i) (x[i]) -#define UCHAR(x,i) (x[i]) -#define BUFFER(x) (x) -#define UBUFFER(x) (x) - -/* * global variables and related macros */ @@ -86,18 +76,25 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; -Desbuf ivec; /* initialization vector */ -Desbuf pvec; /* padding vector */ +#ifdef DES +DES_cblock ivec; /* initialization vector */ +DES_cblock pvec; /* padding vector */ +#endif + char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' }; + int pflag; /* 1 to preserve parity bits */ +#ifdef DES +DES_key_schedule schedule; /* expanded DES key */ +#endif + unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */ int des_n = 0; /* index for put_des_char/get_des_char */ - /* init_des_cipher: initialize DES */ void init_des_cipher(void) @@ -112,7 +109,7 @@ /* initialize the padding vector */ for (i = 0; i < 8; i++) - CHAR(pvec, i) = (char) (arc4random() % 256); + pvec[i] = (char) (arc4random() % 256); #endif } @@ -172,7 +169,7 @@ get_keyword(void) { char *p; /* used to obtain the key */ - Desbuf msgbuf; /* I/O buffer */ + DES_cblock msgbuf; /* I/O buffer */ /* * get the key @@ -182,9 +179,9 @@ /* * copy it, nul-padded, into the key area */ - expand_des_key(BUFFER(msgbuf), p); + expand_des_key(msgbuf, p); MEMZERO(p, _PASSWORD_LEN); - set_des_key(msgbuf); + set_des_key(&msgbuf); MEMZERO(msgbuf, sizeof msgbuf); return 1; } @@ -303,7 +300,7 @@ * DES ignores the low order bit of each character. */ void -set_des_key(Desbuf buf) /* key block */ +set_des_key(DES_cblock *buf) /* key block */ { int i, j; /* counter in a for loop */ int par; /* parity counter */ @@ -315,16 +312,17 @@ for (i = 0; i < 8; i++) { par = 0; for (j = 1; j < 8; j++) - if ((bits[j]&UCHAR(buf, i)) != 0) + if ((bits[j] & (*buf)[i]) != 0) par++; - if ((par&01) == 01) - UCHAR(buf, i) = UCHAR(buf, i)&0177; + if ((par & 0x01) == 0x01) + (*buf)[i] &= 0x7f; else - UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200; + (*buf)[i] = ((*buf)[i] & 0x7f) | 0x80; } } - DES_KEY(UBUFFER(buf)); + DES_set_odd_parity(buf); + DES_set_key(buf, &schedule); } @@ -341,10 +339,10 @@ */ if (n == 8) { for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + MEMCPY(ivec, msgbuf, 8); + return WRITE(msgbuf, 8, fp); } /* * at EOF or last block -- in either case, the last byte contains @@ -356,12 +354,12 @@ /* * Pad the last block randomly */ - (void)MEMCPY(BUFFER(msgbuf + n), BUFFER(pvec), 8 - n); - CHAR(msgbuf, 7) = n; + (void)MEMCPY(msgbuf + n, pvec, 8 - n); + msgbuf[7] = n; for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + return WRITE(msgbuf, 8, fp); } /* @@ -372,25 +370,25 @@ int cbc_decode(unsigned char *msgbuf, FILE *fp) { - Desbuf tbuf; /* temp buffer for initialization vector */ + DES_cblock tbuf; /* temp buffer for initialization vector */ int n; /* number of bytes actually read */ int c; /* used to test for EOF */ int inverse = 1; /* 0 to encrypt, 1 to decrypt */ - if ((n = READ(BUFFER(msgbuf), 8, fp)) == 8) { + if ((n = READ(msgbuf, 8, fp)) == 8) { /* * do the transformation */ - MEMCPY(BUFFER(tbuf), BUFFER(msgbuf), 8); - DES_XFORM(UBUFFER(msgbuf)); + MEMCPY(tbuf, msgbuf, 8); + DES_XFORM((DES_cblock *)msgbuf); for (c = 0; c < 8; c++) - UCHAR(msgbuf, c) ^= UCHAR(ivec, c); - MEMCPY(BUFFER(ivec), BUFFER(tbuf), 8); + msgbuf[c] ^= ivec[c]; + MEMCPY(ivec, tbuf, 8); /* * if the last one, handle it specially */ if ((c = fgetc(fp)) == EOF) { - n = CHAR(msgbuf, 7); + n = msgbuf[7]; if (n < 0 || n > 7) { des_error("decryption failed (block corrupted)"); return EOF; ==== //depot/projects/ia64/bin/ed/ed.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.19 2003/06/02 19:06:28 markm Exp $ */ #include @@ -175,6 +175,18 @@ /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */ #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0') +#ifdef ED_DES_INCLUDES +void des_error(const char *); +void expand_des_key(char *, char *); +void set_des_key(DES_cblock *); +#endif + +/* Other DES support stuff */ +void init_des_cipher(void); +int flush_des_file(FILE *); +int get_des_char(FILE *); +int put_des_char(int, FILE *); + /* Local Function Declarations */ void add_line_node(line_t *); int append_lines(long); @@ -188,21 +200,17 @@ int close_sbuf(void); int copy_lines(long); int delete_lines(long, long); -void des_error(const char *); int display_lines(long, long, int); line_t *dup_line_node(line_t *); int exec_command(void); long exec_global(int, int); -void expand_des_key(char *, char *); int extract_addr_range(void); char *extract_pattern(int); int extract_subst_tail(int *, long *); char *extract_subst_template(void); int filter_lines(long, long, char *); -int flush_des_file(FILE *); line_t *get_addressed_line_node(long); pattern_t *get_compiled_pattern(void); -int get_des_char(FILE *); char *get_extended_line(int *, int); char *get_filename(void); int get_keyword(void); @@ -219,7 +227,6 @@ int has_trailing_escape(char *, char *); int hex_to_binary(int, int); void init_buffers(void); -void init_des_cipher(void); int is_legal_filename(char *); int join_lines(long, long); int mark_line_node(line_t *, int); @@ -230,7 +237,6 @@ char *parse_char_class(char *); int pop_undo_stack(void); undo_t *push_undo_stack(int, long, long); -int put_des_char(int, FILE *); const char *put_sbuf_line(const char *); int put_stream_line(FILE *, const char *, int); int put_tty_line(const char *, int, long, int); @@ -239,7 +245,6 @@ long read_stream(FILE *, long); int search_and_replace(pattern_t *, int, int); int set_active_node(line_t *); -void set_des_key(char *); void signal_hup(int); void signal_int(int); char *strip_escapes(char *); ==== //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_configure.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#11 $ */ #include @@ -184,7 +184,6 @@ if ((name = dup_word(p)) == NULL) goto syserr; ret = openpam_load_chain(pamh, name, fclt); - fprintf(stderr, "include %s returned %d\n", name, ret); FREE(name); if (ret < 0) goto fail; ==== //depot/projects/ia64/gnu/lib/csu/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.17 2003/06/01 22:18:05 obrien Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.18 2003/06/02 02:29:26 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -9,7 +9,7 @@ SRCS= crtstuff.c tconfig.h OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So -CSTD= gnu89 +CSTD?= gnu89 CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-omit-frame-pointer ==== //depot/projects/ia64/gnu/lib/libobjc/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.17 2003/03/17 00:08:47 marcel Exp $ +# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.18 2003/06/02 02:30:52 obrien Exp $ OBJCDIR=${.CURDIR}/../../../contrib/libobjc GCCDIR= ${.CURDIR}/../../../contrib/gcc @@ -23,6 +23,7 @@ CFLAGS+= -fpic .endif +CSTD?= CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.43 2003/05/24 19:38:18 peter Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.44 2003/06/02 06:12:14 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -18,6 +18,7 @@ LIB= stdc++ SHLIB_MAJOR= 4 +CSTD?= CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#13 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.24 2003/02/14 16:01:58 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.25 2003/06/02 18:43:15 ru Exp $ .\" .\" %beginstrip% . @@ -55,6 +55,7 @@ .ds doc-operating-system FreeBSD\~5.0 . .\" FreeBSD releases not found in doc-common +.ds doc-operating-system-FreeBSD-4.9 4.9 .ds doc-operating-system-FreeBSD-5.1 5.1 . .ec ==== //depot/projects/ia64/lib/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.159 2003/06/01 00:32:21 marcel Exp $ +# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -42,10 +42,11 @@ .if ${MACHINE_ARCH} != "amd64" _libstand= libstand +.endif + .if !defined(NOLIBC_R) _libc_r= libc_r .endif -.endif .if !defined(NO_BIND) _libbind= libbind ==== //depot/projects/ia64/lib/csu/i386-elf/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.18 2003/05/04 18:34:00 obrien Exp $ +# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.19 2003/06/04 11:21:18 bde Exp $ .PATH: ${.CURDIR}/../common @@ -6,10 +6,8 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o WARNS?= 6 -CFLAGS+= -elf -Wall \ - -I${.CURDIR}/../common \ +CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -LDFLAGS+= -elf all: ${OBJS} ==== //depot/projects/ia64/lib/libc/amd64/gen/_setjmp.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.17 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.18 2003/06/02 22:37:53 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -53,15 +53,15 @@ ENTRY(_setjmp) movq %rdi,%rax movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rax) /* retval */ - movq %rbx, 8(%rax) - movq %rsp,16(%rax) - movq %rbp,24(%rax) - movq %r12,32(%rax) - movq %r13,40(%rax) - movq %r14,48(%rax) - movq %r15,56(%rax) - fnstcw 64(%rax) + movq %rdx, 0(%rax) /* 0; retval */ + movq %rbx, 8(%rax) /* 1; rbx */ + movq %rsp,16(%rax) /* 2; rsp */ + movq %rbp,24(%rax) /* 3; rbp */ + movq %r12,32(%rax) /* 4; r12 */ + movq %r13,40(%rax) /* 5; r13 */ + movq %r14,48(%rax) /* 6; r14 */ + movq %r15,56(%rax) /* 7; r15 */ + fnstcw 64(%rax) /* 8; fpu cw */ xorq %rax,%rax ret ==== //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#4 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.26 2003/06/02 22:37:53 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -57,20 +57,20 @@ movq %rdi,%rcx movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - leaq 72(%rcx),%rdx /* (sigset_t*)oset */ + leaq 72(%rcx),%rdx /* 9,10; (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx movq 0(%rsp),%rdx /* retval */ - movq %rdx, 0(%rcx) /* retval */ - movq %rbx, 8(%rcx) - movq %rsp,16(%rcx) - movq %rbp,24(%rcx) - movq %r12,32(%rcx) - movq %r13,40(%rcx) - movq %r14,48(%rcx) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 4 15:48:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0059937B404; Wed, 4 Jun 2003 15:48:02 -0700 (PDT) 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 9446737B401 for ; Wed, 4 Jun 2003 15:48:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AACC43F85 for ; Wed, 4 Jun 2003 15:48:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54Mm10U049912 for ; Wed, 4 Jun 2003 15:48:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54Mm1mR049909 for perforce@freebsd.org; Wed, 4 Jun 2003 15:48:01 -0700 (PDT) Date: Wed, 4 Jun 2003 15:48:01 -0700 (PDT) Message-Id: <200306042248.h54Mm1mR049909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 22:48:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=32596 Change 32596 by peter@peter_hammer on 2003/06/04 15:47:18 Install libgcc_pic.a as well. Its necessary. :-/ Affected files ... .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#6 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libgcc/Makefile#6 (text+ko) ==== @@ -12,6 +12,9 @@ #SHLIB_MAJOR= 1 +# We need to install libgcc_pic.a as well, for use by shared libs. +INSTALL_PIC_ARCHIVE= yes + # # XXX This is a hack, but it seems to work. # libgcc2.a is meant to be compiled by *this* version of gcc. From owner-p4-projects@FreeBSD.ORG Wed Jun 4 15:50:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21DE437B404; Wed, 4 Jun 2003 15:50:06 -0700 (PDT) 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 B2D5037B401 for ; Wed, 4 Jun 2003 15:50:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D2E843F93 for ; Wed, 4 Jun 2003 15:50:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54Mo50U050005 for ; Wed, 4 Jun 2003 15:50:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54Mo4k4050002 for perforce@freebsd.org; Wed, 4 Jun 2003 15:50:04 -0700 (PDT) Date: Wed, 4 Jun 2003 15:50:04 -0700 (PDT) Message-Id: <200306042250.h54Mo4k4050002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 22:50:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=32597 Change 32597 by peter@peter_hammer on 2003/06/04 15:49:05 use -lgcc_pic when building shlibs Affected files ... .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 (text+ko) ==== @@ -48,7 +48,8 @@ /* For the native system compiler, we actually build libgcc in a profiled version. So we should use it with -pg. */ -#define LIBGCC_SPEC "%{!pg: -lgcc} %{pg: -lgcc_p}" +#define LIBGCC_SPEC "%{shared: -lgcc_pic} \ + %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}" #define LIBSTDCXX_PROFILE "-lstdc++_p" #define MATH_LIBRARY_PROFILE "-lm_p" #define FORTRAN_LIBRARY_PROFILE "-lg2c_p" From owner-p4-projects@FreeBSD.ORG Wed Jun 4 15:50:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B48A37B407; Wed, 4 Jun 2003 15:50:07 -0700 (PDT) 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 88BAA37B41C for ; Wed, 4 Jun 2003 15:50:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0463143FB1 for ; Wed, 4 Jun 2003 15:50:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54Mo50U050012 for ; Wed, 4 Jun 2003 15:50:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54Mo5Pp050008 for perforce@freebsd.org; Wed, 4 Jun 2003 15:50:05 -0700 (PDT) Date: Wed, 4 Jun 2003 15:50:05 -0700 (PDT) Message-Id: <200306042250.h54Mo5Pp050008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 22:50:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=32598 Change 32598 by peter@peter_hammer on 2003/06/04 15:49:20 include mbr for amd64 Affected files ... .. //depot/projects/hammer/release/Makefile#27 edit Differences ... ==== //depot/projects/hammer/release/Makefile#27 (text+ko) ==== @@ -707,7 +707,7 @@ .if ${TARGET_ARCH} != "ia64" @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot .endif -.if ${TARGET} == "i386" +.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot .endif @echo "Making the regular boot floppy." From owner-p4-projects@FreeBSD.ORG Wed Jun 4 15:51:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E346537B404; Wed, 4 Jun 2003 15:51:08 -0700 (PDT) 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 9B45F37B401 for ; Wed, 4 Jun 2003 15:51:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EE9A43FBD for ; Wed, 4 Jun 2003 15:51:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54Mp70U050151 for ; Wed, 4 Jun 2003 15:51:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54Mp7HP050148 for perforce@freebsd.org; Wed, 4 Jun 2003 15:51:07 -0700 (PDT) Date: Wed, 4 Jun 2003 15:51:07 -0700 (PDT) Message-Id: <200306042251.h54Mp7HP050148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 22:51:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=32599 Change 32599 by peter@peter_hammer on 2003/06/04 15:50:10 add libgcc_pic.a to libnames Affected files ... .. //depot/projects/hammer/share/mk/bsd.libnames.mk#11 edit Differences ... ==== //depot/projects/hammer/share/mk/bsd.libnames.mk#11 (text+ko) ==== @@ -38,6 +38,7 @@ LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a +LIBGCC_PIC?= ${DESTDIR}${LIBDIR}/libgccc_pic.a LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a # XXX in secure dist, not base From owner-p4-projects@FreeBSD.ORG Wed Jun 4 15:52:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6E3E37B404; Wed, 4 Jun 2003 15:52:11 -0700 (PDT) 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 6749237B401 for ; Wed, 4 Jun 2003 15:52:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13D3543FA3 for ; Wed, 4 Jun 2003 15:52:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54MqA0U050203 for ; Wed, 4 Jun 2003 15:52:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54MqAiw050200 for perforce@freebsd.org; Wed, 4 Jun 2003 15:52:10 -0700 (PDT) Date: Wed, 4 Jun 2003 15:52:10 -0700 (PDT) Message-Id: <200306042252.h54MqAiw050200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 22:52:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=32601 Change 32601 by peter@peter_hammer on 2003/06/04 15:51:52 Add libstdc++.so back in, its just the tip of the iceberg. Any c++ code from ports that uses shared libs needs libgcc_pic.a or libgcc.so. There is no way to avoid it, and libstdc++ is the least of our worries here. Affected files ... .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#11 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#11 (text+ko) ==== @@ -8,11 +8,6 @@ ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \ ${SUPDIR} ${GCCDIR} -.if ${MACHINE_ARCH} == "amd64" -NOPIC= broken # need libgcc.so or libgcc_pic.a -NOSHARED= broken -.endif - #SUBDIR= doc LIB= stdc++ From owner-p4-projects@FreeBSD.ORG Wed Jun 4 16:43:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CFFA37B404; Wed, 4 Jun 2003 16:43:17 -0700 (PDT) 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 1809637B401 for ; Wed, 4 Jun 2003 16:43:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9EAC43FA3 for ; Wed, 4 Jun 2003 16:43:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54NhF0U053117 for ; Wed, 4 Jun 2003 16:43:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54NhEmT053114 for perforce@freebsd.org; Wed, 4 Jun 2003 16:43:14 -0700 (PDT) Date: Wed, 4 Jun 2003 16:43:14 -0700 (PDT) Message-Id: <200306042343.h54NhEmT053114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 23:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=32604 Change 32604 by peter@peter_daintree on 2003/06/04 16:43:09 IFC @32603 Affected files ... .. //depot/projects/hammer/MAINTAINERS#8 integrate .. //depot/projects/hammer/bin/df/df.1#4 integrate .. //depot/projects/hammer/bin/df/df.c#7 integrate .. //depot/projects/hammer/bin/ed/cbc.c#3 integrate .. //depot/projects/hammer/lib/csu/i386-elf/Makefile#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#8 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#9 integrate .. //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/kldload.2#3 integrate .. //depot/projects/hammer/lib/libc_r/test/guard_b.c#3 integrate .. //depot/projects/hammer/lib/libc_r/test/join_leak_d.c#2 integrate .. //depot/projects/hammer/lib/libc_r/test/mutex_d.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/hammer/lib/libwrap/Makefile#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#5 integrate .. //depot/projects/hammer/libexec/tcpd/Makefile#3 integrate .. //depot/projects/hammer/release/Makefile#28 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#9 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/hammer/secure/Makefile#2 integrate .. //depot/projects/hammer/secure/lib/libcipher/Makefile#3 delete .. //depot/projects/hammer/secure/lib/libcipher/README#2 delete .. //depot/projects/hammer/secure/lib/libcipher/README.FreeBSD#2 delete .. //depot/projects/hammer/secure/lib/libcipher/cipher.3#2 delete .. //depot/projects/hammer/secure/lib/libcipher/crypt.c#3 delete .. //depot/projects/hammer/secure/lib/libcipher/test/Makefile#2 delete .. //depot/projects/hammer/secure/lib/libcipher/test/README#2 delete .. //depot/projects/hammer/secure/lib/libcipher/test/cert.c#2 delete .. //depot/projects/hammer/secure/lib/libcipher/test/cert.input#2 delete .. //depot/projects/hammer/secure/lib/libcipher/test/speedcrypt.c#2 delete .. //depot/projects/hammer/secure/lib/libcipher/test/speeddes.c#2 delete .. //depot/projects/hammer/share/man/man4/Makefile#14 integrate .. //depot/projects/hammer/share/man/man4/cd.4#2 integrate .. //depot/projects/hammer/share/man/man4/en.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/en.4#2 delete .. //depot/projects/hammer/share/man/man9/VOP_GETEXTATTR.9#5 integrate .. //depot/projects/hammer/share/man/man9/extattr.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#7 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#7 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#14 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.h#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#9 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#9 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsecvar.h#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#6 integrate .. //depot/projects/hammer/sys/geom/geom.h#18 integrate .. //depot/projects/hammer/sys/geom/geom_ccd.c#1 branch .. //depot/projects/hammer/sys/geom/geom_ctl.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#9 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#12 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#13 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#13 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/geom/geom_vol_ffs/Makefile#1 branch .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/hammer/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/hammer/sys/sys/extattr.h#4 integrate .. //depot/projects/hammer/sys/sys/kernel.h#4 integrate .. //depot/projects/hammer/sys/sys/kse.h#9 integrate .. //depot/projects/hammer/sys/sys/proc.h#25 integrate .. //depot/projects/hammer/sys/sys/syscall.h#13 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#13 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#13 integrate .. //depot/projects/hammer/sys/sys/umtx.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#11 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.s3.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.s4.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.s5.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sg.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#2 integrate .. //depot/projects/hammer/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#5 integrate .. //depot/projects/hammer/usr.bin/sed/process.c#4 integrate .. //depot/projects/hammer/usr.bin/unifdef/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/Makefile#20 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#6 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#10 integrate .. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ypbind/ypbind.8#2 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.64 2003/06/04 16:05:38 markm Exp $ subsystem login notes ----------------------------- @@ -78,3 +78,102 @@ sppp(4) joerg Just keep me informed of changes, try not to break it. libc nectar Opportuntity for pre-commit review appreciated for nsdispatch(3) and its consumers. +unifdef(1) fanf Pre-commit review requested. + +Following are the entries from the Makefiles, and a few other sources. +Please remove stale entries from both their origin, and this file. + +Please also consider removing the lines from the files listed below and +stating your preferences here instead. + +bin/dd/Makefile:MAINTAINER= green@FreeBSD.org +bin/rmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter@FreeBSD.org +games/fortune/datfiles/Makefile:MAINTAINER= jkh@FreeBSD.org +gnu/usr.bin/binutils/Makefile:MAINTAINER= obrien@FreeBSD.org +gnu/usr.bin/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/doc/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/lib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch@FreeBSD.org +lib/libbz2/Makefile:MAINTAINER= obrien@FreeBSD.org +lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org +lib/libcam/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libdevstat/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libmilter/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsm/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmdb/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmutil/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG +lib/libz/Makefile:MAINTAINER= peter@FreeBSD.org +libexec/lukemftpd/Makefile:MAINTAINER= obrien@FreeBSD.org +libexec/mail.local/Makefile:MAINTAINER= gshapiro@FreeBSD.org +libexec/smrsh/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sbin/camcontrol/Makefile:MAINTAINER= ken@FreeBSD.org +sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org +sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/ipf/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipfstat/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipmon/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipnat/Makefile:MAINTAINER= guido@freebsd.org +share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro@FreeBSD.org +share/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/boot/i386/pxeldr/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org +sys/dev/asr/MAINTAINER:MAINTAINER= obrien@freebsd.org, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com +sys/dev/bktr/CHANGELOG.TXT:MAINTAINER= Roger Hardiman +sys/dev/ep/if_ep.c:MAINTAINER= Matthew N. Dodd +sys/dev/ex/if_ex.c:MAINTAINER= Matthew N. Dodd +sys/dev/ie/if_ie.c:MAINTAINER= Matthew N. Dodd +sys/dev/sound/pcm/feeder_rate.c:MAINTAINER= Orion Hodson +sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org +sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org +sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/linux/Makefile:MAINTAINER= emulation@FreeBSD.org +sys/modules/osf1/Makefile:MAINTAINER= gallatin@FreeBSD.org +sys/modules/pecoff/Makefile:MAINTAINER= takawata@FreeBSD.org +sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org +sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org +sys/modules/udbp/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ugen/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uhid/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ukbd/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ulpt/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umass/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umodem/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ums/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi +sys/modules/usb/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org +usr.bin/brandelf/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2recover/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/chat/Makefile:MAINTAINER= peter@freebsd.org +usr.bin/locate/Makefile:MAINTAINER= wosch@FreeBSD.org +usr.bin/vacation/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.bin/whois/Makefile:MAINTAINER= mike@FreeBSD.org +usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org +usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG +usr.sbin/ipftest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipresend/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipsend/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/iptest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org +usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org +usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/makemap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/ntp/Makefile:MAINTAINER= roberto@FreeBSD.org +usr.sbin/ntp/Makefile.inc:MAINTAINER= roberto@FreeBSD.org +usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh@FreeBSD.org +usr.sbin/pppd/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/praliases/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/hammer/bin/df/df.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -148,9 +148,7 @@ .Sh BUGS The .Fl n -and -.Fl t -flags are ignored if a file or file system is specified. +flag is ignored if a file or file system is specified. .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , ==== //depot/projects/hammer/bin/df/df.c#7 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $"); #include #include @@ -271,6 +271,7 @@ } } else mntpt = *argv; + /* * Statfs does not take a `wait' flag, so we cannot * implement nflag here. @@ -280,6 +281,18 @@ rv = 1; continue; } + + /* + * Check to make sure the arguments we've been given are + * satisfied. Return an error if we have been asked to + * list a mount point that does not match the other args + * we've been given (-l, -t, etc.). + */ + if (checkvfsname(statfsbuf.f_fstypename, vfslist)) { + rv = 1; + continue; + } + if (argc == 1) { bzero(&maxwidths, sizeof(maxwidths)); update_maxwidths(&maxwidths, &statfsbuf); ==== //depot/projects/hammer/bin/ed/cbc.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.18 2003/06/02 19:06:28 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.19 2003/06/03 17:03:48 jhay Exp $"); #include #include @@ -76,8 +76,10 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; +#ifdef DES DES_cblock ivec; /* initialization vector */ DES_cblock pvec; /* padding vector */ +#endif char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' @@ -85,7 +87,9 @@ int pflag; /* 1 to preserve parity bits */ +#ifdef DES DES_key_schedule schedule; /* expanded DES key */ +#endif unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */ ==== //depot/projects/hammer/lib/csu/i386-elf/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.18 2003/05/04 18:34:00 obrien Exp $ +# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.19 2003/06/04 11:21:18 bde Exp $ .PATH: ${.CURDIR}/../common @@ -6,10 +6,8 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o WARNS?= 6 -CFLAGS+= -elf -Wall \ - -I${.CURDIR}/../common \ +CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -LDFLAGS+= -elf all: ${OBJS} ==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#6 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.17 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.18 2003/06/02 22:37:53 peter Exp $"); /* * C library -- _setjmp, _longjmp ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#8 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.26 2003/06/02 22:37:53 peter Exp $"); /* * C library -- _setjmp, _longjmp ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#9 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.27 2003/06/02 21:59:13 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.28 2003/06/02 22:37:53 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#4 (text+ko) ==== @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2001 Dima Dorfman +.\" Copyright (c) 2003 Robert Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.12 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.13 2003/06/04 04:00:26 rwatson Exp $ .\" .Dd March 28, 2001 .Dt EXTATTR 2 @@ -32,12 +33,15 @@ .Nm extattr_get_fd , .Nm extattr_set_fd , .Nm extattr_delete_fd , +.Nm extattr_list_fd , .Nm extattr_get_file , .Nm extattr_set_file , .Nm extattr_delete_file +.Nm extattr_list_file , .Nm extattr_get_link , .Nm extattr_set_link , .Nm extattr_delete_link +.Nm extattr_list_link , .Nd system calls to manipulate VFS extended attributes .Sh LIBRARY .Lb libc @@ -52,23 +56,30 @@ .Ft int .Fn extattr_delete_fd "int fd" "int attrnamespace" "const char *attrname" .Ft ssize_t +.Fn extattr_list_fd "int fd" "int attrnamespace" "void *data" "size_t nbytes" +.Ft ssize_t .Fn extattr_get_file "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes" .Ft int .Fn extattr_set_file "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes" .Ft int .Fn extattr_delete_file "const char *path" "int attrnamespace" "const char *attrname" .Ft ssize_t +.Fn extattr_list_file "const char *path" "int attrnamespace" "void *data" "size_t nbytes" +.Ft ssize_t .Fn extattr_get_link "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes" .Ft int .Fn extattr_set_link "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes" .Ft int .Fn extattr_delete_link "const char *path" "int attrnamespace" "const char *attrname" +.Ft ssize_t +.Fn extattr_list_link "const char *path" "int attrnamespace" "void *data" "size_t nbytes" .Sh DESCRIPTION Named extended attributes are meta-data associated with vnodes representing files and directories. They exist as .Qq Li name=value pairs within a set of namespaces. +.Pp The .Fn extattr_get_file system call retrieves the value of the specified extended attribute into @@ -85,18 +96,23 @@ .Fn extattr_delete_file system call deletes the extended attribute specified. The -.Fn extattr_get_file +.Fn extattr_list_file +returns a list of attributes present in the requested namespace, separated +by ASCII 0 (nul) characters. +The +.Fn extattr_get_file , and -.Fn extattr_set_file +.Fn extattr_list_file calls consume the .Fa data and .Fa nbytes arguments in the style of -.Xr read 2 -and -.Xr write 2 , -respectively. +.Xr read 2 ; +.Fn extattr_set_file +consumes these arguments in the style of +.Xr write 2. +.Pp If .Fa data is @@ -238,3 +254,13 @@ .Fx 5.0 . It was developed to support security extensions requiring additional labels to be associated with each file or directory. +.Sh BUGS +In earlier versions of this API, passing an empty string for the +attribute name to +.Fn extattr_get_fd , +.Fn extattr_get_file , +or +.Fn extattr_get_link +would return the list of attributes defined for the target object. +This interface has been deprecated in preference to using the explicit +list API, and should not be used. ==== //depot/projects/hammer/lib/libc/sys/kldload.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.17 2002/12/18 09:22:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.18 2003/06/03 12:29:34 hmp Exp $ .\" .Dd March 3, 1999 .Dt KLDLOAD 2 @@ -71,6 +71,10 @@ The file format of .Fa file was unrecognized. +.It Bq Er EEXIST +The supplied +.Fa file +has already been loaded. .El .Sh SEE ALSO .Xr kldfind 2 , ==== //depot/projects/hammer/lib/libc_r/test/guard_b.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * 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_r/test/guard_b.c,v 1.3 2003/06/01 23:03:49 rwatson Exp $ + * $FreeBSD: src/lib/libc_r/test/guard_b.c,v 1.4 2003/06/04 20:36:08 marcel Exp $ * * Test thread stack guard functionality. */ @@ -71,7 +71,7 @@ */ if (parms->top - (void *)&top != FRAME_SIZE * parms->cur) { fprintf(stderr, "Stack size (%d) != expected (%d), frame %d\n", - parms->top - (void *)&top, FRAME_SIZE * parms->cur, + (int)(parms->top - (void *)&top), FRAME_SIZE * parms->cur, parms->cur); } ==== //depot/projects/hammer/lib/libc_r/test/join_leak_d.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * 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_r/test/join_leak_d.c,v 1.1 2001/05/20 23:12:13 jasone Exp $ + * $FreeBSD: src/lib/libc_r/test/join_leak_d.c,v 1.2 2003/06/04 08:16:32 mtm Exp $ * * Test for leaked joined threads. */ @@ -65,6 +65,10 @@ for (i = 0; i < NITERATIONS; i++) { if ((error = pthread_create(&thread, NULL, thread_entry, NULL)) != 0) { + if (error == EAGAIN) { + i--; + continue; + } fprintf(stderr, "Error in pthread_create(): %s\n", strerror(error)); exit(1); ==== //depot/projects/hammer/lib/libc_r/test/mutex_d.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.3 2002/07/02 01:26:16 deischen Exp $ + * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.4 2003/06/04 20:38:54 marcel Exp $ */ #include #include @@ -37,6 +37,7 @@ #include #include #include +#include #include "pthread.h" #include #include @@ -465,8 +466,8 @@ pthread_mutex_unlock (&waiter_mutex); } - log_trace ("Thread %d: Exiting thread 0x%x\n", (int) statep->id, - (int) pthread_self()); + log_trace ("Thread %d: Exiting thread 0x%" PRIxPTR "\n", + (int) statep->id, (uintptr_t) pthread_self()); pthread_exit (arg); return (NULL); } @@ -512,8 +513,8 @@ if (statep->ret == 0) pthread_mutex_unlock (statep->cmd.mutex); - log_trace ("Thread %d: Exiting thread 0x%x\n", (int) statep->id, - (int) pthread_self()); + log_trace ("Thread %d: Exiting thread 0x%" PRIxPTR "\n", + (int) statep->id, (uintptr_t) pthread_self()); pthread_exit (arg); return (NULL); } @@ -522,8 +523,8 @@ static void sighandler (int signo) { - log ("Signal handler caught signal %d, thread id 0x%x\n", - signo, (int) pthread_self()); + log ("Signal handler caught signal %d, thread id 0x%" PRIxPTR "\n", + signo, (uintptr_t) pthread_self()); if (signo == SIGINT) done = 1; ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.43 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.44 2003/06/03 02:21:01 davidxu Exp $ */ #include #include @@ -152,6 +152,9 @@ /* Unlock the condition variable structure: */ THR_LOCK_RELEASE(curthread, &cv->c_lock); + /* Free the cond lock structure: */ + _lock_destroy(&cv->c_lock); + /* * Free the memory allocated for the condition * variable structure: ==== //depot/projects/hammer/lib/libpthread/thread/thr_create.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.45 2003/05/24 02:29:25 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.46 2003/06/04 03:22:59 davidxu Exp $ */ #include #include @@ -143,9 +143,6 @@ || ((kseg = _kseg_alloc(curthread)) == NULL))) { /* Insufficient memory to create a new KSE/KSEG: */ ret = EAGAIN; -#ifndef KMF_DONE -#define KMF_DONE 0x04 -#endif if (kse != NULL) { kse->k_mbx.km_flags |= KMF_DONE; _kse_free(curthread, kse); ==== //depot/projects/hammer/lib/libpthread/thread/thr_init.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.54 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.55 2003/06/04 12:40:21 davidxu Exp $ */ /* Allocate space for global thread variables here: */ @@ -449,6 +449,35 @@ _thr_page_size = getpagesize(); _thr_guard_default = _thr_page_size; + /* Enter a loop to get the existing signal status: */ + for (i = 1; i < NSIG; i++) { + /* Check for signals which cannot be trapped: */ + if (i == SIGKILL || i == SIGSTOP) { + } + + /* Get the signal handler details: */ + else if (__sys_sigaction(i, NULL, + &_thread_sigact[i - 1]) != 0) { + /* + * Abort this process if signal + * initialisation fails: + */ + PANIC("Cannot read signal handler info"); + } + } + /* + * Install the signal handler for SIGINFO. It isn't + * really needed, but it is nice to have for debugging + * purposes. + */ + if (__sys_sigaction(SIGINFO, &act, NULL) != 0) { + /* + * Abort this process if signal initialisation fails: + */ + PANIC("Cannot initialize signal handler"); + } + _thread_sigact[SIGINFO - 1].sa_flags = SA_SIGINFO | SA_RESTART; + init_once = 1; /* Don't do this again. */ } else { /* @@ -462,43 +491,14 @@ _lock_destroy(&_keytable_lock); } - /* Initialize everything else. */ TAILQ_INIT(&_thread_list); TAILQ_INIT(&_thread_gc_list); /* Enter a loop to get the existing signal status: */ - for (i = 1; i < NSIG; i++) { - /* Check for signals which cannot be trapped: */ - if (i == SIGKILL || i == SIGSTOP) { - } - /* Get the signal handler details: */ - else if (__sys_sigaction(i, NULL, - &_thread_sigact[i - 1]) != 0) { - /* - * Abort this process if signal - * initialisation fails: - */ - PANIC("Cannot read signal handler info"); - } - - /* Initialize the SIG_DFL dummy handler count. */ - _thread_dfl_count[i] = 0; - } - - /* - * Install the signal handler for SIGINFO. It isn't - * really needed, but it is nice to have for debugging - * purposes. - */ - if (__sys_sigaction(SIGINFO, &act, NULL) != 0) { - /* - * Abort this process if signal initialisation fails: - */ - PANIC("Cannot initialize signal handler"); - } - _thread_sigact[SIGINFO - 1].sa_flags = SA_SIGINFO | SA_RESTART; + /* Initialize the SIG_DFL dummy handler count. */ + bzero(_thread_dfl_count, sizeof(_thread_dfl_count)); /* * Initialize the lock for temporary installation of signal ==== //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.67 2003/05/24 02:29:25 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.68 2003/06/04 03:22:59 davidxu Exp $"); #include #include @@ -97,10 +97,6 @@ #define KSE_RUNQ_THREADS(kse) ((kse)->k_schedq->sq_runq.pq_threads) -#ifndef KMF_DONE -#define KMF_DONE 0x04 -#endif - /* * We've got to keep track of everything that is allocated, not only * to have a speedy free list, but also so they can be deallocated ==== //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.36 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.37 2003/06/03 02:21:01 davidxu Exp $ */ #include #include @@ -187,6 +187,8 @@ MUTEX_INIT_LINK(pmutex); *mutex = pmutex; } else { + /* Free the mutex lock structure: */ + _lock_destroy(&pmutex->m_lock); free(pmutex); *mutex = NULL; } @@ -235,6 +237,10 @@ * structure: */ MUTEX_ASSERT_NOT_OWNED(m); + + /* Free the mutex lock structure: */ + _lock_destroy(&m->m_lock); + free(m); } } ==== //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sigprocmask.c,v 1.14 2003/05/30 00:09:22 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sigprocmask.c,v 1.15 2003/06/04 12:38:21 davidxu Exp $ */ #include #include @@ -44,8 +44,10 @@ int _sigprocmask(int how, const sigset_t *set, sigset_t *oset) { - if (_kse_isthreaded() != 0) - return (pthread_sigmask(how, set, oset)); - else - return (__sys_sigprocmask(how, set, oset)); + int ret; + + ret = pthread_sigmask(how, set, oset); + if ((ret == 0) && (_kse_isthreaded() == 0)) + ret = __sys_sigprocmask(how, set, oset); + return (ret); } ==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.7 2003/05/25 22:40:57 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.8 2003/06/04 08:23:05 mtm Exp $ */ /* Allocate space for global thread variables here: */ @@ -66,6 +66,8 @@ #include "thr_private.h" +extern void _thread_init_hack(void); + /* * All weak references used within libc should be in this table. * This will is so that static libraries will work. @@ -73,6 +75,8 @@ * XXXTHR - Check this list. */ static void *references[] = { + &_thread_init_hack, + &_thread_init, &_accept, &_bind, &_close, @@ -135,6 +139,8 @@ * libraries, then the actual functions will not be loaded. */ static void *libgcc_references[] = { + &_thread_init_hack, + &_thread_init, &_pthread_once, &_pthread_key_create, &_pthread_key_delete, ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.14 2003/05/26 00:37:07 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.15 2003/06/03 09:31:33 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -141,7 +141,7 @@ */ #define TAILQ_INITIALIZER { NULL, NULL } -#define UMTX_INITIALIZER { NULL, NULL } +#define UMTX_INITIALIZER { NULL } struct pthread_mutex_attr { enum pthread_mutextype m_type; ==== //depot/projects/hammer/lib/libwrap/Makefile#4 (text+ko) ==== @@ -1,9 +1,7 @@ # -# $FreeBSD: src/lib/libwrap/Makefile,v 1.12 2003/05/12 21:59:16 hmp Exp $ +# $FreeBSD: src/lib/libwrap/Makefile,v 1.13 2003/06/04 16:01:37 markm Exp $ # -MAINTAINER=markm@FreeBSD.org - LIB= wrap SHLIB_MAJOR= 3 INCS= tcpd.h ==== //depot/projects/hammer/libexec/rtld-elf/Makefile#5 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.19 2003/05/29 22:58:22 kan Exp $ +# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.20 2003/06/04 05:42:04 obrien Exp $ PROG= ld-elf.so.1 SRCS= rtld_start.S rtld.c rtld_lock.c map_object.c malloc.c \ xmalloc.c debug.c reloc.c MAN= rtld.1 +CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} LDFLAGS+= -nostdlib -e .rtld_start ==== //depot/projects/hammer/libexec/tcpd/Makefile#3 (text+ko) ==== @@ -1,6 +1,4 @@ -# $FreeBSD: src/libexec/tcpd/Makefile,v 1.2 2003/06/02 02:35:58 obrien Exp $ - -MAINTAINER= markm@FreeBSD.org +# $FreeBSD: src/libexec/tcpd/Makefile,v 1.3 2003/06/04 15:59:13 markm Exp $ PROG= tcpd MAN= tcpd.8 ==== //depot/projects/hammer/release/Makefile#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.780 2003/06/02 20:15:12 jhb Exp $ +# $FreeBSD: src/release/Makefile,v 1.782 2003/06/04 22:24:43 peter Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -463,17 +463,12 @@ echo " cd /usr/src" >> ${_MK} echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} echo " touch /tmp/.world_done" >> ${_MK} - echo " ${CROSSMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \\" >> ${_MK} - echo " -DNOPROFILE installworld" >> ${_MK} echo "fi" >> ${_MK} -.if defined(NOPORTS) || defined(NOPORTREADMES) - echo "if false; then" >> ${_MK} -.else - echo "if true; then" >> ${_MK} -.endif + echo "if [ ! -f /tmp/.skip_ports ]; then" >> ${_MK} echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} echo " cd /usr/ports" >> ${_MK} echo " make ${PORTREADMES_FLAGS} readmes" >> ${_MK} + echo " touch /tmp/.skip_ports" >> ${_MK} echo " echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} echo "fi" >> ${_MK} echo "cd /usr/src/release" >> ${_MK} @@ -481,6 +476,9 @@ echo "make \$${_RELTARGET}" >> ${_MK} echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} chmod 755 ${_MK} +.if defined(NOPORTS) || defined(NOPORTREADMES) + touch ${CHROOTDIR}/tmp/.skip_ports +.endif # Ensure md.ko is loaded if md(4) is not statically compiled into the kernel -mdconfig 2>/dev/null env -i /usr/sbin/chroot ${CHROOTDIR} /mk ==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#9 (text+ko) ==== @@ -53,7 +53,7 @@ #endif /* not lint */ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 4 16:46:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D89CF37B404; Wed, 4 Jun 2003 16:46:20 -0700 (PDT) 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 79BA137B401 for ; Wed, 4 Jun 2003 16:46:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2647A43F93 for ; Wed, 4 Jun 2003 16:46:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h54NkJ0U053293 for ; Wed, 4 Jun 2003 16:46:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h54NkJpD053290 for perforce@freebsd.org; Wed, 4 Jun 2003 16:46:19 -0700 (PDT) Date: Wed, 4 Jun 2003 16:46:19 -0700 (PDT) Message-Id: <200306042346.h54NkJpD053290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2003 23:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=32605 Change 32605 by peter@peter_hammer on 2003/06/04 16:45:30 add a hook for local ports patches Affected files ... .. //depot/projects/hammer/release/Makefile#29 edit Differences ... ==== //depot/projects/hammer/release/Makefile#29 (text+ko) ==== @@ -367,6 +367,9 @@ .if !defined(NOPORTSATALL) cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE} .endif +.if defined(LOCAL_PORTSPATCHES) && exists(${LOCAL_PORTSPATCHES}) + cd ${CHROOTDIR}/usr/ports && patch ${PORTSPATCH_FLAGS} < ${LOCAL_PORTSPATCHES} +.endif .if !defined(NODOC) rm -rf ${CHROOTDIR}/usr/doc .if defined(EXTDOCDIR) From owner-p4-projects@FreeBSD.ORG Wed Jun 4 23:12:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDCD737B404; Wed, 4 Jun 2003 23:12:18 -0700 (PDT) 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 59AC537B401 for ; Wed, 4 Jun 2003 23:12:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CA3D43FB1 for ; Wed, 4 Jun 2003 23:12:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h556CG0U084363 for ; Wed, 4 Jun 2003 23:12:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h556CD2c084360 for perforce@freebsd.org; Wed, 4 Jun 2003 23:12:13 -0700 (PDT) Date: Wed, 4 Jun 2003 23:12:13 -0700 (PDT) Message-Id: <200306050612.h556CD2c084360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2003 06:12:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=32617 Change 32617 by rwatson@rwatson_tislabs on 2003/06/04 23:11:40 Integ the TrustedBSD base branch to bring in various 5.1-RELEASE and post-5.1-RELEASE changes: OpenPAM Update More amd64 bits Threading bugfixes Extended attribute list operation changes Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#16 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#5 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#15 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/ed/cbc.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/pam_unix.c#6 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#26 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#14 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#24 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#12 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#13 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias_db.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libalias/libalias.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlinfo.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/ldexp.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/gbk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/extattr_get_file.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldload.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/arch/amd64/_atomic_lock.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/test/guard_b.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/test/join_leak_d.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/test/mutex_d.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt-md5.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt-nthash.c#1 branch .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/geom_ctl.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#20 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/Makefile#5 delete .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/pam_ftp.8#3 delete .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/pam_ftp.c#8 delete .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/Makefile#5 delete .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/pam_wheel.8#4 delete .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/pam_wheel.c#9 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#5 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#8 integrate .. //depot/projects/trustedbsd/base/libexec/rpc.rusersd/rusers_proc.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#9 integrate .. //depot/projects/trustedbsd/base/libexec/tcpd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/Makefile#44 integrate .. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#13 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#15 integrate .. //depot/projects/trustedbsd/base/release/pc98/drivers.conf#11 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/runtest.sh#3 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/sunlabel/sunlabel.c#3 integrate .. //depot/projects/trustedbsd/base/secure/Makefile#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcipher/Makefile#3 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/README#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/README.FreeBSD#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/cipher.3#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/crypt.c#4 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/Makefile#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/README#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/cert.c#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/cert.input#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/speedcrypt.c#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/speeddes.c#2 delete .. //depot/projects/trustedbsd/base/secure/lib/libcrypt/blowfish.c#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypt/blowfish.h#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypt/crypt-blowfish.c#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#16 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/bdes/bdes.1#3 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#32 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/en.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/mac.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_biba.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_bsdextended.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_ifoff.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_lomac.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_mls.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_none.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_partition.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_seeotheruids.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_test.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/en.4#3 delete .. //depot/projects/trustedbsd/base/share/man/man4/raid.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sem.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#28 integrate .. //depot/projects/trustedbsd/base/share/man/man7/maclabel.7#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VFS_SET.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VFS_VGET.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_GETEXTATTR.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/devclass.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/devclass_find.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/extattr.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ktr.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/namei.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#15 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#8 integrate .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/asm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/param.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/profile.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#25 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcireg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_init.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/syscons/scmouse.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinum.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#27 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#24 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ccd.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.h#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ext.h#3 delete .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/OsdEnvironment.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/autoconf.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/bios.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/critical.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_disasm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_interface.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/i386-gdbstub.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/i686_mem.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/in_cksum.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/initcpu.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/math_emulate.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mem.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mpapic.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/nexus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/perfmon.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm86.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_errno.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_fcntl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ioctl.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ipc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_other.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_signal.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_stat.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_util.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/asm.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/profile.h#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/asc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/cronyx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/ctx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/cx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/cy.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/elink.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/gpib.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/gsc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_cx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_el.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_le.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_rdp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/isa.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/isa_dma.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/istallion.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/ithread.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/loran.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/mse.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcaudio.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcf.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spic.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spigot.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spkr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/stallion.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/wt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/imgact_linux.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_ptrace.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#15 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#34 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#15 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_vol_ffs/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/au88x0/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_media.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_encap.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/clock.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/ppc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#25 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/ofw_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#30 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#28 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/ccdvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/extattr.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/filedesc.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/kernel.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/kse.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#41 integrate .. //depot/projects/trustedbsd/base/sys/sys/sem.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#32 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#32 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/umtx.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#35 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#14 integrate .. //depot/projects/trustedbsd/base/tools/regression/ccd/layout/ccd.sh#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.s3.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.s4.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.s5.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sg.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/crypto/cryptotest.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/checknr/checknr.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/env/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/env/env.1#1 branch .. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/lorder/lorder.sh#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/printenv/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/printenv/printenv.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/process.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/stat/stat.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/unifdef/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#25 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chroot/chroot.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/extattr/rmextattr.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sendmail/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#18 integrate .. //depot/projects/trustedbsd/base/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.8#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.65 2003/06/05 05:03:01 roberto Exp $ subsystem login notes ----------------------------- @@ -78,3 +78,101 @@ sppp(4) joerg Just keep me informed of changes, try not to break it. libc nectar Opportuntity for pre-commit review appreciated for nsdispatch(3) and its consumers. +unifdef(1) fanf Pre-commit review requested. +ntp roberto Pre-commit review requested. + +Following are the entries from the Makefiles, and a few other sources. +Please remove stale entries from both their origin, and this file. + +Please also consider removing the lines from the files listed below and +stating your preferences here instead. + +bin/dd/Makefile:MAINTAINER= green@FreeBSD.org +bin/rmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter@FreeBSD.org +games/fortune/datfiles/Makefile:MAINTAINER= jkh@FreeBSD.org +gnu/usr.bin/binutils/Makefile:MAINTAINER= obrien@FreeBSD.org +gnu/usr.bin/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/doc/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/lib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch@FreeBSD.org +lib/libbz2/Makefile:MAINTAINER= obrien@FreeBSD.org +lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org +lib/libcam/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libdevstat/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libmilter/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsm/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmdb/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmutil/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG +lib/libz/Makefile:MAINTAINER= peter@FreeBSD.org +libexec/lukemftpd/Makefile:MAINTAINER= obrien@FreeBSD.org +libexec/mail.local/Makefile:MAINTAINER= gshapiro@FreeBSD.org +libexec/smrsh/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sbin/camcontrol/Makefile:MAINTAINER= ken@FreeBSD.org +sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org +sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/ipf/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipfstat/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipmon/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipnat/Makefile:MAINTAINER= guido@freebsd.org +share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro@FreeBSD.org +share/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/boot/i386/pxeldr/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org +sys/dev/asr/MAINTAINER:MAINTAINER= obrien@freebsd.org, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com +sys/dev/bktr/CHANGELOG.TXT:MAINTAINER= Roger Hardiman +sys/dev/ep/if_ep.c:MAINTAINER= Matthew N. Dodd +sys/dev/ex/if_ex.c:MAINTAINER= Matthew N. Dodd +sys/dev/ie/if_ie.c:MAINTAINER= Matthew N. Dodd +sys/dev/sound/pcm/feeder_rate.c:MAINTAINER= Orion Hodson +sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org +sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org +sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/linux/Makefile:MAINTAINER= emulation@FreeBSD.org +sys/modules/osf1/Makefile:MAINTAINER= gallatin@FreeBSD.org +sys/modules/pecoff/Makefile:MAINTAINER= takawata@FreeBSD.org +sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org +sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org +sys/modules/udbp/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ugen/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uhid/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ukbd/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ulpt/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umass/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umodem/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ums/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi +sys/modules/usb/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org +usr.bin/brandelf/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2recover/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/chat/Makefile:MAINTAINER= peter@freebsd.org +usr.bin/locate/Makefile:MAINTAINER= wosch@FreeBSD.org +usr.bin/vacation/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.bin/whois/Makefile:MAINTAINER= mike@FreeBSD.org +usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org +usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG +usr.sbin/ipftest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipresend/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipsend/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/iptest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org +usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org +usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/makemap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh@FreeBSD.org +usr.sbin/pppd/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/praliases/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/trustedbsd/base/bin/df/df.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -148,9 +148,7 @@ .Sh BUGS The .Fl n -and -.Fl t -flags are ignored if a file or file system is specified. +flag is ignored if a file or file system is specified. .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , ==== //depot/projects/trustedbsd/base/bin/df/df.c#15 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $"); #include #include @@ -271,6 +271,7 @@ } } else mntpt = *argv; + /* * Statfs does not take a `wait' flag, so we cannot * implement nflag here. @@ -280,6 +281,18 @@ rv = 1; continue; } + + /* + * Check to make sure the arguments we've been given are + * satisfied. Return an error if we have been asked to + * list a mount point that does not match the other args + * we've been given (-l, -t, etc.). + */ + if (checkvfsname(statfsbuf.f_fstypename, vfslist)) { + rv = 1; + continue; + } + if (argc == 1) { bzero(&maxwidths, sizeof(maxwidths)); update_maxwidths(&maxwidths, &statfsbuf); ==== //depot/projects/trustedbsd/base/bin/ed/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.23 2003/06/02 19:06:28 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,8 +8,8 @@ .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES -DPADD= ${LIBCIPHER} -LDADD= -lcipher +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto .endif .include ==== //depot/projects/trustedbsd/base/bin/ed/cbc.c#5 (text+ko) ==== @@ -36,13 +36,15 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.19 2003/06/03 17:03:48 jhay Exp $"); #include #include #include #ifdef DES #include +#include +#define ED_DES_INCLUDES #endif #include "ed.h" @@ -56,12 +58,9 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ - des_error("des_setkey"); #define DES_XFORM(buf) \ - if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ - des_error("des_cipher"); + DES_ecb_encrypt(buf, buf, &schedule, \ + inverse ? DES_DECRYPT : DES_ENCRYPT); /* * read/write - no error checking @@ -70,15 +69,6 @@ #define WRITE(buf, n, fp) fwrite(buf, sizeof(char), n, fp) /* - * some things to make references easier - */ -typedef char Desbuf[8]; -#define CHAR(x,i) (x[i]) -#define UCHAR(x,i) (x[i]) -#define BUFFER(x) (x) -#define UBUFFER(x) (x) - -/* * global variables and related macros */ @@ -86,18 +76,25 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; -Desbuf ivec; /* initialization vector */ -Desbuf pvec; /* padding vector */ +#ifdef DES +DES_cblock ivec; /* initialization vector */ +DES_cblock pvec; /* padding vector */ +#endif + char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' }; + int pflag; /* 1 to preserve parity bits */ +#ifdef DES +DES_key_schedule schedule; /* expanded DES key */ +#endif + unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */ int des_n = 0; /* index for put_des_char/get_des_char */ - /* init_des_cipher: initialize DES */ void init_des_cipher(void) @@ -112,7 +109,7 @@ /* initialize the padding vector */ for (i = 0; i < 8; i++) - CHAR(pvec, i) = (char) (arc4random() % 256); + pvec[i] = (char) (arc4random() % 256); #endif } @@ -172,7 +169,7 @@ get_keyword(void) { char *p; /* used to obtain the key */ - Desbuf msgbuf; /* I/O buffer */ + DES_cblock msgbuf; /* I/O buffer */ /* * get the key @@ -182,9 +179,9 @@ /* * copy it, nul-padded, into the key area */ - expand_des_key(BUFFER(msgbuf), p); + expand_des_key(msgbuf, p); MEMZERO(p, _PASSWORD_LEN); - set_des_key(msgbuf); + set_des_key(&msgbuf); MEMZERO(msgbuf, sizeof msgbuf); return 1; } @@ -303,7 +300,7 @@ * DES ignores the low order bit of each character. */ void -set_des_key(Desbuf buf) /* key block */ +set_des_key(DES_cblock *buf) /* key block */ { int i, j; /* counter in a for loop */ int par; /* parity counter */ @@ -315,16 +312,17 @@ for (i = 0; i < 8; i++) { par = 0; for (j = 1; j < 8; j++) - if ((bits[j]&UCHAR(buf, i)) != 0) + if ((bits[j] & (*buf)[i]) != 0) par++; - if ((par&01) == 01) - UCHAR(buf, i) = UCHAR(buf, i)&0177; + if ((par & 0x01) == 0x01) + (*buf)[i] &= 0x7f; else - UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200; + (*buf)[i] = ((*buf)[i] & 0x7f) | 0x80; } } - DES_KEY(UBUFFER(buf)); + DES_set_odd_parity(buf); + DES_set_key(buf, &schedule); } @@ -341,10 +339,10 @@ */ if (n == 8) { for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + MEMCPY(ivec, msgbuf, 8); + return WRITE(msgbuf, 8, fp); } /* * at EOF or last block -- in either case, the last byte contains @@ -356,12 +354,12 @@ /* * Pad the last block randomly */ - (void)MEMCPY(BUFFER(msgbuf + n), BUFFER(pvec), 8 - n); - CHAR(msgbuf, 7) = n; + (void)MEMCPY(msgbuf + n, pvec, 8 - n); + msgbuf[7] = n; for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + return WRITE(msgbuf, 8, fp); } /* @@ -372,25 +370,25 @@ int cbc_decode(unsigned char *msgbuf, FILE *fp) { - Desbuf tbuf; /* temp buffer for initialization vector */ + DES_cblock tbuf; /* temp buffer for initialization vector */ int n; /* number of bytes actually read */ int c; /* used to test for EOF */ int inverse = 1; /* 0 to encrypt, 1 to decrypt */ - if ((n = READ(BUFFER(msgbuf), 8, fp)) == 8) { + if ((n = READ(msgbuf, 8, fp)) == 8) { /* * do the transformation */ - MEMCPY(BUFFER(tbuf), BUFFER(msgbuf), 8); - DES_XFORM(UBUFFER(msgbuf)); + MEMCPY(tbuf, msgbuf, 8); + DES_XFORM((DES_cblock *)msgbuf); for (c = 0; c < 8; c++) - UCHAR(msgbuf, c) ^= UCHAR(ivec, c); - MEMCPY(BUFFER(ivec), BUFFER(tbuf), 8); + msgbuf[c] ^= ivec[c]; + MEMCPY(ivec, tbuf, 8); /* * if the last one, handle it specially */ if ((c = fgetc(fp)) == EOF) { - n = CHAR(msgbuf, 7); + n = msgbuf[7]; if (n < 0 || n > 7) { des_error("decryption failed (block corrupted)"); return EOF; ==== //depot/projects/trustedbsd/base/bin/ed/ed.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.19 2003/06/02 19:06:28 markm Exp $ */ #include @@ -175,6 +175,18 @@ /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */ #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0') +#ifdef ED_DES_INCLUDES +void des_error(const char *); +void expand_des_key(char *, char *); +void set_des_key(DES_cblock *); +#endif + +/* Other DES support stuff */ +void init_des_cipher(void); +int flush_des_file(FILE *); +int get_des_char(FILE *); +int put_des_char(int, FILE *); + /* Local Function Declarations */ void add_line_node(line_t *); int append_lines(long); @@ -188,21 +200,17 @@ int close_sbuf(void); int copy_lines(long); int delete_lines(long, long); -void des_error(const char *); int display_lines(long, long, int); line_t *dup_line_node(line_t *); int exec_command(void); long exec_global(int, int); -void expand_des_key(char *, char *); int extract_addr_range(void); char *extract_pattern(int); int extract_subst_tail(int *, long *); char *extract_subst_template(void); int filter_lines(long, long, char *); -int flush_des_file(FILE *); line_t *get_addressed_line_node(long); pattern_t *get_compiled_pattern(void); -int get_des_char(FILE *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 5 12:44:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEADA37B404; Thu, 5 Jun 2003 12:44:45 -0700 (PDT) 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 6C31137B401 for ; Thu, 5 Jun 2003 12:44:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA75E43F3F for ; Thu, 5 Jun 2003 12:44:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h55Jih0U046601 for ; Thu, 5 Jun 2003 12:44:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h55Jihri046598 for perforce@freebsd.org; Thu, 5 Jun 2003 12:44:43 -0700 (PDT) Date: Thu, 5 Jun 2003 12:44:43 -0700 (PDT) Message-Id: <200306051944.h55Jihri046598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2003 19:44:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=32631 Change 32631 by marcel@marcel_nfs on 2003/06/05 12:44:35 IFC @32630 Affected files ... .. //depot/projects/ia64/MAINTAINERS#27 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#14 integrate .. //depot/projects/ia64/lib/libmd/md2c.c#2 integrate .. //depot/projects/ia64/lib/libmd/md4c.c#2 integrate .. //depot/projects/ia64/lib/libmd/md5c.c#4 integrate .. //depot/projects/ia64/release/Makefile#55 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#55 integrate .. //depot/projects/ia64/share/man/man9/Makefile#25 integrate .. //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#9 integrate .. //depot/projects/ia64/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#6 integrate .. //depot/projects/ia64/share/man/man9/extattr.9#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/ia64/sys/dev/em/README#7 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#23 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#14 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#9 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#10 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#44 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#12 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#14 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#27 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#17 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#12 integrate .. //depot/projects/ia64/usr.bin/sed/process.c#14 integrate .. //depot/projects/ia64/usr.sbin/extattr/rmextattr.c#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/Makefile.inc#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#27 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.64 2003/06/04 16:05:38 markm Exp $ +$FreeBSD: src/MAINTAINERS,v 1.65 2003/06/05 05:03:01 roberto Exp $ subsystem login notes ----------------------------- @@ -79,6 +79,7 @@ libc nectar Opportuntity for pre-commit review appreciated for nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. +ntp roberto Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. @@ -169,8 +170,6 @@ usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/makemap/Makefile:MAINTAINER= gshapiro@FreeBSD.org -usr.sbin/ntp/Makefile:MAINTAINER= roberto@FreeBSD.org -usr.sbin/ntp/Makefile.inc:MAINTAINER= roberto@FreeBSD.org usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh@FreeBSD.org usr.sbin/pppd/Makefile:MAINTAINER= peter@freebsd.org usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#14 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.25 2003/06/02 18:43:15 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.26 2003/06/05 13:18:43 ru Exp $ .\" .\" %beginstrip% . @@ -52,7 +52,7 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . .\" Default .Os value -.ds doc-operating-system FreeBSD\~5.0 +.ds doc-operating-system FreeBSD\~5.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-4.9 4.9 ==== //depot/projects/ia64/lib/libmd/md2c.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libmd/md2c.c,v 1.9 2001/09/30 21:56:22 dillon Exp $"); +__FBSDID("$FreeBSD: src/lib/libmd/md2c.c,v 1.10 2003/06/05 13:17:32 markm Exp $"); /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights reserved. @@ -104,32 +104,32 @@ const unsigned char *input; /* input block */ unsigned int inputLen; /* length of input block */ { - unsigned int i, index, partLen; + unsigned int i, idx, partLen; /* Update number of bytes mod 16 */ - index = context->count; - context->count = (index + inputLen) & 0xf; + idx = context->count; + context->count = (idx + inputLen) & 0xf; - partLen = 16 - index; + partLen = 16 - idx; /* Transform as many times as possible. */ if (inputLen >= partLen) { memcpy - ((POINTER)&context->buffer[index], (POINTER)input, partLen); + ((POINTER)&context->buffer[idx], (POINTER)input, partLen); MD2Transform (context->state, context->checksum, context->buffer); for (i = partLen; i + 15 < inputLen; i += 16) MD2Transform (context->state, context->checksum, &input[i]); - index = 0; + idx = 0; } else i = 0; /* Buffer remaining input */ memcpy - ((POINTER)&context->buffer[index], (POINTER)&input[i], + ((POINTER)&context->buffer[idx], (POINTER)&input[i], inputLen-i); } @@ -138,12 +138,12 @@ void MD2Pad (context) MD2_CTX *context; /* context */ { - unsigned int index, padLen; + unsigned int idx, padLen; /* Pad out to multiple of 16. */ - index = context->count; - padLen = 16 - index; + idx = context->count; + padLen = 16 - idx; MD2Update (context, PADDING[padLen], padLen); /* Extend with checksum */ ==== //depot/projects/ia64/lib/libmd/md4c.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libmd/md4c.c,v 1.8 2001/09/30 21:56:22 dillon Exp $"); +__FBSDID("$FreeBSD: src/lib/libmd/md4c.c,v 1.9 2003/06/05 13:17:32 markm Exp $"); /* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved. @@ -30,6 +30,7 @@ #include "md4.h" typedef unsigned char *POINTER; +typedef const unsigned char *CONST_POINTER; typedef u_int16_t UINT2; typedef u_int32_t UINT4; @@ -111,35 +112,35 @@ const unsigned char *input; /* input block */ unsigned int inputLen; /* length of input block */ { - unsigned int i, index, partLen; + unsigned int i, idx, partLen; /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); + idx = (unsigned int)((context->count[0] >> 3) & 0x3F); /* Update number of bits */ if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3)) context->count[1]++; context->count[1] += ((UINT4)inputLen >> 29); - partLen = 64 - index; + partLen = 64 - idx; /* Transform as many times as possible. */ if (inputLen >= partLen) { memcpy - ((POINTER)&context->buffer[index], (POINTER)input, partLen); + ((POINTER)&context->buffer[idx], (CONST_POINTER)input, partLen); MD4Transform (context->state, context->buffer); for (i = partLen; i + 63 < inputLen; i += 64) MD4Transform (context->state, &input[i]); - index = 0; + idx = 0; } else i = 0; /* Buffer remaining input */ memcpy - ((POINTER)&context->buffer[index], (POINTER)&input[i], + ((POINTER)&context->buffer[idx], (CONST_POINTER)&input[i], inputLen-i); } @@ -148,15 +149,15 @@ MD4_CTX *context; /* context */ { unsigned char bits[8]; - unsigned int index, padLen; + unsigned int idx, padLen; /* Save number of bits */ Encode (bits, context->count, 8); /* Pad out to 56 mod 64. */ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); + idx = (unsigned int)((context->count[0] >> 3) & 0x3f); + padLen = (idx < 56) ? (56 - idx) : (120 - idx); MD4Update (context, PADDING, padLen); /* Append length (before padding) */ ==== //depot/projects/ia64/lib/libmd/md5c.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.15 2002/06/24 13:52:26 mux Exp $"); +__FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.16 2003/06/05 13:17:32 markm Exp $"); #include @@ -152,10 +152,10 @@ const unsigned char *input; unsigned int inputLen; { - unsigned int i, index, partLen; + unsigned int i, idx, partLen; /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); + idx = (unsigned int)((context->count[0] >> 3) & 0x3F); /* Update number of bits */ if ((context->count[0] += ((u_int32_t)inputLen << 3)) @@ -163,24 +163,24 @@ context->count[1]++; context->count[1] += ((u_int32_t)inputLen >> 29); - partLen = 64 - index; + partLen = 64 - idx; /* Transform as many times as possible. */ if (inputLen >= partLen) { - memcpy((void *)&context->buffer[index], (const void *)input, + memcpy((void *)&context->buffer[idx], (const void *)input, partLen); MD5Transform (context->state, context->buffer); for (i = partLen; i + 63 < inputLen; i += 64) MD5Transform (context->state, &input[i]); - index = 0; + idx = 0; } else i = 0; /* Buffer remaining input */ - memcpy ((void *)&context->buffer[index], (const void *)&input[i], + memcpy ((void *)&context->buffer[idx], (const void *)&input[i], inputLen-i); } @@ -193,14 +193,14 @@ MD5_CTX *context; { unsigned char bits[8]; - unsigned int index, padLen; + unsigned int idx, padLen; /* Save number of bits */ Encode (bits, context->count, 8); /* Pad out to 56 mod 64. */ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); + idx = (unsigned int)((context->count[0] >> 3) & 0x3f); + padLen = (idx < 56) ? (56 - idx) : (120 - idx); MD5Update (context, PADDING, padLen); /* Append length (before padding) */ ==== //depot/projects/ia64/release/Makefile#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.781 2003/06/04 05:17:18 marcel Exp $ +# $FreeBSD: src/release/Makefile,v 1.782 2003/06/04 22:24:43 peter Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -694,7 +694,7 @@ .if ${TARGET_ARCH} != "ia64" @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot .endif -.if ${TARGET} == "i386" +.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot .endif @echo "Making the regular boot floppy." ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#55 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.157 2003/05/30 11:24:00 nyan Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.158 2003/06/05 15:13:46 bmah Exp $ Supported Devices @@ -155,7 +155,7 @@ driver) - Adaptec 19160/291x/2920/2930/2940/2950/29160/3940/3950/3960/39160/398x/494x + Adaptec 19160/291x/2920C/2930/2940/2950/29160/3940/3950/3960/39160/398x/494x series PCI SCSI controllers, including Narrow/Wide/Twin/Ultra/Ultra2 variants (&man.ahc.4; driver) @@ -727,12 +727,18 @@ - TMC 18C30, 18C50 based ISA/PC-Card SCSI host + TMC 18C30, 18C50 and 36C70 (AIC-6820) based ISA/PC-Card SCSI host adapters (stg driver) + Adaptec 2920/A + + Future Domain SCSI2GO + + Future Domain TMC-18XX/3260 + IBM SCSI PCMCIA Card ==== //depot/projects/ia64/share/man/man9/Makefile#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.192 2003/05/30 22:57:54 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.193 2003/06/05 14:20:48 rwatson Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \ @@ -15,8 +15,8 @@ VOP_ACLCHECK.9 VOP_ADVLOCK.9 VOP_ATTRIB.9 VOP_BWRITE.9 \ VOP_CREATE.9 VOP_FSYNC.9 VOP_GETACL.9 VOP_GETEXTATTR.9 \ VOP_GETPAGES.9 VOP_GETVOBJECT.9 VOP_INACTIVE.9 VOP_IOCTL.9 \ - VOP_LEASE.9 VOP_LINK.9 VOP_LOCK.9 VOP_LOOKUP.9 VOP_OPENCLOSE.9 \ - VOP_PATHCONF.9 VOP_PRINT.9 VOP_RDWR.9 VOP_READDIR.9 \ + VOP_LEASE.9 VOP_LINK.9 VOP_LISTEXTATTR.9 VOP_LOCK.9 VOP_LOOKUP.9 \ + VOP_OPENCLOSE.9 VOP_PATHCONF.9 VOP_PRINT.9 VOP_RDWR.9 VOP_READDIR.9 \ VOP_READLINK.9 VOP_REALLOCBLKS.9 VOP_REMOVE.9 VOP_RENAME.9 \ VOP_REVOKE.9 VOP_SETACL.9 VOP_SETEXTATTR.9 VOP_STRATEGY.9 \ accept_filter.9 accf_data.9 accf_http.9 acl.9 atomic.9 \ ==== //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.17 2003/06/04 04:03:58 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.19 2003/06/05 14:20:48 rwatson Exp $ .\" .Dd December 23, 1999 .Os @@ -98,8 +98,8 @@ reflect data read. Otherwise, an appropriate error code is returned. .Sh ERRORS .Bl -tag -width Er -.It Bq Er ENOENT -The attribute name is not defined for this vnode. +.It Bq Er ENOATTR +The requested attribute was not defined for this vnode. .It Bq Er EACCES The the caller does not have the appropriate privilege. .It Bq Er ENXIO @@ -111,7 +111,8 @@ The uio structure refers to an invalid userspace address. .It Bq Er EINVAL The -.Fa name +.Fa name , +.Fa namespace, or .Fa uio argument is invalid. @@ -122,6 +123,7 @@ .Sh SEE ALSO .Xr extattr 9 , .Xr vnode 9 , +.Xr VOP_LISTEXTATTR 9 .Xr VOP_SETEXTATTR 9 .Sh BUGS By passing in the empty string as the attribute name, some file systems ==== //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.14 2002/12/12 17:25:58 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.16 2003/06/05 14:20:48 rwatson Exp $ .\" .Dd December 23, 1999 .Os @@ -100,7 +100,7 @@ .It Bq Er EFAULT The uio structure refers to an invalid userspace address. .It Bq Er EINVAL -The name or uio argument is invalid. +The name, namespace, or uio argument is invalid. .It Bq Er EOPNOTSUPP The file system does not support .Fn VOP_SETEXTATTR . @@ -113,6 +113,7 @@ .Xr extattr 9 , .Xr vnode 9 , .Xr VOP_GETEXTATTR 9 +.Xr VOP_LISTEXTATTR 9 .Sh AUTHORS This man page was written by .An Robert Watson . ==== //depot/projects/ia64/share/man/man9/extattr.9#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/extattr.9,v 1.12 2003/06/04 04:01:44 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/extattr.9,v 1.13 2003/06/05 14:20:48 rwatson Exp $ .\" .Dd December 23, 1999 .Os @@ -73,13 +73,15 @@ Extended attributes are named using a null-terminated character string. Depending on underlying file system semantics, this name may or may not be case-sensitive. Appropriate vnode extended attribute calls are: -.Xr VOP_GETEXTATTR 9 +.Xr VOP_GETEXTATTR 9 , +.Xr VOP_LISTEXTATTR 9 , and .Xr VOP_SETEXTATTR 9 . .Sh SEE ALSO .Xr VFS 9 , .Xr VFS_EXTATTRCTL 9 , .Xr VOP_GETEXTATTR 9 , +.Xr VOP_LISTEXTATTR 9 , .Xr VOP_SETEXTATTR 9 .Sh AUTHORS This man page was written by ==== //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.209 2003/05/23 05:04:54 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.210 2003/06/04 22:46:27 marcel Exp $ */ #include "opt_isa.h" @@ -219,7 +219,7 @@ * such as those generated in thread_userret() itself. */ void -cpu_set_upcall(struct thread *td, void *pcb) +cpu_set_upcall(struct thread *td, struct thread *td0) { } ==== //depot/projects/ia64/sys/dev/em/README#7 (text+ko) ==== @@ -1,8 +1,8 @@ -$FreeBSD: src/sys/dev/em/README,v 1.6 2003/03/21 21:47:30 pdeuskar Exp $ +$FreeBSD: src/sys/dev/em/README,v 1.7 2003/06/05 17:51:37 pdeuskar Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ -February 5, 2003 +April 13, 2003 Contents @@ -65,6 +65,8 @@ 82546 PRO/1000 MF Dual Port Server Adapter A91620-xxx + 82546EB PRO/1000 MT Quad Port Server Adapter C11227-xxx + To verify your Intel adapter is supported, find the board ID number on the @@ -126,7 +128,7 @@ cp if_em* /usr/src/sys/dev/em - cp Makefile /usr/src/sys/modules/em + cp Makefile.kernel /usr/src/sys/modules/em/Makefile Edit the /usr/src/sys/conf/files.i386 file, and add the following lines: ==== //depot/projects/ia64/sys/dev/em/if_em.c#23 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.25 2003/05/06 03:55:12 des Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.26 2003/06/05 17:51:37 pdeuskar Exp $*/ #include @@ -51,7 +51,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "1.5.31"; +char em_driver_version[] = "1.6.6"; /********************************************************************* @@ -87,6 +87,7 @@ { 0x8086, 0x1018, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1019, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x101A, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x101D, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x101E, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} @@ -158,6 +159,10 @@ static int em_dma_malloc(struct adapter *, bus_size_t, struct em_dma_alloc *, int); static void em_dma_free(struct adapter *, struct em_dma_alloc *); +static void em_print_debug_info(struct adapter *); +static int em_is_valid_ether_addr(u_int8_t *); +static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); +static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); /********************************************************************* * FreeBSD Device Interface Entry Points @@ -249,6 +254,7 @@ struct adapter * adapter; int s; int tsize, rsize; + int error = 0; INIT_DEBUGOUT("em_attach: begin"); s = splimp(); @@ -269,6 +275,31 @@ adapter->next = em_adapter_list; em_adapter_list = adapter; + /* SYSCTL stuff */ + sysctl_ctx_init(&adapter->sysctl_ctx); + adapter->sysctl_tree = SYSCTL_ADD_NODE(&adapter->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_hw), + OID_AUTO, + device_get_nameunit(dev), + CTLFLAG_RD, + 0, ""); + if (adapter->sysctl_tree == NULL) { + error = EIO; + goto err_sysctl; + } + + SYSCTL_ADD_PROC(&adapter->sysctl_ctx, + SYSCTL_CHILDREN(adapter->sysctl_tree), + OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, + (void *)adapter, 0, + em_sysctl_debug_info, "I", "Debug Information"); + + SYSCTL_ADD_PROC(&adapter->sysctl_ctx, + SYSCTL_CHILDREN(adapter->sysctl_tree), + OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, + (void *)adapter, 0, + em_sysctl_stats, "I", "Statistics"); + callout_handle_init(&adapter->timer_handle); callout_handle_init(&adapter->tx_fifo_timer_handle); @@ -288,9 +319,10 @@ adapter->hw.tbi_compatibility_en = TRUE; adapter->rx_buffer_len = EM_RXBUFFER_2048; - /* These parameters control the automatic generation(Tx) and - * response(Rx) to Ethernet PAUSE frames. - */ + /* + * These parameters control the automatic generation(Tx) and + * response(Rx) to Ethernet PAUSE frames. + */ adapter->hw.fc_high_water = FC_DEFAULT_HI_THRESH; adapter->hw.fc_low_water = FC_DEFAULT_LO_THRESH; adapter->hw.fc_pause_time = FC_DEFAULT_TX_TIMER; @@ -319,9 +351,8 @@ if (em_allocate_pci_resources(adapter)) { printf("em%d: Allocation of PCI resources failed\n", adapter->unit); - em_free_pci_resources(adapter); - splx(s); - return(ENXIO); + error = ENXIO; + goto err_pci; } @@ -335,9 +366,8 @@ if (em_dma_malloc(adapter, tsize, &adapter->txdma, BUS_DMA_NOWAIT)) { printf("em%d: Unable to allocate tx_desc memory\n", adapter->unit); - em_free_pci_resources(adapter); - splx(s); - return(ENOMEM); + error = ENOMEM; + goto err_tx_desc; } adapter->tx_desc_base = (struct em_tx_desc *) adapter->txdma.dma_vaddr; @@ -348,10 +378,8 @@ if (em_dma_malloc(adapter, rsize, &adapter->rxdma, BUS_DMA_NOWAIT)) { printf("em%d: Unable to allocate rx_desc memory\n", adapter->unit); - em_free_pci_resources(adapter); - em_dma_free(adapter, &adapter->txdma); - splx(s); - return(ENOMEM); + error = ENOMEM; + goto err_rx_desc; } adapter->rx_desc_base = (struct em_rx_desc *) adapter->rxdma.dma_vaddr; @@ -359,24 +387,24 @@ if (em_hardware_init(adapter)) { printf("em%d: Unable to initialize the hardware\n", adapter->unit); - em_free_pci_resources(adapter); - em_dma_free(adapter, &adapter->txdma); - em_dma_free(adapter, &adapter->rxdma); - splx(s); - return(EIO); + error = EIO; + goto err_hw_init; } /* Copy the permanent MAC address out of the EEPROM */ if (em_read_mac_addr(&adapter->hw) < 0) { printf("em%d: EEPROM read error while reading mac address\n", adapter->unit); - em_free_pci_resources(adapter); - em_dma_free(adapter, &adapter->txdma); - em_dma_free(adapter, &adapter->rxdma); - splx(s); - return(EIO); + error = EIO; + goto err_mac_addr; } + if (!em_is_valid_ether_addr(adapter->hw.mac_addr)) { + printf("em%d: Invalid mac address\n", adapter->unit); + error = EIO; + goto err_mac_addr; + } + bcopy(adapter->hw.mac_addr, adapter->interface_data.ac_enaddr, ETHER_ADDR_LEN); @@ -403,6 +431,20 @@ INIT_DEBUGOUT("em_attach: end"); splx(s); return(0); + +err_mac_addr: +err_hw_init: + em_dma_free(adapter, &adapter->rxdma); +err_rx_desc: + em_dma_free(adapter, &adapter->txdma); +err_tx_desc: +err_pci: + em_free_pci_resources(adapter); + sysctl_ctx_free(&adapter->sysctl_ctx); +err_sysctl: + splx(s); + return(error); + } /********************************************************************* @@ -579,9 +621,13 @@ if (ifp->if_flags & IFF_RUNNING) { em_disable_intr(adapter); em_set_multi(adapter); - if (adapter->hw.mac_type == em_82542_rev2_0) + if (adapter->hw.mac_type == em_82542_rev2_0) { em_initialize_receive_unit(adapter); - em_enable_intr(adapter); + } +#ifdef DEVICE_POLLING + if (!(ifp->if_ipending & IFF_POLLING)) +#endif + em_enable_intr(adapter); } break; case SIOCSIFMEDIA: @@ -787,31 +833,30 @@ } #endif /* DEVICE_POLLING */ + reg_icr = E1000_READ_REG(&adapter->hw, ICR); + if (!reg_icr) { + return; + } - em_disable_intr(adapter); - while (loop_cnt > 0 && - (reg_icr = E1000_READ_REG(&adapter->hw, ICR)) != 0) { + /* Link status change */ + if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { + untimeout(em_local_timer, adapter, + adapter->timer_handle); + adapter->hw.get_link_status = 1; + em_check_for_link(&adapter->hw); + em_print_link_status(adapter); + adapter->timer_handle = + timeout(em_local_timer, adapter, 2*hz); + } - /* Link status change */ - if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { - untimeout(em_local_timer, adapter, - adapter->timer_handle); - adapter->hw.get_link_status = 1; - em_check_for_link(&adapter->hw); - em_print_link_status(adapter); - adapter->timer_handle = - timeout(em_local_timer, adapter, 2*hz); - } - + while (loop_cnt > 0) { if (ifp->if_flags & IFF_RUNNING) { em_process_receive_interrupts(adapter, -1); em_clean_transmit_interrupts(adapter); } loop_cnt--; } - - em_enable_intr(adapter); - + if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) em_start(ifp); @@ -1915,32 +1960,23 @@ E1000_READ_REG(&adapter->hw, TDBAL), E1000_READ_REG(&adapter->hw, TDLEN)); - /* Set the default values for the Tx Inter Packet Gap timer */ switch (adapter->hw.mac_type) { - case em_82543: - case em_82544: - case em_82540: - case em_82545: - case em_82546: - case em_82541: - case em_82547: - if (adapter->hw.media_type == em_media_type_fiber) - reg_tipg = DEFAULT_82543_TIPG_IPGT_FIBER; - else - reg_tipg = DEFAULT_82543_TIPG_IPGT_COPPER; - reg_tipg |= DEFAULT_82543_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; - reg_tipg |= DEFAULT_82543_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; - break; case em_82542_rev2_0: - case em_82542_rev2_1: - reg_tipg = DEFAULT_82542_TIPG_IPGT; - reg_tipg |= DEFAULT_82542_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; - reg_tipg |= DEFAULT_82542_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; - break; - default: - printf("em%d: Invalid mac type detected\n", adapter->unit); - } + case em_82542_rev2_1: + reg_tipg = DEFAULT_82542_TIPG_IPGT; + reg_tipg |= DEFAULT_82542_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; + reg_tipg |= DEFAULT_82542_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; + break; + default: + if (adapter->hw.media_type == em_media_type_fiber) + reg_tipg = DEFAULT_82543_TIPG_IPGT_FIBER; + else + reg_tipg = DEFAULT_82543_TIPG_IPGT_COPPER; + reg_tipg |= DEFAULT_82543_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; + reg_tipg |= DEFAULT_82543_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; + } + E1000_WRITE_REG(&adapter->hw, TIPG, reg_tipg); E1000_WRITE_REG(&adapter->hw, TIDV, adapter->tx_int_delay); if(adapter->hw.mac_type >= em_82540) @@ -2100,6 +2136,7 @@ int i, num_avail; struct em_buffer *tx_buffer; struct em_tx_desc *tx_desc; + struct ifnet *ifp = &adapter->interface_data.ac_if; if (adapter->num_tx_desc_avail == adapter->num_tx_desc) return; @@ -2120,7 +2157,7 @@ num_avail++; if (tx_buffer->m_head) { - + ifp->if_opackets++; bus_dmamap_sync(adapter->txtag, tx_buffer->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(adapter->txtag, tx_buffer->map); @@ -2128,7 +2165,6 @@ m_freem(tx_buffer->m_head); tx_buffer->m_head = NULL; - } if (++i == adapter->num_tx_desc) @@ -2146,9 +2182,7 @@ * If there are no pending descriptors, clear the timeout. Otherwise, * if some descriptors have been freed, restart the timeout. */ - if (num_avail > EM_TX_CLEANUP_THRESHOLD) { - struct ifnet *ifp = &adapter->interface_data.ac_if; - + if (num_avail > EM_TX_CLEANUP_THRESHOLD) { ifp->if_flags &= ~IFF_OACTIVE; if (num_avail == adapter->num_tx_desc) ifp->if_timer = 0; @@ -2535,6 +2569,7 @@ if (eop) { adapter->fmp->m_pkthdr.rcvif = ifp; + ifp->if_ipackets++; #if __FreeBSD_version < 500000 eh = mtod(adapter->fmp, struct ether_header *); @@ -2664,6 +2699,18 @@ return; } +static int +em_is_valid_ether_addr(u_int8_t *addr) +{ + char zero_addr[6] = { 0, 0, 0, 0, 0, 0 }; + + if ((addr[0] & 1) || (!bcmp(addr, zero_addr, ETHER_ADDR_LEN))) { + return (FALSE); + } + + return(TRUE); +} + void em_write_pci_cfg(struct em_hw *hw, uint32_t reg, @@ -2798,8 +2845,6 @@ ifp = &adapter->interface_data.ac_if; /* Fill out the OS statistics structure */ - ifp->if_ipackets = adapter->stats.gprc; - ifp->if_opackets = adapter->stats.gptc; ifp->if_ibytes = adapter->stats.gorcl; ifp->if_obytes = adapter->stats.gotcl; ifp->if_imcasts = adapter->stats.mprc; @@ -2828,68 +2873,123 @@ * **********************************************************************/ static void -em_print_hw_stats(struct adapter *adapter) +em_print_debug_info(struct adapter *adapter) { - int unit = adapter->unit; + int unit = adapter->unit; #ifdef DBG_STATS - printf("em%d: Packets not Avail = %ld\n", unit, - adapter->no_pkts_avail); - printf("em%d: CleanTxInterrupts = %ld\n", unit, - adapter->clean_tx_interrupts); + printf("em%d: Packets not Avail = %ld\n", unit, + adapter->no_pkts_avail); + printf("em%d: CleanTxInterrupts = %ld\n", unit, + adapter->clean_tx_interrupts); #endif + printf("em%d: fifo workaround = %lld, fifo_reset = %lld\n", unit, + (long long)adapter->tx_fifo_wrk, + (long long)adapter->tx_fifo_reset); + printf("em%d: hw tdh = %d, hw tdt = %d\n", unit, + E1000_READ_REG(&adapter->hw, TDH), + E1000_READ_REG(&adapter->hw, TDT)); + printf("em%d: Num Tx descriptors avail = %d\n", unit, + adapter->num_tx_desc_avail); + printf("em%d: Tx Descriptors not avail1 = %ld\n", unit, + adapter->no_tx_desc_avail1); + printf("em%d: Tx Descriptors not avail2 = %ld\n", unit, + adapter->no_tx_desc_avail2); + printf("em%d: Std mbuf failed = %ld\n", unit, + adapter->mbuf_alloc_failed); + printf("em%d: Std mbuf cluster failed = %ld\n", unit, + adapter->mbuf_cluster_failed); + printf("em%d: Driver dropped packets = %ld\n", unit, + adapter->dropped_pkts); + + return; +} + +static void +em_print_hw_stats(struct adapter *adapter) +{ + int unit = adapter->unit; + + printf("em%d: Excessive collisions = %lld\n", unit, + (long long)adapter->stats.ecol); + printf("em%d: Symbol errors = %lld\n", unit, + (long long)adapter->stats.symerrs); + printf("em%d: Sequence errors = %lld\n", unit, + (long long)adapter->stats.sec); + printf("em%d: Defer count = %lld\n", unit, + (long long)adapter->stats.dc); + + printf("em%d: Missed Packets = %lld\n", unit, + (long long)adapter->stats.mpc); + printf("em%d: Receive No Buffers = %lld\n", unit, + (long long)adapter->stats.rnbc); + printf("em%d: Receive length errors = %lld\n", unit, + (long long)adapter->stats.rlec); + printf("em%d: Receive errors = %lld\n", unit, + (long long)adapter->stats.rxerrc); + printf("em%d: Crc errors = %lld\n", unit, + (long long)adapter->stats.crcerrs); + printf("em%d: Alignment errors = %lld\n", unit, + (long long)adapter->stats.algnerrc); + printf("em%d: Carrier extension errors = %lld\n", unit, + (long long)adapter->stats.cexterr); - printf("em%d: fifo workaround = %lld, fifo_reset = %lld\n", unit, - (long long)adapter->tx_fifo_wrk, - (long long)adapter->tx_fifo_reset); - printf("em%d: hw tdh = %d, hw tdt = %d\n", unit, - E1000_READ_REG(&adapter->hw, TDH), - E1000_READ_REG(&adapter->hw, TDT)); - printf("em%d: Excessive collisions = %lld\n", unit, - (long long)adapter->stats.ecol); - printf("em%d: Tx Descriptors not avail1 = %ld\n", unit, - adapter->no_tx_desc_avail1); - printf("em%d: Tx Descriptors not avail2 = %ld\n", unit, - adapter->no_tx_desc_avail2); + printf("em%d: XON Rcvd = %lld\n", unit, + (long long)adapter->stats.xonrxc); + printf("em%d: XON Xmtd = %lld\n", unit, + (long long)adapter->stats.xontxc); + printf("em%d: XOFF Rcvd = %lld\n", unit, + (long long)adapter->stats.xoffrxc); + printf("em%d: XOFF Xmtd = %lld\n", unit, + (long long)adapter->stats.xofftxc); + + printf("em%d: Good Packets Rcvd = %lld\n", unit, + (long long)adapter->stats.gprc); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 6 09:58:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23AB037B401; Fri, 6 Jun 2003 09:58:33 -0700 (PDT) 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 96B5F37B405 for ; Fri, 6 Jun 2003 09:58:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D06643F93 for ; Fri, 6 Jun 2003 09:58:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h56GwV0U047176 for ; Fri, 6 Jun 2003 09:58:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h56GwUkU047172 for perforce@freebsd.org; Fri, 6 Jun 2003 09:58:30 -0700 (PDT) Date: Fri, 6 Jun 2003 09:58:30 -0700 (PDT) Message-Id: <200306061658.h56GwUkU047172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 32666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2003 16:58:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=32666 Change 32666 by jhb@jhb_laptop on 2003/06/06 09:57:53 IFC @32661. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#22 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#3 integrate .. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#7 integrate .. //depot/projects/smpng/sys/debugscripts/.gdbinit#1 branch .. //depot/projects/smpng/sys/debugscripts/gdbinit.i386#1 branch .. //depot/projects/smpng/sys/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/smpng/sys/debugscripts/gdbinit.vinum#1 branch .. //depot/projects/smpng/sys/dev/em/README#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#22 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#14 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#9 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#9 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#14 integrate .. //depot/projects/smpng/sys/dev/exca/excareg.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#18 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#7 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#18 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_init.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.h#4 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#29 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#25 integrate .. //depot/projects/smpng/sys/geom/geom.h#29 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#1 branch .. //depot/projects/smpng/sys/geom/geom_ctl.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#38 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#26 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#34 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#29 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#28 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#57 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#38 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#13 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/geom/geom_vol_ffs/Makefile#1 branch .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#17 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#31 integrate .. //depot/projects/smpng/sys/sys/extattr.h#7 integrate .. //depot/projects/smpng/sys/sys/kse.h#9 integrate .. //depot/projects/smpng/sys/sys/proc.h#90 integrate .. //depot/projects/smpng/sys/sys/syscall.h#29 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#29 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#31 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#19 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#24 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#38 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#20 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#23 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.84 2003/04/17 21:57:16 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.85 2003/06/04 21:13:19 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -262,7 +262,7 @@ } void -cpu_set_upcall(struct thread *td, void *pcb) +cpu_set_upcall(struct thread *td, struct thread *td0) { struct pcb *pcb2; @@ -282,7 +282,7 @@ * at this time (see the matching comment below for * more analysis) (need a good safe default). */ - bcopy(pcb, pcb2, sizeof(*pcb2)); + bcopy(td0->td_pcb, pcb2, sizeof(*pcb2)); /* * Create a new fresh stack for the new thread. @@ -291,7 +291,7 @@ * The contexts are filled in at the time we actually DO the * upcall as only then do we know which KSE we got. */ - td->td_frame = (struct trapframe *)((caddr_t)pcb2) - 1; + bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); /* * Arrange for continuation at fork_return(), which ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.209 2003/05/23 05:04:54 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.210 2003/06/04 22:46:27 marcel Exp $ */ #include "opt_isa.h" @@ -219,7 +219,7 @@ * such as those generated in thread_userret() itself. */ void -cpu_set_upcall(struct thread *td, void *pcb) +cpu_set_upcall(struct thread *td, struct thread *td0) { } ==== //depot/projects/smpng/sys/amd64/include/param.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.5 2003/05/23 05:04:54 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.6 2003/06/04 02:15:13 peter Exp $ */ /* @@ -87,7 +87,7 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) -#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER((p),(t)) +#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) /* Size of the level 1 page table units */ ==== //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#7 (text+ko) ==== @@ -1,21 +1,25 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.12 2002/09/30 20:37:57 peter Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.13 2003/06/06 13:49:51 kuriyama Exp $ -FILES= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r -BINDIR= /usr/lib .PATH: ${.CURDIR}/../../../kern -CLEANFILES=${FILES} +CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x3f8 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} +all: ${OBJS} kgzldr.o + kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} -.include +realinstall: + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + kgzldr.o ${DESTDIR}${LIBDIR} + +.include ==== //depot/projects/smpng/sys/dev/em/README#7 (text+ko) ==== @@ -1,8 +1,8 @@ -$FreeBSD: src/sys/dev/em/README,v 1.6 2003/03/21 21:47:30 pdeuskar Exp $ +$FreeBSD: src/sys/dev/em/README,v 1.7 2003/06/05 17:51:37 pdeuskar Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ -February 5, 2003 +April 13, 2003 Contents @@ -65,6 +65,8 @@ 82546 PRO/1000 MF Dual Port Server Adapter A91620-xxx + 82546EB PRO/1000 MT Quad Port Server Adapter C11227-xxx + To verify your Intel adapter is supported, find the board ID number on the @@ -126,7 +128,7 @@ cp if_em* /usr/src/sys/dev/em - cp Makefile /usr/src/sys/modules/em + cp Makefile.kernel /usr/src/sys/modules/em/Makefile Edit the /usr/src/sys/conf/files.i386 file, and add the following lines: ==== //depot/projects/smpng/sys/dev/em/if_em.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.25 2003/05/06 03:55:12 des Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.26 2003/06/05 17:51:37 pdeuskar Exp $*/ #include @@ -51,7 +51,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "1.5.31"; +char em_driver_version[] = "1.6.6"; /********************************************************************* @@ -87,6 +87,7 @@ { 0x8086, 0x1018, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1019, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x101A, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x101D, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x101E, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} @@ -158,6 +159,10 @@ static int em_dma_malloc(struct adapter *, bus_size_t, struct em_dma_alloc *, int); static void em_dma_free(struct adapter *, struct em_dma_alloc *); +static void em_print_debug_info(struct adapter *); +static int em_is_valid_ether_addr(u_int8_t *); +static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); +static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); /********************************************************************* * FreeBSD Device Interface Entry Points @@ -249,6 +254,7 @@ struct adapter * adapter; int s; int tsize, rsize; + int error = 0; INIT_DEBUGOUT("em_attach: begin"); s = splimp(); @@ -269,6 +275,31 @@ adapter->next = em_adapter_list; em_adapter_list = adapter; + /* SYSCTL stuff */ + sysctl_ctx_init(&adapter->sysctl_ctx); + adapter->sysctl_tree = SYSCTL_ADD_NODE(&adapter->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_hw), + OID_AUTO, + device_get_nameunit(dev), + CTLFLAG_RD, + 0, ""); + if (adapter->sysctl_tree == NULL) { + error = EIO; + goto err_sysctl; + } + + SYSCTL_ADD_PROC(&adapter->sysctl_ctx, + SYSCTL_CHILDREN(adapter->sysctl_tree), + OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, + (void *)adapter, 0, + em_sysctl_debug_info, "I", "Debug Information"); + + SYSCTL_ADD_PROC(&adapter->sysctl_ctx, + SYSCTL_CHILDREN(adapter->sysctl_tree), + OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, + (void *)adapter, 0, + em_sysctl_stats, "I", "Statistics"); + callout_handle_init(&adapter->timer_handle); callout_handle_init(&adapter->tx_fifo_timer_handle); @@ -288,9 +319,10 @@ adapter->hw.tbi_compatibility_en = TRUE; adapter->rx_buffer_len = EM_RXBUFFER_2048; - /* These parameters control the automatic generation(Tx) and - * response(Rx) to Ethernet PAUSE frames. - */ + /* + * These parameters control the automatic generation(Tx) and + * response(Rx) to Ethernet PAUSE frames. + */ adapter->hw.fc_high_water = FC_DEFAULT_HI_THRESH; adapter->hw.fc_low_water = FC_DEFAULT_LO_THRESH; adapter->hw.fc_pause_time = FC_DEFAULT_TX_TIMER; @@ -319,9 +351,8 @@ if (em_allocate_pci_resources(adapter)) { printf("em%d: Allocation of PCI resources failed\n", adapter->unit); - em_free_pci_resources(adapter); - splx(s); - return(ENXIO); + error = ENXIO; + goto err_pci; } @@ -335,9 +366,8 @@ if (em_dma_malloc(adapter, tsize, &adapter->txdma, BUS_DMA_NOWAIT)) { printf("em%d: Unable to allocate tx_desc memory\n", adapter->unit); - em_free_pci_resources(adapter); - splx(s); - return(ENOMEM); + error = ENOMEM; + goto err_tx_desc; } adapter->tx_desc_base = (struct em_tx_desc *) adapter->txdma.dma_vaddr; @@ -348,10 +378,8 @@ if (em_dma_malloc(adapter, rsize, &adapter->rxdma, BUS_DMA_NOWAIT)) { printf("em%d: Unable to allocate rx_desc memory\n", adapter->unit); - em_free_pci_resources(adapter); - em_dma_free(adapter, &adapter->txdma); - splx(s); - return(ENOMEM); + error = ENOMEM; + goto err_rx_desc; } adapter->rx_desc_base = (struct em_rx_desc *) adapter->rxdma.dma_vaddr; @@ -359,24 +387,24 @@ if (em_hardware_init(adapter)) { printf("em%d: Unable to initialize the hardware\n", adapter->unit); - em_free_pci_resources(adapter); - em_dma_free(adapter, &adapter->txdma); - em_dma_free(adapter, &adapter->rxdma); - splx(s); - return(EIO); + error = EIO; + goto err_hw_init; } /* Copy the permanent MAC address out of the EEPROM */ if (em_read_mac_addr(&adapter->hw) < 0) { printf("em%d: EEPROM read error while reading mac address\n", adapter->unit); - em_free_pci_resources(adapter); - em_dma_free(adapter, &adapter->txdma); - em_dma_free(adapter, &adapter->rxdma); - splx(s); - return(EIO); + error = EIO; + goto err_mac_addr; } + if (!em_is_valid_ether_addr(adapter->hw.mac_addr)) { + printf("em%d: Invalid mac address\n", adapter->unit); + error = EIO; + goto err_mac_addr; + } + bcopy(adapter->hw.mac_addr, adapter->interface_data.ac_enaddr, ETHER_ADDR_LEN); @@ -403,6 +431,20 @@ INIT_DEBUGOUT("em_attach: end"); splx(s); return(0); + +err_mac_addr: +err_hw_init: + em_dma_free(adapter, &adapter->rxdma); +err_rx_desc: + em_dma_free(adapter, &adapter->txdma); +err_tx_desc: +err_pci: + em_free_pci_resources(adapter); + sysctl_ctx_free(&adapter->sysctl_ctx); +err_sysctl: + splx(s); + return(error); + } /********************************************************************* @@ -579,9 +621,13 @@ if (ifp->if_flags & IFF_RUNNING) { em_disable_intr(adapter); em_set_multi(adapter); - if (adapter->hw.mac_type == em_82542_rev2_0) + if (adapter->hw.mac_type == em_82542_rev2_0) { em_initialize_receive_unit(adapter); - em_enable_intr(adapter); + } +#ifdef DEVICE_POLLING + if (!(ifp->if_ipending & IFF_POLLING)) +#endif + em_enable_intr(adapter); } break; case SIOCSIFMEDIA: @@ -787,31 +833,30 @@ } #endif /* DEVICE_POLLING */ + reg_icr = E1000_READ_REG(&adapter->hw, ICR); + if (!reg_icr) { + return; + } - em_disable_intr(adapter); - while (loop_cnt > 0 && - (reg_icr = E1000_READ_REG(&adapter->hw, ICR)) != 0) { + /* Link status change */ + if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { + untimeout(em_local_timer, adapter, + adapter->timer_handle); + adapter->hw.get_link_status = 1; + em_check_for_link(&adapter->hw); + em_print_link_status(adapter); + adapter->timer_handle = + timeout(em_local_timer, adapter, 2*hz); + } - /* Link status change */ - if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { - untimeout(em_local_timer, adapter, - adapter->timer_handle); - adapter->hw.get_link_status = 1; - em_check_for_link(&adapter->hw); - em_print_link_status(adapter); - adapter->timer_handle = - timeout(em_local_timer, adapter, 2*hz); - } - + while (loop_cnt > 0) { if (ifp->if_flags & IFF_RUNNING) { em_process_receive_interrupts(adapter, -1); em_clean_transmit_interrupts(adapter); } loop_cnt--; } - - em_enable_intr(adapter); - + if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) em_start(ifp); @@ -1915,32 +1960,23 @@ E1000_READ_REG(&adapter->hw, TDBAL), E1000_READ_REG(&adapter->hw, TDLEN)); - /* Set the default values for the Tx Inter Packet Gap timer */ switch (adapter->hw.mac_type) { - case em_82543: - case em_82544: - case em_82540: - case em_82545: - case em_82546: - case em_82541: - case em_82547: - if (adapter->hw.media_type == em_media_type_fiber) - reg_tipg = DEFAULT_82543_TIPG_IPGT_FIBER; - else - reg_tipg = DEFAULT_82543_TIPG_IPGT_COPPER; - reg_tipg |= DEFAULT_82543_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; - reg_tipg |= DEFAULT_82543_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; - break; case em_82542_rev2_0: - case em_82542_rev2_1: - reg_tipg = DEFAULT_82542_TIPG_IPGT; - reg_tipg |= DEFAULT_82542_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; - reg_tipg |= DEFAULT_82542_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; - break; - default: - printf("em%d: Invalid mac type detected\n", adapter->unit); - } + case em_82542_rev2_1: + reg_tipg = DEFAULT_82542_TIPG_IPGT; + reg_tipg |= DEFAULT_82542_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; + reg_tipg |= DEFAULT_82542_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; + break; + default: + if (adapter->hw.media_type == em_media_type_fiber) + reg_tipg = DEFAULT_82543_TIPG_IPGT_FIBER; + else + reg_tipg = DEFAULT_82543_TIPG_IPGT_COPPER; + reg_tipg |= DEFAULT_82543_TIPG_IPGR1 << E1000_TIPG_IPGR1_SHIFT; + reg_tipg |= DEFAULT_82543_TIPG_IPGR2 << E1000_TIPG_IPGR2_SHIFT; + } + E1000_WRITE_REG(&adapter->hw, TIPG, reg_tipg); E1000_WRITE_REG(&adapter->hw, TIDV, adapter->tx_int_delay); if(adapter->hw.mac_type >= em_82540) @@ -2100,6 +2136,7 @@ int i, num_avail; struct em_buffer *tx_buffer; struct em_tx_desc *tx_desc; + struct ifnet *ifp = &adapter->interface_data.ac_if; if (adapter->num_tx_desc_avail == adapter->num_tx_desc) return; @@ -2120,7 +2157,7 @@ num_avail++; if (tx_buffer->m_head) { - + ifp->if_opackets++; bus_dmamap_sync(adapter->txtag, tx_buffer->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(adapter->txtag, tx_buffer->map); @@ -2128,7 +2165,6 @@ m_freem(tx_buffer->m_head); tx_buffer->m_head = NULL; - } if (++i == adapter->num_tx_desc) @@ -2146,9 +2182,7 @@ * If there are no pending descriptors, clear the timeout. Otherwise, * if some descriptors have been freed, restart the timeout. */ - if (num_avail > EM_TX_CLEANUP_THRESHOLD) { - struct ifnet *ifp = &adapter->interface_data.ac_if; - + if (num_avail > EM_TX_CLEANUP_THRESHOLD) { ifp->if_flags &= ~IFF_OACTIVE; if (num_avail == adapter->num_tx_desc) ifp->if_timer = 0; @@ -2535,6 +2569,7 @@ if (eop) { adapter->fmp->m_pkthdr.rcvif = ifp; + ifp->if_ipackets++; #if __FreeBSD_version < 500000 eh = mtod(adapter->fmp, struct ether_header *); @@ -2664,6 +2699,18 @@ return; } +static int +em_is_valid_ether_addr(u_int8_t *addr) +{ + char zero_addr[6] = { 0, 0, 0, 0, 0, 0 }; + + if ((addr[0] & 1) || (!bcmp(addr, zero_addr, ETHER_ADDR_LEN))) { + return (FALSE); + } + + return(TRUE); +} + void em_write_pci_cfg(struct em_hw *hw, uint32_t reg, @@ -2798,8 +2845,6 @@ ifp = &adapter->interface_data.ac_if; /* Fill out the OS statistics structure */ - ifp->if_ipackets = adapter->stats.gprc; - ifp->if_opackets = adapter->stats.gptc; ifp->if_ibytes = adapter->stats.gorcl; ifp->if_obytes = adapter->stats.gotcl; ifp->if_imcasts = adapter->stats.mprc; @@ -2828,68 +2873,123 @@ * **********************************************************************/ static void -em_print_hw_stats(struct adapter *adapter) +em_print_debug_info(struct adapter *adapter) { - int unit = adapter->unit; + int unit = adapter->unit; #ifdef DBG_STATS - printf("em%d: Packets not Avail = %ld\n", unit, - adapter->no_pkts_avail); - printf("em%d: CleanTxInterrupts = %ld\n", unit, - adapter->clean_tx_interrupts); + printf("em%d: Packets not Avail = %ld\n", unit, + adapter->no_pkts_avail); + printf("em%d: CleanTxInterrupts = %ld\n", unit, + adapter->clean_tx_interrupts); #endif + printf("em%d: fifo workaround = %lld, fifo_reset = %lld\n", unit, + (long long)adapter->tx_fifo_wrk, + (long long)adapter->tx_fifo_reset); + printf("em%d: hw tdh = %d, hw tdt = %d\n", unit, + E1000_READ_REG(&adapter->hw, TDH), + E1000_READ_REG(&adapter->hw, TDT)); + printf("em%d: Num Tx descriptors avail = %d\n", unit, + adapter->num_tx_desc_avail); + printf("em%d: Tx Descriptors not avail1 = %ld\n", unit, + adapter->no_tx_desc_avail1); + printf("em%d: Tx Descriptors not avail2 = %ld\n", unit, + adapter->no_tx_desc_avail2); + printf("em%d: Std mbuf failed = %ld\n", unit, + adapter->mbuf_alloc_failed); + printf("em%d: Std mbuf cluster failed = %ld\n", unit, + adapter->mbuf_cluster_failed); + printf("em%d: Driver dropped packets = %ld\n", unit, + adapter->dropped_pkts); + + return; +} + +static void +em_print_hw_stats(struct adapter *adapter) +{ + int unit = adapter->unit; + + printf("em%d: Excessive collisions = %lld\n", unit, + (long long)adapter->stats.ecol); + printf("em%d: Symbol errors = %lld\n", unit, + (long long)adapter->stats.symerrs); + printf("em%d: Sequence errors = %lld\n", unit, + (long long)adapter->stats.sec); + printf("em%d: Defer count = %lld\n", unit, + (long long)adapter->stats.dc); + + printf("em%d: Missed Packets = %lld\n", unit, + (long long)adapter->stats.mpc); + printf("em%d: Receive No Buffers = %lld\n", unit, + (long long)adapter->stats.rnbc); + printf("em%d: Receive length errors = %lld\n", unit, + (long long)adapter->stats.rlec); + printf("em%d: Receive errors = %lld\n", unit, + (long long)adapter->stats.rxerrc); + printf("em%d: Crc errors = %lld\n", unit, + (long long)adapter->stats.crcerrs); + printf("em%d: Alignment errors = %lld\n", unit, + (long long)adapter->stats.algnerrc); + printf("em%d: Carrier extension errors = %lld\n", unit, + (long long)adapter->stats.cexterr); - printf("em%d: fifo workaround = %lld, fifo_reset = %lld\n", unit, - (long long)adapter->tx_fifo_wrk, - (long long)adapter->tx_fifo_reset); - printf("em%d: hw tdh = %d, hw tdt = %d\n", unit, - E1000_READ_REG(&adapter->hw, TDH), - E1000_READ_REG(&adapter->hw, TDT)); - printf("em%d: Excessive collisions = %lld\n", unit, - (long long)adapter->stats.ecol); - printf("em%d: Tx Descriptors not avail1 = %ld\n", unit, - adapter->no_tx_desc_avail1); - printf("em%d: Tx Descriptors not avail2 = %ld\n", unit, - adapter->no_tx_desc_avail2); + printf("em%d: XON Rcvd = %lld\n", unit, + (long long)adapter->stats.xonrxc); + printf("em%d: XON Xmtd = %lld\n", unit, + (long long)adapter->stats.xontxc); + printf("em%d: XOFF Rcvd = %lld\n", unit, + (long long)adapter->stats.xoffrxc); + printf("em%d: XOFF Xmtd = %lld\n", unit, + (long long)adapter->stats.xofftxc); + + printf("em%d: Good Packets Rcvd = %lld\n", unit, + (long long)adapter->stats.gprc); + printf("em%d: Good Packets Xmtd = %lld\n", unit, + (long long)adapter->stats.gptc); + + return; +} - printf("em%d: Symbol errors = %lld\n", unit, - (long long)adapter->stats.symerrs); - printf("em%d: Sequence errors = %lld\n", unit, - (long long)adapter->stats.sec); - printf("em%d: Defer count = %lld\n", unit, - (long long)adapter->stats.dc); +static int +em_sysctl_debug_info(SYSCTL_HANDLER_ARGS) +{ + int error; + int result; + struct adapter *adapter; - printf("em%d: Missed Packets = %lld\n", unit, - (long long)adapter->stats.mpc); - printf("em%d: Receive No Buffers = %lld\n", unit, - (long long)adapter->stats.rnbc); - printf("em%d: Receive length errors = %lld\n", unit, - (long long)adapter->stats.rlec); - printf("em%d: Receive errors = %lld\n", unit, - (long long)adapter->stats.rxerrc); - printf("em%d: Crc errors = %lld\n", unit, - (long long)adapter->stats.crcerrs); - printf("em%d: Alignment errors = %lld\n", unit, - (long long)adapter->stats.algnerrc); - printf("em%d: Carrier extension errors = %lld\n", unit, - (long long)adapter->stats.cexterr); - printf("em%d: Driver dropped packets = %ld\n", unit, - adapter->dropped_pkts); + result = -1; + error = sysctl_handle_int(oidp, &result, 0, req); - printf("em%d: XON Rcvd = %lld\n", unit, - (long long)adapter->stats.xonrxc); - printf("em%d: XON Xmtd = %lld\n", unit, - (long long)adapter->stats.xontxc); - printf("em%d: XOFF Rcvd = %lld\n", unit, - (long long)adapter->stats.xoffrxc); - printf("em%d: XOFF Xmtd = %lld\n", unit, - (long long)adapter->stats.xofftxc); + if (error || !req->newptr) + return (error); - printf("em%d: Good Packets Rcvd = %lld\n", unit, - (long long)adapter->stats.gprc); - printf("em%d: Good Packets Xmtd = %lld\n", unit, - (long long)adapter->stats.gptc); + if (result == 1) { + adapter = (struct adapter *)arg1; + em_print_debug_info(adapter); + } - return; + return error; } + +static int +em_sysctl_stats(SYSCTL_HANDLER_ARGS) +{ + int error; + int result; + struct adapter *adapter; + + result = -1; + error = sysctl_handle_int(oidp, &result, 0, req); + + if (error || !req->newptr) + return (error); + + if (result == 1) { + adapter = (struct adapter *)arg1; + em_print_hw_stats(adapter); + } + + return error; +} ==== //depot/projects/smpng/sys/dev/em/if_em.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.15 2003/05/03 07:35:47 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.16 2003/06/05 17:51:38 pdeuskar Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -72,6 +72,8 @@ #include #include #include +#include +#include #include "opt_bdg.h" #include @@ -81,7 +83,7 @@ /* * TxDescriptors * Valid Range: 80-256 for 82542 and 82543-based adapters - * 80-4096 for 82540, 82544, 82545, and 82546-based adapters + * 80-4096 for others * Default Value: 256 * This value is the number of transmit descriptors allocated by the driver. * Increasing this value allows the driver to queue more transmits. Each @@ -92,7 +94,7 @@ /* * RxDescriptors * Valid Range: 80-256 for 82542 and 82543-based adapters - * 80-4096 for 82540, 82544, 82545, and 82546-based adapters + * 80-4096 for others * Default Value: 256 * This value is the number of receive descriptors allocated by the driver. * Increasing this value allows the driver to buffer more incoming packets. @@ -115,7 +117,7 @@ #define EM_TIDV 64 /* - * TxAbsIntDelay (82540, 82545, and 82546-based adapters only) + * TxAbsIntDelay (Not valid for 82542 and 82543) * Valid Range: 0-65535 (0=off) * Default Value: 64 * This value, in units of 1.024 microseconds, limits the delay in which a @@ -149,7 +151,7 @@ #define EM_RDTR 0 /* - * RxAbsIntDelay (82540, 82545, and 82546-based adapters only) + * RxAbsIntDelay (Not valid for 82542 and 82543) * Valid Range: 0-65535 (0=off) * Default Value: 64 * This value, in units of 1.024 microseconds, limits the delay in which a @@ -198,7 +200,7 @@ * 1 - Wait for autonegotiation to complete * 0 - Don't wait for autonegotiation to complete */ -#define WAIT_FOR_AUTO_NEG_DEFAULT 1 +#define WAIT_FOR_AUTO_NEG_DEFAULT 0 /* Tunables -- End */ @@ -371,6 +373,9 @@ u_int16_t tx_fifo_head; + struct sysctl_ctx_list sysctl_ctx; + struct sysctl_oid *sysctl_tree; + /* Misc stats maintained by the driver */ unsigned long dropped_pkts; unsigned long mbuf_alloc_failed; ==== //depot/projects/smpng/sys/dev/em/if_em_hw.c#9 (text+ko) ==== @@ -31,11 +31,11 @@ *******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.8 2003/05/02 21:17:08 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.9 2003/06/05 17:51:38 pdeuskar Exp $*/ /* if_em_hw.c * Shared functions for accessing and configuring the MAC */ - + #include static int32_t em_set_phy_type(struct em_hw *hw); @@ -191,6 +191,7 @@ break; case E1000_DEV_ID_82546EB_COPPER: case E1000_DEV_ID_82546EB_FIBER: + case E1000_DEV_ID_82546EB_QUAD_COPPER: hw->mac_type = em_82546; break; case E1000_DEV_ID_82541EI: @@ -260,14 +261,24 @@ /* Must reset the PHY before resetting the MAC */ if((hw->mac_type == em_82541) || (hw->mac_type == em_82547)) { - E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_PHY_RST)); + E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_PHY_RST)); msec_delay(5); } - if((hw->mac_type > em_82543) && (hw->mac_type != em_82547)) - E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST)); - else - E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST)); + switch(hw->mac_type) { + case em_82544: + case em_82540: + case em_82545: + case em_82546: + case em_82541: + /* These controllers can't ack the 64-bit write when issuing the + * reset, so use IO-mapping as a workaround to issue the reset */ + E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST)); + break; + default: + E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST)); + break; + } /* Force a reload from the EEPROM if necessary */ if(hw->mac_type < em_82540) { @@ -294,9 +305,7 @@ /* Configure activity LED after PHY reset */ led_ctrl = E1000_READ_REG(hw, LEDCTL); led_ctrl &= IGP_ACTIVITY_LED_MASK; - led_ctrl |= IGP_ACTIVITY_LED_ENABLE; - if(hw->mac_type == em_82547) - led_ctrl |= IGP_LED3_MODE; + led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE); E1000_WRITE_REG(hw, LEDCTL, led_ctrl); } @@ -694,7 +703,8 @@ static int32_t em_setup_copper_link(struct em_hw *hw) { - uint32_t ctrl, led_ctrl; + uint32_t ctrl; + uint32_t led_ctrl; int32_t ret_val; uint16_t i; uint16_t phy_data; @@ -724,144 +734,146 @@ } DEBUGOUT1("Phy ID = %x \n", hw->phy_id); -if (hw->phy_type == em_phy_igp) { + if (hw->phy_type == em_phy_igp) { + + ret_val = em_phy_reset(hw); + if(ret_val < 0) { + DEBUGOUT("Error Resetting the PHY\n"); + return ret_val; + } - ret_val = em_phy_reset(hw); - if(ret_val < 0) { - DEBUGOUT("Error Resetting the PHY\n"); - return ret_val; - } + /* Wait 10ms for MAC to configure PHY from eeprom settings */ + msec_delay(15); - /* Wait 10ms for MAC to configure PHY from eeprom settings */ - msec_delay(15); + if(em_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0000) < 0) { + DEBUGOUT("PHY Write Error\n"); + return -E1000_ERR_PHY; + } - if(em_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0000) < 0) { - DEBUGOUT("PHY Write Error\n"); - return -E1000_ERR_PHY; - } + /* Configure activity LED after PHY reset */ + led_ctrl = E1000_READ_REG(hw, LEDCTL); + led_ctrl &= IGP_ACTIVITY_LED_MASK; + led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE); + E1000_WRITE_REG(hw, LEDCTL, led_ctrl); - /* Configure activity LED after PHY reset */ - led_ctrl = E1000_READ_REG(hw, LEDCTL); - led_ctrl &= IGP_ACTIVITY_LED_MASK; - led_ctrl |= IGP_ACTIVITY_LED_ENABLE; - if(hw->mac_type == em_82547) - led_ctrl |= IGP_LED3_MODE; - E1000_WRITE_REG(hw, LEDCTL, led_ctrl); + if(hw->autoneg_advertised == ADVERTISE_1000_FULL) { + /* Disable SmartSpeed */ + if(em_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, + &phy_data) < 0) { + DEBUGOUT("PHY Read Error\n"); + return -E1000_ERR_PHY; + } + phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED; + if(em_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, + phy_data) < 0) { + DEBUGOUT("PHY Write Error\n"); + return -E1000_ERR_PHY; + } + /* Set auto Master/Slave resolution process */ + if(em_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data) < 0) { + DEBUGOUT("PHY Read Error\n"); + return -E1000_ERR_PHY; + } + phy_data &= ~CR_1000T_MS_ENABLE; + if(em_write_phy_reg(hw, PHY_1000T_CTRL, phy_data) < 0) { + DEBUGOUT("PHY Write Error\n"); + return -E1000_ERR_PHY; + } + } - if(hw->autoneg_advertised == ADVERTISE_1000_FULL) { - /* Disable SmartSpeed */ - if(em_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, &phy_data) < 0) { + if(em_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data) < 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 6 17:25:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3A3C37B404; Fri, 6 Jun 2003 17:25:31 -0700 (PDT) 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 5247E37B401 for ; Fri, 6 Jun 2003 17:25:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36BF943F75 for ; Fri, 6 Jun 2003 17:25:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h570PU0U084660 for ; Fri, 6 Jun 2003 17:25:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h570PTVk084642 for perforce@freebsd.org; Fri, 6 Jun 2003 17:25:29 -0700 (PDT) Date: Fri, 6 Jun 2003 17:25:29 -0700 (PDT) Message-Id: <200306070025.h570PTVk084642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 00:25:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=32694 Change 32694 by marcel@marcel_nfs on 2003/06/06 17:24:34 IFC @32693 Affected files ... .. //depot/projects/ia64/MAINTAINERS#28 integrate .. //depot/projects/ia64/bin/csh/Makefile#7 integrate .. //depot/projects/ia64/etc/inetd.conf#10 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#13 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#21 integrate .. //depot/projects/ia64/etc/rc.d/network1#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#4 integrate .. //depot/projects/ia64/lib/libc/gen/devname.c#3 integrate .. //depot/projects/ia64/lib/libform/Makefile#3 integrate .. //depot/projects/ia64/lib/libmenu/Makefile#3 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#15 integrate .. //depot/projects/ia64/lib/libpanel/Makefile#4 integrate .. //depot/projects/ia64/libexec/getty/main.c#4 integrate .. //depot/projects/ia64/sbin/ipf/Makefile#4 integrate .. //depot/projects/ia64/sbin/ipfstat/Makefile#5 integrate .. //depot/projects/ia64/sbin/ipmon/Makefile#5 integrate .. //depot/projects/ia64/sbin/ipnat/Makefile#5 integrate .. //depot/projects/ia64/share/man/man4/Makefile#46 integrate .. //depot/projects/ia64/share/man/man4/exca.4#3 integrate .. //depot/projects/ia64/share/man/man4/pccbb.4#3 integrate .. //depot/projects/ia64/share/man/man4/wi.4#21 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#19 integrate .. //depot/projects/ia64/share/mklocale/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#7 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#17 integrate .. //depot/projects/ia64/sys/debugscripts/.gdbinit#1 branch .. //depot/projects/ia64/sys/debugscripts/gdbinit.i386#1 branch .. //depot/projects/ia64/sys/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/ia64/sys/debugscripts/gdbinit.vinum#1 branch .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/exca/excareg.h#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#27 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#5 integrate .. //depot/projects/ia64/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/apic_vector.s#8 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#56 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#16 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#49 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#58 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#19 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/Makefile#4 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-iswctype.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-towctrans.c#1 branch .. //depot/projects/ia64/usr.bin/awk/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#28 integrate .. //depot/projects/ia64/usr.bin/less/Makefile.common#2 integrate .. //depot/projects/ia64/usr.bin/truss/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/chkgrp/chkgrp.c#3 integrate .. //depot/projects/ia64/usr.sbin/ipftest/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ipresend/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/ipsend/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/iptest/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#12 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#28 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.65 2003/06/05 05:03:01 roberto Exp $ +$FreeBSD: src/MAINTAINERS,v 1.66 2003/06/06 11:30:49 guido Exp $ subsystem login notes ----------------------------- @@ -117,11 +117,11 @@ sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG -sbin/ipf/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipf/Makefile:MAINTAINER= darrenr@freebsd.org sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org -sbin/ipfstat/Makefile:MAINTAINER= guido@freebsd.org -sbin/ipmon/Makefile:MAINTAINER= guido@freebsd.org -sbin/ipnat/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipfstat/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipmon/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipnat/Makefile:MAINTAINER= darrenr@freebsd.org share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro@FreeBSD.org share/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb@FreeBSD.org @@ -162,10 +162,10 @@ usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG -usr.sbin/ipftest/Makefile:MAINTAINER= guido@freebsd.org -usr.sbin/ipresend/Makefile:MAINTAINER= guido@freebsd.org -usr.sbin/ipsend/Makefile:MAINTAINER= guido@freebsd.org -usr.sbin/iptest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipftest/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/ipresend/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/ipsend/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/iptest/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org ==== //depot/projects/ia64/bin/csh/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.31 2003/06/06 13:46:55 kuriyama Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -73,7 +73,7 @@ .endfor csh.1: tcsh.man - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} build-tools: gethost ==== //depot/projects/ia64/etc/inetd.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.62 2003/06/06 08:54:29 yar Exp $ # # Internet server configuration database # @@ -17,7 +17,6 @@ #finger stream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd -s #finger stream tcp6 nowait/3/10 nobody /usr/libexec/fingerd fingerd -s #exec stream tcp nowait root /usr/libexec/rexecd rexecd -#nntp stream tcp nowait usenet /usr/libexec/nntpd nntpd # # run comsat as root to be able to print partial mailbox contents w/ biff, # or use the safer tty:tty to just print that new mail has been received. @@ -85,7 +84,12 @@ # #imap4 stream tcp nowait root /usr/local/libexec/imapd imapd # +# example entry for the optional nntp server +# +#nntp stream tcp nowait news /usr/local/libexec/nntpd nntpd +# # example entry for the optional uucpd server +# #uucpd stream tcp nowait root /usr/local/libexec/uucpd uucpd # # Return error for all "ident" requests ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.96 2003/06/01 15:37:37 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.97 2003/06/06 22:34:43 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -417,6 +417,8 @@ .. ro_RO.ISO8859-2 .. + ru_RU.CP1251 + .. ru_RU.CP866 .. ru_RU.ISO8859-5 ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.274 2003/06/01 15:37:37 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.275 2003/06/06 22:34:43 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -479,6 +479,8 @@ .. ro_RO.ISO8859-2 .. + ru_RU.CP1251 + .. ru_RU.CP866 .. ru_RU.ISO8859-5 @@ -801,6 +803,8 @@ .. ro_RO.ISO8859-2 .. + ru_RU.CP1251 + .. ru_RU.CP866 .. ru_RU.ISO8859-5 ==== //depot/projects/ia64/etc/rc.d/network1#11 (text+ko) ==== @@ -1,6 +1,6 @@ -#!/bin/sh -x +#!/bin/sh # -# $FreeBSD: src/etc/rc.d/network1,v 1.146 2003/04/18 17:51:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.147 2003/06/06 13:00:43 mtm Exp $ # # PROVIDE: network1 ==== //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.22 2002/06/05 21:30:45 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.23 2003/06/06 13:46:55 kuriyama Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -17,6 +17,6 @@ CLEANFILES= cpp.1 cpp.1: cccp.1 - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.19 2002/06/09 00:03:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.20 2003/06/06 13:46:55 kuriyama Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -18,6 +18,6 @@ CLEANFILES= f77.1 f77.1: g77.1 - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/ia64/lib/libc/gen/devname.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.8 2003/06/05 21:55:57 phk Exp $"); #include #include @@ -105,10 +105,10 @@ } /* Finally just format it */ - if (minor(dev) > 255) + if (dev == NODEV) + r = "#NODEV"; + else r = "#%c:%d:0x%x"; - else - r = "#%c:%d:0x%d"; snprintf(buf, SPECNAMELEN + 1, r, (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev)); return (buf); ==== //depot/projects/ia64/lib/libform/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libform -# $FreeBSD: src/lib/libform/Makefile,v 1.7 2002/05/21 07:08:30 peter Exp $ +# $FreeBSD: src/lib/libform/Makefile,v 1.8 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -45,7 +45,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .endfor MLINKS+=form_cursor.3 pos_form_cursor.3 ==== //depot/projects/ia64/lib/libmenu/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libmenu -# $FreeBSD: src/lib/libmenu/Makefile,v 1.9 2002/05/21 07:08:30 peter Exp $ +# $FreeBSD: src/lib/libmenu/Makefile,v 1.10 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -42,7 +42,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .endfor MLINKS+=menu_attributes.3 menu_back.3 menu_attributes.3 menu_fore.3 \ ==== //depot/projects/ia64/lib/libncurses/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncurses/Makefile,v 1.69 2003/04/30 15:49:40 obrien Exp $ +# $FreeBSD: src/lib/libncurses/Makefile,v 1.70 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -410,7 +410,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .endfor MLINKS+=ncurses.3 curses.3 ==== //depot/projects/ia64/lib/libpanel/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libpanel -# $FreeBSD: src/lib/libpanel/Makefile,v 1.8 2002/05/21 05:41:07 peter Exp $ +# $FreeBSD: src/lib/libpanel/Makefile,v 1.9 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -32,7 +32,7 @@ CLEANFILES+= panel.3 MAN= panel.3 panel.3: panel.3x - ln -s ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} MLINKS+=panel.3 bottom_panel.3 panel.3 del_panel.3 panel.3 hide_panel.3 \ panel.3 move_panel.3 panel.3 new_panel.3 panel.3 panel_above.3 \ ==== //depot/projects/ia64/libexec/getty/main.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)from: main.c 8.1 (Berkeley) 6/20/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/getty/main.c,v 1.38 2003/01/20 10:33:35 sobomax Exp $"; + "$FreeBSD: src/libexec/getty/main.c,v 1.39 2003/06/06 14:36:41 yar Exp $"; #endif /* not lint */ #include @@ -344,6 +344,8 @@ signal(SIGALRM, dingdong); alarm(TO); } + + rval = 0; if (AL) { const char *p = AL; char *q = name; @@ -374,12 +376,20 @@ oflush(); alarm(0); signal(SIGALRM, SIG_DFL); + if (name[0] == '\0') + continue; if (name[0] == '-') { puts("user names may not start with '-'."); continue; } - if (!(upper || lower || digit)) - continue; + if (!(upper || lower || digit)) { + if (AL) { + syslog(LOG_ERR, + "invalid auto-login name: %s", AL); + exit(1); + } else + continue; + } set_flags(2); if (crmod) { tmode.c_iflag |= ICRNL; @@ -564,7 +574,7 @@ } if (c == EOT || c == CTRL('d')) - exit(1); + exit(0); if (c == '\r' || c == '\n' || np >= &name[sizeof name-1]) { putf("\r\n"); break; @@ -590,6 +600,7 @@ else if (np > name) puts(" \r"); prompt(); + digit = lower = upper = 0; np = name; continue; } else if (isdigit(c)) ==== //depot/projects/ia64/sbin/ipf/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipf/Makefile,v 1.12 2002/03/20 09:02:48 darrenr Exp $ +# $FreeBSD: src/sbin/ipf/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -11,6 +11,6 @@ CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter WARNS= 0 -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include ==== //depot/projects/ia64/sbin/ipfstat/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.17 2002/03/19 22:51:53 alfred Exp $ +# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.18 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -14,6 +14,6 @@ DPADD= ${LIBNCURSES} ${LIBKVM} LDADD= -lncurses -lkvm -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include ==== //depot/projects/ia64/sbin/ipmon/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipmon/Makefile,v 1.12 2003/04/05 10:42:38 darrenr Exp $ +# $FreeBSD: src/sbin/ipmon/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -11,6 +11,6 @@ CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter WARNS= 0 -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include ==== //depot/projects/ia64/sbin/ipnat/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipnat/Makefile,v 1.14 2002/03/20 09:01:48 darrenr Exp $ +# $FreeBSD: src/sbin/ipnat/Makefile,v 1.15 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -15,6 +15,6 @@ DPADD= ${LIBKVM} LDADD= -lkvm -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include ==== //depot/projects/ia64/share/man/man4/Makefile#46 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.204 2003/06/03 07:58:39 harti Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.205 2003/06/05 21:12:55 ru Exp $ MAN= aac.4 \ acpi.4 \ @@ -303,6 +303,7 @@ MLINKS+=netintro.4 networking.4 MLINKS+=nge.4 if_nge.4 MLINKS+=oldcard.4 card.4 +MLINKS+=pccbb.4 cbb.4 MLINKS+=pcm.4 snd.4 MLINKS+=pcn.4 if_pcn.4 MLINKS+=pcvt.4 vt.4 ==== //depot/projects/ia64/share/man/man4/exca.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/exca.4,v 1.2 2003/03/02 21:04:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/exca.4,v 1.3 2003/06/05 21:12:55 ru Exp $ .\" .Dd February 23, 2003 .Dt EXCA 4 @@ -36,5 +36,5 @@ module is used to implement the Intel ExCA interface to PC Cards. .Sh SEE ALSO -.Xr cbb 4 , +.Xr pccbb 4 , .Xr pcic 4 ==== //depot/projects/ia64/share/man/man4/pccbb.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.2 2002/12/10 14:21:55 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.3 2003/06/05 21:12:55 ru Exp $ .\" .Dd July 9, 2002 .Dt PCCBB 4 @@ -31,7 +31,7 @@ .Nm pccbb .Nd cardbus bridge driver .Sh SYNOPSIS -.Cd device pccbb +.Cd device cbb .Cd device pccard .Cd device cardbus .Sh DESCRIPTION ==== //depot/projects/ia64/share/man/man4/wi.4#21 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wi.4,v 1.43 2003/05/20 22:09:18 ru Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.44 2003/06/05 21:12:55 ru Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -313,9 +313,9 @@ .Xr an 4 , .Xr arp 4 , .Xr card 4 , -.Xr cbb 4 , .Xr netintro 4 , .Xr pccard 4 , +.Xr pccbb 4 , .Xr pcic 4 , .Xr ifconfig 8 , .Xr wicontrol 8 ==== //depot/projects/ia64/share/mk/bsd.sys.mk#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.27 2003/06/02 08:13:49 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.28 2003/06/06 16:55:05 obrien Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -8,7 +8,8 @@ # for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 -CSTD ?= +# Can't use "c99" below due to lack of alloca.S for non-i386 platforms. +CSTD ?= gnu99 .if ${CSTD} != "" . if ${CSTD} == "k&r" CFLAGS += -traditional ==== //depot/projects/ia64/share/mklocale/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mklocale/Makefile,v 1.49 2003/06/01 15:51:27 ache Exp $ +# $FreeBSD: src/share/mklocale/Makefile,v 1.50 2003/06/06 22:39:24 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -34,6 +34,7 @@ LATIN2LINKS= cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK LATIN4LINKS= lt_LT LATIN5LINKS= sr_YU uk_UA +CP1251LINKS= ru_RU .SUFFIXES: .src .out @@ -67,6 +68,10 @@ ln -fs ../ru_RU.ISO8859-5/LC_CTYPE \ ${LOCALEDIR}/${link}.ISO8859-5/LC_CTYPE .endfor +.for link in ${CP1251LINKS} + ln -fs ../bg_BG.CP1251/LC_CTYPE \ + ${LOCALEDIR}/${link}.CP1251/LC_CTYPE +.endfor .for link in ${ASCIILINKS} ln -fs ../la_LN.US-ASCII/LC_CTYPE \ ${LOCALEDIR}/${link}.US-ASCII/LC_CTYPE ==== //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#7 (text+ko) ==== @@ -1,21 +1,25 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.12 2002/09/30 20:37:57 peter Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.13 2003/06/06 13:49:51 kuriyama Exp $ -FILES= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r -BINDIR= /usr/lib .PATH: ${.CURDIR}/../../../kern -CLEANFILES=${FILES} +CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x3f8 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} +all: ${OBJS} kgzldr.o + kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} -.include +realinstall: + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + kgzldr.o ${DESTDIR}${LIBDIR} + +.include ==== //depot/projects/ia64/sys/ddb/db_ps.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.41 2003/04/10 17:35:43 julian Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.44 2003/06/06 20:28:11 julian Exp $ */ #include #include @@ -43,8 +43,8 @@ #include #include -static void -dumpthread(volatile struct proc *p, volatile struct thread *td); + +static void dumpthread(volatile struct proc *p, volatile struct thread *td); void db_ps(dummy1, dummy2, dummy3, dummy4) @@ -72,7 +72,7 @@ /* * XXX just take 20 for now... */ - if (nl++ == 20) { + if (nl++ >= 20) { int c; db_printf("--More--"); @@ -108,7 +108,7 @@ if (P_SHOULDSTOP(p)) state = "stop"; else - state = "norm"; + state = ""; break; case PRS_NEW: state = "new "; @@ -120,7 +120,7 @@ state = "Unkn"; break; } - db_printf("%5d %8p %8p %4d %5d %5d %07x %-4s", + db_printf("%5d %8p %8p %4d %5d %5d %07x %s", p->p_pid, (volatile void *)p, (void *)p->p_uarea, p->p_ucred != NULL ? p->p_ucred->cr_ruid : 0, pp->p_pid, p->p_pgrp != NULL ? p->p_pgrp->pg_id : 0, p->p_flag, @@ -129,6 +129,7 @@ db_printf("(threaded) %s\n", p->p_comm); FOREACH_THREAD_IN_PROC(p, td) { dumpthread(p, td); + nl++; } /* PROC_UNLOCK(p); */ @@ -138,6 +139,7 @@ } /* sx_sunlock(&allproc_lock); */ } + static void dumpthread(volatile struct proc *p, volatile struct thread *td) { @@ -145,10 +147,16 @@ db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); if (TD_ON_SLEEPQ(td)) { if (td->td_flags & TDF_CVWAITQ) - db_printf("[CVQ "); + if (TD_IS_SLEEPING(td)) + db_printf("[CV]"); + else + db_printf("[CVQ"); else - db_printf("[SLPQ "); - db_printf(" %6s %8p]", td->td_wmesg, + if (TD_IS_SLEEPING(td)) + db_printf("[SLP]"); + else + db_printf("[SLPQ"); + db_printf("%s %p]", td->td_wmesg, (void *)td->td_wchan); } switch (td->td_state) { @@ -158,9 +166,11 @@ td->td_lockname, (void *)td->td_blocked); } +#if 0 /* covered above */ if (TD_IS_SLEEPING(td)) { db_printf("[SLP]"); } +#endif if (TD_IS_SWAPPED(td)) { db_printf("[SWAP]"); } @@ -180,8 +190,11 @@ case TDS_RUNNING: db_printf("[CPU %d]", td->td_oncpu); break; + case TDS_INACTIVE: + db_printf("[INACTIVE]"); + break; default: - panic("unknown thread state"); + db_printf("[UNK: %#x]", td->td_state); } if (p->p_flag & P_THREADED) { if (td->td_kse) ==== //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#7 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#30 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#32 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.12 2003/05/03 23:55:38 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.14 2003/06/06 23:48:18 gibbs Exp $ */ #ifdef __linux__ @@ -67,8 +67,7 @@ static ahc_device_setup_t ahc_aic7770_EISA_setup;; static ahc_device_setup_t ahc_aic7770_setup; - -struct aic7770_identity aic7770_ident_table [] = +struct aic7770_identity aic7770_ident_table[] = { { ID_AHA_274x, @@ -83,6 +82,12 @@ ahc_aic7770_VL_setup }, { + ID_AHA_284x, + 0xFFFFFFFE, + "Adaptec 284X SCSI adapter (BIOS Disabled)", + ahc_aic7770_VL_setup + }, + { ID_OLV_274x, 0xFFFFFFFF, "Adaptec (Olivetti OEM) 274X SCSI adapter", @@ -154,7 +159,7 @@ ahc->bus_suspend = aic7770_suspend; ahc->bus_resume = aic7770_resume; - error = ahc_reset(ahc); + error = ahc_reset(ahc, /*reinit*/FALSE); if (error != 0) return (error); ==== //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#13 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic79xx.c,v 1.16 2003/05/26 21:43:29 gibbs Exp $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.17 2003/05/30 02:15:15 scottl Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.20 2003/06/06 23:53:39 gibbs Exp $ */ #ifdef __linux__ @@ -1880,21 +1880,32 @@ tinfo->goal.ppr_options = 0; ahd_qinfifo_requeue_tail(ahd, scb); printerror = 0; - } else if ((ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) - || ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)) + } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) && ppr_busfree == 0) { /* - * Negotiation Rejected. Go-async and + * Negotiation Rejected. Go-narrow and * retry command. */ #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) - printf("Negotiation rejected busfree.\n"); + printf("WDTR negotiation rejected busfree.\n"); #endif ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT, AHD_TRANS_CUR|AHD_TRANS_GOAL, /*paused*/TRUE); + ahd_qinfifo_requeue_tail(ahd, scb); + printerror = 0; + } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE) + && ppr_busfree == 0) { + /* + * Negotiation Rejected. Go-async and + * retry command. + */ +#ifdef AHD_DEBUG + if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) + printf("SDTR negotiation rejected busfree.\n"); +#endif ahd_set_syncrate(ahd, &devinfo, /*period*/0, /*offset*/0, /*ppr_options*/0, @@ -2188,7 +2199,7 @@ ahd_outb(ahd, LQOMODE1, 0); ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); simode1 = ahd_inb(ahd, SIMODE1); - ahd_outb(ahd, SIMODE1, ENBUSFREE); + ahd_outb(ahd, SIMODE1, simode1 & ENBUSFREE); ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) | STEP); stepping = TRUE; } @@ -3232,6 +3243,7 @@ * may change. */ period = tinfo->goal.period; + offset = tinfo->goal.offset; ppr_options = tinfo->goal.ppr_options; /* Target initiated PPR is not allowed in the SCSI spec */ if (devinfo->role == ROLE_TARGET) @@ -3239,7 +3251,7 @@ ahd_devlimited_syncrate(ahd, tinfo, &period, &ppr_options, devinfo->role); dowide = tinfo->curr.width != tinfo->goal.width; - dosync = tinfo->curr.period != period; + dosync = tinfo->curr.offset != offset || tinfo->curr.period != period; /* * Only use PPR if we have options that need it, even if the device * claims to support it. There might be an expander in the way @@ -3249,7 +3261,7 @@ if (!dowide && !dosync && !doppr) { dowide = tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT; - dosync = tinfo->goal.period != 0; + dosync = tinfo->goal.offset != 0; } if (!dowide && !dosync && !doppr) { @@ -3983,22 +3995,30 @@ response = TRUE; sending_reply = TRUE; } + /* + * After a wide message, we are async, but + * some devices don't seem to honor this portion + * of the spec. Force a renegotiation of the + * sync component of our transfer agreement even + * if our goal is async. By updating our width + * after forcing the negotiation, we avoid + * renegotiating for width. + */ + ahd_update_neg_request(ahd, devinfo, tstate, + tinfo, AHD_NEG_ALWAYS); ahd_set_width(ahd, devinfo, bus_width, AHD_TRANS_ACTIVE|AHD_TRANS_GOAL, /*paused*/TRUE); - /* After a wide message, we are async */ - ahd_set_syncrate(ahd, devinfo, /*period*/0, - /*offset*/0, /*ppr_options*/0, - AHD_TRANS_ACTIVE, /*paused*/TRUE); if (sending_reply == FALSE && reject == FALSE) { - if (tinfo->goal.offset) { - ahd->msgout_index = 0; - ahd->msgout_len = 0; - ahd_build_transfer_msg(ahd, devinfo); - ahd->msgout_index = 0; - response = TRUE; - } + /* + * We will always have an SDTR to send. + */ + ahd->msgout_index = 0; + ahd->msgout_len = 0; + ahd_build_transfer_msg(ahd, devinfo); + ahd->msgout_index = 0; + response = TRUE; } done = MSGLOOP_MSGCOMPLETE; break; @@ -5000,15 +5020,20 @@ ahd_timer_stop(&ahd->stat_timer); /* This will reset most registers to 0, but not all */ - ahd_reset(ahd); + ahd_reset(ahd, /*reinit*/FALSE); } /* * Reset the controller and record some information about it - * that is only available just after a reset. + * that is only available just after a reset. If "reinit" is + * non-zero, this reset occured after initial configuration + * and the caller requests that the chip be fully reinitialized + * to a runable state. Chip interrupts are *not* enabled after + * a reinitialization. The caller must enable interrupts via + * ahd_intr_enable(). */ int -ahd_reset(struct ahd_softc *ahd) +ahd_reset(struct ahd_softc *ahd, int reinit) { u_int sxfrctl1; int wait; @@ -5101,7 +5126,7 @@ * If a recovery action has forced a chip reset, * re-initialize the chip to our liking. */ - if (ahd->init_level > 0) + if (reinit != 0) ahd_chip_init(ahd); return (0); @@ -6703,141 +6728,24 @@ int ahd_suspend(struct ahd_softc *ahd) { -#if 0 - uint8_t *ptr; - int i; ahd_pause_and_flushwork(ahd); - if (LIST_FIRST(&ahd->pending_scbs) != NULL) + if (LIST_FIRST(&ahd->pending_scbs) != NULL) { + ahd_unpause(ahd); return (EBUSY); - -#if AHD_TARGET_MODE - /* - * XXX What about ATIOs that have not yet been serviced? - * Perhaps we should just refuse to be suspended if we - * are acting in a target role. - */ - if (ahd->pending_device != NULL) - return (EBUSY); -#endif - - /* Save volatile registers */ - ahd->suspend_state.channel[0].scsiseq = ahd_inb(ahd, SCSISEQ0); - ahd->suspend_state.channel[0].sxfrctl0 = ahd_inb(ahd, SXFRCTL0); - ahd->suspend_state.channel[0].sxfrctl1 = ahd_inb(ahd, SXFRCTL1); - ahd->suspend_state.channel[0].simode0 = ahd_inb(ahd, SIMODE0); - ahd->suspend_state.channel[0].simode1 = ahd_inb(ahd, SIMODE1); - ahd->suspend_state.channel[0].seltimer = ahd_inb(ahd, SELTIMER); - ahd->suspend_state.channel[0].seqctl = ahd_inb(ahd, SEQCTL0); - ahd->suspend_state.dscommand0 = ahd_inb(ahd, DSCOMMAND0); - ahd->suspend_state.dspcistatus = ahd_inb(ahd, DSPCISTATUS); - - if ((ahd->features & AHD_DT) != 0) { - u_int sfunct; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 6 21:26:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49C9937B404; Fri, 6 Jun 2003 21:26:06 -0700 (PDT) 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 DAE9737B401 for ; Fri, 6 Jun 2003 21:26:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A1D043F93 for ; Fri, 6 Jun 2003 21:26:05 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h574Q40U004016 for ; Fri, 6 Jun 2003 21:26:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h574Q4Ec004013 for perforce@freebsd.org; Fri, 6 Jun 2003 21:26:04 -0700 (PDT) Date: Fri, 6 Jun 2003 21:26:04 -0700 (PDT) Message-Id: <200306070426.h574Q4Ec004013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 32711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 04:26:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=32711 Change 32711 by marcel@marcel_nfs on 2003/06/06 21:25:05 IFC @32710 Affected files ... .. //depot/projects/ia64/share/colldef/Makefile#12 integrate .. //depot/projects/ia64/share/colldef/bg_BG.CP1251.src#2 integrate .. //depot/projects/ia64/share/colldef/map.CP866#2 integrate .. //depot/projects/ia64/share/colldef/map.KOI8-R#2 integrate .. //depot/projects/ia64/share/colldef/map.KOI8-U#2 integrate .. //depot/projects/ia64/share/colldef/ru_RU.CP1251.src#1 branch .. //depot/projects/ia64/share/colldef/ru_RU.CP866.src#2 integrate .. //depot/projects/ia64/share/colldef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/ia64/share/colldef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/ia64/share/colldef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/ia64/share/monetdef/Makefile#9 integrate .. //depot/projects/ia64/share/monetdef/ru_RU.CP1251.src#1 branch .. //depot/projects/ia64/share/msgdef/Makefile#9 integrate .. //depot/projects/ia64/share/msgdef/ru_RU.CP1251.src#1 branch .. //depot/projects/ia64/share/numericdef/Makefile#9 integrate .. //depot/projects/ia64/share/numericdef/ru_RU.CP866.src#2 delete .. //depot/projects/ia64/share/numericdef/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/ia64/share/numericdef/uk_UA.ISO8859-5.src#2 delete .. //depot/projects/ia64/share/timedef/Makefile#9 integrate .. //depot/projects/ia64/share/timedef/ru_RU.CP1251.src#1 branch .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#65 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#57 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#54 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#59 integrate .. //depot/projects/ia64/tools/debugscripts/dot.gdbinit#1 branch .. //depot/projects/ia64/tools/debugscripts/gdbinit.i386#1 branch .. //depot/projects/ia64/tools/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/ia64/tools/debugscripts/gdbinit.vinum#1 branch Differences ... ==== //depot/projects/ia64/share/colldef/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/colldef/Makefile,v 1.54 2003/06/02 07:53:44 ache Exp $ +# $FreeBSD: src/share/colldef/Makefile,v 1.55 2003/06/06 23:59:18 ache Exp $ # NOMAN=YES @@ -25,6 +25,7 @@ lt_LT.ISO8859-4 \ lt_LT.ISO8859-13 \ pl_PL.ISO8859-2 \ + ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ @@ -75,6 +76,7 @@ lt_LT.ISO8859-4.out: map.ISO8859-4 lt_LT.ISO8859-13.out: map.ISO8859-13 pl_PL.ISO8859-2.out: map.ISO8859-2 +ru_RU.CP1251.out: map.CP1251 ru_RU.CP866.out: map.CP866 ru_RU.ISO8859-5.out: map.ISO8859-5 ru_RU.KOI8-R.out: map.KOI8-R ==== //depot/projects/ia64/share/colldef/bg_BG.CP1251.src#2 (text+ko) ==== @@ -1,18 +1,19 @@ # CP1251 (backward compatible with ASCII) # -# $FreeBSD: src/share/colldef/bg_BG.CP1251.src,v 1.1 2001/11/05 06:58:02 ache Exp $ +# $FreeBSD: src/share/colldef/bg_BG.CP1251.src,v 1.2 2003/06/07 03:26:21 ache Exp $ # charmap map.CP1251 order \ # controls ;...;;\ # - ;!;\";;;\ - %;&;';\(;\);*;+;\,;-;.;/;\ + ;;!;\";<"6>;<"9>;<<<>;/>>;\ + ;;;;\ + %;&;';<'6>;<'9>;\(;\);*;+;<+->;\,;<-->;-;.;/;\ # digits - 0;1;2;3;...;9;\ + 0;...;9;\ # - :;\;;\<;=;>;?;;\ + :;\;;\<;=;>;?;;;;;;\ # uppercase A;...;Z;\ ;;;;;;;;\ @@ -28,13 +29,15 @@ ;;;;;;;;;\ <='>;;<%'>;;;;\ # - \{;|;\};~;
;\ + \{;;|;;\};~;<.M>;;;\ + <-N>;<-M>;<.9>;<:9>;;;<.3>;<%0>;<<1>;1>;\ + ;;;;
;\ # - ;;<.9>;;<:9>;<.3>;;;\ - ;<%0>;;<<1>;;;;;\ - ;<'6>;<'9>;<"6>;<"9>;;<-N>;<-M>;\ - ;;;1>;;;;;\ - ;;;;;;;;\ - ;;;<<<>;;<-->;;;\ - ;<+->;;;;;;<.M>;\ - ;;;/>>;;;; + ;;;\ + ;;;;;\ + ;\ + ;;;;;\ + ;;;;\ + ;;;\ + ;;;\ + ;;;;; ==== //depot/projects/ia64/share/colldef/map.CP866#2 (text+ko) ==== @@ -1,3 +1,4 @@ +# $FreeBSD: src/share/colldef/map.CP866,v 1.2 2003/06/07 02:51:52 ache Exp $ NU \x00 SH \x01 SX \x02 @@ -44,131 +45,131 @@ !) \x7d '? \x7e DT \x7f -hh \xc4 -vv \xb3 -dr \xda -dl \xbf -ur \xc0 -ul \xd9 -vr \xc3 -vl \xb4 -dh \xc2 -uh \xc1 -vh \xc5 -TB \xdf -LB \xdc -FB \xdb -lB \xdd -RB \xde +A= \x80 +B= \x81 +V= \x82 +G= \x83 +D= \x84 +E= \x85 +Z% \x86 +Z= \x87 +I= \x88 +J= \x89 +K= \x8a +L= \x8b +M= \x8c +N= \x8d +O= \x8e +P= \x8f +R= \x90 +S= \x91 +T= \x92 +U= \x93 +F= \x94 +H= \x95 +C= \x96 +C% \x97 +S% \x98 +Sc \x99 +=" \x9a +Y= \x9b +%" \x9c +JE \x9d +JU \x9e +JA \x9f +a= \xa0 +b= \xa1 +v= \xa2 +g= \xa3 +d= \xa4 +e= \xa5 +z% \xa6 +z= \xa7 +i= \xa8 +j= \xa9 +k= \xaa +l= \xab +m= \xac +n= \xad +o= \xae +p= \xaf .S \xb0 :S \xb1 ?S \xb2 -Iu \xf4 -fS \xfe -sb \xf9 -RT \xfb -?2 \xf7 -=< \xf3 ->= \xf2 -NS \xff -Il \xf5 -DG \xf8 -2S \xfd -.M \xfa --: \xf6 -HH \xcd +vv \xb3 +vl \xb4 +vL \xb5 +Vl \xb6 +Dl \xb7 +dL \xb8 +VL \xb9 VV \xba -dR \xd5 -io \xf1 -Dr \xd6 -DR \xc9 -dL \xb8 -Dl \xb7 LD \xbb -uR \xd4 -Ur \xd3 -UR \xc8 +UL \xbc +Ul \xbd uL \xbe -Ul \xbd -UL \xbc +dl \xbf +ur \xc0 +uh \xc1 +dh \xc2 +vr \xc3 +hh \xc4 +vh \xc5 vR \xc6 Vr \xc7 +UR \xc8 +DR \xc9 +UH \xca +DH \xcb VR \xcc -vL \xb5 -IO \xf0 -Vl \xb6 -VL \xb9 +HH \xcd +VH \xce +uH \xcf +Uh \xd0 dH \xd1 Dh \xd2 -DH \xcb -uH \xcf -Uh \xd0 -UH \xca +Ur \xd3 +uR \xd4 +dR \xd5 +Dr \xd6 +Vh \xd7 vH \xd8 -Vh \xd7 -VH \xce -Co \xfc -ju \xee -a= \xa0 -b= \xa1 -c= \xe6 -d= \xa4 -e= \xa5 -f= \xe4 -g= \xa3 -h= \xe5 -i= \xa8 -j= \xa9 -k= \xaa -l= \xab -m= \xac -n= \xad -o= \xae -p= \xaf -ja \xef +ul \xd9 +dr \xda +FB \xdb +LB \xdc +lB \xdd +RB \xde +TB \xdf r= \xe0 s= \xe1 t= \xe2 u= \xe3 -z% \xa6 -v= \xa2 -%' \xec -y= \xeb -z= \xa7 +f= \xe4 +h= \xe5 +c= \xe6 +c% \xe7 s% \xe8 -je \xed sc \xe9 -c% \xe7 =' \xea -JU \x9e -A= \x80 -B= \x81 -C= \x96 -D= \x84 -E= \x85 -F= \x94 -G= \x83 -H= \x95 -I= \x88 -J= \x89 -K= \x8a -L= \x8b -M= \x8c -N= \x8d -O= \x8e -P= \x8f -JA \x9f -R= \x90 -S= \x91 -T= \x92 -U= \x93 -Z% \x86 -V= \x82 -%" \x9c -Y= \x9b -Z= \x87 -S% \x98 -JE \x9d -Sc \x99 -C% \x97 -=" \x9a +y= \xeb +%' \xec +je \xed +ju \xee +ja \xef +IO \xf0 +io \xf1 +IE \xf2 +ie \xf3 +YI \xf4 +yi \xf5 +V% \xf6 +v% \xf7 +DG \xf8 +Sb \xf9 +.M \xfa +RT \xfb +N0 \xfc +Cu \xfd +fS \xfe +NS \xff ==== //depot/projects/ia64/share/colldef/map.KOI8-R#2 (text+ko) ==== @@ -1,3 +1,4 @@ +# $FreeBSD: src/share/colldef/map.KOI8-R,v 1.2 2003/06/07 02:51:52 ache Exp $ NU \x00 SH \x01 SX \x02 @@ -65,7 +66,7 @@ ?S \x92 Iu \x93 fS \x94 -sb \x95 +Sb \x95 RT \x96 ?2 \x97 =< \x98 ==== //depot/projects/ia64/share/colldef/map.KOI8-U#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/colldef/map.KOI8-U,v 1.2 2000/05/04 18:03:46 phantom Exp $ +# $FreeBSD: src/share/colldef/map.KOI8-U,v 1.3 2003/06/07 02:59:28 ache Exp $ NU \x00 SH \x01 SX \x02 @@ -66,7 +66,7 @@ ?S \x92 Iu \x93 fS \x94 -sb \x95 +Sb \x95 RT \x96 ?2 \x97 =< \x98 ==== //depot/projects/ia64/share/colldef/ru_RU.CP866.src#2 (text+ko) ==== @@ -1,18 +1,18 @@ # CP866 (backward compatible with ASCII) # -# $FreeBSD: src/share/colldef/ru_RU.CP866.src,v 1.8 1999/08/28 00:59:49 peter Exp $ +# $FreeBSD: src/share/colldef/ru_RU.CP866.src,v 1.10 2003/06/07 02:51:52 ache Exp $ # charmap map.CP866 order \ # controls ;...;;\ # - ;;!;\";;;\ - %;&;';\(;\);*;+;<-:>;\,;-;.;/;\ + ;;!;\";;;;\ + %;&;';\(;\);*;+;\,;-;.;/;\ # digits - 0;1;(2,<2S>);3;...;9;\ + 0;...;9;\ # - :;\;;\<;<=<>;=;=>;>;?;;;\ + :;\;;\<;=;>;?;;\ # capital A;...;Z;\ ;;;;;;;;;\ @@ -28,12 +28,13 @@ ;;;;;;;;;\ <='>;;<%'>;;;;\ # - \{;|;\};~;<.M>;;
;\ + \{;|;\};~;<.M>;;;;;\ # - ;;;;;\ ;;;;;;;;\
;
;
;;;;;;\
    ;
      ;
        ;
          ;;;;;\ ;;;;;;;;\ ;;;;;;;;\ - ;;;;;<.S>;<:S>;; + ;;;;;<.S>;<:S>;;;
          ;\ +# + ;;;;; ==== //depot/projects/ia64/share/colldef/ru_RU.ISO8859-5.src#2 (text+ko) ==== @@ -1,6 +1,6 @@ # Russian part of ISO8859-5 (backward compatible with ASCII) # -# $FreeBSD: src/share/colldef/ru_RU.ISO8859-5.src,v 1.2 2001/06/10 13:43:47 ache Exp $ +# $FreeBSD: src/share/colldef/ru_RU.ISO8859-5.src,v 1.3 2003/06/07 00:46:20 ache Exp $ # charmap map.ISO8859-5 order \ @@ -8,7 +8,7 @@ ;...;;\ # ;;!;\";;;\ - %;&;';\(;\);*;+;\,;-;.;/;\ + %;&;';\(;\);*;+;\,;<-->;-;.;/;\ # digits 0;...;9;\ # @@ -28,10 +28,12 @@ ;;;;;;;;;\ <='>;;<%'>;;;;\ # - \{;|;\};~;
          ;;;;;;;\ + \{;|;\};~;;
          ;\ +# + ;;;;;;\ ;;;;;;;;;\ ;;;;;;;;;\ ;;;;;;;;;\ ;;;;;;;;;\ - ;<-->;;;;;;;;\ + ;;;;;;;\ ;;;;;;;;; ==== //depot/projects/ia64/share/colldef/ru_RU.KOI8-R.src#2 (text+ko) ==== @@ -1,6 +1,6 @@ # koi8-r (backward compatible with ASCII) # -# $FreeBSD: src/share/colldef/ru_RU.KOI8-R.src,v 1.8 1999/08/28 00:59:49 peter Exp $ +# $FreeBSD: src/share/colldef/ru_RU.KOI8-R.src,v 1.10 2003/06/07 02:51:52 ache Exp $ # charmap map.KOI8-R order \ @@ -28,12 +28,12 @@ ;;;;;;;;;\ <='>;;<%'>;;;;\ # - \{;|;\};~;<.M>;;
          ;\ + \{;|;\};~;<.M>;;\ # - ;;;;;\ + ;;;;;\ ;;;;;;;;\
          ;
          ;
          ;;;;;;\
            ;
              ;
                ;
                  ;;;;;\ ;;;;;;;;\ ;;;;;;;;\ - ;;;;;<.S>;<:S>;; + ;;;;;<.S>;<:S>;;;
                  ==== //depot/projects/ia64/share/colldef/uk_UA.KOI8-U.src#2 (text+ko) ==== @@ -1,6 +1,6 @@ # koi8-u (backward compatible with ASCII) # -# $FreeBSD: src/share/colldef/uk_UA.KOI8-U.src,v 1.2 2000/05/04 18:03:47 phantom Exp $ +# $FreeBSD: src/share/colldef/uk_UA.KOI8-U.src,v 1.3 2003/06/07 02:59:28 ache Exp $ # charmap map.KOI8-U order \ @@ -30,7 +30,7 @@ # \{;|;\};~;<.M>;;
                  ;\ # - ;;;;;\ + ;;;;;\ ;;;;;;;\
                  ;;;;;;\
                    ;
                      ;
                        ;;;;;\ ==== //depot/projects/ia64/share/monetdef/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.43 2002/12/30 09:09:57 ache Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.44 2003/06/07 00:28:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -38,6 +38,7 @@ pt_BR.ISO8859-1 \ pt_PT.ISO8859-1 \ ro_RO.ISO8859-2 \ + ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ==== //depot/projects/ia64/share/msgdef/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/msgdef/Makefile,v 1.44 2002/12/30 09:09:58 ache Exp $ +# $FreeBSD: src/share/msgdef/Makefile,v 1.45 2003/06/07 00:26:32 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -30,6 +30,7 @@ pl_PL.ISO8859-2 \ pt_PT.ISO8859-1 \ ro_RO.ISO8859-2 \ + ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ==== //depot/projects/ia64/share/numericdef/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/numericdef/Makefile,v 1.42 2002/12/30 09:09:58 ache Exp $ +# $FreeBSD: src/share/numericdef/Makefile,v 1.45 2003/06/07 01:24:02 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -30,8 +30,6 @@ pt_BR.ISO8859-1 \ pt_PT.ISO8859-1 \ ro_RO.ISO8859-2 \ - ru_RU.CP866 \ - ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ sk_SK.ISO8859-2 \ sl_SI.ISO8859-2 \ @@ -39,7 +37,6 @@ sr_YU.ISO8859-5 \ sv_SE.ISO8859-1 \ tr_TR.ISO8859-9 \ - uk_UA.ISO8859-5 \ uk_UA.KOI8-U \ zh_CN.eucCN \ zh_TW.Big5 @@ -55,8 +52,10 @@ FR_LINKS= fr_CA fr_CH DE_LINKS= de_AT de_CH IT_LINKS= it_CH - BE_LINKS= nl_BE +RU_LINKS= ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 +UA_LINKS= uk_UA.ISO8859-5 +CN_LINKS= zh_CN.GBK .SUFFIXES: .src .out @@ -114,6 +113,18 @@ ln -sf ../fr_BE.ISO8859-1/LC_NUMERIC \ ${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC .endfor +.for link in ${RU_LINKS} + ln -sf ../ru_RU.KOI8-R/LC_NUMERIC \ + ${LOCALEDIR}/${link}/LC_NUMERIC +.endfor +.for link in ${UA_LINKS} + ln -sf ../uk_UA.KOI8-U/LC_NUMERIC \ + ${LOCALEDIR}/${link}/LC_NUMERIC +.endfor +.for link in ${CN_LINKS} + ln -sf ../zh_CN.eucCN/LC_NUMERIC \ + ${LOCALEDIR}/${link}/LC_NUMERIC +.endfor .for link in ${ASCIILINKS} ln -sf ../${link}.ISO8859-1/LC_NUMERIC \ ${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC ==== //depot/projects/ia64/share/timedef/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/timedef/Makefile,v 1.31 2002/12/30 09:09:58 ache Exp $ +# $FreeBSD: src/share/timedef/Makefile,v 1.32 2003/06/07 00:12:12 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -33,6 +33,7 @@ pt_BR.ISO8859-1 \ pt_PT.ISO8859-1 \ ro_RO.ISO8859-2 \ + ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#65 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.107 2003/05/26 22:54:18 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.108 2003/06/07 04:17:39 marcel Exp $ */ /* @@ -1508,6 +1508,7 @@ va = pv->pv_va; if (va >= sva && va < eva) { pte = pmap_find_vhpt(va); + KASSERT(pte != NULL, ("pte")); pmap_remove_pte(pmap, pte, va, pv, 1); pmap_invalidate_page(pmap, va); } @@ -1565,6 +1566,7 @@ oldpmap = pmap_install(pmap); pte = pmap_find_vhpt(va); + KASSERT(pte != NULL, ("pte")); if (pmap_pte_pa(pte) != VM_PAGE_TO_PHYS(m)) panic("pmap_remove_all: pv_table for %lx is inconsistent", VM_PAGE_TO_PHYS(m)); pmap_remove_pte(pmap, pte, va, pv, 1); @@ -2052,7 +2054,7 @@ oldpmap = pmap_install(pmap); pte = pmap_find_vhpt(va); - + KASSERT(pte != NULL, ("pte")); if (wired && !pmap_pte_w(pte)) pmap->pm_stats.wired_count++; else if (!wired && pmap_pte_w(pte)) @@ -2212,16 +2214,9 @@ } pte = pmap_find_vhpt(pv->pv_va); - if (!pte) - panic("pmap_remove_pages: page on pm_pvlist has no pte\n"); - - -/* - * We cannot remove wired pages from a process' mapping at this time - */ - if (pte->pte_ig & PTE_IG_WIRED) { + KASSERT(pte != NULL, ("pte")); + if (pte->pte_ig & PTE_IG_WIRED) continue; - } pmap_remove_pte(pmap, pte, pv->pv_va, pv, 1); } @@ -2250,6 +2245,7 @@ pmap_t oldpmap = pmap_install(pv->pv_pmap); struct ia64_lpte *pte; pte = pmap_find_vhpt(pv->pv_va); + KASSERT(pte != NULL, ("pte")); pmap_pte_set_prot(pte, newprot); pmap_update_vhpt(pte, pv->pv_va); pmap_invalidate_page(pv->pv_pmap, pv->pv_va); @@ -2286,6 +2282,7 @@ pmap_t oldpmap = pmap_install(pv->pv_pmap); struct ia64_lpte *pte; pte = pmap_find_vhpt(pv->pv_va); + KASSERT(pte != NULL, ("pte")); if (pte->pte_a) { count++; pte->pte_a = 0; @@ -2317,6 +2314,7 @@ pmap_t oldpmap = pmap_install(pv->pv_pmap); struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va); pmap_install(oldpmap); + KASSERT(pte != NULL, ("pte")); if (pte->pte_a) return 1; } @@ -2343,6 +2341,7 @@ pmap_t oldpmap = pmap_install(pv->pv_pmap); struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va); pmap_install(oldpmap); + KASSERT(pte != NULL, ("pte")); if (pte->pte_d) return 1; } @@ -2364,6 +2363,7 @@ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap_t oldpmap = pmap_install(pv->pv_pmap); struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va); + KASSERT(pte != NULL, ("pte")); if (pte->pte_d) { pte->pte_d = 0; pmap_update_vhpt(pte, pv->pv_va); @@ -2389,6 +2389,7 @@ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap_t oldpmap = pmap_install(pv->pv_pmap); struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va); + KASSERT(pte != NULL, ("pte")); if (pte->pte_a) { pte->pte_a = 0; pmap_update_vhpt(pte, pv->pv_va); ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#57 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.81 2003/06/06 23:44:05 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.82 2003/06/07 04:10:07 marcel Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ @@ -699,7 +699,9 @@ /* * Additionally check the privilege level. We don't want to * panic when we're in the gateway page, running at user - * level. This happens for the signal trampolines. + * level. This happens for the signal trampolines. Note that + * when that happens, user is defined as 0 above. We need to + * set user to 1 to force calling userret() and do_ast(). */ if (!TRAPF_USERMODE(framep)) { /* Check for copyin/copyout fault. */ @@ -711,7 +713,8 @@ goto out; } goto dopanic; - } + } else + user = 1; ucode = va; i = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; break; ==== //depot/projects/ia64/sys/vm/vm_map.c#54 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.296 2003/04/30 19:18:09 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.297 2003/06/07 02:29:17 alc Exp $ */ /* @@ -2143,9 +2143,7 @@ if (object->ref_count != 1 && (object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING && (object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) { - VM_OBJECT_UNLOCK(object); vm_object_collapse(object); - VM_OBJECT_LOCK(object); vm_object_page_remove(object, offidxstart, offidxend, FALSE); if (object->type == OBJT_SWAP) swap_pager_freespace(object, offidxstart, count); @@ -2289,7 +2287,9 @@ if ((src_object->handle == NULL) && (src_object->type == OBJT_DEFAULT || src_object->type == OBJT_SWAP)) { + VM_OBJECT_LOCK(src_object); vm_object_collapse(src_object); + VM_OBJECT_UNLOCK(src_object); if ((src_object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING) { vm_object_split(src_entry); src_object = src_entry->object.vm_object; ==== //depot/projects/ia64/sys/vm/vm_object.c#59 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.294 2003/06/05 20:55:27 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.295 2003/06/07 02:29:17 alc Exp $ */ /* @@ -508,8 +508,8 @@ goto doterm; } object = robject; - /* XXX */ VM_OBJECT_UNLOCK(object); vm_object_collapse(object); + VM_OBJECT_UNLOCK(object); continue; } VM_OBJECT_UNLOCK(robject); @@ -1495,7 +1495,7 @@ void vm_object_collapse(vm_object_t object) { - GIANT_REQUIRED; + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); while (TRUE) { vm_object_t backing_object; @@ -1505,9 +1505,6 @@ * * The object exists and the backing object exists. */ - if (object == NULL) - break; - if ((backing_object = object->backing_object) == NULL) break; @@ -1536,7 +1533,7 @@ VM_OBJECT_UNLOCK(backing_object); break; } - +/* XXX */ VM_OBJECT_UNLOCK(object); /* * We know that we can either collapse the backing object (if * the parent is the only reference to it) or (perhaps) have @@ -1645,6 +1642,7 @@ */ if (vm_object_backing_scan(object, OBSC_TEST_ALL_SHADOWED) == 0) { VM_OBJECT_UNLOCK(backing_object); +/* XXX */ VM_OBJECT_LOCK(object); break; } @@ -1687,6 +1685,7 @@ /* * Try again with this object's new backing object. */ +/* XXX */ VM_OBJECT_LOCK(object); } } @@ -1801,9 +1800,7 @@ /* * Try to collapse the object first */ - VM_OBJECT_UNLOCK(prev_object); vm_object_collapse(prev_object); - VM_OBJECT_LOCK(prev_object); /* * Can't coalesce if: . more than one reference . paged out . shadows From owner-p4-projects@FreeBSD.ORG Sat Jun 7 03:23:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C04E537B404; Sat, 7 Jun 2003 03:23:34 -0700 (PDT) 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 5935537B401 for ; Sat, 7 Jun 2003 03:23:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03B2143F3F for ; Sat, 7 Jun 2003 03:23:34 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57ANX0U029510 for ; Sat, 7 Jun 2003 03:23:33 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57ANXcP029507 for perforce@freebsd.org; Sat, 7 Jun 2003 03:23:33 -0700 (PDT) Date: Sat, 7 Jun 2003 03:23:33 -0700 (PDT) Message-Id: <200306071023.h57ANXcP029507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 10:23:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=32730 Change 32730 by jmallett@jmallett_dalek on 2003/06/07 03:22:49 Actually mask away lower bits of the VPN2 for EntryHi. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#6 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#6 (text+ko) ==== @@ -71,7 +71,7 @@ #define MIPS_HI_VPN2_SHIFT 13 #define MIPS_HI_VPN2_BMASK 0xFFFFFFE #define MIPS_HI_VPN2_MASK (MIPS_HI_VPN2_BMASK << MIPS_HI_VPN2_SHIFT) -#define MIPS_HI_VA_TO_VPN2(va) (((va) & MIPS_HI_VPN2_BMASK) << MIPS_HI_VPN2_SHIFT) +#define MIPS_HI_VA_TO_VPN2(va) ((va) & MIPS_HI_VPN2_MASK) /* * TLB page bits that aren't really flags: From owner-p4-projects@FreeBSD.ORG Sat Jun 7 03:30:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E79A37B404; Sat, 7 Jun 2003 03:30:44 -0700 (PDT) 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 AA44D37B401 for ; Sat, 7 Jun 2003 03:30:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CA2343F85 for ; Sat, 7 Jun 2003 03:30:43 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57AUh0U029821 for ; Sat, 7 Jun 2003 03:30:43 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57AUg7e029818 for perforce@freebsd.org; Sat, 7 Jun 2003 03:30:42 -0700 (PDT) Date: Sat, 7 Jun 2003 03:30:42 -0700 (PDT) Message-Id: <200306071030.h57AUg7e029818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 10:30:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=32731 Change 32731 by jmallett@jmallett_dalek on 2003/06/07 03:29:57 Expose TBIA like TBIAP is exposed. Affected files ... .. //depot/projects/mips/sys/mips/include/locore.h#7 edit Differences ... ==== //depot/projects/mips/sys/mips/include/locore.h#7 (text+ko) ==== @@ -83,7 +83,7 @@ extern long *mips_locoresw[]; #define MachSetPID mips64_SetPID -#define MIPS_TBIA mips64_TBIA +#define MIPS_TBIA() mips64_TBIA(mips_num_tlb_entries) #define MIPS_TBIAP() mips64_TBIAP(mips_num_tlb_entries) #define MIPS_TBIS mips64_TBIS #define MachTLBUpdate mips64_TLBUpdate From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:00:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 198F237B404; Sat, 7 Jun 2003 04:00:21 -0700 (PDT) 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 AF0C437B401 for ; Sat, 7 Jun 2003 04:00:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4111343F93 for ; Sat, 7 Jun 2003 04:00:20 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57B0K0U031064 for ; Sat, 7 Jun 2003 04:00:20 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57B0JYM031061 for perforce@freebsd.org; Sat, 7 Jun 2003 04:00:19 -0700 (PDT) Date: Sat, 7 Jun 2003 04:00:19 -0700 (PDT) Message-Id: <200306071100.h57B0JYM031061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:00:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=32733 Change 32733 by jmallett@jmallett_dalek on 2003/06/07 03:59:18 Add a PG_ bit for all hardware bits. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#7 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#7 (text+ko) ==== @@ -96,10 +96,12 @@ * G: Global bit. This means that this mapping is present * in EVERY address space, and to ignore the ASID when * it is matched. + * HW: Mask of all hardware bits. */ #define PG_D 0x04 #define PG_V 0x02 #define PG_G 0x01 +#define PG_HW (PG_D | PG_V | PG_G) /* * VM flags managed in software: From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:27:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B3D337B404; Sat, 7 Jun 2003 04:27:56 -0700 (PDT) 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 D961237B401 for ; Sat, 7 Jun 2003 04:27:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8383143F85 for ; Sat, 7 Jun 2003 04:27:55 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57BRt0U035389 for ; Sat, 7 Jun 2003 04:27:55 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57BRtXO035386 for perforce@freebsd.org; Sat, 7 Jun 2003 04:27:55 -0700 (PDT) Date: Sat, 7 Jun 2003 04:27:55 -0700 (PDT) Message-Id: <200306071127.h57BRtXO035386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=32736 Change 32736 by jmallett@jmallett_dalek on 2003/06/07 04:27:25 Test set and clear macros for PTE bits. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#8 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#8 (text+ko) ==== @@ -120,4 +120,20 @@ */ #define PG_PROT (PG_RO) +/* + * PTE management functions for bits defined above. + */ +#define pte_clear(pte,bit) ((*(pte)) &= ~(bit)) +#define pte_set(pte,bit) ((*(pte)) |= (bit)) +#define pte_test(pte,bit) (((*(pte)) & (bit)) == (bit)) + +#define pte_managed(pte) (pte_test((pte), PG_M)) +#define pte_valid(pte) (pte_test((pte), PG_V)) +#define pte_ro(pte) (pte_test((pte), PG_RO)) +#define pte_dirty(pte) (pte_test((pte), PG_D)) +#define pte_wired(pte) (pte_test((pte), PG_W)) + +#define pte_wire(pte) (pte_set((pte), PG_W)) +#define pte_unwire(pte) (pte_clear((pte), PG_W)) + #endif /* _MACHINE_PTE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:28:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD0C37B428; Sat, 7 Jun 2003 04:28:58 -0700 (PDT) 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 DCC9937B496 for ; Sat, 7 Jun 2003 04:28:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 731B343F93 for ; Sat, 7 Jun 2003 04:28:57 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57BSv0U035495 for ; Sat, 7 Jun 2003 04:28:57 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57BSuqw035492 for perforce@freebsd.org; Sat, 7 Jun 2003 04:28:56 -0700 (PDT) Date: Sat, 7 Jun 2003 04:28:56 -0700 (PDT) Message-Id: <200306071128.h57BSuqw035492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=32737 Change 32737 by jmallett@jmallett_dalek on 2003/06/07 04:28:04 A header describing some simple interfaces to TLB management code. Affected files ... .. //depot/projects/mips/sys/mips/include/tlb.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:30:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C358737B407; Sat, 7 Jun 2003 04:30:00 -0700 (PDT) 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 624B737B404 for ; Sat, 7 Jun 2003 04:30:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C52F43FBD for ; Sat, 7 Jun 2003 04:29:59 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57BTx0U035550 for ; Sat, 7 Jun 2003 04:29:59 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57BTwJn035547 for perforce@freebsd.org; Sat, 7 Jun 2003 04:29:58 -0700 (PDT) Date: Sat, 7 Jun 2003 04:29:58 -0700 (PDT) Message-Id: <200306071129.h57BTwJn035547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:30:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=32738 Change 32738 by jmallett@jmallett_dalek on 2003/06/07 04:29:17 Abstractions of some TLB code into its own file, for use by pmap. A few XXXs, namely that ASID stuff needs moved here, and that the NetBSD TBI* stuff is a big dodgy. I'll probably go the route of implementing them in C using cpufunc or such, at some point. Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:30:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 398D837B40E; Sat, 7 Jun 2003 04:30:01 -0700 (PDT) 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 7893B37B405 for ; Sat, 7 Jun 2003 04:30:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D847543FBF for ; Sat, 7 Jun 2003 04:29:59 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57BTx0U035556 for ; Sat, 7 Jun 2003 04:29:59 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57BTxbn035553 for perforce@freebsd.org; Sat, 7 Jun 2003 04:29:59 -0700 (PDT) Date: Sat, 7 Jun 2003 04:29:59 -0700 (PDT) Message-Id: <200306071129.h57BTxbn035553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:30:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=32739 Change 32739 by jmallett@jmallett_dalek on 2003/06/07 04:29:37 Hook tlb.c up to the build. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#19 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#19 (text+ko) ==== @@ -22,6 +22,7 @@ mips/mips/support.S standard mips/mips/sys_machdep.c standard mips/mips/syscall.c standard +mips/mips/tlb.c standard mips/mips/trap.c standard mips/mips/vm_machdep.c standard # XXX cache code needs to be split up per CPU type, but yuck. From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:33:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 136DB37B404; Sat, 7 Jun 2003 04:33:05 -0700 (PDT) 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 9235D37B401 for ; Sat, 7 Jun 2003 04:33:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3ACFC43F93 for ; Sat, 7 Jun 2003 04:33:04 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57BX40U035720 for ; Sat, 7 Jun 2003 04:33:04 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57BX3KK035717 for perforce@freebsd.org; Sat, 7 Jun 2003 04:33:03 -0700 (PDT) Date: Sat, 7 Jun 2003 04:33:03 -0700 (PDT) Message-Id: <200306071133.h57BX3KK035717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:33:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=32740 Change 32740 by jmallett@jmallett_dalek on 2003/06/07 04:32:03 Call TLBMod (and others, in time) handler before deciding this is quite a _fatal_ trap. Affected files ... .. //depot/projects/mips/sys/mips/mips/trap.c#8 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/trap.c#8 (text+ko) ==== @@ -84,6 +84,20 @@ code = (cause & MIPS3_CR_EXC_CODE) >> MIPS_CR_EXC_CODE_SHIFT; kernelmode = (tf->tf_regs[TF_SR] & MIPS_SR_KSU_USER) == 0; + + /* + * Handle that which we can. + */ + switch (code) { + case T_TLB_MOD: + /* XXX Kernel only. */ + tlb_modified(badvaddr); + return; + default: + /* Fatal! */ + break; + } + printf("\n\nFatal trap type %d in %s mode:", code, kernelmode ? "kernel" : "user"); if (code <= MAXTRAPID && code >= 0) { @@ -109,10 +123,6 @@ kdb_trap(code, tf); break; #endif - case T_TLB_MOD: - /* XXX Kernel only. */ - pmap_tlb_modified(badvaddr); - return; default: goto dopanic; } From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:36:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C96337B404; Sat, 7 Jun 2003 04:36:10 -0700 (PDT) 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 1501537B401 for ; Sat, 7 Jun 2003 04:36:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BF4343FB1 for ; Sat, 7 Jun 2003 04:36:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57Ba90U035908 for ; Sat, 7 Jun 2003 04:36:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57Ba8g9035905 for perforce@freebsd.org; Sat, 7 Jun 2003 04:36:08 -0700 (PDT) Date: Sat, 7 Jun 2003 04:36:08 -0700 (PDT) Message-Id: <200306071136.h57Ba8g9035905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 11:36:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=32742 Change 32742 by jmallett@jmallett_dalek on 2003/06/07 04:35:37 Add tlbwi / tlbwr. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#12 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#12 (text+ko) ==== @@ -34,6 +34,18 @@ #include static __inline void +mips_tlbwi(void) +{ + __asm __volatile ("tlbwi"); +} + +static __inline void +mips_tlbwr(void) +{ + __asm __volatile ("tlbwr"); +} + +static __inline void mips_wbflush(void) { __asm __volatile ("sync" : : : "memory"); From owner-p4-projects@FreeBSD.ORG Sat Jun 7 05:01:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C36837B404; Sat, 7 Jun 2003 05:01:42 -0700 (PDT) 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 D736437B401 for ; Sat, 7 Jun 2003 05:01:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8095543FBF for ; Sat, 7 Jun 2003 05:01:41 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57C1f0U042250 for ; Sat, 7 Jun 2003 05:01:41 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57C1ffS042247 for perforce@freebsd.org; Sat, 7 Jun 2003 05:01:41 -0700 (PDT) Date: Sat, 7 Jun 2003 05:01:41 -0700 (PDT) Message-Id: <200306071201.h57C1ffS042247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 12:01:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=32744 Change 32744 by jmallett@jmallett_dalek on 2003/06/07 05:01:02 Include tlbr, tlbp. Include pagemask reading. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#13 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#13 (text+ko) ==== @@ -34,6 +34,18 @@ #include static __inline void +mips_tlbp(void) +{ + __asm __volatile ("tlbp"); +} + +static __inline void +mips_tlbr(void) +{ + __asm __volatile ("tlbr"); +} + +static __inline void mips_tlbwi(void) { __asm __volatile ("tlbwi"); @@ -74,6 +86,7 @@ MIPS_RDRW64_COP0(entrylo0, MIPS_COP_0_TLB_LO0) MIPS_RDRW64_COP0(entrylo1, MIPS_COP_0_TLB_LO1) MIPS_RDRW64_COP0(entryhi, MIPS_COP_0_TLB_HI) +MIPS_RDRW64_COP0(pagemask, MIPS_COP_0_TLB_PG_MASK) #undef MIPS_RDRW64_COP0 From owner-p4-projects@FreeBSD.ORG Sat Jun 7 05:11:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BC1537B404; Sat, 7 Jun 2003 05:11:55 -0700 (PDT) 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 05D4F37B401 for ; Sat, 7 Jun 2003 05:11:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8473443F75 for ; Sat, 7 Jun 2003 05:11:54 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57CBs0U043603 for ; Sat, 7 Jun 2003 05:11:54 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57CBr80043600 for perforce@freebsd.org; Sat, 7 Jun 2003 05:11:53 -0700 (PDT) Date: Sat, 7 Jun 2003 05:11:53 -0700 (PDT) Message-Id: <200306071211.h57CBr80043600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 12:11:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=32745 Change 32745 by jmallett@jmallett_dalek on 2003/06/07 05:10:57 GC SetPID code... Affected files ... .. //depot/projects/mips/sys/mips/include/locore.h#8 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#31 edit .. //depot/projects/mips/sys/mips/mips/mips_subr.S#9 edit Differences ... ==== //depot/projects/mips/sys/mips/include/locore.h#8 (text+ko) ==== @@ -31,7 +31,6 @@ struct tlb; -void mips64_SetPID(int); void mips64_TBIA(int); void mips64_TBIAP(int); void mips64_TBIS(vm_paddr_t); @@ -66,7 +65,6 @@ * XXX Sprite coding-convention names used in 4.4bsd/pmax. */ typedef struct { - void (*setTLBpid)(int pid); void (*TBIA)(int); void (*TBIAP)(int); void (*TBIS)(vm_paddr_t); @@ -82,7 +80,6 @@ extern mips_locore_jumpvec_t mips_locore_jumpvec; extern long *mips_locoresw[]; -#define MachSetPID mips64_SetPID #define MIPS_TBIA() mips64_TBIA(mips_num_tlb_entries) #define MIPS_TBIAP() mips64_TBIAP(mips_num_tlb_entries) #define MIPS_TBIS mips64_TBIS ==== //depot/projects/mips/sys/mips/mips/machdep.c#31 (text+ko) ==== @@ -578,7 +578,6 @@ */ const mips_locore_jumpvec_t mips64_locore_vec = { - mips64_SetPID, mips64_TBIA, mips64_TBIAP, mips64_TBIS, ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#9 (text+ko) ==== @@ -180,33 +180,6 @@ /*-------------------------------------------------------------------------- * - * mipsN_SetPID -- - * - * Write the given pid into the TLB pid reg. - * - * mips3_SetPID(pid) - * int pid; - * - * Results: - * None. - * - * Side effects: - * PID set in the entry hi register. - * - *-------------------------------------------------------------------------- - */ -LEAF(MIPSX(SetPID)) - _MTC0 a0, MIPS_COP_0_TLB_HI # Write the hi reg value - COP0_SYNC - /* XXX simonb: lose these nops for mips32/64? */ - nop # required for QED5230 - nop # required for QED5230 - j ra - nop -END(MIPSX(SetPID)) - -/*-------------------------------------------------------------------------- - * * mipsN_TLBUpdate -- * * Update the TLB if highreg is found; otherwise, enter the data. From owner-p4-projects@FreeBSD.ORG Sat Jun 7 22:06:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7436337B404; Sat, 7 Jun 2003 22:06:50 -0700 (PDT) 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 E633137B401 for ; Sat, 7 Jun 2003 22:06:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 650B343FA3 for ; Sat, 7 Jun 2003 22:06:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5856n0U022666 for ; Sat, 7 Jun 2003 22:06:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5856mAt022663 for perforce@freebsd.org; Sat, 7 Jun 2003 22:06:48 -0700 (PDT) Date: Sat, 7 Jun 2003 22:06:48 -0700 (PDT) Message-Id: <200306080506.h5856mAt022663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 32788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 05:06:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=32788 Change 32788 by rwatson@rwatson_tislabs on 2003/06/07 22:05:57 Add new MAC entry point to facilitate the processing of CIPSO labels: mac_update_mbuf_from_cipso, which accepts an mbuf pointer and a pointer to the IP CIPSO option, as well as letting the MAC framework return an ICMP error code if the call fails in some form. Invoke the entry point from ip_dooptions() in the input path. Add a new MAC policy entry point, mpo_update_mbuf_from_cipso, with similar arguments (added ifnet, mbuf label, and ifnet label arguments). These calls will likely be revised as support for CIPSO evolves. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#390 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#34 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#237 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#190 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#390 (text+ko) ==== @@ -2443,6 +2443,25 @@ MAC_PERFORM(update_ipq, fragment, label, ipq, &ipq->ipq_label); } +int +mac_update_mbuf_from_cipso(struct mbuf *m, char *cp, int *code) +{ + struct label *label, *ifnetlabel; + int error; + + label = mbuf_to_label(m); + + if (m->m_pkthdr.rcvif != NULL) + ifnetlabel = &m->m_pkthdr.rcvif->if_label; + else + ifnetlabel = NULL; + + MAC_CHECK(update_mbuf_from_cipso, m, label, m->m_pkthdr.rcvif, + ifnetlabel, cp, code); + + return (error); +} + void mac_create_mbuf_from_socket(struct socket *socket, struct mbuf *mbuf) { ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#34 (text+ko) ==== @@ -1288,6 +1288,9 @@ struct in_addr *sin, dst; n_time ntime; struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; +#ifdef MAC + int error; +#endif dst = ip->ip_dst; cp = (u_char *)(ip + 1); @@ -1527,6 +1530,15 @@ ntime = iptime(); (void)memcpy(cp + off, &ntime, sizeof(n_time)); cp[IPOPT_OFFSET] += sizeof(n_time); + break; + + case IPOPT_CIPSO: +#ifdef MAC + error = mac_update_mbuf_from_cipso(m, cp, &code); + if (error) + goto bad; +#endif + break; } } if (forward && ipforwarding) { ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#237 (text+ko) ==== @@ -214,6 +214,7 @@ void mac_reflect_mbuf_icmp(struct mbuf *m); void mac_reflect_mbuf_tcp(struct mbuf *m); void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); +int mac_update_mbuf_from_cipso(struct mbuf *m, char *cp, int *code); /* * Labeling event operations: processes. ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#190 (text+ko) ==== @@ -238,6 +238,9 @@ void (*mpo_update_ipq)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); + int (*mpo_update_mbuf_from_cipso)(struct mbuf *m, + struct label *mlabel, struct ifnet *ifnet, + struct label *ifnetlabel, char *cp, int *code); /* * Labeling event operations: processes.