From owner-p4-projects@FreeBSD.ORG Sun Jul 30 00:04:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DFF516A4E1; Sun, 30 Jul 2006 00:04:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1202B16A4DD for ; Sun, 30 Jul 2006 00:04:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46AD143D73 for ; Sun, 30 Jul 2006 00:04:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U049Tj071492 for ; Sun, 30 Jul 2006 00:04:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U049iF071489 for perforce@freebsd.org; Sun, 30 Jul 2006 00:04:09 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Jul 2006 00:04:09 GMT Message-Id: <200607300004.k6U049iF071489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 00:04:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=102752 Change 102752 by jb@jb_freebsd2 on 2006/07/30 00:03:10 Change 'printf' and 'vprintf' to write to a buffer on the stack rather than using putchar to write to the console device character by character. The limitation here is that if the 256 character buffer on the stack isn't large enough, a malloc is required and this will (obviously) only work after kmem is initialised. printfs early in the kernel boot process will need to be limited to 256 characters. More work is required to ensure the formatted string gets sent to the syslog. Affected files ... .. //depot/projects/dtrace/src/sys/kern/subr_prf.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/subr_prf.c#4 (text+ko) ==== @@ -92,7 +92,6 @@ static char *ksprintn(char *nbuf, uintmax_t num, int base, int *len, int upper); static void snprintf_func(int ch, void *arg); -static int consintr = 1; /* Ok to handle console interrupts? */ static int msgbufmapped; /* Set when safe to use msgbuf */ int msgbuftrigger; @@ -283,42 +282,79 @@ int printf(const char *fmt, ...) { + char bufr[256]; + char *p_bufr = bufr; + int s_bufr = sizeof(bufr); + int retval; va_list ap; - int savintr; - struct putchar_arg pca; - int retval; - savintr = consintr; /* disable interrupts */ - consintr = 0; + /* Try to format the string using the buffer on the stack. */ va_start(ap, fmt); - pca.tty = NULL; - pca.flags = TOCONS | TOLOG; - pca.pri = -1; - retval = kvprintf(fmt, putchar, &pca, 10, ap); + retval = vsnprintf(p_bufr, s_bufr, fmt, ap); va_end(ap); - if (!panicstr) - msgbuftrigger = 1; - consintr = savintr; /* reenable interrupts */ - return (retval); + + /* Check if the stack buffer wasn't large enough. */ + if (retval >= s_bufr) { + /* + * Allocate a temporary buffer and format that string + * into it. + */ + s_bufr = retval + 1; + p_bufr = malloc(s_bufr, M_TEMP, M_WAITOK); + va_start(ap, fmt); + retval = vsnprintf(p_bufr, s_bufr, fmt, ap); + va_end(ap); + } + + /* + * If there are characters in the string write them to put them + * to each console. + */ + if (retval > 0) + cnputs(p_bufr, retval); + + /* If a temporary buffer was allocated, free it. */ + if (p_bufr != NULL && p_bufr != bufr) + free(p_bufr, M_TEMP); + + return(retval); } int vprintf(const char *fmt, va_list ap) { - int savintr; - struct putchar_arg pca; + char bufr[256]; + char *p_bufr = bufr; + int s_bufr = sizeof(bufr); int retval; + va_list ap_cp = ap; + + /* Try to format the string using the buffer on the stack. */ + retval = vsnprintf(p_bufr, s_bufr, fmt, ap); + + /* Check if the stack buffer wasn't large enough. */ + if (retval >= s_bufr) { + /* + * Allocate a temporary buffer and format that string + * into it. + */ + s_bufr = retval + 1; + p_bufr = malloc(s_bufr, M_TEMP, M_WAITOK); + retval = vsnprintf(p_bufr, s_bufr, fmt, ap_cp); + } - savintr = consintr; /* disable interrupts */ - consintr = 0; - pca.tty = NULL; - pca.flags = TOCONS | TOLOG; - pca.pri = -1; - retval = kvprintf(fmt, putchar, &pca, 10, ap); - if (!panicstr) - msgbuftrigger = 1; - consintr = savintr; /* reenable interrupts */ - return (retval); + /* + * If there are characters in the string write them to put them + * to each console. + */ + if (retval > 0) + cnputs(p_bufr, retval); + + /* If a temporary buffer was allocated, free it. */ + if (p_bufr != NULL && p_bufr != bufr) + free(p_bufr, M_TEMP); + + return(retval); } /* From owner-p4-projects@FreeBSD.ORG Sun Jul 30 00:07:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FC5E16A4DF; Sun, 30 Jul 2006 00:07:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF67816A4DA for ; Sun, 30 Jul 2006 00:07:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4E4943D53 for ; Sun, 30 Jul 2006 00:07:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U07EcV071693 for ; Sun, 30 Jul 2006 00:07:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U07E3u071690 for perforce@freebsd.org; Sun, 30 Jul 2006 00:07:14 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Jul 2006 00:07:14 GMT Message-Id: <200607300007.k6U07E3u071690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 00:07:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=102753 Change 102753 by jb@jb_freebsd2 on 2006/07/30 00:07:07 Add puts methods to the console devices. These all default to calling the character methods for the time being. Affected files ... .. //depot/projects/dtrace/src/sys/dev/dcons/dcons.h#3 edit .. //depot/projects/dtrace/src/sys/dev/dcons/dcons_os.c#3 edit .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#4 edit .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#4 edit .. //depot/projects/dtrace/src/sys/dev/zs/zs.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/dcons/dcons.h#3 (text+ko) ==== @@ -101,6 +101,7 @@ int dcons_checkc(struct dcons_softc *); int dcons_ischar(struct dcons_softc *); void dcons_putc(struct dcons_softc *, int); +void dcons_puts(struct dcons_softc *, char *, int); int dcons_load_buffer(struct dcons_buf *, int, struct dcons_softc *); void dcons_init(struct dcons_buf *, int, struct dcons_softc *); #endif ==== //depot/projects/dtrace/src/sys/dev/dcons/dcons_os.c#3 (text+ko) ==== @@ -174,6 +174,7 @@ static cn_term_t dcons_cnterm; static cn_getc_t dcons_cngetc; static cn_putc_t dcons_cnputc; +static cn_puts_t dcons_cnputs; CONSOLE_DRIVER(dcons); @@ -455,6 +456,17 @@ return (dcons_os_checkc(dc)); } static void +dcons_cnputs(struct consdev *cp, char *p, int num) +{ + int i; + + for (i = 0; i < num; i++) { + if (p[i] == '\n') + dcons_cnputc(cp, '\r'); + dcons_cnputc(cp, p[i] & 0xff); + } +} +static void dcons_cnputc(struct consdev *cp, int c) { struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg; ==== //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#4 (text+ko) ==== @@ -78,6 +78,7 @@ static cn_term_t ofw_cnterm; static cn_getc_t ofw_cngetc; static cn_putc_t ofw_cnputc; +static cn_puts_t ofw_cnputs; CONSOLE_DRIVER(ofw); @@ -289,6 +290,17 @@ } static void +ofw_cnputs(struct consdev *cp, char *p, int num) +{ + int i; + for (i = 0; i < num; i++) { + if (p[i] == '\n') + ofw_cnputc(cp, '\r'); + ofw_cnputc(cp, p[i] & 0xff); + } +} + +static void ofw_cnputc(struct consdev *cp, int c) { char cbuf; ==== //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#4 (text+ko) ==== @@ -222,6 +222,7 @@ static cn_term_t sc_cnterm; static cn_getc_t sc_cngetc; static cn_putc_t sc_cnputc; +static cn_puts_t sc_cnputs; CONSOLE_DRIVER(sc); @@ -1455,6 +1456,18 @@ } static void +sc_cnputs(struct consdev *cd, char *p, int num) +{ + int i; + + for (i = 0; i < num; i++) { + if (p[i] == '\n') + sc_cnputc(cp, '\r'); + sc_cnputc(cd, p[i] & 0xff); + } +} + +static void sc_cnputc(struct consdev *cd, int c) { u_char buf[1]; ==== //depot/projects/dtrace/src/sys/dev/zs/zs.c#3 (text+ko) ==== @@ -130,6 +130,7 @@ static cn_term_t zs_cnterm; static cn_getc_t zs_cngetc; static cn_putc_t zs_cnputc; +static cn_puts_t zs_cnputs; static int zstty_cngetc(struct zstty_softc *sc); static int zstty_cncheckc(struct zstty_softc *sc); @@ -837,6 +838,17 @@ } static void +zs_cnputs(struct consdev *cn, char *p, int num) +{ + int i; + for (i = 0; i < num; i++) { + if (p[i] == '\n') + zs_cnputc(cp, '\r'); + zs_cnputc(cp, p[i] & 0xff); + } +} + +static void zs_cnputc(struct consdev *cn, int c) { struct zstty_softc *sc = zstty_cons; From owner-p4-projects@FreeBSD.ORG Sun Jul 30 00:15:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFE2316A4E0; Sun, 30 Jul 2006 00:15:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9822B16A4DE for ; Sun, 30 Jul 2006 00:15:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47D5743D46 for ; Sun, 30 Jul 2006 00:15:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U0FPfV072268 for ; Sun, 30 Jul 2006 00:15:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U0FOjn072265 for perforce@freebsd.org; Sun, 30 Jul 2006 00:15:24 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Jul 2006 00:15:24 GMT Message-Id: <200607300015.k6U0FOjn072265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 00:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102754 Change 102754 by jb@jb_freebsd2 on 2006/07/30 00:15:07 Allow non-386 architectures to use libelf for ports for the time being. This is a temporary measure until jkoshy's libbsdelf is available. He thinks it will be a few weeks from now. His library will make life so much easier because it uses FreeBSD headers natively without the need for hacks and it will support cross-building which is something the Sun and ports libelfs aren't designed to do. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/Makefile#4 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#4 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#2 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#4 edit .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/Makefile#4 (text+ko) ==== @@ -1,5 +1,9 @@ # $FreeBSD$ -SUBDIR= libctf libdtrace libelf libproc +SUBDIR= libctf libdtrace libproc + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= libelf +.endif .include ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#4 (text+ko) ==== @@ -41,6 +41,11 @@ LDADD+= -lctf -ldwarf -lelf -lz +.if ${MACHINE_ARCH} != "i386" +LDFLAGS+= -L/usr/local/lib +LDADD+= -lintl -liconv +.endif + .PATH: ${.CURDIR} .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#2 (text+ko) ==== @@ -22,6 +22,11 @@ LDADD+= -lelf -lz +.if ${MACHINE_ARCH} != "i386" +LDFLAGS+= -L/usr/local/lib +LDADD+= -lintl -liconv +.endif + .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#4 (text+ko) ==== @@ -38,6 +38,11 @@ LDADD+= -lctf -ldwarf -lelf -lz +.if ${MACHINE_ARCH} != "i386" +LDFLAGS+= -L/usr/local/lib +LDADD+= -lintl -liconv +.endif + .PATH: ${.CURDIR}/../ctfconvert .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt ==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#5 (text+ko) ==== @@ -30,6 +30,11 @@ LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz +.if ${MACHINE_ARCH} != "i386" +LDFLAGS+= -L/usr/local/lib +LDADD+= -lintl -liconv +.endif + #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ} NO_MAN= From owner-p4-projects@FreeBSD.ORG Sun Jul 30 00:51:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 838BA16A4E0; Sun, 30 Jul 2006 00:51:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A68316A4DE for ; Sun, 30 Jul 2006 00:51:11 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17CC943D46 for ; Sun, 30 Jul 2006 00:51:11 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U0pAZc082087 for ; Sun, 30 Jul 2006 00:51:10 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U0pAm4082084 for perforce@freebsd.org; Sun, 30 Jul 2006 00:51:10 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 30 Jul 2006 00:51:10 GMT Message-Id: <200607300051.k6U0pAm4082084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 00:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=102756 Change 102756 by howardsu@su_vm on 2006/07/30 00:50:21 extend the ptrace(2) kernel part. Now the PT_LWPINFO will give more information about why child is stoped. TODO: update man page Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#7 edit .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#6 edit .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#6 edit .. //depot/projects/dtrace/src/sys/kern/sys_process.c#3 edit .. //depot/projects/dtrace/src/sys/sys/proc.h#10 edit .. //depot/projects/dtrace/src/sys/sys/ptrace.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -667,7 +667,6 @@ */ if (p->p_flag & P_TRACED) { -printf("%s:%s(%d): SIGTRAP to debugger\n",__FUNCTION__,__FILE__,__LINE__); tdsignal(p, td, SIGTRAP, NULL); } ==== //depot/projects/dtrace/src/sys/kern/kern_exit.c#6 (text+ko) ==== @@ -433,7 +433,6 @@ * since their existence means someone is screwing up. */ if (q->p_flag & P_TRACED) { -printf("%s:%s(%d): Kill a traced process\n",__FUNCTION__,__FILE__,__LINE__); q->p_flag &= ~(P_TRACED | P_STOPPED_TRACE); psignal(q, SIGKILL); } @@ -834,7 +833,6 @@ (p->p_suspcount == p->p_numthreads) && (p->p_flag & P_WAITED) == 0 && (p->p_flag & P_TRACED || options & WUNTRACED)) { -printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__); mtx_unlock_spin(&sched_lock); p->p_flag |= P_WAITED; sx_xunlock(&proctree_lock); ==== //depot/projects/dtrace/src/sys/kern/kern_sig.c#6 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -2133,7 +2134,6 @@ * either winding down or already on the suspended queue. */ if (p->p_flag & P_TRACED) { -printf("%s:%s(%d): the traced process is already stopped\n",__FUNCTION__,__FILE__,__LINE__); /* * The traced process is already stopped, * so no further action is necessary. @@ -2380,7 +2380,6 @@ WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.mtx_object, "Stopping for traced signal"); -printf("%s:%s(%d): stopping for a traced signal %d\n",__FUNCTION__,__FILE__,__LINE__,sig); mtx_lock_spin(&sched_lock); td->td_flags |= TDF_XSIG; mtx_unlock_spin(&sched_lock); @@ -2412,7 +2411,6 @@ PROC_LOCK(p); if (!(p->p_flag & P_TRACED)) break; -printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__); if (td->td_flags & TDF_DBSUSPEND) { if (p->p_flag & P_SINGLE_EXIT) break; @@ -2478,8 +2476,8 @@ /* * If traced, always stop. */ -printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__); mtx_unlock(&ps->ps_mtx); + td->td_xsig_why = PL_EVENT_SIGNAL; newsig = ptracestop(td, sig); mtx_lock(&ps->ps_mtx); @@ -2559,7 +2557,6 @@ mtx_unlock(&ps->ps_mtx); WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.mtx_object, "Catching SIGSTOP"); -printf("%s:%s(%d): catching SIGSTOP\n",__FUNCTION__,__FILE__,__LINE__); p->p_flag |= P_STOPPED_SIG; p->p_xstat = sig; mtx_lock_spin(&sched_lock); ==== //depot/projects/dtrace/src/sys/kern/sys_process.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include - +#include #include #include @@ -939,13 +939,23 @@ } pl = addr; pl->pl_lwpid = td2->td_tid; - if (td2->td_flags & TDF_XSIG) - pl->pl_event = PL_EVENT_SIGNAL; - else - pl->pl_event = 0; + pl->pl_event = td2->td_xsig_why; pl->pl_flags = 0; pl->pl_sigmask = td2->td_sigmask; pl->pl_siglist = td2->td_siglist; + if (data > (int)&((struct ptrace_lwpinfo *)NULL)->pl_sysnum) { + switch(td2->td_xsig_why){ + case PL_EVENT_SYSENTER: + case PL_EVENT_SYSEXIT: + pl->pl_sysnum = td2->td_frame->tf_eax; + break; + case PL_EVENT_SIGNAL: + pl->pl_signal = td2->td_xsig; + break; + } + } + + break; case PT_GETNUMLWPS: ==== //depot/projects/dtrace/src/sys/sys/proc.h#10 (text+ko) ==== @@ -217,6 +217,7 @@ volatile u_int td_generation; /* (k) For detection of preemption */ stack_t td_sigstk; /* (k) Stack ptr and on-stack flag. */ int td_xsig; /* (c) Signal for ptrace */ + int td_xsig_why; /* (c) reason for ptrace signal PL_EVENT_* */ u_long td_profil_addr; /* (k) Temporary addr until AST. */ u_int td_profil_ticks; /* (k) Temporary ticks until AST. */ char td_name[MAXCOMLEN + 1]; /* (*) Thread name. */ ==== //depot/projects/dtrace/src/sys/sys/ptrace.h#3 (text+ko) ==== @@ -91,18 +91,29 @@ int pl_event; /* Event that stopped the LWP. */ #define PL_EVENT_NONE 0 #define PL_EVENT_SIGNAL 1 +#define PL_EVENT_SYSENTER 2 +#define PL_EVENT_SYSEXIT 3 int pl_flags; /* LWP flags. */ #define PL_FLAG_SA 0x01 /* M:N thread */ #define PL_FLAG_BOUND 0x02 /* M:N bound thread */ sigset_t pl_sigmask; /* LWP signal mask */ sigset_t pl_siglist; /* LWP pending signal */ + + union { + int _pl_sysnum; + int _pl_signal; + }pl_data; }; +#define pl_sysnum pl_data._pl_sysnum +#define pl_signal pl_data._pl_signal + #ifdef _KERNEL #define PTRACESTOP_SC(p, td, flag) \ if ((p)->p_flag & P_TRACED && (p)->p_stops & (flag)) { \ PROC_LOCK(p); \ + td->td_xsig_why = (flag==S_PT_SCE)?PL_EVENT_SYSENTER:PL_EVENT_SYSEXIT; \ ptracestop((td), SIGTRAP); \ PROC_UNLOCK(p); \ } From owner-p4-projects@FreeBSD.ORG Sun Jul 30 01:04:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2E7916A4E0; Sun, 30 Jul 2006 01:04:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77DAE16A4DD for ; Sun, 30 Jul 2006 01:04:28 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 320A443D45 for ; Sun, 30 Jul 2006 01:04:28 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U14Sve083910 for ; Sun, 30 Jul 2006 01:04:28 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U14REm083907 for perforce@freebsd.org; Sun, 30 Jul 2006 01:04:27 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 30 Jul 2006 01:04:27 GMT Message-Id: <200607300104.k6U14REm083907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 01:04:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=102757 Change 102757 by howardsu@su_vm on 2006/07/30 01:04:04 fix a typo what breaks the kernel build Affected files ... .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#5 (text+ko) ==== @@ -1462,7 +1462,7 @@ for (i = 0; i < num; i++) { if (p[i] == '\n') - sc_cnputc(cp, '\r'); + sc_cnputc(cd, '\r'); sc_cnputc(cd, p[i] & 0xff); } } From owner-p4-projects@FreeBSD.ORG Sun Jul 30 05:07:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B3DE16A4DF; Sun, 30 Jul 2006 05:07:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D2AF16A4DA for ; Sun, 30 Jul 2006 05:07:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16F6343D45 for ; Sun, 30 Jul 2006 05:07:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U57Vn9009159 for ; Sun, 30 Jul 2006 05:07:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U57VOn009156 for perforce@freebsd.org; Sun, 30 Jul 2006 05:07:31 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Jul 2006 05:07:31 GMT Message-Id: <200607300507.k6U57VOn009156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 05:07:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102762 Change 102762 by jb@jb_freebsd2 on 2006/07/30 05:07:01 Remove remnants of debugging cruft. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -666,9 +666,7 @@ * single thread mode. */ if (p->p_flag & P_TRACED) -{ tdsignal(p, td, SIGTRAP, NULL); -} /* clear "fork but no exec" flag, as we _are_ execing */ p->p_acflag &= ~AFORK; From owner-p4-projects@FreeBSD.ORG Sun Jul 30 08:23:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8042616A4DF; Sun, 30 Jul 2006 08:23:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C33516A4DD for ; Sun, 30 Jul 2006 08:23:39 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27E2F43D46 for ; Sun, 30 Jul 2006 08:23:39 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6U8Ndji023673 for ; Sun, 30 Jul 2006 08:23:39 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U8NcED023670 for perforce@freebsd.org; Sun, 30 Jul 2006 08:23:38 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 30 Jul 2006 08:23:38 GMT Message-Id: <200607300823.k6U8NcED023670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 08:23:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102773 Change 102773 by howardsu@su_vm on 2006/07/30 08:22:55 Remove syscall number from LWPINFo. There is no clean MI way to do it. And it is easy to get from the userland. Affected files ... .. //depot/projects/dtrace/src/sys/kern/sys_process.c#4 edit .. //depot/projects/dtrace/src/sys/sys/ptrace.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sys_process.c#4 (text+ko) ==== @@ -943,19 +943,16 @@ pl->pl_flags = 0; pl->pl_sigmask = td2->td_sigmask; pl->pl_siglist = td2->td_siglist; - if (data > (int)&((struct ptrace_lwpinfo *)NULL)->pl_sysnum) { - switch(td2->td_xsig_why){ - case PL_EVENT_SYSENTER: - case PL_EVENT_SYSEXIT: - pl->pl_sysnum = td2->td_frame->tf_eax; - break; - case PL_EVENT_SIGNAL: - pl->pl_signal = td2->td_xsig; - break; - } + if (td->td_sig & TD_XSIG) + pl->pl_event = td2->td_xsig_why; + else + pl->pl_event = PL_EVENT_NONE; + switch(td2->td_xsig_why){ + case PL_EVENT_SIGNAL: + pl->pl_signal = td2->td_xsig; + break; } - break; case PT_GETNUMLWPS: ==== //depot/projects/dtrace/src/sys/sys/ptrace.h#4 (text+ko) ==== @@ -100,12 +100,10 @@ sigset_t pl_siglist; /* LWP pending signal */ union { - int _pl_sysnum; int _pl_signal; }pl_data; }; -#define pl_sysnum pl_data._pl_sysnum #define pl_signal pl_data._pl_signal #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Sun Jul 30 12:06:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E187B16A4DF; Sun, 30 Jul 2006 12:06:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A568016A4DE for ; Sun, 30 Jul 2006 12:06:30 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD57143D60 for ; Sun, 30 Jul 2006 12:06:25 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UC6Ph3046774 for ; Sun, 30 Jul 2006 12:06:25 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UC6PAN046771 for perforce@freebsd.org; Sun, 30 Jul 2006 12:06:25 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 30 Jul 2006 12:06:25 GMT Message-Id: <200607301206.k6UC6PAN046771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 12:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=102783 Change 102783 by howardsu@su_vm on 2006/07/30 12:05:29 Remove the dependency of procfs. Convert it to use the new ptrace(2) interface. Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/alpha-fbsd.c#3 edit .. //depot/projects/dtrace/src/usr.bin/truss/amd64-fbsd.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/extern.h#3 edit .. //depot/projects/dtrace/src/usr.bin/truss/i386-fbsd.c#5 edit .. //depot/projects/dtrace/src/usr.bin/truss/i386-linux.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/ia64-fbsd.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/main.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/powerpc-fbsd.c#3 edit .. //depot/projects/dtrace/src/usr.bin/truss/setup.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/sparc64-fbsd.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/syscall.h#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/syscalls.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/truss.1#3 edit .. //depot/projects/dtrace/src/usr.bin/truss/truss.h#4 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/alpha-fbsd.c#3 (text+ko) ==== @@ -45,8 +45,7 @@ */ #include -#include -#include +#include #include #include @@ -65,7 +64,6 @@ #include "syscall.h" #include "extern.h" -static int fd = -1; static int cpid = -1; #include "syscalls.h" @@ -115,30 +113,17 @@ void alpha_syscall_entry(struct trussinfo *trussinfo, int nargs) { - char buf[32]; struct reg regs; int syscall_num; int i; unsigned int parm_offset; struct syscall *sc; int indir = 0; /* indirect system call */ + struct ptrace_io_desc iorequest; + cpid = trussinfo->tid; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDWR); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return; - } - cpid = trussinfo->pid; - } - clear_fsc(); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); parm_offset = regs.r_regs[R_SP] + sizeof(int); /* @@ -185,8 +170,13 @@ * on the stack, as is normal for other processors. * The fall-through for all of these is deliberate!!! */ - lseek(Procfd, regs.r_regs[R_SP], SEEK_SET); - read(fd, &fsc.args[6], (nargs - 6) * sizeof(fsc.args[0])); + iorequest.piod_op = PIOD_READ_D; + iorequest.piod_offs = (void *)regs.r_regs[R_SP]; + iorequest.piod_addr = &fsc.args[6]; + iorequest.piod_len = (nargs - 6) * sizeof(unsigned long); + ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0); + if (iorequest.piod_len == 0) return; + break; case 6: fsc.args[5] = regs.r_regs[R_A5]; case 5: fsc.args[4] = regs.r_regs[R_A4]; case 4: fsc.args[3] = regs.r_regs[R_A3]; @@ -238,7 +228,7 @@ i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { - fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args, 0, trussinfo); + fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo); } } #if DEBUG @@ -293,28 +283,15 @@ long alpha_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { - char buf[32]; struct reg regs; long retval; int i; int errorp; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return (-1); - } - cpid = trussinfo->pid; - } + cpid = trussinfo->tid; - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "\n"); - return (-1); - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); retval = regs.r_regs[R_V0]; errorp = !!(regs.r_regs[R_A3]); @@ -342,7 +319,7 @@ if (errorp) asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]); else - temp = print_arg(Procfd, &sc->args[i], fsc.args, retval, trussinfo); + temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo); fsc.s_args[i] = temp; } } ==== //depot/projects/dtrace/src/usr.bin/truss/amd64-fbsd.c#4 (text+ko) ==== @@ -43,9 +43,8 @@ */ #include -#include -#include #include +#include #include #include @@ -63,7 +62,6 @@ #include "syscall.h" #include "extern.h" -static int fd = -1; static int cpid = -1; #include "syscalls.h" @@ -113,28 +111,15 @@ void amd64_syscall_entry(struct trussinfo *trussinfo, int nargs) { - char buf[32]; struct reg regs; int syscall_num; int i, reg; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDWR); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return; - } - cpid = trussinfo->pid; - } + cpid = trussinfo->pid; clear_fsc(); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); /* * FreeBSD has two special kinds of system call redirctions -- @@ -181,9 +166,14 @@ } } if (nargs > i) { - lseek(Procfd, regs.r_rsp + sizeof(register_t), SEEK_SET); - if (read(Procfd, &fsc.args[i], (nargs-i) * sizeof(register_t)) == -1) - return; + struct ptrace_io_desc iorequest; + iorequest.piod_op = PIOD_READ_D; + iorequest.piod_offs = (void *)(regs.r_rsp + sizeof(register_t)); + iorequest.piod_addr = &fsc.args[i]; + iorequest.piod_len = (nargs - i) * sizeof(register_t); + ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0); + if (iorequest.piod_len == 0) + return; } sc = get_syscall(fsc.name); @@ -223,7 +213,7 @@ i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { - fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args, 0, trussinfo); + fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo); } } #if DEBUG @@ -279,28 +269,15 @@ long amd64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { - char buf[32]; struct reg regs; long retval; int i; int errorp; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return (-1); - } - cpid = trussinfo->pid; - } + cpid = trussinfo->pid; - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return (-1); - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); retval = regs.r_rax; errorp = !!(regs.r_rflags & PSL_C); @@ -328,7 +305,7 @@ if (errorp) asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]); else - temp = print_arg(Procfd, &sc->args[i], fsc.args, retval, trussinfo); + temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo); fsc.s_args[i] = temp; } } ==== //depot/projects/dtrace/src/usr.bin/truss/extern.h#3 (text+ko) ==== @@ -32,8 +32,9 @@ */ extern int setup_and_wait(char **); -extern int start_tracing(int, int, int, int); +extern int start_tracing(int); extern void restore_proc(int); +extern void waitevent(struct trussinfo *); extern const char *ioctlname(register_t val); extern char *strsig(int sig); #ifdef __alpha__ @@ -63,4 +64,3 @@ extern long sparc64_syscall_exit(struct trussinfo *, int); #endif -extern int Procfd; ==== //depot/projects/dtrace/src/usr.bin/truss/i386-fbsd.c#5 (text+ko) ==== @@ -43,9 +43,8 @@ */ #include -#include -#include #include +#include #include #include @@ -63,7 +62,6 @@ #include "syscall.h" #include "extern.h" -static int fd = -1; static int cpid = -1; #include "syscalls.h" @@ -113,29 +111,16 @@ void i386_syscall_entry(struct trussinfo *trussinfo, int nargs) { - char buf[32]; struct reg regs; int syscall_num; int i; unsigned int parm_offset; struct syscall *sc = NULL; - - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDWR); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return; - } - cpid = trussinfo->pid; - } + struct ptrace_io_desc iorequest; + cpid = trussinfo->tid; clear_fsc(); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); parm_offset = regs.r_esp + sizeof(int); /* @@ -146,14 +131,12 @@ syscall_num = regs.r_eax; switch (syscall_num) { case SYS_syscall: - lseek(Procfd, parm_offset, SEEK_SET); - read(Procfd, &syscall_num, sizeof(int)); - parm_offset += sizeof(int); + syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0); + parm_offset += sizeof(int); break; case SYS___syscall: - lseek(Procfd, parm_offset, SEEK_SET); - read(Procfd, &syscall_num, sizeof(int)); - parm_offset += sizeof(quad_t); + syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0); + parm_offset += sizeof(quad_t); break; } @@ -171,14 +154,18 @@ { trussinfo->in_fork = 1; } - + if (nargs == 0) return; fsc.args = malloc((1+nargs) * sizeof(unsigned long)); - lseek(Procfd, parm_offset, SEEK_SET); - if (read(Procfd, fsc.args, nargs * sizeof(unsigned long)) == -1) - return; + iorequest.piod_op = PIOD_READ_D; + iorequest.piod_offs = (void *)parm_offset; + iorequest.piod_addr = fsc.args; + iorequest.piod_len = nargs * sizeof(unsigned long); + ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0); + if (iorequest.piod_len == 0) + return; if (fsc.name) sc = get_syscall(fsc.name); @@ -218,7 +205,7 @@ i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { - fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args, 0, trussinfo); + fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo); } } #if DEBUG @@ -274,28 +261,16 @@ long i386_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { - char buf[32]; struct reg regs; long retval; int i; int errorp; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return (-1); - } - cpid = trussinfo->pid; - } + cpid = trussinfo->pid; + + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return (-1); - } retval = regs.r_eax; errorp = !!(regs.r_eflags & PSL_C); @@ -323,7 +298,7 @@ if (errorp) asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]); else - temp = print_arg(Procfd, &sc->args[i], fsc.args, retval, trussinfo); + temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo); fsc.s_args[i] = temp; } } ==== //depot/projects/dtrace/src/usr.bin/truss/i386-linux.c#4 (text+ko) ==== @@ -41,8 +41,7 @@ */ #include -#include -#include +#include #include #include @@ -60,7 +59,6 @@ #include "syscall.h" #include "extern.h" -static int fd = -1; static int cpid = -1; #include "linux_syscalls.h" @@ -108,28 +106,16 @@ void i386_linux_syscall_entry(struct trussinfo *trussinfo, int nargs) { - char buf[32]; struct reg regs; int syscall_num; int i; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDWR); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return; - } - cpid = trussinfo->pid; - } + cpid = trussinfo->tid; clear_fsc(); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; - } + + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); syscall_num = regs.r_eax; fsc.number = syscall_num; @@ -200,7 +186,7 @@ i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { - fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args, 0, trussinfo); + fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo); } } #if DEBUG @@ -264,28 +250,15 @@ long i386_linux_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { - char buf[32]; struct reg regs; long retval; int i; int errorp; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return (-1); - } - cpid = trussinfo->pid; - } + cpid = trussinfo->pid; - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "\n"); - return (-1); - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); retval = regs.r_eax; errorp = !!(regs.r_eflags & PSL_C); @@ -313,7 +286,7 @@ if (errorp) asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]); else - temp = print_arg(Procfd, &sc->args[i], fsc.args, retval, trussinfo); + temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo); fsc.s_args[i] = temp; } } ==== //depot/projects/dtrace/src/usr.bin/truss/ia64-fbsd.c#4 (text+ko) ==== @@ -43,8 +43,7 @@ */ #include -#include -#include +#include #include #include @@ -62,7 +61,6 @@ #include "syscall.h" #include "extern.h" -static int fd = -1; static int cpid = -1; #include "syscalls.h" @@ -112,29 +110,16 @@ void ia64_syscall_entry(struct trussinfo *trussinfo, int nargs) { - char buf[32]; struct reg regs; int syscall_num; int i; unsigned long *parm_offset; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDWR); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return; - } - cpid = trussinfo->pid; - } + cpid = trussinfo->tid; clear_fsc(); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); parm_offset = ®s.r_scratch.gr16; /* @@ -204,7 +189,7 @@ i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { - fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args, 0, trussinfo); + fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo); } } #if DEBUG @@ -260,28 +245,15 @@ long ia64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { - char buf[32]; struct reg regs; long retval; int i; int errorp; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return (-1); - } - cpid = trussinfo->pid; - } + cpid = trussinfo->tid; - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return (-1); - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); retval = regs.r_scratch.gr8; errorp = (regs.r_scratch.gr10 != 0) ? 1 : 0; @@ -309,7 +281,7 @@ if (errorp) asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]); else - temp = print_arg(Procfd, &sc->args[i], fsc.args, retval, trussinfo); + temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo); fsc.s_args[i] = temp; } } ==== //depot/projects/dtrace/src/usr.bin/truss/main.c#4 (text+ko) ==== @@ -39,11 +39,10 @@ */ #include -#include -#include #include #include #include +#include #include #include @@ -59,12 +58,7 @@ #include "truss.h" #include "extern.h" -/* - * It's difficult to parameterize this because it must be - * accessible in a signal handler. - */ - -int Procfd; +#define MAXARGS 5 static void usage(void) @@ -119,18 +113,18 @@ set_etype(struct trussinfo *trussinfo) { struct ex_types *funcs; - char etype[24]; char progt[32]; - int fd; + int len = sizeof(progt); + int mib[4]; + int error; - sprintf(etype, "/proc/%d/etype", trussinfo->pid); - if ((fd = open(etype, O_RDONLY)) == -1) { - strcpy(progt, "FreeBSD a.out"); - } else { - int len = read(fd, progt, sizeof(progt)); - progt[len-1] = '\0'; - close(fd); - } + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_SV_NAME; + mib[3] = trussinfo->pid; + error = sysctl(mib, 4, progt, &len, NULL, 0); + if (error != 0) + err(1, "can not sysctl"); for (funcs = ex_types; funcs->type; funcs++) if (!strcmp(funcs->type, progt)) @@ -167,14 +161,11 @@ int c; int i; char **command; - struct procfs_status pfs; struct ex_types *funcs; - int in_exec, sigexit, initial_open; + int sigexit, initial_open; char *fname; struct trussinfo *trussinfo; char *signame; - - in_exec = 0; sigexit = 0; fname = NULL; initial_open = 1; @@ -245,6 +236,7 @@ signal(SIGTERM, SIG_IGN); signal(SIGQUIT, SIG_IGN); } else { + start_tracing(trussinfo->pid); signal(SIGINT, restore_proc); signal(SIGTERM, restore_proc); signal(SIGQUIT, restore_proc); @@ -255,20 +247,11 @@ * At this point, if we started the process, it is stopped waiting to * be woken up, either in exit() or in execve(). */ +START_TRACE: + funcs = set_etype(trussinfo); -START_TRACE: - Procfd = start_tracing( - trussinfo->pid, initial_open, - S_EXEC | S_SCE | S_SCX | S_CORE | S_EXIT | - ((trussinfo->flags & NOSIGS) ? 0 : S_SIG), - ((trussinfo->flags & FOLLOWFORKS) ? PF_FORK : 0)); initial_open = 0; - if (Procfd == -1) - return (0); - pfs.why = 0; - - funcs = set_etype(trussinfo); /* * At this point, it's a simple loop, waiting for the process to * stop, finding out why, printing out why, and then continuing it. @@ -278,42 +261,27 @@ clock_gettime(CLOCK_REALTIME, &trussinfo->start_time); do { - int val = 0; - struct timespec timediff; - - if (ioctl(Procfd, PIOCWAIT, &pfs) == -1) - warn("PIOCWAIT top of loop"); - else { - switch(i = pfs.why) { + struct timespec timediff; + waitevent(trussinfo); + switch(i = trussinfo->pr_why) { case S_SCE: - funcs->enter_syscall(trussinfo, pfs.val); + funcs->enter_syscall(trussinfo, MAXARGS); clock_gettime(CLOCK_REALTIME, &trussinfo->before); break; case S_SCX: clock_gettime(CLOCK_REALTIME, &trussinfo->after); - /* - * This is so we don't get two messages for - * an exec -- one for the S_EXEC, and one for - * the syscall exit. It also, conveniently, - * ensures that the first message printed out - * isn't the return-from-syscall used to - * create the process. - */ - if (in_exec) { - in_exec = 0; - break; - } if (trussinfo->in_fork && - (trussinfo->flags & FOLLOWFORKS)) { + (trussinfo->flags & FOLLOWFORKS) + ) { int childpid; trussinfo->in_fork = 0; childpid = funcs->exit_syscall(trussinfo, - pfs.val); + trussinfo->pr_data); /* * Fork a new copy of ourself to trace @@ -326,7 +294,7 @@ } break; } - funcs->exit_syscall(trussinfo, pfs.val); + funcs->exit_syscall(trussinfo, MAXARGS); break; case S_SIG: if (trussinfo->flags & FOLLOWFORKS) @@ -346,12 +314,12 @@ (long)timediff.tv_sec, timediff.tv_nsec); } - signame = strsig(pfs.val); + signame = strsig(trussinfo->pr_data); fprintf(trussinfo->outfile, - "SIGNAL %lu (%s)\n", pfs.val, + "SIGNAL %u (%s)\n", trussinfo->pr_data, signame == NULL ? "?" : signame); free(signame); - sigexit = pfs.val; + sigexit = trussinfo->pr_data; break; case S_EXIT: if (trussinfo->flags & FOLLOWFORKS) @@ -371,25 +339,12 @@ (long)timediff.tv_sec, timediff.tv_nsec); } fprintf(trussinfo->outfile, - "process exit, rval = %lu\n", pfs.val); + "process exit, rval = %u\n", trussinfo->pr_data); break; - case S_EXEC: - funcs = set_etype(trussinfo); - in_exec = 1; - break; default: - fprintf(trussinfo->outfile, - "Process stopped because of: %d\n", i); break; - } } - if (ioctl(Procfd, PIOCCONT, val) == -1) { - if (kill(trussinfo->pid, 0) == -1 && errno == ESRCH) - break; - else - warn("PIOCCONT"); - } - } while (pfs.why != S_EXIT); + } while (trussinfo->pr_why != S_EXIT); fflush(trussinfo->outfile); if (sigexit) { struct rlimit rlp; ==== //depot/projects/dtrace/src/usr.bin/truss/powerpc-fbsd.c#3 (text+ko) ==== @@ -41,8 +41,7 @@ */ #include -#include -#include +#include #include #include @@ -62,7 +61,6 @@ #include "syscall.h" #include "extern.h" -static int fd = -1; static int cpid = -1; #include "syscalls.h" @@ -112,7 +110,6 @@ void powerpc_syscall_entry(struct trussinfo *trussinfo, int nargs) { - char buf[32]; struct reg regs; void *args; int syscall_num; @@ -120,22 +117,10 @@ unsigned int regargs; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDWR); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return; - } - cpid = trussinfo->pid; - } + cpid = trussinfo->tid; clear_fsc(); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; - } + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); /* * FreeBSD has two special kinds of system call redirctions -- @@ -177,8 +162,13 @@ if (nargs > regargs) { memmove(&fsc.args[0], args, regargs * sizeof(fsc.args[0])); - lseek(Procfd, regs.fixreg[1] + 8, SEEK_SET); - read(Procfd, &fsc.args[regargs], (nargs - regargs) * sizeof(fsc.args[0])); + + iorequest.piod_op = PIOD_READ_D; + iorequest.piod_offs = (void *)(regs.fixreg[1] + 8); + iorequest.piod_addr = &fsc.args[regargs]; + iorequest.piod_len = (nargs - regargs) * sizeof(fsc.args[0]); + ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0); + if (iorequest.piod_len == 0) return; } else { memmove(&fsc.args[0], args, nargs * sizeof(fsc.args[0])); } @@ -220,7 +210,7 @@ i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { - fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args, 0, trussinfo); + fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo); } } #if DEBUG @@ -275,28 +265,15 @@ long powerpc_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { - char buf[32]; struct reg regs; long retval; int i; int errorp; struct syscall *sc; - if (fd == -1 || trussinfo->pid != cpid) { - sprintf(buf, "/proc/%d/regs", trussinfo->pid); - fd = open(buf, O_RDONLY); - if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); - return (-1); - } - cpid = trussinfo->pid; - } + cpid = trussinfo->tid; + ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0); - lseek(fd, 0L, 0); - if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "\n"); - return (-1); - } retval = regs.fixreg[3]; errorp = !!(regs.cr & 0x10000000); @@ -332,7 +309,7 @@ if (errorp) asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]); else - temp = print_arg(Procfd, &sc->args[i], fsc.args, retval, trussinfo); + temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo); fsc.s_args[i] = temp; } } ==== //depot/projects/dtrace/src/usr.bin/truss/setup.c#4 (text+ko) ==== @@ -38,11 +38,13 @@ */ #include -#include -#include #include +#include +#include +#include #include +#include #include #include #include @@ -51,11 +53,30 @@ #include #include +#include + #include "truss.h" #include "extern.h" -static int evflags = 0; + +static siginfo_t myinfo; + +static void handler(int si __unused, siginfo_t *info, void *uap __unused) +{ + memcpy(&myinfo, info, sizeof(myinfo)); +} +static void +installhandler(void) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 30 12:54:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38A2016A4DF; Sun, 30 Jul 2006 12:54:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EAB4916A4DD for ; Sun, 30 Jul 2006 12:54:25 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1A9D43D45 for ; Sun, 30 Jul 2006 12:54:25 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UCsPQ1056641 for ; Sun, 30 Jul 2006 12:54:25 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UCsPRv056638 for perforce@freebsd.org; Sun, 30 Jul 2006 12:54:25 GMT (envelope-from als@FreeBSD.org) Date: Sun, 30 Jul 2006 12:54:25 GMT Message-Id: <200607301254.k6UCsPRv056638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 102785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 12:54:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102785 Change 102785 by als@als_head on 2006/07/30 12:54:15 use J_DISK instead of J_RESOURCE for set virtual root. Affected files ... .. //depot/projects/jail2/j2_tools/jdisk/jdisk.c#3 edit Differences ... ==== //depot/projects/jail2/j2_tools/jdisk/jdisk.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ static void usage(void); #define C_CTX 0 -#define C_VROOT JAIL2_COMMAND(J_RESOURCE,J_SETVROOT) +#define C_VROOT JAIL2_COMMAND(J_DISK,J_SETVROOT) int main(int argc, char **argv) From owner-p4-projects@FreeBSD.ORG Sun Jul 30 13:14:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB88B16A4E1; Sun, 30 Jul 2006 13:14:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F01F16A4DA for ; Sun, 30 Jul 2006 13:14:52 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 374A643D46 for ; Sun, 30 Jul 2006 13:14:52 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UDEqs7059335 for ; Sun, 30 Jul 2006 13:14:52 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UDEqUB059332 for perforce@freebsd.org; Sun, 30 Jul 2006 13:14:52 GMT (envelope-from als@FreeBSD.org) Date: Sun, 30 Jul 2006 13:14:52 GMT Message-Id: <200607301314.k6UDEqUB059332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 102786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 13:14:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=102786 Change 102786 by als@als_head on 2006/07/30 13:14:32 Virtualize kern.maxfiles & kern.openfiles. now it show datas from context limits. kern.maxfiles - fd limit, if limit don`t set - show system maxfiles limit. kern.openfiles - show current prison fd usage. Affected files ... .. //depot/projects/jail2/sys/kern/kern_descrip.c#3 edit Differences ... ==== //depot/projects/jail2/sys/kern/kern_descrip.c#3 (text+ko) ==== @@ -2589,11 +2589,60 @@ SYSCTL_INT(_kern, KERN_MAXFILESPERPROC, maxfilesperproc, CTLFLAG_RW, &maxfilesperproc, 0, "Maximum files allowed open per process"); +#ifdef JAIL + +static int +sysctl_jail_maxfiles(SYSCTL_HANDLER_ARGS) +{ + struct prison *jail = req->td->td_ucred->cr_prison; + int error; + int32_t maxfile = JAIL_FILE_GETLIMIT(jail); + + if (maxfile == 0) { + maxfile = maxfiles; + } + error = SYSCTL_OUT(req, &maxfile, sizeof(int)); + if (error || req->newptr == NULL) + return (error); + if (jail != &jail_0) + return (EPERM); + + /* Read in and verify the new value. */ + error = SYSCTL_IN(req, &maxfile, sizeof(int)); + if (error) + return (error); + if (maxfile <= 0) + return (EINVAL); + maxfiles = maxfile; + return (0); + +} + +SYSCTL_PROC(_kern, OID_AUTO, maxfiles, CTLTYPE_INT | CTLFLAG_RW, + NULL, 0, sysctl_jail_maxfiles, "I", "Maximum number of files"); + + +static int +sysctl_jail_openfile(SYSCTL_HANDLER_ARGS) +{ + struct prison *jail = req->td->td_ucred->cr_prison; + uint32_t fdcount = JAIL_FILE_GETCOUNT(jail); + + return SYSCTL_OUT(req, &fdcount, sizeof(int)); +} + +SYSCTL_PROC(_kern, OID_AUTO, openfiles, CTLTYPE_INT | CTLFLAG_RD, + NULL, 0, sysctl_jail_openfile, "I", "System-wide number of open files"); + +#else + SYSCTL_INT(_kern, KERN_MAXFILES, maxfiles, CTLFLAG_RW, &maxfiles, 0, "Maximum number of files"); SYSCTL_INT(_kern, OID_AUTO, openfiles, CTLFLAG_RD, &openfiles, 0, "System-wide number of open files"); + +#endif /* ARGSUSED*/ static void From owner-p4-projects@FreeBSD.ORG Sun Jul 30 14:35:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F385016A4E2; Sun, 30 Jul 2006 14:35:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C63C16A4DD for ; Sun, 30 Jul 2006 14:35:34 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4107743D58 for ; Sun, 30 Jul 2006 14:35:34 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UEZYNO067551 for ; Sun, 30 Jul 2006 14:35:34 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UEZXEA067548 for perforce@freebsd.org; Sun, 30 Jul 2006 14:35:33 GMT (envelope-from piso@freebsd.org) Date: Sun, 30 Jul 2006 14:35:33 GMT Message-Id: <200607301435.k6UEZXEA067548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 14:35:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=102788 Change 102788 by piso@piso_newluxor on 2006/07/30 14:35:20 As long as we access symbols via dlopen() & friends, we can declare them static. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#6 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#5 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#6 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#6 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#6 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#5 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#5 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#6 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#6 (text+ko) ==== @@ -69,10 +69,7 @@ static void AliasHandleCUSeeMeIn(struct libalias *la, struct ip *pip, struct in_addr original_addr); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->oaddr == NULL) @@ -82,20 +79,14 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleCUSeeMeIn(la, pip, *ah->oaddr); return (0); } -#ifdef _KERNEL -static -#endif -int +static int protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleCUSeeMeOut(la, pip, ah->lnk); @@ -144,7 +135,8 @@ #ifdef _KERNEL static #endif -moduledata_t alias_mod = { +moduledata_t +alias_mod = { "alias_cuseeme", mod_handler, NULL }; @@ -183,10 +175,7 @@ * counts etc */ }; -#ifdef _KERNEL -static -#endif -void +static void AliasHandleCUSeeMeOut(struct libalias *la, struct ip *pip, struct alias_link *lnk) { struct udphdr *ud = ip_next(pip); @@ -209,10 +198,7 @@ } } -#ifdef _KERNEL -static -#endif -void +static void AliasHandleCUSeeMeIn(struct libalias *la, struct ip *pip, struct in_addr original_addr) { struct in_addr alias_addr; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#5 (text+ko) ==== @@ -68,10 +68,7 @@ static void AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { /* @@ -96,10 +93,7 @@ * packets */ -#ifdef _KERNEL -static -#endif -int +static int protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleDummy(la, pip, ah); @@ -158,10 +152,7 @@ MODULE_DEPEND(alias_dummy, libalias, 1, 1, 1); #endif -#ifdef _KERNEL -static -#endif -void +static void AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah) { ; /* dummy */ } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#6 (text+ko) ==== @@ -107,10 +107,7 @@ AliasHandleFtpOut(struct libalias *, struct ip *, struct alias_link *, int maxpacketsize); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || @@ -122,10 +119,7 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleFtpOut(la, pip, ah->lnk, ah->maxpktsize); @@ -196,8 +190,7 @@ static int ParseFtp229Reply(struct libalias *la, char *, int); static void NewFtpMessage(struct libalias *la, struct ip *, struct alias_link *, int, int); -static -void +static void AliasHandleFtpOut( struct libalias *la, struct ip *pip, /* IP packet to examine/patch */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#6 (text+ko) ==== @@ -96,10 +96,7 @@ AliasHandleIrcOut(struct libalias *, struct ip *, struct alias_link *, int maxpacketsize); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->dport == NULL || ah->lnk == NULL || @@ -111,10 +108,7 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleIrcOut(la, pip, ah->lnk, ah->maxpktsize); @@ -165,10 +159,7 @@ MODULE_DEPEND(alias_irc, libalias, 1, 1, 1); #endif -#ifdef _KERNEL -static -#endif -void +static void AliasHandleIrcOut(struct libalias *la, struct ip *pip, /* IP packet to examine */ struct alias_link *lnk, /* Which link are we on? */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#6 (text+ko) ==== @@ -84,10 +84,7 @@ static int AliasHandleUdpNbtNS(struct libalias *, struct ip *, struct alias_link *, struct in_addr *, u_short *, struct in_addr *, u_short *); -#ifdef _KERNEL -static -#endif -int +static int fingerprint1(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || @@ -99,20 +96,14 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleUdpNbt(la, pip, ah->lnk, ah->aaddr, *ah->aport); return (0); } -#ifdef _KERNEL -static -#endif -int +static int fingerprint2(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || @@ -124,10 +115,7 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandler2(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport, @@ -333,10 +321,7 @@ #define DGM_POSITIVE_RES 0x15 #define DGM_NEGATIVE_RES 0x16 -#ifdef _KERNEL -static -#endif -int +static int AliasHandleUdpNbt( struct libalias *la, struct ip *pip, /* IP packet to examine/patch */ @@ -764,10 +749,7 @@ return ((u_char *) q); } -#ifdef _KERNEL -static -#endif -int +static int AliasHandleUdpNbtNS( struct libalias *la, struct ip *pip, /* IP packet to examine/patch */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#5 (text+ko) ==== @@ -92,10 +92,7 @@ static int AliasHandlePptpGreIn(struct libalias *, struct ip *); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) @@ -106,39 +103,27 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int fingerprintgre(struct libalias *la, struct ip *pip, struct alias_data *ah) { return (0); } -#ifdef _KERNEL -static -#endif -int +static int protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandlePptpIn(la, pip, ah->lnk); return (0); } -#ifdef _KERNEL -static -#endif -int +static int protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandlePptpOut(la, pip, ah->lnk); return (0); } -#ifdef _KERNEL -static -#endif -int +static int protohandlergrein(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY || @@ -147,10 +132,7 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandlergreout(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (AliasHandlePptpGreOut(la, pip) == 0) @@ -322,10 +304,7 @@ static PptpCallId AliasVerifyPptp(struct ip *, u_int16_t *); -#ifdef _KERNEL -static -#endif -void +static void AliasHandlePptpOut(struct libalias *la, struct ip *pip, /* IP packet to examine/patch */ struct alias_link *lnk) @@ -397,10 +376,7 @@ } } -#ifdef _KERNEL -static -#endif -void +static void AliasHandlePptpIn(struct libalias *la, struct ip *pip, /* IP packet to examine/patch */ struct alias_link *lnk) @@ -503,10 +479,7 @@ return (PptpCallId) (hptr + 1); } -#ifdef _KERNEL -static -#endif -int +static int AliasHandlePptpGreOut(struct libalias *la, struct ip *pip) { GreHdr *gr; @@ -530,10 +503,7 @@ return (0); } -#ifdef _KERNEL -static -#endif -int +static int AliasHandlePptpGreIn(struct libalias *la, struct ip *pip) { GreHdr *gr; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#5 (text+ko) ==== @@ -67,10 +67,7 @@ static void AliasHandleSkinny(struct libalias *, struct ip *, struct alias_link *); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) @@ -81,10 +78,7 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) { AliasHandleSkinny(la, pip, ah->lnk); @@ -314,10 +308,7 @@ return (0); } -#ifdef _KERNEL -static -#endif -void +static void AliasHandleSkinny(struct libalias *la, struct ip *pip, struct alias_link *lnk) { size_t hlen, tlen, dlen; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#6 (text+ko) ==== @@ -136,10 +136,7 @@ static void AliasHandleRtspOut(struct libalias *, struct ip *, struct alias_link *, int maxpacketsize); -#ifdef _KERNEL -static -#endif -int +static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || @@ -154,10 +151,7 @@ return (-1); } -#ifdef _KERNEL -static -#endif -int +static int protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) { if (ntohs(*ah->dport) == TFTP_PORT_NUMBER) @@ -483,10 +477,7 @@ return (0); } -#ifdef _KERNEL -static -#endif -void +static void AliasHandleRtspOut(struct libalias *la, struct ip *pip, struct alias_link *lnk, int maxpacketsize) { int hlen, tlen, dlen; From owner-p4-projects@FreeBSD.ORG Sun Jul 30 15:19:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44C8E16A4EE; Sun, 30 Jul 2006 15:19:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CD0216A4EC for ; Sun, 30 Jul 2006 15:19:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A9AD43D5D for ; Sun, 30 Jul 2006 15:19:45 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UFJjW1071845 for ; Sun, 30 Jul 2006 15:19:45 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UFJUXt071821 for perforce@freebsd.org; Sun, 30 Jul 2006 15:19:30 GMT (envelope-from piso@freebsd.org) Date: Sun, 30 Jul 2006 15:19:30 GMT Message-Id: <200607301519.k6UFJUXt071821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 15:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=102792 Change 102792 by piso@piso_newluxor on 2006/07/30 15:18:33 IFC Affected files ... .. //depot/projects/soc2005/libalias/bin/sh/sh.1#3 integrate .. //depot/projects/soc2005/libalias/bin/test/test.1#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/CHANGES#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/Configure#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/FAQ#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/LICENSE#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/NEWS#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/README#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/der_chop#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/comm.txt#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/comms.txt#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/config#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_div.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_cryptodev.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_ubsec.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/rmd_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/BN_add_word.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/BN_new.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/EVP_SealInit.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/RSA_sign.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/bn.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/hmac.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/threads.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/doc/openssl.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_error.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_session.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_shutdown.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_state_string.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssl/ssl.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/e_os.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/bio_ssl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s23_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s23_meth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_meth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_both.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_meth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_algs.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_txt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_meth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_srvr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/tls1.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/CAss.cnf#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/P1ss.cnf#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/test/P2ss.cnf#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/test/Uss.cnf#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/bctest#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/tcrl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/testca#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/testenc#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/testfipsssl#2 delete .. //depot/projects/soc2005/libalias/crypto/openssl/test/testgen#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/testss#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/testssl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/testsslproxy#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/test/tpkcs7#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/tpkcs7d#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/treq#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/trsa#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/tsid#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/tx509#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/tools/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/ck_errf.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/copy.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/util/domd#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/extract-section.pl#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkdir-p.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkerr.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkfiles.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mklink.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkstack.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/opensslwrap.sh#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 30 19:14:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAB416A4DF; Sun, 30 Jul 2006 19:14:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71BA616A4DA for ; Sun, 30 Jul 2006 19:14:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B74C843D70 for ; Sun, 30 Jul 2006 19:14:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UJEH2b097335 for ; Sun, 30 Jul 2006 19:14:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UJCZuA097254 for perforce@freebsd.org; Sun, 30 Jul 2006 19:12:35 GMT (envelope-from sam@freebsd.org) Date: Sun, 30 Jul 2006 19:12:35 GMT Message-Id: <200607301912.k6UJCZuA097254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 102798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 19:14:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=102798 Change 102798 by sam@sam_ebb on 2006/07/30 19:10:41 IFC; still needs testing and does not include merge of work in other repo's Affected files ... .. //depot/projects/wifi/MAINTAINERS#12 integrate .. //depot/projects/wifi/Makefile#13 integrate .. //depot/projects/wifi/Makefile.inc1#27 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#7 integrate .. //depot/projects/wifi/README#2 integrate .. //depot/projects/wifi/UPDATING#23 integrate .. //depot/projects/wifi/bin/Makefile#3 integrate .. //depot/projects/wifi/bin/Makefile.inc#3 integrate .. //depot/projects/wifi/bin/chflags/chflags.1#7 integrate .. //depot/projects/wifi/bin/cp/cp.c#4 integrate .. //depot/projects/wifi/bin/csh/Makefile#4 integrate .. //depot/projects/wifi/bin/csh/config.h#6 integrate .. //depot/projects/wifi/bin/csh/iconv.h#1 branch .. //depot/projects/wifi/bin/csh/iconv_stub.c#1 branch .. //depot/projects/wifi/bin/dd/Makefile#2 integrate .. //depot/projects/wifi/bin/ed/Makefile#3 integrate .. //depot/projects/wifi/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/wifi/bin/getfacl/getfacl.c#3 integrate .. //depot/projects/wifi/bin/ln/ln.1#4 integrate .. //depot/projects/wifi/bin/ln/ln.c#4 integrate .. //depot/projects/wifi/bin/ls/cmp.c#4 integrate .. //depot/projects/wifi/bin/ls/extern.h#3 integrate .. //depot/projects/wifi/bin/ls/ls.1#8 integrate .. //depot/projects/wifi/bin/ls/ls.c#5 integrate .. //depot/projects/wifi/bin/ls/ls.h#3 integrate .. //depot/projects/wifi/bin/ls/print.c#3 integrate .. //depot/projects/wifi/bin/ls/util.c#6 integrate .. //depot/projects/wifi/bin/pax/pax.1#4 integrate .. //depot/projects/wifi/bin/ps/keyword.c#4 integrate .. //depot/projects/wifi/bin/ps/print.c#2 integrate .. //depot/projects/wifi/bin/rm/rm.c#5 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/wifi/bin/sh/Makefile#3 integrate .. //depot/projects/wifi/bin/sh/TOUR#2 integrate .. //depot/projects/wifi/bin/sh/builtins.def#4 integrate .. //depot/projects/wifi/bin/sh/cd.c#2 integrate .. //depot/projects/wifi/bin/sh/error.c#2 integrate .. //depot/projects/wifi/bin/sh/eval.c#5 integrate .. //depot/projects/wifi/bin/sh/exec.c#4 integrate .. //depot/projects/wifi/bin/sh/exec.h#3 integrate .. //depot/projects/wifi/bin/sh/expand.c#4 integrate .. //depot/projects/wifi/bin/sh/input.c#2 integrate .. //depot/projects/wifi/bin/sh/jobs.c#5 integrate .. //depot/projects/wifi/bin/sh/main.c#2 integrate .. //depot/projects/wifi/bin/sh/miscbltin.c#4 integrate .. //depot/projects/wifi/bin/sh/mkbuiltins#4 integrate .. //depot/projects/wifi/bin/sh/options.c#5 integrate .. //depot/projects/wifi/bin/sh/sh.1#11 integrate .. //depot/projects/wifi/bin/sh/show.c#3 integrate .. //depot/projects/wifi/bin/sh/trap.c#4 integrate .. //depot/projects/wifi/bin/sh/var.c#3 integrate .. //depot/projects/wifi/bin/sh/var.h#2 integrate .. //depot/projects/wifi/bin/test/test.1#3 integrate .. //depot/projects/wifi/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/wifi/contrib/binutils/bfd/elf64-sparc.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/wifi/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/wifi/contrib/bsnmp/TODO#2 integrate .. //depot/projects/wifi/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/snmpclient.c#4 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/wifi/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.h#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#5 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_route.c#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/bsnmpd.1#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/config.c#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/main.c#7 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpd.config#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpmod.3#5 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpmod.h#4 integrate .. //depot/projects/wifi/contrib/csup/GNUmakefile#1 branch .. //depot/projects/wifi/contrib/csup/Makefile#1 branch .. //depot/projects/wifi/contrib/csup/README#1 branch .. //depot/projects/wifi/contrib/csup/TODO#1 branch .. //depot/projects/wifi/contrib/csup/attrstack.c#1 branch .. //depot/projects/wifi/contrib/csup/attrstack.h#1 branch .. //depot/projects/wifi/contrib/csup/config.c#1 branch .. //depot/projects/wifi/contrib/csup/config.h#1 branch .. //depot/projects/wifi/contrib/csup/csup.1#1 branch .. //depot/projects/wifi/contrib/csup/detailer.c#1 branch .. //depot/projects/wifi/contrib/csup/detailer.h#1 branch .. //depot/projects/wifi/contrib/csup/diff.c#1 branch .. //depot/projects/wifi/contrib/csup/diff.h#1 branch .. //depot/projects/wifi/contrib/csup/fattr.c#1 branch .. //depot/projects/wifi/contrib/csup/fattr.h#1 branch .. //depot/projects/wifi/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/wifi/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/wifi/contrib/csup/fixups.c#1 branch .. //depot/projects/wifi/contrib/csup/fixups.h#1 branch .. //depot/projects/wifi/contrib/csup/fnmatch.c#1 branch .. //depot/projects/wifi/contrib/csup/fnmatch.h#1 branch .. //depot/projects/wifi/contrib/csup/globtree.c#1 branch .. //depot/projects/wifi/contrib/csup/globtree.h#1 branch .. //depot/projects/wifi/contrib/csup/idcache.c#1 branch .. //depot/projects/wifi/contrib/csup/idcache.h#1 branch .. //depot/projects/wifi/contrib/csup/keyword.c#1 branch .. //depot/projects/wifi/contrib/csup/keyword.h#1 branch .. //depot/projects/wifi/contrib/csup/lister.c#1 branch .. //depot/projects/wifi/contrib/csup/lister.h#1 branch .. //depot/projects/wifi/contrib/csup/main.c#1 branch .. //depot/projects/wifi/contrib/csup/main.h#1 branch .. //depot/projects/wifi/contrib/csup/misc.c#1 branch .. //depot/projects/wifi/contrib/csup/misc.h#1 branch .. //depot/projects/wifi/contrib/csup/mux.c#1 branch .. //depot/projects/wifi/contrib/csup/mux.h#1 branch .. //depot/projects/wifi/contrib/csup/parse.y#1 branch .. //depot/projects/wifi/contrib/csup/pathcomp.c#1 branch .. //depot/projects/wifi/contrib/csup/pathcomp.h#1 branch .. //depot/projects/wifi/contrib/csup/proto.c#1 branch .. //depot/projects/wifi/contrib/csup/proto.h#1 branch .. //depot/projects/wifi/contrib/csup/queue.h#1 branch .. //depot/projects/wifi/contrib/csup/status.c#1 branch .. //depot/projects/wifi/contrib/csup/status.h#1 branch .. //depot/projects/wifi/contrib/csup/stream.c#1 branch .. //depot/projects/wifi/contrib/csup/stream.h#1 branch .. //depot/projects/wifi/contrib/csup/threads.c#1 branch .. //depot/projects/wifi/contrib/csup/threads.h#1 branch .. //depot/projects/wifi/contrib/csup/token.h#1 branch .. //depot/projects/wifi/contrib/csup/token.l#1 branch .. //depot/projects/wifi/contrib/csup/updater.c#1 branch .. //depot/projects/wifi/contrib/csup/updater.h#1 branch .. //depot/projects/wifi/contrib/file/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/animation#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/apple#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/archive#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/audio#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/basis#1 branch .. //depot/projects/wifi/contrib/file/Magdir/bflt#1 branch .. //depot/projects/wifi/contrib/file/Magdir/bout#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/wifi/contrib/file/Magdir/c64#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/cad#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/commands#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/compress#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/console#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/wifi/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/database#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/diff#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/digital#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/dump#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/elf#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/flash#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/iff#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/images#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/java#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/linux#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/mach#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/maple#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/mup#1 branch .. //depot/projects/wifi/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/perl#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/printer#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/psion#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/python#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/riff#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/scientific#1 branch .. //depot/projects/wifi/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/sql#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/wifi/contrib/file/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/file/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/file/aclocal.m4#3 integrate .. //depot/projects/wifi/contrib/file/apprentice.c#3 integrate .. //depot/projects/wifi/contrib/file/ascmagic.c#3 integrate .. //depot/projects/wifi/contrib/file/compress.c#3 integrate .. //depot/projects/wifi/contrib/file/config.h.in#3 integrate .. //depot/projects/wifi/contrib/file/configure#3 integrate .. //depot/projects/wifi/contrib/file/configure.in#3 integrate .. //depot/projects/wifi/contrib/file/file.c#3 integrate .. //depot/projects/wifi/contrib/file/file.h#3 integrate .. //depot/projects/wifi/contrib/file/file.man#2 integrate .. //depot/projects/wifi/contrib/file/fsmagic.c#3 integrate .. //depot/projects/wifi/contrib/file/funcs.c#3 integrate .. //depot/projects/wifi/contrib/file/libmagic.man#2 integrate .. //depot/projects/wifi/contrib/file/magic.c#3 integrate .. //depot/projects/wifi/contrib/file/magic.man#2 integrate .. //depot/projects/wifi/contrib/file/magic.mime#3 integrate .. //depot/projects/wifi/contrib/file/magic2mime#2 integrate .. //depot/projects/wifi/contrib/file/patchlevel.h#3 integrate .. //depot/projects/wifi/contrib/file/print.c#3 integrate .. //depot/projects/wifi/contrib/file/readelf.c#3 integrate .. //depot/projects/wifi/contrib/file/readelf.h#3 integrate .. //depot/projects/wifi/contrib/file/softmagic.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/hostapd/Makefile#3 integrate .. //depot/projects/wifi/contrib/hostapd/README#2 integrate .. //depot/projects/wifi/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/aes.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/common.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/common.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/config.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/config.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/config_types.h#1 branch .. //depot/projects/wifi/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/defconfig#2 integrate .. //depot/projects/wifi/contrib/hostapd/defs.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/driver.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_sm.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_sm.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/wifi/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/wifi/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/wifi/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/wifi/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/wifi/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/wifi/contrib/hostapd/md5.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/md5.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/ms_funcs.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/radius.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/radius.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/radius_client.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/radius_server.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/tls.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/tls_openssl.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/version.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/wifi/contrib/hostapd/wpa.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/wifi/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/wifi/contrib/ipfilter/man/Makefile#3 integrate .. //depot/projects/wifi/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/wifi/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/wifi/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/wifi/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/wifi/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/wifi/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/wifi/contrib/libreadline/MANIFEST#2 integrate .. //depot/projects/wifi/contrib/libreadline/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/libreadline/NEWS#2 integrate .. //depot/projects/wifi/contrib/libreadline/README#2 integrate .. //depot/projects/wifi/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/libreadline/bind.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/callback.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/chardefs.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/complete.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/wifi/contrib/libreadline/configure#2 integrate .. //depot/projects/wifi/contrib/libreadline/configure.in#2 integrate .. //depot/projects/wifi/contrib/libreadline/display.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/histexamp.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/rl.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/wifi/contrib/libreadline/examples/rltest.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/rlversion.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/funmap.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/history.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/input.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/macro.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/misc.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/readline.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/readline.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/rldefs.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/search.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/shell.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/shlib/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/libreadline/signals.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/support/config.guess#2 integrate .. //depot/projects/wifi/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/wifi/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/wifi/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/wifi/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/text.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/tilde.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/undo.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/util.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/vi_keymap.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/wifi/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/wifi/contrib/netcat/atomicio.h#1 branch .. //depot/projects/wifi/contrib/netcat/nc.1#3 integrate .. //depot/projects/wifi/contrib/netcat/netcat.c#2 integrate .. //depot/projects/wifi/contrib/netcat/socks.c#2 integrate .. //depot/projects/wifi/contrib/ngatm/man/libngatm.3#3 integrate .. //depot/projects/wifi/contrib/ngatm/man/uniaddr.3#3 integrate .. //depot/projects/wifi/contrib/ngatm/man/unifunc.3#3 integrate .. //depot/projects/wifi/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/wifi/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/wifi/contrib/ngatm/man/unistruct.3#3 integrate .. //depot/projects/wifi/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/wifi/contrib/openbsm/HISTORY#1 branch .. //depot/projects/wifi/contrib/openbsm/LICENSE#1 branch .. //depot/projects/wifi/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/README#1 branch .. //depot/projects/wifi/contrib/openbsm/TODO#1 branch .. //depot/projects/wifi/contrib/openbsm/VERSION#1 branch .. //depot/projects/wifi/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/wifi/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/wifi/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/wifi/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/wifi/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/wifi/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/wifi/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/wifi/contrib/openbsm/config/config.h#1 branch .. //depot/projects/wifi/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/wifi/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/wifi/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/wifi/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/wifi/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/wifi/contrib/openbsm/config/missing#1 branch .. //depot/projects/wifi/contrib/openbsm/configure#1 branch .. //depot/projects/wifi/contrib/openbsm/configure.ac#1 branch .. //depot/projects/wifi/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/wifi/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/wifi/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/wifi/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/wifi/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/wifi/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/wifi/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/wifi/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/wifi/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/wifi/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/wifi/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/wifi/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/wifi/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/wifi/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/wifi/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/wifi/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/wifi/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/wifi/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/wifi/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/wifi/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/wifi/contrib/opie/opiepasswd.c#2 integrate .. //depot/projects/wifi/contrib/pf/authpf/authpf.8#3 integrate .. //depot/projects/wifi/contrib/pf/man/pfsync.4#7 integrate .. //depot/projects/wifi/contrib/pf/pflogd/pflogd.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/FREEBSD-upgrade#4 integrate .. //depot/projects/wifi/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/wifi/contrib/sendmail/README#2 integrate .. //depot/projects/wifi/contrib/sendmail/RELEASE_NOTES#4 integrate .. //depot/projects/wifi/contrib/sendmail/cf/README#3 integrate .. //depot/projects/wifi/contrib/sendmail/cf/cf/Makefile#3 integrate .. //depot/projects/wifi/contrib/sendmail/cf/cf/knecht.mc#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/cf/submit.cf#4 integrate .. //depot/projects/wifi/contrib/sendmail/cf/cf/submit.mc#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/m4/proto.m4#3 integrate .. //depot/projects/wifi/contrib/sendmail/cf/m4/version.m4#4 integrate .. //depot/projects/wifi/contrib/sendmail/cf/ostype/darwin.m4#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/sendmail.schema#2 integrate .. //depot/projects/wifi/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate .. //depot/projects/wifi/contrib/sendmail/doc/op/Makefile#2 integrate .. //depot/projects/wifi/contrib/sendmail/doc/op/op.me#3 integrate .. //depot/projects/wifi/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/wifi/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/include/sm/conf.h#4 integrate .. //depot/projects/wifi/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/wifi/contrib/sendmail/libmilter/README#2 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/listener.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/signal.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libmilter/smfi.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/Makefile.m4#4 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/b-strcmp.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/b-strl.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/clock.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/fclose.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/fflush.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/fopen.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/fpos.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/fseek.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/ldap.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/local.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/wifi/contrib/sendmail/libsm/refill.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/shm.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/signal.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/stdio.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/strio.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/t-event.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/wifi/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/ungetc.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/vfprintf.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/vfscanf.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/README#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/TRACEFLAGS#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/bf.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/collect.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/conf.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/daemon.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/deliver.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/domain.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/envelope.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/helpfile#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/map.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/mci.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/milter.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/mime.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/parseaddr.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/queue.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/readcf.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/savemail.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/sfsasl.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/srvrsmtp.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/tls.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/udb.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/usersmtp.c#4 integrate .. //depot/projects/wifi/contrib/sendmail/src/util.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/version.c#4 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/wifi/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/wifi/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/top/top.X#4 integrate .. //depot/projects/wifi/contrib/top/top.c#4 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/README#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/wifi/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_mschapv2.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_peap.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/wifi/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate .. //depot/projects/wifi/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/wifi/crypto/openssh/FREEBSD-upgrade#4 integrate .. //depot/projects/wifi/crypto/openssh/Makefile.in#5 integrate .. //depot/projects/wifi/crypto/openssh/README#5 integrate .. //depot/projects/wifi/crypto/openssh/README.platform#4 integrate .. //depot/projects/wifi/crypto/openssh/README.tun#1 branch .. //depot/projects/wifi/crypto/openssh/acconfig.h#5 delete .. //depot/projects/wifi/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-krb5.c#5 integrate .. //depot/projects/wifi/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/wifi/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/wifi/crypto/openssh/auth2.c#5 integrate .. //depot/projects/wifi/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/wifi/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/wifi/crypto/openssh/canohost.c#5 integrate .. //depot/projects/wifi/crypto/openssh/channels.c#5 integrate .. //depot/projects/wifi/crypto/openssh/channels.h#5 integrate .. //depot/projects/wifi/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/wifi/crypto/openssh/cipher-ctr.c#4 integrate .. //depot/projects/wifi/crypto/openssh/cipher.c#5 integrate .. //depot/projects/wifi/crypto/openssh/clientloop.c#5 integrate .. //depot/projects/wifi/crypto/openssh/config.h#5 integrate .. //depot/projects/wifi/crypto/openssh/configure.ac#5 integrate .. //depot/projects/wifi/crypto/openssh/defines.h#5 integrate .. //depot/projects/wifi/crypto/openssh/dns.c#4 integrate .. //depot/projects/wifi/crypto/openssh/dns.h#2 integrate .. //depot/projects/wifi/crypto/openssh/entropy.c#3 integrate .. //depot/projects/wifi/crypto/openssh/entropy.h#2 integrate .. //depot/projects/wifi/crypto/openssh/envpass.sh#2 delete .. //depot/projects/wifi/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/wifi/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/wifi/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/wifi/crypto/openssh/hostfile.c#4 integrate .. //depot/projects/wifi/crypto/openssh/includes.h#5 integrate .. //depot/projects/wifi/crypto/openssh/kex.c#4 integrate .. //depot/projects/wifi/crypto/openssh/kex.h#4 integrate .. //depot/projects/wifi/crypto/openssh/kexdh.c#2 integrate .. //depot/projects/wifi/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/wifi/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/wifi/crypto/openssh/kexgex.c#2 integrate .. //depot/projects/wifi/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/wifi/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/wifi/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/wifi/crypto/openssh/misc.c#5 integrate .. //depot/projects/wifi/crypto/openssh/misc.h#5 integrate .. //depot/projects/wifi/crypto/openssh/monitor.c#5 integrate .. //depot/projects/wifi/crypto/openssh/monitor_wrap.c#5 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/Makefile.in#4 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/base64.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/dirname.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/getcwd.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/getrrsetbyname.c#5 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/mktemp.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/readpassphrase.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/realpath.c#4 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/setenv.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strlcat.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strmode.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strsep.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/vis.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/vis.h#2 integrate .. //depot/projects/wifi/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/wifi/crypto/openssh/packet.c#5 integrate .. //depot/projects/wifi/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/wifi/crypto/openssh/readconf.c#5 integrate .. //depot/projects/wifi/crypto/openssh/readconf.h#5 integrate .. //depot/projects/wifi/crypto/openssh/regress/README.regress#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/agent-getpeereid.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/forwarding.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/test-exec.sh#5 integrate .. //depot/projects/wifi/crypto/openssh/regress/try-ciphers.sh#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/yes-head.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/scp.1#4 integrate .. //depot/projects/wifi/crypto/openssh/scp.c#5 integrate .. //depot/projects/wifi/crypto/openssh/servconf.c#5 integrate .. //depot/projects/wifi/crypto/openssh/servconf.h#5 integrate .. //depot/projects/wifi/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/wifi/crypto/openssh/session.c#5 integrate .. //depot/projects/wifi/crypto/openssh/sftp-client.c#5 integrate .. //depot/projects/wifi/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/wifi/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/wifi/crypto/openssh/sftp.1#4 integrate .. //depot/projects/wifi/crypto/openssh/sftp.c#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh-add.c#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/wifi/crypto/openssh/ssh-agent.c#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keygen.1#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keygen.c#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keyscan.c#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keysign.c#4 integrate .. //depot/projects/wifi/crypto/openssh/ssh.1#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh.c#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/wifi/crypto/openssh/ssh_namespace.h#1 branch .. //depot/projects/wifi/crypto/openssh/sshconnect.c#5 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect1.c#4 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/wifi/crypto/openssh/sshd.8#5 integrate .. //depot/projects/wifi/crypto/openssh/sshd.c#6 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config#5 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/wifi/crypto/openssh/version.h#5 integrate .. //depot/projects/wifi/crypto/openssl/CHANGES#3 integrate .. //depot/projects/wifi/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/wifi/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/wifi/crypto/openssl/Configure#3 integrate .. //depot/projects/wifi/crypto/openssl/FAQ#3 integrate .. //depot/projects/wifi/crypto/openssl/INSTALL#3 integrate .. //depot/projects/wifi/crypto/openssl/LICENSE#2 integrate .. //depot/projects/wifi/crypto/openssl/Makefile#2 integrate .. //depot/projects/wifi/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/wifi/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/wifi/crypto/openssl/NEWS#3 integrate .. //depot/projects/wifi/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/wifi/crypto/openssl/README#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/der_chop#3 delete .. //depot/projects/wifi/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/wifi/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/wifi/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/wifi/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/openssl.cnf#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/wifi/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/wifi/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/wifi/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/wifi/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/wifi/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/wifi/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/wifi/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/wifi/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/wifi/crypto/openssl/certs/demo/ca-cert.pem#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 30 21:24:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18A0B16A4E8; Sun, 30 Jul 2006 21:24:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4D3816A4E2 for ; Sun, 30 Jul 2006 21:24:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ED9D43D58 for ; Sun, 30 Jul 2006 21:24:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6ULOFUB014387 for ; Sun, 30 Jul 2006 21:24:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6ULO0xb014380 for perforce@freebsd.org; Sun, 30 Jul 2006 21:24:00 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Jul 2006 21:24:00 GMT Message-Id: <200607302124.k6ULO0xb014380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 102803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 21:24:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=102803 Change 102803 by imp@imp_harmony on 2006/07/30 21:23:35 IFC @102794 Affected files ... .. //depot/projects/arm/src/bin/sh/sh.1#3 integrate .. //depot/projects/arm/src/bin/test/test.1#2 integrate .. //depot/projects/arm/src/crypto/openssl/CHANGES#2 integrate .. //depot/projects/arm/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/arm/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/arm/src/crypto/openssl/Configure#2 integrate .. //depot/projects/arm/src/crypto/openssl/FAQ#2 integrate .. //depot/projects/arm/src/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/arm/src/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/arm/src/crypto/openssl/INSTALL#2 integrate .. //depot/projects/arm/src/crypto/openssl/LICENSE#2 integrate .. //depot/projects/arm/src/crypto/openssl/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/arm/src/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/arm/src/crypto/openssl/NEWS#2 integrate .. //depot/projects/arm/src/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/arm/src/crypto/openssl/README#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/der_chop#2 delete .. //depot/projects/arm/src/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/arm/src/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/arm/src/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/arm/src/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/arm/src/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/arm/src/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/arm/src/crypto/openssl/comm.txt#2 delete .. //depot/projects/arm/src/crypto/openssl/comms.txt#2 delete .. //depot/projects/arm/src/crypto/openssl/config#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_div.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/conf/conf.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/des.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_cryptodev.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_ubsec.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md4/md4_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ripemd/rmd_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/arm/src/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/arm/src/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/arm/src/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/BN_add_word.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/BN_new.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/EVP_SealInit.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/RSA_sign.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/bn.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/hmac.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/threads.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/arm/src/crypto/openssl/doc/openssl.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_error.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_session.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_shutdown.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_state_string.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssl/ssl.pod#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/e_os.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/arm/src/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/arm/src/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/bio_ssl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/arm/src/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s23_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s23_meth.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s2_meth.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_both.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_meth.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_algs.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_rsa.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_txt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/t1_clnt.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/t1_meth.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/t1_srvr.c#2 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/tls1.h#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/CAss.cnf#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/P1ss.cnf#1 branch .. //depot/projects/arm/src/crypto/openssl/test/P2ss.cnf#1 branch .. //depot/projects/arm/src/crypto/openssl/test/Uss.cnf#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/bctest#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/tcrl#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/testca#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/testenc#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/testfipsssl#2 delete .. //depot/projects/arm/src/crypto/openssl/test/testgen#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/testss#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/testssl#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/testsslproxy#1 branch .. //depot/projects/arm/src/crypto/openssl/test/tpkcs7#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/tpkcs7d#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/treq#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/trsa#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/tsid#2 integrate .. //depot/projects/arm/src/crypto/openssl/test/tx509#2 integrate .. //depot/projects/arm/src/crypto/openssl/tools/Makefile#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/ck_errf.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/copy.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/util/domd#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/extract-section.pl#1 branch .. //depot/projects/arm/src/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mkdir-p.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mkerr.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mkfiles.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mklink.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/mkstack.pl#2 integrate .. //depot/projects/arm/src/crypto/openssl/util/opensslwrap.sh#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 30 21:40:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19D3716A4DE; Sun, 30 Jul 2006 21:40:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFA1316A4E1 for ; Sun, 30 Jul 2006 21:40:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F011F43D67 for ; Sun, 30 Jul 2006 21:40:36 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6ULeaZl015231 for ; Sun, 30 Jul 2006 21:40:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6ULeaSa015228 for perforce@freebsd.org; Sun, 30 Jul 2006 21:40:36 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 30 Jul 2006 21:40:36 GMT Message-Id: <200607302140.k6ULeaSa015228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 102806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 21:40:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102806 Change 102806 by kmacy@kmacy_vt-x:dtrace on 2006/07/30 21:40:29 add ttrace_addentry Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#2 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#3 (text+ko) ==== @@ -110,6 +110,7 @@ extern uint64_t hv_ttrace_buf_conf(uint64_t, uint64_t, uint64_t *); extern uint64_t hv_ttrace_enable(uint64_t, uint64_t *); extern uint64_t hv_ttrace_freeze(uint64_t, uint64_t *); +extern uint64_t hv_ttrace_addentry(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t); extern uint64_t hv_dump_buf_update(uint64_t, uint64_t, uint64_t *); extern int64_t hv_cnputchar(uint8_t); ==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#2 (text+ko) ==== @@ -10,6 +10,7 @@ #define CPU_STICK_NPT 0x82 #define MMU_MAP_ADDR 0x83 #define MMU_UNMAP_ADDR 0x84 +#define TTRACE_ADDENTRY 0x85 /* * Error returns in %o0. ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#2 (text+ko) ==== @@ -1322,6 +1322,23 @@ SET_SIZE(hv_ttrace_freeze) /* + * TTRACE_ADDENTRY + * arg0 tag (16-bits) (%o0) + * arg1 data word 0 (%o1) + * arg2 data word 1 (%o2) + * arg3 data word 2 (%o3) + * arg4 data word 3 (%o4) + * ret0 status (%o0) + */ + ENTRY(hv_ttrace_addentry) + ta TTRACE_ADDENTRY + retl + nop + SET_SIZE(hv_ttrace_freeze) + + + + /* * MACH_DESC * arg0 buffer real address * arg1 pointer to uint64_t for size of buffer From owner-p4-projects@FreeBSD.ORG Mon Jul 31 00:11:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1E2E16A4E1; Mon, 31 Jul 2006 00:11:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5D0116A4DA for ; Mon, 31 Jul 2006 00:11:48 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9575E43D62 for ; Mon, 31 Jul 2006 00:11:47 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V0BlRl027371 for ; Mon, 31 Jul 2006 00:11:47 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V0BlSe027368 for perforce@freebsd.org; Mon, 31 Jul 2006 00:11:47 GMT (envelope-from howardsu@FreeBSD.org) Date: Mon, 31 Jul 2006 00:11:47 GMT Message-Id: <200607310011.k6V0BlSe027368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 00:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=102813 Change 102813 by howardsu@su_laptop on 2006/07/31 00:11:05 Fix compile error Affected files ... .. //depot/projects/dtrace/src/sys/kern/sys_process.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sys_process.c#5 (text+ko) ==== @@ -943,7 +943,7 @@ pl->pl_flags = 0; pl->pl_sigmask = td2->td_sigmask; pl->pl_siglist = td2->td_siglist; - if (td->td_sig & TD_XSIG) + if (td->td_xsig & TDF_XSIG) pl->pl_event = td2->td_xsig_why; else pl->pl_event = PL_EVENT_NONE; From owner-p4-projects@FreeBSD.ORG Mon Jul 31 00:38:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C413216A4DE; Mon, 31 Jul 2006 00:38:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 777C716A4DD for ; Mon, 31 Jul 2006 00:38:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1348443D45 for ; Mon, 31 Jul 2006 00:38:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V0cnWt028619 for ; Mon, 31 Jul 2006 00:38:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V0ZTcY028553 for perforce@freebsd.org; Mon, 31 Jul 2006 00:35:29 GMT (envelope-from marcel@freebsd.org) Date: Mon, 31 Jul 2006 00:35:29 GMT Message-Id: <200607310035.k6V0ZTcY028553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 00:38:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=102814 Change 102814 by marcel@marcel_nfs on 2006/07/31 00:31:40 IFC @102808 Affected files ... .. //depot/projects/gdb/COPYRIGHT#2 integrate .. //depot/projects/gdb/LOCKS#1 branch .. //depot/projects/gdb/MAINTAINERS#15 integrate .. //depot/projects/gdb/Makefile#11 integrate .. //depot/projects/gdb/Makefile.inc1#14 integrate .. //depot/projects/gdb/ObsoleteFiles.inc#1 branch .. //depot/projects/gdb/README#2 integrate .. //depot/projects/gdb/UPDATING#25 integrate .. //depot/projects/gdb/UPDATING.64BTT#4 delete .. //depot/projects/gdb/bin/Makefile#3 integrate .. //depot/projects/gdb/bin/Makefile.inc#3 integrate .. //depot/projects/gdb/bin/cat/cat.1#4 integrate .. //depot/projects/gdb/bin/cat/cat.c#4 integrate .. //depot/projects/gdb/bin/chflags/Makefile#2 integrate .. //depot/projects/gdb/bin/chflags/chflags.1#3 integrate .. //depot/projects/gdb/bin/chflags/chflags.c#4 integrate .. //depot/projects/gdb/bin/chio/Makefile#2 integrate .. //depot/projects/gdb/bin/chio/chio.1#3 integrate .. //depot/projects/gdb/bin/chio/chio.c#2 integrate .. //depot/projects/gdb/bin/chio/defs.h#2 integrate .. //depot/projects/gdb/bin/chio/pathnames.h#2 integrate .. //depot/projects/gdb/bin/chmod/chmod.1#3 integrate .. //depot/projects/gdb/bin/chmod/chmod.c#3 integrate .. //depot/projects/gdb/bin/cp/cp.1#4 integrate .. //depot/projects/gdb/bin/cp/cp.c#3 integrate .. //depot/projects/gdb/bin/cp/extern.h#3 integrate .. //depot/projects/gdb/bin/cp/utils.c#4 integrate .. //depot/projects/gdb/bin/csh/Makefile#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/csh.1#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/csh.2#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/csh.3#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/csh.4#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/csh.a#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/csh.g#3 integrate .. //depot/projects/gdb/bin/csh/USD.doc/tabs#3 integrate .. //depot/projects/gdb/bin/csh/config.h#3 integrate .. //depot/projects/gdb/bin/csh/config_p.h#1 branch .. //depot/projects/gdb/bin/csh/iconv.h#1 branch .. //depot/projects/gdb/bin/csh/iconv_stub.c#1 branch .. //depot/projects/gdb/bin/date/date.1#8 integrate .. //depot/projects/gdb/bin/date/date.c#4 integrate .. //depot/projects/gdb/bin/dd/Makefile#5 integrate .. //depot/projects/gdb/bin/dd/dd.1#6 integrate .. //depot/projects/gdb/bin/dd/gen.c#2 integrate .. //depot/projects/gdb/bin/df/df.1#8 integrate .. //depot/projects/gdb/bin/df/df.c#11 integrate .. //depot/projects/gdb/bin/domainname/domainname.1#4 integrate .. //depot/projects/gdb/bin/domainname/domainname.c#3 integrate .. //depot/projects/gdb/bin/echo/echo.1#4 integrate .. //depot/projects/gdb/bin/echo/echo.c#3 integrate .. //depot/projects/gdb/bin/ed/Makefile#3 integrate .. //depot/projects/gdb/bin/ed/ed.1#3 integrate .. //depot/projects/gdb/bin/ed/ed.h#2 integrate .. //depot/projects/gdb/bin/ed/main.c#2 integrate .. //depot/projects/gdb/bin/expr/expr.1#4 integrate .. //depot/projects/gdb/bin/expr/expr.y#2 integrate .. //depot/projects/gdb/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/gdb/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/gdb/bin/hostname/hostname.1#4 integrate .. //depot/projects/gdb/bin/hostname/hostname.c#3 integrate .. //depot/projects/gdb/bin/kenv/kenv.1#2 integrate .. //depot/projects/gdb/bin/kenv/kenv.c#3 integrate .. //depot/projects/gdb/bin/kill/kill.1#4 integrate .. //depot/projects/gdb/bin/kill/kill.c#5 integrate .. //depot/projects/gdb/bin/ln/ln.1#5 integrate .. //depot/projects/gdb/bin/ln/ln.c#3 integrate .. //depot/projects/gdb/bin/ln/symlink.7#4 integrate .. //depot/projects/gdb/bin/ls/cmp.c#4 integrate .. //depot/projects/gdb/bin/ls/extern.h#4 integrate .. //depot/projects/gdb/bin/ls/ls.1#7 integrate .. //depot/projects/gdb/bin/ls/ls.c#5 integrate .. //depot/projects/gdb/bin/ls/ls.h#3 integrate .. //depot/projects/gdb/bin/ls/print.c#9 integrate .. //depot/projects/gdb/bin/ls/util.c#5 integrate .. //depot/projects/gdb/bin/mkdir/Makefile#2 integrate .. //depot/projects/gdb/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/gdb/bin/mkdir/mkdir.c#3 integrate .. //depot/projects/gdb/bin/mv/mv.1#3 integrate .. //depot/projects/gdb/bin/mv/mv.c#4 integrate .. //depot/projects/gdb/bin/pax/ar_io.c#4 integrate .. //depot/projects/gdb/bin/pax/ar_subs.c#3 integrate .. //depot/projects/gdb/bin/pax/cpio.1#2 integrate .. //depot/projects/gdb/bin/pax/extern.h#3 integrate .. //depot/projects/gdb/bin/pax/ftree.c#3 integrate .. //depot/projects/gdb/bin/pax/getoldopt.c#2 integrate .. //depot/projects/gdb/bin/pax/pax.1#5 integrate .. //depot/projects/gdb/bin/pax/tar.1#2 integrate .. //depot/projects/gdb/bin/pax/tar.c#3 integrate .. //depot/projects/gdb/bin/ps/Makefile#3 integrate .. //depot/projects/gdb/bin/ps/keyword.c#7 integrate .. //depot/projects/gdb/bin/ps/print.c#9 integrate .. //depot/projects/gdb/bin/ps/ps.1#12 integrate .. //depot/projects/gdb/bin/ps/ps.c#16 integrate .. //depot/projects/gdb/bin/pwd/pwd.1#4 integrate .. //depot/projects/gdb/bin/pwd/pwd.c#3 integrate .. //depot/projects/gdb/bin/rcp/Makefile#2 integrate .. //depot/projects/gdb/bin/rcp/rcp.1#5 integrate .. //depot/projects/gdb/bin/rcp/rcp.c#2 integrate .. //depot/projects/gdb/bin/realpath/realpath.1#3 integrate .. //depot/projects/gdb/bin/rm/Makefile#2 integrate .. //depot/projects/gdb/bin/rm/rm.1#4 integrate .. //depot/projects/gdb/bin/rm/rm.c#3 integrate .. //depot/projects/gdb/bin/rmail/Makefile#4 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.c#5 integrate .. //depot/projects/gdb/bin/setfacl/file.c#2 integrate .. //depot/projects/gdb/bin/setfacl/mask.c#2 integrate .. //depot/projects/gdb/bin/setfacl/merge.c#2 integrate .. //depot/projects/gdb/bin/setfacl/remove.c#2 integrate .. //depot/projects/gdb/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/gdb/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/gdb/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/gdb/bin/setfacl/util.c#2 integrate .. //depot/projects/gdb/bin/sh/Makefile#5 integrate .. //depot/projects/gdb/bin/sh/TOUR#2 integrate .. //depot/projects/gdb/bin/sh/alias.c#3 integrate .. //depot/projects/gdb/bin/sh/arith.h#3 integrate .. //depot/projects/gdb/bin/sh/arith.y#4 integrate .. //depot/projects/gdb/bin/sh/arith_lex.l#3 integrate .. //depot/projects/gdb/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/gdb/bin/sh/bltin/echo.1#5 integrate .. //depot/projects/gdb/bin/sh/builtins.def#3 integrate .. //depot/projects/gdb/bin/sh/cd.c#3 integrate .. //depot/projects/gdb/bin/sh/error.c#3 integrate .. //depot/projects/gdb/bin/sh/eval.c#4 integrate .. //depot/projects/gdb/bin/sh/eval.h#3 integrate .. //depot/projects/gdb/bin/sh/exec.c#3 integrate .. //depot/projects/gdb/bin/sh/exec.h#3 integrate .. //depot/projects/gdb/bin/sh/expand.c#3 integrate .. //depot/projects/gdb/bin/sh/funcs/cmv#3 integrate .. //depot/projects/gdb/bin/sh/funcs/dirs#3 integrate .. //depot/projects/gdb/bin/sh/funcs/kill#3 integrate .. //depot/projects/gdb/bin/sh/funcs/login#3 integrate .. //depot/projects/gdb/bin/sh/funcs/newgrp#3 integrate .. //depot/projects/gdb/bin/sh/funcs/popd#3 integrate .. //depot/projects/gdb/bin/sh/funcs/pushd#3 integrate .. //depot/projects/gdb/bin/sh/funcs/suspend#3 integrate .. //depot/projects/gdb/bin/sh/histedit.c#3 integrate .. //depot/projects/gdb/bin/sh/input.c#4 integrate .. //depot/projects/gdb/bin/sh/jobs.c#4 integrate .. //depot/projects/gdb/bin/sh/mail.c#3 integrate .. //depot/projects/gdb/bin/sh/main.c#3 integrate .. //depot/projects/gdb/bin/sh/memalloc.c#3 integrate .. //depot/projects/gdb/bin/sh/memalloc.h#3 integrate .. //depot/projects/gdb/bin/sh/miscbltin.c#3 integrate .. //depot/projects/gdb/bin/sh/mkbuiltins#3 integrate .. //depot/projects/gdb/bin/sh/mkinit.c#3 integrate .. //depot/projects/gdb/bin/sh/mksyntax.c#3 integrate .. //depot/projects/gdb/bin/sh/mktokens#3 integrate .. //depot/projects/gdb/bin/sh/nodetypes#3 integrate .. //depot/projects/gdb/bin/sh/options.c#3 integrate .. //depot/projects/gdb/bin/sh/output.c#3 integrate .. //depot/projects/gdb/bin/sh/parser.c#4 integrate .. //depot/projects/gdb/bin/sh/sh.1#6 integrate .. //depot/projects/gdb/bin/sh/show.c#3 integrate .. //depot/projects/gdb/bin/sh/trap.c#4 integrate .. //depot/projects/gdb/bin/sh/var.c#3 integrate .. //depot/projects/gdb/bin/sh/var.h#3 integrate .. //depot/projects/gdb/bin/sleep/sleep.1#3 integrate .. //depot/projects/gdb/bin/sleep/sleep.c#3 integrate .. //depot/projects/gdb/bin/stty/key.c#3 integrate .. //depot/projects/gdb/bin/stty/print.c#3 integrate .. //depot/projects/gdb/bin/stty/stty.1#5 integrate .. //depot/projects/gdb/bin/stty/stty.c#3 integrate .. //depot/projects/gdb/bin/sync/sync.8#3 integrate .. //depot/projects/gdb/bin/sync/sync.c#3 integrate .. //depot/projects/gdb/bin/test/TEST.sh#2 integrate .. //depot/projects/gdb/bin/test/test.1#6 integrate .. //depot/projects/gdb/bin/test/test.c#2 integrate .. //depot/projects/gdb/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/gdb/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/gdb/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/gdb/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/gdb/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/gdb/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/gdb/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/gdb/contrib/bc/bc/main.c#3 integrate .. //depot/projects/gdb/contrib/bind/CHANGES#2 delete .. //depot/projects/gdb/contrib/bind/DNSSEC#2 delete .. //depot/projects/gdb/contrib/bind/FREEBSD-Upgrade#2 delete .. //depot/projects/gdb/contrib/bind/FREEBSD-Xlist#2 delete .. //depot/projects/gdb/contrib/bind/INSTALL#2 delete .. //depot/projects/gdb/contrib/bind/LICENSE#2 delete .. //depot/projects/gdb/contrib/bind/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/README#2 delete .. //depot/projects/gdb/contrib/bind/SUPPORT#2 delete .. //depot/projects/gdb/contrib/bind/TODO#2 delete .. //depot/projects/gdb/contrib/bind/Version#2 delete .. //depot/projects/gdb/contrib/bind/bin/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/addr/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/addr/addr.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/dig/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/dig/dig.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/dnskeygen/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/dnskeygen/dnskeygen.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/dnsquery/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/dnsquery/dnsquery.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/host/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/host/host.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/irpd/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/irpd/irpd.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/irpd/irs-irpd.conf#2 delete .. //depot/projects/gdb/contrib/bind/bin/irpd/version.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/mkservdb/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/mkservdb/mkservdb.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete .. //depot/projects/gdb/contrib/bind/bin/named-bootconf/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/named-bootconf/named-bootconf.sh#2 delete .. //depot/projects/gdb/contrib/bind/bin/named-bootconf/test.boot#2 delete .. //depot/projects/gdb/contrib/bind/bin/named-xfer/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/named-xfer/named-xfer.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_defs.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_dump.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_func.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_glob.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_glue.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_ixfr.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_load.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_lookup.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_save.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_sec.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_tsig.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/db_update.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/named.conf#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/named.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_config.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_ctl.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_defs.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_forw.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_func.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_glob.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_glue.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_init.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_ixfr.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_lexer.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_lexer.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_main.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_maint.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_ncache.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_notify.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_parser.y#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_parseutil.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_parseutil.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_req.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_resp.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_signal.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_sort.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_stats.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_udp.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_update.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/ns_xfr.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/pathtemplate.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/test/127.0.0.zone#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/test/localhost.zone#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/test/named.conf#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/test/root.hint#2 delete .. //depot/projects/gdb/contrib/bind/bin/named/version.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/ndc/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/ndc/ndc.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/commands.l#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/debug.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/getinfo.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/list.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/main.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/nslookup.help#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/pathnames.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/res.h#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/send.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/skip.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nslookup/subr.c#2 delete .. //depot/projects/gdb/contrib/bind/bin/nsupdate/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/bin/nsupdate/nsupdate.c#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/acl.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/address_list.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/comments.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/config.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/controls.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/docdef.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/example.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/include.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/index.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/key.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/logging.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/master.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/options.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/server.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/trusted-keys.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/html/zone.html#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/dig.1#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/dnskeygen.1#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/dnsquery.1#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/getaddrinfo.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/gethostbyname.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/getipnodebyname.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/getnameinfo.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/getnetent.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/hesiod.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/host.1#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/hostname.7#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/inet_cidr.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/irs.conf.5#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/mailaddr.7#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/mkdep.1#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/named-bootconf.8#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/named-xfer.8#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/named.8#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/named.conf.5#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/ndc.8#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/nslookup.8#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/nsupdate.8#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/resolver.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/resolver.5#2 delete .. //depot/projects/gdb/contrib/bind/doc/man/tsig.3#2 delete .. //depot/projects/gdb/contrib/bind/doc/misc/DynamicUpdate#2 delete .. //depot/projects/gdb/contrib/bind/doc/misc/FAQ.1of2#2 delete .. //depot/projects/gdb/contrib/bind/doc/misc/FAQ.2of2#2 delete .. //depot/projects/gdb/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete .. //depot/projects/gdb/contrib/bind/doc/misc/style.txt#2 delete .. //depot/projects/gdb/contrib/bind/include/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/include/arpa/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/include/arpa/inet.h#2 delete .. //depot/projects/gdb/contrib/bind/include/arpa/nameser.h#2 delete .. //depot/projects/gdb/contrib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/gdb/contrib/bind/include/fd_setsize.h#2 delete .. //depot/projects/gdb/contrib/bind/include/hesiod.h#2 delete .. //depot/projects/gdb/contrib/bind/include/irp.h#2 delete .. //depot/projects/gdb/contrib/bind/include/irs.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/assertions.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/ctl.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/dst.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/eventlib.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/heap.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/list.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/logging.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/misc.h#2 delete .. //depot/projects/gdb/contrib/bind/include/isc/tree.h#2 delete .. //depot/projects/gdb/contrib/bind/include/netdb.h#2 delete .. //depot/projects/gdb/contrib/bind/include/netgroup.h#2 delete .. //depot/projects/gdb/contrib/bind/include/res_update.h#2 delete .. //depot/projects/gdb/contrib/bind/include/resolv.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/README#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/bsafe_link.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/cylink_link.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/dst_api.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/dst_internal.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/eay_dss_link.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/hmac_link.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/md5.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/md5_dgst.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/md5_locl.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/prandom.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/rsaref_link.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/dst/support.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_addr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_cidr_pton.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_data.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_lnaof.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_makeaddr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_net_ntop.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_net_pton.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_neta.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_netof.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_network.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_ntoa.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_ntop.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/inet_pton.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/inet/nsap_addr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/Makefile.BSD#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/README#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_gr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_ho.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_nw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_pr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_pw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/dns_sv.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gai_strerror.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_gr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_ho.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_ng.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_nw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_pr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_pw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gen_sv.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getaddrinfo.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getgrent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getgrent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gethostent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/gethostent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getnameinfo.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getnetent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getnetent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getnetgrent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getnetgrent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getprotoent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getprotoent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getpwent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getpwent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getservent.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/getservent_r.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/hesiod.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/hesiod_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_gr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_ho.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_ng.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_nw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_pr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_pw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irp_sv.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irpmarshall.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irs_data.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irs_data.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/irs_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_gr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_ho.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_ng.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_nw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_pr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_pw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/lcl_sv.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_gr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_ho.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_ng.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_nw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_pr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_pw.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nis_sv.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/nul_ng.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/pathnames.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/irs/util.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/assertions.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/assertions.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/base64.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/bitncmp.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/bitncmp.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ctl_clnt.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ctl_p.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ctl_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ctl_srvr.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ev_connects.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ev_files.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ev_streams.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ev_timers.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/ev_waits.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/eventlib.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/eventlib.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/eventlib_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/heap.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/heap.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/hex.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/logging.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/logging.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/logging_p.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/memcluster.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/memcluster.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/movefile.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/tree.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/isc/tree.mdoc#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_date.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_name.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_netint.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_parse.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_print.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_samedomain.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_sign.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_ttl.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/nameser/ns_verify.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/herror.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_comp.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_data.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_debug.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_debug.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_findzonecut.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_init.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_mkquery.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_mkupdate.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_mkupdate.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_private.h#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_query.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_send.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_sendsigned.c#2 delete .. //depot/projects/gdb/contrib/bind/lib/resolv/res_update.c#2 delete .. //depot/projects/gdb/contrib/bind/port/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/port/README#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/Makefile.set#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/bin/probe_ipv6#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/include/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/include/port_after.h#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/include/port_before.h#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/include/prand_conf.h#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/include/sys/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/noop.c#2 delete .. //depot/projects/gdb/contrib/bind/port/freebsd/probe#2 delete .. //depot/projects/gdb/contrib/bind/port/prand_conf/Makefile#2 delete .. //depot/projects/gdb/contrib/bind/port/prand_conf/README#2 delete .. //depot/projects/gdb/contrib/bind/port/prand_conf/prand_conf.c#2 delete .. //depot/projects/gdb/contrib/bind/port/settings#2 delete .. //depot/projects/gdb/contrib/bind/port/systype#2 delete .. //depot/projects/gdb/contrib/bind/tests/irs_testclient.c#2 delete .. //depot/projects/gdb/contrib/bind/tests/irs_testirpd.c#2 delete .. //depot/projects/gdb/contrib/bind/tests/irs_testserver.c#2 delete .. //depot/projects/gdb/contrib/bind/tests/test_cidr.c#2 delete .. //depot/projects/gdb/contrib/bind/tests/test_getaddr.c#2 delete .. //depot/projects/gdb/contrib/bind9/CHANGES#1 branch .. //depot/projects/gdb/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/gdb/contrib/bind9/FAQ#1 branch .. //depot/projects/gdb/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/gdb/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/gdb/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/gdb/contrib/bind9/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/README#1 branch .. //depot/projects/gdb/contrib/bind9/acconfig.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/gdb/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/gdb/contrib/bind9/config.guess#1 branch .. //depot/projects/gdb/contrib/bind9/config.sub#1 branch .. //depot/projects/gdb/contrib/bind9/config.threads.in#1 branch .. //depot/projects/gdb/contrib/bind9/configure.in#1 branch .. //depot/projects/gdb/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/gdb/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3596.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3597.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3645.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3655.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3658.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3833.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3845.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc952.txt#1 branch .. //depot/projects/gdb/contrib/bind9/install-sh#1 branch .. //depot/projects/gdb/contrib/bind9/isc-config.sh.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/README#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/aclocal.m4#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/api#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/daemon.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/ftruncate.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/gettimeofday.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/mktemp.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/putenv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/readv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/setenv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/setitimer.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/strcasecmp.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/strdup.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/strerror.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/strpbrk.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/strsep.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/strtoul.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/utimes.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/bsd/writev.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/config.h.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/configure#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/configure.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/dst_api.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/dst_internal.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/hmac_link.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/md5.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/md5_dgst.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/md5_locl.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/support.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/arpa/inet.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/fd_setsize.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/hesiod.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/irp.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/irs.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/assertions.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/ctl.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/dst.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/heap.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/list.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/logging.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/misc.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/isc/tree.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/netdb.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/netgroup.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/res_update.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/resolv.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_addr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_data.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_lnaof.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_makeaddr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_net_ntop.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_net_pton.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_neta.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_netof.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_network.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_ntoa.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_ntop.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/inet_pton.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/inet/nsap_addr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_gr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_ho.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_nw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_pr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_pw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/dns_sv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gai_strerror.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_gr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_ho.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_ng.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_nw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_pr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_pw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gen_sv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getaddrinfo.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getgrent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getgrent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gethostent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gethostent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getnameinfo.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getnetent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getnetent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getnetgrent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getnetgrent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getprotoent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getprotoent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getpwent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getpwent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getservent.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/getservent_r.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/hesiod.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/hesiod_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_gr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_ho.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_ng.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_nw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_pr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_pw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irp_sv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irpmarshall.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irs_data.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irs_data.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irs_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_gr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_ho.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_ng.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_nw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_pr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_pw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/lcl_sv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_gr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_ho.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_ng.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_nw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_p.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_pr.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_pw.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nis_sv.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/nul_ng.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/pathnames.h#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/util.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/assertions.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/assertions.mdoc#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/base64.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/bitncmp.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/bitncmp.mdoc#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/ctl_clnt.c#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/ctl_p.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 31 01:38:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA20216A4E1; Mon, 31 Jul 2006 01:38:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABD6016A4DF for ; Mon, 31 Jul 2006 01:38:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74DB243D45 for ; Mon, 31 Jul 2006 01:38:04 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V1c4GF040542 for ; Mon, 31 Jul 2006 01:38:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V1c4LF040539 for perforce@freebsd.org; Mon, 31 Jul 2006 01:38:04 GMT (envelope-from marcel@freebsd.org) Date: Mon, 31 Jul 2006 01:38:04 GMT Message-Id: <200607310138.k6V1c4LF040539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 01:38:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=102817 Change 102817 by marcel@marcel_nfs on 2006/07/31 01:37:22 IFC fixups... Affected files ... .. //depot/projects/gdb/libexec/rtld-aout/support.c#3 edit .. //depot/projects/gdb/libexec/rtld-aout/support.h#3 edit .. //depot/projects/gdb/sys/boot/i386/loader/loader.rc#3 edit Differences ... ==== //depot/projects/gdb/libexec/rtld-aout/support.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.5 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.7 2005/01/11 16:40:29 trhodes Exp $ */ #include #include ==== //depot/projects/gdb/libexec/rtld-aout/support.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.4 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.6 2005/01/11 16:40:29 trhodes Exp $ */ /* ==== //depot/projects/gdb/sys/boot/i386/loader/loader.rc#3 (text+ko) ==== @@ -1,10 +1,10 @@ \ Loader.rc -\ $FreeBSD: src/sys/boot/i386/loader/loader.rc,v 1.2 2003/11/21 19:01:02 dcs Exp $ +\ $FreeBSD: src/sys/boot/i386/loader/loader.rc,v 1.4 2005/10/30 05:41:42 scottl Exp $ \ \ Includes additional commands include /boot/loader.4th -\ Reads and processes loader.rc +\ Reads and processes loader.conf variables start \ Tests for password -- executes autoboot first if a password was defined From owner-p4-projects@FreeBSD.ORG Mon Jul 31 01:51:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B8FE16A4E5; Mon, 31 Jul 2006 01:51:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5741116A4DE for ; Mon, 31 Jul 2006 01:51:22 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E08443D58 for ; Mon, 31 Jul 2006 01:51:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V1pLqt045350 for ; Mon, 31 Jul 2006 01:51:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V1pLHa045347 for perforce@freebsd.org; Mon, 31 Jul 2006 01:51:21 GMT (envelope-from marcel@freebsd.org) Date: Mon, 31 Jul 2006 01:51:21 GMT Message-Id: <200607310151.k6V1pLHa045347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 01:51:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=102819 Change 102819 by marcel@marcel_nfs on 2006/07/31 01:50:40 Bring over the preparatory changes from the core branch (depot user/marcel/core). The core branch is going to be retired. Future core file related work is going to happen on the gdb branch (depot projects/gdb). The preparatory changes include simplifying the dumping code so that it could be more easily extended for the next generation core file (Core/NG). Core/NG was triggered by discussions on the GDB mailing list when I attempted to contribute the support for FreeBSD/ia64. This attempt stalled due to lack of time and energy to also revamp the core file dumping. With ARM, MIPS & PowerPC standing in line for GDB support, it seems like a good idea to work towards an integrated branch onto which all GDB related work can happen. I expect that there will be enough overlap that seperate branches are more trouble than they are worth... Affected files ... .. //depot/projects/gdb/sys/kern/imgact_elf.c#15 edit Differences ... ==== //depot/projects/gdb/sys/kern/imgact_elf.c#15 (text+ko) ==== @@ -1,7 +1,8 @@ /*- - * Copyright (c) 2000 David O'Brien * Copyright (c) 1995-1996 Søren Schmidt * Copyright (c) 1996 Peter Wemm + * Copyright (c) 2000 David O'Brien + * Copyright (c) 2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -886,8 +887,6 @@ static void cb_put_phdr(vm_map_entry_t, void *); static void cb_size_segment(vm_map_entry_t, void *); static void each_writable_segment(struct thread *, segment_callback, void *); -static int __elfN(corehdr)(struct thread *, struct vnode *, struct ucred *, - int, void *, size_t); static void __elfN(puthdr)(struct thread *, void *, size_t *, int); static void __elfN(putnote)(void *, size_t *, const char *, int, const void *, size_t); @@ -895,16 +894,15 @@ extern int osreldate; int -__elfN(coredump)(td, vp, limit) - struct thread *td; - struct vnode *vp; - off_t limit; +__elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit) { + struct sseg_closure seginfo; struct ucred *cred = td->td_ucred; - int error = 0; - struct sseg_closure seginfo; + Elf_Phdr *php; void *hdr; - size_t hdrsize; + off_t offset; + size_t pre_hdrsz, post_hdrsz; + int error, idx; /* Size the program segments. */ seginfo.count = 0; @@ -916,41 +914,45 @@ * a dry run of generating it. Nothing is written, but the * size is calculated. */ - hdrsize = 0; - __elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count); + pre_hdrsz = 0; + __elfN(puthdr)(td, (void *)NULL, &pre_hdrsz, seginfo.count); - if (hdrsize + seginfo.size >= limit) + if (pre_hdrsz + seginfo.size >= limit) return (EFAULT); /* - * Allocate memory for building the header, fill it up, + * Allocate memory for building the headers, fill it up, * and write it out. */ - hdr = malloc(hdrsize, M_TEMP, M_WAITOK); - if (hdr == NULL) { + hdr = malloc(pre_hdrsz, M_TEMP, M_WAITOK | M_ZERO); + if (hdr == NULL) return (EINVAL); - } - error = __elfN(corehdr)(td, vp, cred, seginfo.count, hdr, hdrsize); + + post_hdrsz = 0; + __elfN(puthdr)(td, hdr, &post_hdrsz, seginfo.count); + + /* + * We allow that pre-sizing over-estimates. It is not acceptable + * that we overrun the buffer. + */ + KASSERT(pre_hdrsz >= post_hdrsz, + ("%s: pre_hdrsz < post_hdrsz", __func__)); + + /* Write it to the core file. */ + error = vn_rdwr_inchunks(UIO_WRITE, vp, hdr, post_hdrsz, (off_t)0, + UIO_SYSSPACE, IO_UNIT | IO_DIRECT, cred, NOCRED, NULL, td); /* Write the contents of all of the writable segments. */ - if (error == 0) { - Elf_Phdr *php; - off_t offset; - int i; - - php = (Elf_Phdr *)((char *)hdr + sizeof(Elf_Ehdr)) + 1; - offset = hdrsize; - for (i = 0; i < seginfo.count; i++) { - error = vn_rdwr_inchunks(UIO_WRITE, vp, - (caddr_t)(uintptr_t)php->p_vaddr, - php->p_filesz, offset, UIO_USERSPACE, - IO_UNIT | IO_DIRECT, cred, NOCRED, NULL, - curthread); /* XXXKSE */ - if (error != 0) - break; - offset += php->p_filesz; - php++; - } + offset = post_hdrsz; + php = (Elf_Phdr *)((char *)hdr + sizeof(Elf_Ehdr)) + 1; + while (error == 0 && seginfo.count > 0) { + error = vn_rdwr_inchunks(UIO_WRITE, vp, + (caddr_t)(uintptr_t)php->p_vaddr, php->p_filesz, + offset, UIO_USERSPACE, IO_UNIT | IO_DIRECT, cred, + NOCRED, NULL, td); + offset += php->p_filesz; + php++; + seginfo.count--; } free(hdr, M_TEMP); @@ -962,9 +964,7 @@ * program header entry. */ static void -cb_put_phdr(entry, closure) - vm_map_entry_t entry; - void *closure; +cb_put_phdr(vm_map_entry_t entry, void *closure) { struct phdr_closure *phc = (struct phdr_closure *)closure; Elf_Phdr *phdr = phc->phdr; @@ -994,9 +994,7 @@ * the number of segments and their total size. */ static void -cb_size_segment(entry, closure) - vm_map_entry_t entry; - void *closure; +cb_size_segment(vm_map_entry_t entry, void *closure) { struct sseg_closure *ssc = (struct sseg_closure *)closure; @@ -1010,18 +1008,15 @@ * caller-supplied data. */ static void -each_writable_segment(td, func, closure) - struct thread *td; - segment_callback func; - void *closure; +each_writable_segment(struct thread *td, segment_callback func, void *closure) { struct proc *p = td->td_proc; vm_map_t map = &p->p_vmspace->vm_map; vm_map_entry_t entry; + vm_object_t obj; for (entry = map->header.next; entry != &map->header; - entry = entry->next) { - vm_object_t obj; + entry = entry->next) { /* * Don't dump inaccessible mappings, deal with legacy @@ -1065,32 +1060,6 @@ } } -/* - * Write the core file header to the file, including padding up to - * the page boundary. - */ -static int -__elfN(corehdr)(td, vp, cred, numsegs, hdr, hdrsize) - struct thread *td; - struct vnode *vp; - struct ucred *cred; - int numsegs; - size_t hdrsize; - void *hdr; -{ - size_t off; - - /* Fill in the header. */ - bzero(hdr, hdrsize); - off = 0; - __elfN(puthdr)(td, hdr, &off, numsegs); - - /* Write it to the core file. */ - return (vn_rdwr_inchunks(UIO_WRITE, vp, hdr, hdrsize, (off_t)0, - UIO_SYSSPACE, IO_UNIT | IO_DIRECT, cred, NOCRED, NULL, - td)); /* XXXKSE */ -} - #if defined(COMPAT_IA32) && __ELF_WORD_SIZE == 32 typedef struct prstatus32 elf_prstatus_t; typedef struct prpsinfo32 elf_prpsinfo_t; From owner-p4-projects@FreeBSD.ORG Mon Jul 31 02:00:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E7B116A4E2; Mon, 31 Jul 2006 02:00:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 095F516A4E0 for ; Mon, 31 Jul 2006 02:00:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5C5143D45 for ; Mon, 31 Jul 2006 02:00:33 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V20XHg045776 for ; Mon, 31 Jul 2006 02:00:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V20Xs9045773 for perforce@freebsd.org; Mon, 31 Jul 2006 02:00:33 GMT (envelope-from marcel@freebsd.org) Date: Mon, 31 Jul 2006 02:00:33 GMT Message-Id: <200607310200.k6V20Xs9045773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 02:00:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=102820 Change 102820 by marcel@marcel_nfs on 2006/07/31 02:00:21 Add a new header, called core.h, that I had lying around. The purpose of the header is to describe the notes in Core/NG. Typical consumers of this header include the toolchain. Affected files ... .. //depot/projects/gdb/sys/sys/core.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 31 03:08:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C85416A4E5; Mon, 31 Jul 2006 03:08:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 281AA16A4E9 for ; Mon, 31 Jul 2006 03:08:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EAD143D53 for ; Mon, 31 Jul 2006 03:08:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V38tZv051691 for ; Mon, 31 Jul 2006 03:08:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V38scp051688 for perforce@freebsd.org; Mon, 31 Jul 2006 03:08:54 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Jul 2006 03:08:54 GMT Message-Id: <200607310308.k6V38scp051688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 102822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 03:08:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=102822 Change 102822 by sam@sam_ebb on 2006/07/31 03:08:01 make it compile; still needs scanning support Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#2 edit .. //depot/projects/wifi/sys/dev/ral/rt2560var.h#2 edit .. //depot/projects/wifi/sys/dev/ral/rt2661.c#2 edit .. //depot/projects/wifi/sys/dev/ral/rt2661var.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#2 (text) ==== @@ -88,7 +88,6 @@ static struct ieee80211_node *rt2560_node_alloc( struct ieee80211_node_table *); static int rt2560_media_change(struct ifnet *); -static void rt2560_next_scan(void *); static void rt2560_iter_func(void *, struct ieee80211_node *); static void rt2560_update_rssadapt(void *); static int rt2560_newstate(struct ieee80211com *, @@ -204,7 +203,6 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - callout_init(&sc->scan_ch, debug_mpsafenet ? CALLOUT_MPSAFE : 0); callout_init(&sc->rssadapt_ch, CALLOUT_MPSAFE); /* retrieve RT2560 rev. no */ @@ -384,7 +382,6 @@ struct ifnet *ifp = ic->ic_ifp; rt2560_stop(sc); - callout_stop(&sc->scan_ch); callout_stop(&sc->rssadapt_ch); bpfdetach(ifp); @@ -760,20 +757,6 @@ } /* - * This function is called periodically (every 200ms) during scanning to - * switch from one channel to another. - */ -static void -rt2560_next_scan(void *arg) -{ - struct rt2560_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; - - if (ic->ic_state == IEEE80211_S_SCAN) - ieee80211_next_scan(ic); -} - -/* * This function is called for each node present in the node station table. */ static void @@ -812,7 +795,6 @@ int error = 0; ostate = ic->ic_state; - callout_stop(&sc->scan_ch); switch (nstate) { case IEEE80211_S_INIT: @@ -829,8 +811,6 @@ case IEEE80211_S_SCAN: rt2560_set_chan(sc, ic->ic_curchan); - callout_reset(&sc->scan_ch, (sc->dwelltime * hz) / 1000, - rt2560_next_scan, sc); break; case IEEE80211_S_AUTH: @@ -1253,7 +1233,7 @@ (struct ieee80211_frame_min *)wh); /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, desc->rssi, 0); + ieee80211_input(ic, m, ni, desc->rssi, 0, 0); /* give rssi to the rate adatation algorithm */ rn = (struct rt2560_node *)ni; @@ -2088,7 +2068,6 @@ rt2560_watchdog(struct ifnet *ifp) { struct rt2560_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; RAL_LOCK(sc); @@ -2105,8 +2084,6 @@ ifp->if_timer = 1; } - ieee80211_watchdog(ic); - RAL_UNLOCK(sc); } ==== //depot/projects/wifi/sys/dev/ral/rt2560var.h#2 (text) ==== @@ -108,7 +108,6 @@ struct mtx sc_mtx; - struct callout scan_ch; struct callout rssadapt_ch; int sc_tx_timer; ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#2 (text) ==== @@ -90,7 +90,6 @@ static struct ieee80211_node *rt2661_node_alloc( struct ieee80211_node_table *); static int rt2661_media_change(struct ifnet *); -static void rt2661_next_scan(void *); static int rt2661_newstate(struct ieee80211com *, enum ieee80211_state, int); static uint16_t rt2661_eeprom_read(struct rt2661_softc *, uint8_t); @@ -207,7 +206,6 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - callout_init(&sc->scan_ch, debug_mpsafenet ? CALLOUT_MPSAFE : 0); callout_init(&sc->rssadapt_ch, CALLOUT_MPSAFE); /* wait for NIC to initialize */ @@ -405,7 +403,6 @@ struct ifnet *ifp = ic->ic_ifp; rt2661_stop(sc); - callout_stop(&sc->scan_ch); callout_stop(&sc->rssadapt_ch); bpfdetach(ifp); @@ -775,20 +772,6 @@ } /* - * This function is called periodically (every 200ms) during scanning to - * switch from one channel to another. - */ -static void -rt2661_next_scan(void *arg) -{ - struct rt2661_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; - - if (ic->ic_state == IEEE80211_S_SCAN) - ieee80211_next_scan(ic); -} - -/* * This function is called for each node present in the node station table. */ static void @@ -827,7 +810,6 @@ int error = 0; ostate = ic->ic_state; - callout_stop(&sc->scan_ch); switch (nstate) { case IEEE80211_S_INIT: @@ -842,8 +824,6 @@ case IEEE80211_S_SCAN: rt2661_set_chan(sc, ic->ic_curchan); - callout_reset(&sc->scan_ch, (sc->dwelltime * hz) / 1000, - rt2661_next_scan, sc); break; case IEEE80211_S_AUTH: @@ -1160,7 +1140,7 @@ (struct ieee80211_frame_min *)wh); /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, desc->rssi, 0); + ieee80211_input(ic, m, ni, desc->rssi, 0, 0); /* give rssi to the rate adatation algorithm */ rn = (struct rt2661_node *)ni; @@ -1861,7 +1841,6 @@ rt2661_watchdog(struct ifnet *ifp) { struct rt2661_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; RAL_LOCK(sc); @@ -1878,8 +1857,6 @@ ifp->if_timer = 1; } - ieee80211_watchdog(ic); - RAL_UNLOCK(sc); } ==== //depot/projects/wifi/sys/dev/ral/rt2661var.h#2 (text) ==== @@ -101,7 +101,6 @@ struct mtx sc_mtx; - struct callout scan_ch; struct callout rssadapt_ch; int sc_tx_timer; From owner-p4-projects@FreeBSD.ORG Mon Jul 31 03:17:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 989F816A4DA; Mon, 31 Jul 2006 03:17:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5738516A4DD for ; Mon, 31 Jul 2006 03:17:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C7D343D45 for ; Mon, 31 Jul 2006 03:17:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V3H63g052114 for ; Mon, 31 Jul 2006 03:17:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V3H6ft052105 for perforce@freebsd.org; Mon, 31 Jul 2006 03:17:06 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Jul 2006 03:17:06 GMT Message-Id: <200607310317.k6V3H6ft052105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 102823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 03:17:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102823 Change 102823 by sam@sam_ebb on 2006/07/31 03:16:08 mismerge Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#39 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#39 (text+ko) ==== @@ -203,7 +203,6 @@ void ieee80211_probe_curchan(struct ieee80211com *, int); void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *); void ieee80211_reset_bss(struct ieee80211com *); -void ieee80211_end_scan(struct ieee80211com *); int ieee80211_ibss_merge(struct ieee80211_node *); struct ieee80211_scan_entry; int ieee80211_sta_join(struct ieee80211com *, From owner-p4-projects@FreeBSD.ORG Mon Jul 31 03:52:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2A7816A4EC; Mon, 31 Jul 2006 03:52:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A86A716A4EA for ; Mon, 31 Jul 2006 03:52:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B60343D55 for ; Mon, 31 Jul 2006 03:52:51 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V3qowV054225 for ; Mon, 31 Jul 2006 03:52:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V3qoiO054222 for perforce@freebsd.org; Mon, 31 Jul 2006 03:52:50 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Jul 2006 03:52:50 GMT Message-Id: <200607310352.k6V3qoiO054222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 102824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 03:52:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=102824 Change 102824 by sam@sam_ebb on 2006/07/31 03:52:10 bandaids to make it compile Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#14 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#9 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#14 (text+ko) ==== @@ -975,10 +975,6 @@ /* XXX state change race with taskqueue */ switch (nstate) { - case IEEE80211_S_INIT: - sc->flags &= ~IWI_FLAG_SCANNING; - break; - case IEEE80211_S_SCAN: if (ic->ic_state == IEEE80211_S_RUN) { /* @@ -1321,7 +1317,7 @@ ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); /* send the frame to the 802.11 layer */ - type = ieee80211_input(ic, m, ni, frame->rssi_dbm, 0); + type = ieee80211_input(ic, m, ni, frame->rssi_dbm, 0, 0); /* node is no longer needed */ ieee80211_free_node(ni); @@ -2660,13 +2656,13 @@ #ifdef IWI_DEBUG if (iwi_debug > 0) { printf("Setting desired ESSID to "); - ieee80211_print_essid(ic->ic_des_essid, - ic->ic_des_esslen); + ieee80211_print_essid(ic->ic_des_ssid[0].ssid, + ic->ic_des_ssid[0].len); printf("\n"); } #endif - error = iwi_cmd(sc, IWI_CMD_SET_ESSID, ic->ic_des_essid, - ic->ic_des_esslen); + error = iwi_cmd(sc, IWI_CMD_SET_ESSID, ic->ic_des_ssid[0].ssid, + ic->ic_des_ssid[0].len); if (error != 0) return error; } @@ -2713,9 +2709,9 @@ scan.dwell_time[IWI_SCAN_TYPE_BROADCAST] = htole16(sc->dwelltime); scan.dwell_time[IWI_SCAN_TYPE_BDIRECTED] = htole16(sc->dwelltime); - scan.full_scan_index = htole32(ic->ic_scan.nt_scangen); + scan.full_scan_index = htole32(++sc->sc_scangen); - scan_type = (ic->ic_des_esslen != 0) ? IWI_SCAN_TYPE_BDIRECTED : + scan_type = (ic->ic_des_nssid != 0) ? IWI_SCAN_TYPE_BDIRECTED : IWI_SCAN_TYPE_BROADCAST; ix = 0; @@ -2804,7 +2800,9 @@ * in the list. */ if (sc->flags & IWI_FLAG_SCANNING) { +#if 0 ieee80211_begin_scan(ic, 1); +#endif if (iwi_scan(sc) != 0) { /* XXX should not happen */ sc->flags &= ~IWI_FLAG_SCANNING; @@ -2818,13 +2816,14 @@ iwi_scandone(void *arg, int npending) { struct iwi_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; IWI_LOCK_DECL; IWI_LOCK(sc); if (sc->flags & IWI_FLAG_ASSOCIATED) iwi_disassociate(sc, 0); +#if 0 ieee80211_end_scan(ic); +#endif IWI_UNLOCK(sc); } @@ -2846,7 +2845,7 @@ ic = &sc->sc_ic; KASSERT(ic->ic_opmode == IEEE80211_M_MONITOR, ("opmode %u", ic->ic_opmode)); - chan = ic->ic_ibss_chan; + chan = ic->ic_bsschan; memset(&scan, 0, sizeof scan); /* @@ -2856,7 +2855,7 @@ * channel hopping in monitor mode. */ scan.dwell_time[IWI_SCAN_TYPE_PASSIVE] = htole16(2000); - scan.full_scan_index = htole32(ic->ic_scan.nt_scangen); + scan.full_scan_index = htole32(++sc->sc_scangen); if (IEEE80211_IS_CHAN_5GHZ(chan)) scan.channels[0] = 1 | IWI_CHAN_5GHZ; else ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#9 (text+ko) ==== @@ -165,6 +165,7 @@ int bluetooth; struct iwi_associate assoc; struct iwi_wme_params wme[3]; + u_int sc_scangen; struct task sc_radiontask; /* radio on processing */ struct task sc_radiofftask; /* radio off processing */ From owner-p4-projects@FreeBSD.ORG Mon Jul 31 04:10:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EB7716A4DF; Mon, 31 Jul 2006 04:10:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 330F316A4DD for ; Mon, 31 Jul 2006 04:10:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C856043D45 for ; Mon, 31 Jul 2006 04:10:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V4AChG058569 for ; Mon, 31 Jul 2006 04:10:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V4ACJ6058560 for perforce@freebsd.org; Mon, 31 Jul 2006 04:10:12 GMT (envelope-from marcel@freebsd.org) Date: Mon, 31 Jul 2006 04:10:12 GMT Message-Id: <200607310410.k6V4ACJ6058560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 04:10:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=102825 Change 102825 by marcel@marcel_nfs on 2006/07/31 04:09:11 Collect some local changes I had in my CVS tree for ages: Interface definitions for getting machine-specific registers. On ia64 these definitions can be used or need to be used for getting the dirty stacked registers. Affected files ... .. //depot/projects/gdb/include/proc_service.h#7 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.h#9 edit .. //depot/projects/gdb/sys/sys/ptrace.h#6 edit Differences ... ==== //depot/projects/gdb/include/proc_service.h#7 (text+ko) ==== @@ -49,8 +49,11 @@ ps_err_e ps_lcontinue(struct ps_prochandle *, lwpid_t); ps_err_e ps_lgetfpregs(struct ps_prochandle *, lwpid_t, prfpregset_t *); ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, prgregset_t); +ps_err_e ps_lgetxregs(struct ps_prochandle *, lwpid_t, void *); +ps_err_e ps_lgetxregsize(struct ps_prochandle *, lwpid_t, int *); ps_err_e ps_lsetfpregs(struct ps_prochandle *, lwpid_t, const prfpregset_t *); ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const prgregset_t); +ps_err_e ps_lsetxregs(struct ps_prochandle *, lwpid_t, const void *); #ifdef __i386__ ps_err_e ps_lgetxmmregs (struct ps_prochandle *, lwpid_t, char *); ps_err_e ps_lsetxmmregs (struct ps_prochandle *, lwpid_t, const char *); ==== //depot/projects/gdb/lib/libthread_db/thread_db.h#9 (text+ko) ==== @@ -232,12 +232,15 @@ #endif td_err_e td_thr_getfpregs(const td_thrhandle_t *, prfpregset_t *); td_err_e td_thr_getgregs(const td_thrhandle_t *, prgregset_t); +td_err_e td_thr_getxregs(const td_thrhandle_t *, void *); +td_err_e td_thr_getxregsize(const td_thrhandle_t *, int *); td_err_e td_thr_set_event(const td_thrhandle_t *, td_thr_events_t *); #ifdef __i386__ td_err_e td_thr_setxmmregs(const td_thrhandle_t *, const char *); #endif td_err_e td_thr_setfpregs(const td_thrhandle_t *, const prfpregset_t *); td_err_e td_thr_setgregs(const td_thrhandle_t *, const prgregset_t); +td_err_e td_thr_setxregs(const td_thrhandle_t *, const void *); td_err_e td_thr_validate(const td_thrhandle_t *); td_err_e td_thr_tls_get_addr(const td_thrhandle_t *, void *, size_t, void **); ==== //depot/projects/gdb/sys/sys/ptrace.h#6 (text+ko) ==== @@ -67,6 +67,9 @@ #define PT_SETFPREGS 36 /* set floating-point registers */ #define PT_GETDBREGS 37 /* get debugging registers */ #define PT_SETDBREGS 38 /* set debugging registers */ +#define PT_GETXREGS 39 /* get machine-specific registers */ +#define PT_SETXREGS 40 /* set machine-specific registers */ + #define PT_FIRSTMACH 64 /* for machine-specific requests */ #include /* machine-specific requests, if any */ From owner-p4-projects@FreeBSD.ORG Mon Jul 31 05:40:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F51A16A4DF; Mon, 31 Jul 2006 05:40:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 468F316A4DE for ; Mon, 31 Jul 2006 05:40:07 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D38DB43D45 for ; Mon, 31 Jul 2006 05:40:06 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V5e65X075716 for ; Mon, 31 Jul 2006 05:40:06 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V5e6wU075713 for perforce@freebsd.org; Mon, 31 Jul 2006 05:40:06 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 31 Jul 2006 05:40:06 GMT Message-Id: <200607310540.k6V5e6wU075713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 05:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102827 Change 102827 by cdjones@cdjones-impulse on 2006/07/31 05:39:21 Fix format error in fprintf() call. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#6 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#6 (text+ko) ==== @@ -196,7 +196,7 @@ usage(void) { - (void)fprintf(stderr, "%s%s%s%s\n", + (void)fprintf(stderr, "%s%s%s%s%s\n", "usage: jail [-i] [-J jid_file] [-m mem_limit] ", "[-p priority] [-s securelevel]", " [-l -u ", From owner-p4-projects@FreeBSD.ORG Mon Jul 31 07:09:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5439C16A4DE; Mon, 31 Jul 2006 07:09:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECCBF16A4DF for ; Mon, 31 Jul 2006 07:09:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 812BF43D49 for ; Mon, 31 Jul 2006 07:09:23 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V79NoO083830 for ; Mon, 31 Jul 2006 07:09:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V790ln083820 for perforce@freebsd.org; Mon, 31 Jul 2006 07:09:00 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Jul 2006 07:09:00 GMT Message-Id: <200607310709.k6V790ln083820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 102829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 07:09:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=102829 Change 102829 by kmacy@kmacy_storage:sun4v_work_stable on 2006/07/31 07:08:19 IFC && fix compile breakage Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/MAINTAINERS#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/UPDATING#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/dd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/test/test.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/CHANGES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Configure#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/FAQ#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/INSTALL#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/LICENSE#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/NEWS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/der_chop#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/comm.txt#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/comms.txt#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/config#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_div.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/conf/conf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/des.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_cryptodev.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_ubsec.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md4/md4_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ripemd/rmd_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/BN_add_word.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/BN_new.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/EVP_SealInit.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/RSA_sign.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/bn.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/hmac.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/threads.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/openssl.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_error.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_session.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_shutdown.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_state_string.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssl/ssl.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/e_os.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/bio_ssl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s23_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s23_meth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_meth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_both.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_meth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_algs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_txt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/t1_clnt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/t1_meth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/t1_srvr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/tls1.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/CAss.cnf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/P1ss.cnf#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/P2ss.cnf#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/Uss.cnf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/bctest#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/tcrl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testca#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testenc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testfipsssl#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testgen#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testss#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testssl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/testsslproxy#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/tpkcs7#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/tpkcs7d#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/treq#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/trsa#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/tsid#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/tx509#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/tools/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/ck_errf.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/copy.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/domd#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/extract-section.pl#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/mkdef.pl#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 31 07:11:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC0E16A4DF; Mon, 31 Jul 2006 07:11:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A7D516A4DD for ; Mon, 31 Jul 2006 07:11:27 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E2CA43D4C for ; Mon, 31 Jul 2006 07:11:27 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V7BQoN084027 for ; Mon, 31 Jul 2006 07:11:26 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V7BQBr084024 for perforce@freebsd.org; Mon, 31 Jul 2006 07:11:26 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 31 Jul 2006 07:11:26 GMT Message-Id: <200607310711.k6V7BQBr084024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 07:11:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=102830 Change 102830 by cdjones@cdjones-impulse on 2006/07/31 07:11:08 Trivial program to chew through RAM and sit on it, to test the memory limiting in jails. Affected files ... .. //depot/projects/soc2006/cdjones_jail/test/useMemory.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 31 07:13:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6DAF16A4DE; Mon, 31 Jul 2006 07:13:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A05C416A4DA for ; Mon, 31 Jul 2006 07:13:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B54243D55 for ; Mon, 31 Jul 2006 07:13:30 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V7DUcp084142 for ; Mon, 31 Jul 2006 07:13:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V7DTOY084139 for perforce@freebsd.org; Mon, 31 Jul 2006 07:13:29 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Jul 2006 07:13:29 GMT Message-Id: <200607310713.k6V7DTOY084139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 102831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 07:13:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=102831 Change 102831 by kmacy@kmacy_storage:sun4v_work_stable on 2006/07/31 07:12:48 md fixes for IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/db_trace.c#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/trap.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/db_trace.c#2 (text+ko) ==== @@ -97,7 +97,7 @@ * User stack trace (debugging aid). */ static void -db_utrace(struct thread *td, struct trapframe *tf, int count, int *quitp) +db_utrace(struct thread *td, struct trapframe *tf, int count) { struct pcb *pcb; db_addr_t sp, rsp, o7, pc; @@ -109,7 +109,7 @@ FALSE); pc = db_get_value((db_addr_t)&tf->tf_tpc, sizeof(tf->tf_tpc), FALSE); db_printf("user trace: trap %%o7=%#lx\n", o7); - while (count-- && sp != 0 && !*quitp) { + while (count-- && sp != 0 && !db_pager_quit) { db_printf("pc %#lx, sp %#lx\n", pc, sp); /* First, check whether the frame is in the pcb. */ found = 0; @@ -135,7 +135,7 @@ } static int -db_print_trap(struct thread *td, struct trapframe *tf, int count, int *quitp) +db_print_trap(struct thread *td, struct trapframe *tf, int count) { struct proc *p; const char *symname; @@ -226,7 +226,7 @@ db_printf("userland() at "); db_printsym(tpc, DB_STGY_PROC); db_printf("\n"); - db_utrace(td, tf, count, quitp); + db_utrace(td, tf, count); } return (user); } @@ -252,8 +252,7 @@ user = 0; npc = 0; quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !user && !quit) { + while (count-- && !user && !db_pager_quit) { pc = (db_addr_t)db_get_value((db_addr_t)&fp->fr_pc, sizeof(fp->fr_pc), FALSE); if (trap) { @@ -277,7 +276,7 @@ tf = (struct trapframe *)(fp + 1); npc = db_get_value((db_addr_t)&tf->tf_tpc, sizeof(tf->tf_tpc), FALSE); - user = db_print_trap(td, tf, count, &quit); + user = db_print_trap(td, tf, count); trap = 1; } else { db_printf("%s() at ", name); ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/trap.c#5 (text+ko) ==== @@ -603,7 +603,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; if (narg <= regcnt) { argp = &tf->tf_out[reg]; @@ -625,9 +625,6 @@ * Try to run the syscall without the MP lock if the syscall * is MP safe. */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, argp); @@ -682,13 +679,6 @@ } /* - * Release Giant if we had to get it. Don't use mtx_owned(), - * we want to catch broken syscalls. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Handle reschedule and other end-of-syscall issues */ userret(td, tf); From owner-p4-projects@FreeBSD.ORG Mon Jul 31 08:30:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5195916A4E6; Mon, 31 Jul 2006 08:30:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AC2416A4E2 for ; Mon, 31 Jul 2006 08:30:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80EBF43D4C for ; Mon, 31 Jul 2006 08:30:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V8U5M2089102 for ; Mon, 31 Jul 2006 08:30:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V8U5Xc089099 for perforce@freebsd.org; Mon, 31 Jul 2006 08:30:05 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Jul 2006 08:30:05 GMT Message-Id: <200607310830.k6V8U5Xc089099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 08:30:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=102832 Change 102832 by jb@jb_freebsd2 on 2006/07/31 08:30:03 Add a kernel option for Hypervisor trap tracing and enable it per cpu, reporting the trace buffer for a rogue CPU which fails to respond to IPIs. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.sun4v#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/options.sun4v#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/conf/GENERIC#7 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/hypervisor_api.h#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/mp_machdep.c#3 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#10 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/trap_trace.S#1 add Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.sun4v#2 (text+ko) ==== @@ -52,6 +52,7 @@ eeprom sbus sun4v/sun4v/gdb_machdep.c optional gdb sun4v/sun4v/hv_pci.c optional pci +sun4v/sun4v/trap_trace.S optional trap_tracing sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci ==== //depot/projects/kmacy_sun4v_stable/src/sys/conf/options.sun4v#2 (text+ko) ==== @@ -15,3 +15,6 @@ SIMULATOR opt_simulator.h DTRACE opt_global.h + +TRAP_TRACING opt_trap_trace.h +TRAP_TRACE_ENTRIES opt_trap_trace.h ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/conf/GENERIC#7 (text+ko) ==== @@ -65,6 +65,8 @@ options KDB # Enable kernel debugger support. options KDB_TRACE options DDB # Support DDB. +options TRAP_TRACING # Enable trap tracing. +options TRAP_TRACE_ENTRIES=256 # Trap trace buffer entries. #options GDB # Support remote GDB. #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/hypervisor_api.h#2 (text+ko) ==== @@ -62,6 +62,22 @@ typedef uint64_t r_addr_t; typedef uint64_t io_addr_t; +typedef struct trap_trace_entry { + uint8_t tte_type; /* Hypervisor or guest entry. */ + uint8_t tte_hpstat; /* Hyper-privileged state. */ + uint8_t tte_tl; /* Trap level. */ + uint8_t tte_gl; /* Global register level. */ + uint16_t tte_tt; /* Trap type.*/ + uint16_t tte_tag; /* Extended trap identifier. */ + uint64_t tte_tstate; /* Trap state. */ + uint64_t tte_tick; /* Tick. */ + uint64_t tte_tpc; /* Trap PC. */ + uint64_t tte_f1; /* Entry specific. */ + uint64_t tte_f2; /* Entry specific. */ + uint64_t tte_f3; /* Entry specific. */ + uint64_t tte_f4; /* Entry specific. */ +} trap_trace_entry_t; + extern uint64_t hv_mmu_map_perm_addr(void *, int, uint64_t, int); extern uint64_t hv_mmu_unmap_perm_addr(void *, int, int); extern uint64_t hv_set_ctx0(uint64_t, uint64_t); @@ -94,6 +110,7 @@ extern uint64_t hv_ttrace_buf_conf(uint64_t, uint64_t, uint64_t *); extern uint64_t hv_ttrace_enable(uint64_t, uint64_t *); extern uint64_t hv_ttrace_freeze(uint64_t, uint64_t *); +extern uint64_t hv_ttrace_addentry(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t); extern uint64_t hv_dump_buf_update(uint64_t, uint64_t, uint64_t *); extern int64_t hv_cnputchar(uint8_t); ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/mp_machdep.c#3 (text+ko) ==== @@ -57,6 +57,8 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.31 2006/02/07 21:22:02 phk Exp $"); +#include "opt_trap_trace.h" + #include #include #include @@ -116,6 +118,59 @@ void cpu_mp_unleash(void *); SYSINIT(cpu_mp_unleash, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); +#ifdef TRAP_TRACING +#ifndef TRAP_TRACE_ENTRIES +#define TRAP_TRACE_ENTRIES 64 +#endif +extern trap_trace_entry_t trap_trace_entry[MAXCPU][TRAP_TRACE_ENTRIES]; + +static void +mp_trap_trace_init(void) +{ + uint64_t ret, ret1; + + printf("curcpu %d trap_trace_entry %p TRAP_TRACE_ENTRIES %d\n", curcpu, &trap_trace_entry[curcpu][0], TRAP_TRACE_ENTRIES); + + /* Configure the trap trace buffer for the current CPU. */ + if ((ret = hv_ttrace_buf_conf((uint64_t) vtophys(&trap_trace_entry[curcpu][0]), + (uint64_t) TRAP_TRACE_ENTRIES, &ret1)) != 0) + printf("%s: hv_ttrace_buf_conf error %lu\n", __FUNCTION__, ret); + + /* Enable trap tracing for the current CPU. */ + else if ((ret = hv_ttrace_enable((uint64_t) -1, &ret1)) != 0) + printf("%s: hv_ttrace_enable error %lu\n", __FUNCTION__, ret); +} + +void trap_trace_report(int); + +static int trace_trap_lock; + +void +trap_trace_report(int cpuid) +{ + int i, j; + + while (!atomic_cmpset_acq_int(&trace_trap_lock, 0, 1)) + DELAY(10000); + + for (i = 0; i < MAXCPU; i++) { + if (cpuid != -1 && cpuid != i) + continue; + + for (j = 0; j < TRAP_TRACE_ENTRIES; j++) { + trap_trace_entry_t *p = &trap_trace_entry[i][j]; + + printf("0x%08jx [%02d][%04d] tpc 0x%jx type 0x%x hpstat 0x%x tl %u gl %u tt 0x%hx tag 0x%hx tstate 0x%jx f1 0x%jx f2 0x%jx f3 0x%jx f4 0x%jx\n", + p->tte_tick, i, j, p->tte_tpc,p->tte_type,p->tte_hpstat, + p->tte_tl,p->tte_gl,p->tte_tt,p->tte_tag,p->tte_tstate, + p->tte_f1,p->tte_f2,p->tte_f3,p->tte_f4); + } + } + + atomic_store_rel_int(&trace_trap_lock, 0); +} +#endif + vm_offset_t mp_tramp_alloc(void) { @@ -327,6 +382,11 @@ trap_init(); cpu_intrq_init(); tick_start(); + +#ifdef TRAP_TRACING + mp_trap_trace_init(); +#endif + /* * enable interrupts now that we have our trap table set */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#10 (text+ko) ==== @@ -28,6 +28,7 @@ #include "opt_kstack_pages.h" #include "opt_msgbuf.h" #include "opt_pmap.h" +#include "opt_trap_trace.h" #include #include @@ -74,6 +75,10 @@ #include +#ifdef TRAP_TRACING +void trap_trace_report(int); +#endif + #if 1 #define PMAP_DEBUG #endif @@ -384,7 +389,7 @@ { pmap_t pmap, oldpmap; int err; - + critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); @@ -1275,10 +1280,19 @@ membar(Sync); i++; if (i > 10000000) { +#ifdef TRAP_TRACING + int j; +#endif uint64_t cpu_state; printf("cpu with cpumask=0x%x appears to not be responding to ipis\n", curactive & ~ackmask); +#ifdef TRAP_TRACING + for (j = 0; j < MAXCPU; j++) + if (((1 << j) & curactive & ~ackmask) != 0) + trap_trace_report(j); +#endif + hv_cpu_state((uint64_t)ffs64(curactive & ~ackmask), &cpu_state); printf("cpu_state of %ld is %ld\n", ffs64(curactive & ~ackmask), cpu_state); if (!retried) { @@ -1289,7 +1303,7 @@ goto retry; } - panic(" ackmask=0x%x active=0x%x\n", ackmask, curactive); + panic(" ackmask=0x%x active=0x%x\n", ackmask, curactive); } } @@ -1327,7 +1341,6 @@ char *func; cpumask_t active; #endif - if ((eva - sva) == PAGE_SIZE) { pmap_invalidate_page(pmap, sva, cleartsb); return; From owner-p4-projects@FreeBSD.ORG Mon Jul 31 09:21:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2F0C16A4DF; Mon, 31 Jul 2006 09:21:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81CD316A4DD for ; Mon, 31 Jul 2006 09:21:15 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D99743D46 for ; Mon, 31 Jul 2006 09:21:15 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V9LFVv000875 for ; Mon, 31 Jul 2006 09:21:15 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V9LEM5000872 for perforce@freebsd.org; Mon, 31 Jul 2006 09:21:14 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 31 Jul 2006 09:21:14 GMT Message-Id: <200607310921.k6V9LEM5000872@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 09:21:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=102837 Change 102837 by cdjones@cdjones-impulse on 2006/07/31 09:20:22 Back out changes. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#6 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#6 (text+ko) ==== @@ -762,10 +762,11 @@ PROC_LOCK(imgp->proc); if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) || text_size > maxtsiz || - total_size > lim_cur(imgp->proc, RLIMIT_VMEM) || + total_size > lim_cur(imgp->proc, RLIMIT_VMEM)) { +/* || (jailed(imgp->proc->p_ucred) && total_size > (prison_memory_limit(imgp->proc->p_ucred) - - prison_memory(imgp->proc->p_ucred)))) { + - prison_memory(imgp->proc->p_ucred)))) { */ PROC_UNLOCK(imgp->proc); return (ENOMEM); } From owner-p4-projects@FreeBSD.ORG Mon Jul 31 09:22:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C56BF16A4E7; Mon, 31 Jul 2006 09:22:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A12AB16A4E2 for ; Mon, 31 Jul 2006 09:22:18 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EA1443D5A for ; Mon, 31 Jul 2006 09:22:17 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V9MGuu000954 for ; Mon, 31 Jul 2006 09:22:16 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V9MGj6000951 for perforce@freebsd.org; Mon, 31 Jul 2006 09:22:16 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 31 Jul 2006 09:22:16 GMT Message-Id: <200607310922.k6V9MGj6000951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 09:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=102838 Change 102838 by cdjones@cdjones-impulse on 2006/07/31 09:21:43 Make -m argument denominated in MB. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#16 edit .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#7 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#16 (text+ko) ==== @@ -104,19 +104,19 @@ { struct prison *pr; pr = arg; - - printf("Starting jsched_td\n"); - + +/* printf("Starting jsched_td\n"); */ + for (;;) { if (pr->pr_scheduler_flags & J_SCHED_TD_DIE) break; - + /* Scheduling stuff goes here. */ - printf("jsched_td running\n"); +/* printf("jsched_td running\n"); */ tsleep(pr, 0, "-", hz); } - printf("Exiting jsched_td\n"); +/* printf("Exiting jsched_td\n"); */ pr->pr_scheduler_flags = J_SCHED_TD_DEAD; kthread_exit(0); @@ -130,17 +130,16 @@ struct thread *td; vm_pindex_t limit, size, usage; int breakout; - + pr = arg; - - printf("Starting jpager_td\n"); - + + printf("Starting jpager/%d with memory limit %ld bytes\n", + pr->pr_id, (long) prison_memory_limit(pr)); + for (;;) { - printf("jpager_td running\n"); - if (pr->pr_pager_flags & J_PAGER_TD_DIE) break; - + /* TODO: consider whether it might be better to start * pushing back when we approach the limit, rather than * when we hit it. @@ -148,68 +147,75 @@ limit = prison_memory_limit(pr); usage = prison_memory(pr); - if ((usage - limit) > 0) - continue; - /* The logic from vm_daemon() really needs to go here. * Problem: we want to push things below their rlimits. * * TODO: refactor vm_daemon to optionally act on specific jails? */ - - sx_slock(&allproc_lock); - LIST_FOREACH(p, &allproc, p_list) { - - if (pr != p->p_ucred->cr_prison) - continue; - - PROC_LOCK(p); - if (p->p_flag & (P_SYSTEM | P_WEXIT)) { - PROC_UNLOCK(p); - continue; - } - - mtx_lock_spin(&sched_lock); - breakout = 0; - FOREACH_THREAD_IN_PROC(p, td) { - if (!TD_ON_RUNQ(td) && - !TD_IS_RUNNING(td) && - !TD_IS_SLEEPING(td)) { - breakout = 1; - break; - } - } - mtx_unlock_spin(&sched_lock); - if (breakout) { - PROC_UNLOCK(p); - continue; - } - /* NOTE: we differ here from vm_daemon b/c we don't - * care about the rlimit; things that are exceeding that will - * get caught in due course. We need, however, to decrease - * the pressure on our permitted memory allocation. Fortunately, - * we only care about eventually hitting the limit, so if we - * don't get there right away, it's okay. - */ + printf("jthread/%d: memory %ld / %ld bytes\n", + pr->pr_id, (long) usage, (long) limit); - /* TODO: this arbitrarily reduces each process's space by - * one page (until it's completely swapped out) while - * we're under memory pressure. A better way would be - * to either hit large processes first, or to hit the - * least-active processes first, or .... - */ - size = vmspace_resident_count(p->p_vmspace) - 1; - if (size < 0) - size = 0; - vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, size); - - sx_sunlock(&allproc_lock); + if ((usage - limit) > 0) { + printf("jthread/%d: overcommitted by %ld bytes (%d %%)\n", + pr->pr_id, (long) (usage - limit), + (int) (100 * (usage - limit) / limit)); + sx_slock(&allproc_lock); + LIST_FOREACH(p, &allproc, p_list) { + + if (pr != p->p_ucred->cr_prison) + continue; + + PROC_LOCK(p); + if (p->p_flag & (P_SYSTEM | P_WEXIT)) { + PROC_UNLOCK(p); + continue; + } + + mtx_lock_spin(&sched_lock); + breakout = 0; + FOREACH_THREAD_IN_PROC(p, td) { + if (!TD_ON_RUNQ(td) && + !TD_IS_RUNNING(td) && + !TD_IS_SLEEPING(td)) { + breakout = 1; + break; + } + } + mtx_unlock_spin(&sched_lock); + if (breakout) { + PROC_UNLOCK(p); + continue; + } + + /* NOTE: we differ here from vm_daemon b/c we don't + * care about the rlimit; things that are exceeding that will + * get caught in due course. We need, however, to decrease + * the pressure on our permitted memory allocation. Fortunately, + * we only care about eventually hitting the limit, so if we + * don't get there right away, it's okay. + */ + + /* TODO: this arbitrarily reduces each process's space by + * one page (until it's completely swapped out) while + * we're under memory pressure. A better way would be + * to either hit large processes first, or to hit the + * least-active processes first, or go proportionally, + * .... + */ + size = vmspace_resident_count(p->p_vmspace) - 1; + if (size < 0) + size = 0; + printf("jpager_td: squeezing process %d to %ld\n", p->p_pid, (long) size); + vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, (long) size); + + sx_sunlock(&allproc_lock); + } /* end LIST_FOREACH procs */ } - /* TODO --- make interval into a sysctl? */ + /* TODO --- make interval into a sysctl. */ printf("jpager_td sleeping\n"); - tsleep(pr, 0, "-", hz); + tsleep(pr, 0, "-", 5 * hz); } printf("Exiting jpager_td\n"); @@ -427,6 +433,7 @@ /* Tell scheduler to die. No need to wait for it. */ pr->pr_scheduler_flags |= J_SCHED_TD_DIE; + pr->pr_pager_flags |= J_PAGER_TD_DIE; wakeup(pr); TASK_INIT(&pr->pr_task, 0, prison_complete, pr); @@ -563,9 +570,9 @@ /* Convert to bytes, cache (maybe unncessary?). */ mem_used *= PAGE_SIZE; - mtx_lock(&pr->pr_mtx); + /* mtx_lock(&pr->pr_mtx); pr->pr_mem_usage = mem_used; - mtx_unlock(&pr->pr_mtx); + mtx_unlock(&pr->pr_mtx); */ return mem_used; } ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#7 (text+ko) ==== @@ -80,7 +80,9 @@ Jflag = 1; break; case 'm': + /* TODO --- should this be specified in MB? */ mem_limit = atoi(optarg); + mem_limit *= 1024 * 1024; break; case 'p': priority = atoi(optarg); From owner-p4-projects@FreeBSD.ORG Mon Jul 31 09:24:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5947516A4F0; Mon, 31 Jul 2006 09:24:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E5EA16A4ED for ; Mon, 31 Jul 2006 09:24:21 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EF4343D49 for ; Mon, 31 Jul 2006 09:24:20 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V9OKAl001080 for ; Mon, 31 Jul 2006 09:24:20 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V9OJid001070 for perforce@freebsd.org; Mon, 31 Jul 2006 09:24:19 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 31 Jul 2006 09:24:19 GMT Message-Id: <200607310924.k6V9OJid001070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 09:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=102839 Change 102839 by cdjones@cdjones-impulse on 2006/07/31 09:24:11 Now correctly identifies memory over-commit and tries to take action (leading to kernel panic, which is tomorrow's work). This actually was in changeset #102838, which was supposed to only be about usr.sbin/jail/jail.c. Alas, momentary incaution. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#17 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#17 (text+ko) ==== @@ -215,7 +215,7 @@ /* TODO --- make interval into a sysctl. */ printf("jpager_td sleeping\n"); - tsleep(pr, 0, "-", 5 * hz); + tsleep(pr, 0, "-", 3 * hz); } printf("Exiting jpager_td\n"); From owner-p4-projects@FreeBSD.ORG Mon Jul 31 09:44:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C12A16A4E1; Mon, 31 Jul 2006 09:44:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D438E16A4DE for ; Mon, 31 Jul 2006 09:44:50 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 334E243D5D for ; Mon, 31 Jul 2006 09:44:46 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V9ikeN002094 for ; Mon, 31 Jul 2006 09:44:46 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V9ijPj002091 for perforce@freebsd.org; Mon, 31 Jul 2006 09:44:45 GMT (envelope-from piso@freebsd.org) Date: Mon, 31 Jul 2006 09:44:45 GMT Message-Id: <200607310944.k6V9ijPj002091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102841 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 09:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=102841 Change 102841 by piso@piso_newluxor on 2006/07/31 09:43:49 Cosmetic Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#3 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#6 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#3 (text+ko) ==== @@ -1041,7 +1041,7 @@ switch (link_type) { struct tcp_dat *aux_tcp; - case LINK_ICMP: + case LINK_ICMP: la->icmpLinkCount++; break; case LINK_UDP: @@ -2537,7 +2537,7 @@ #ifndef NO_FW_PUNCH UninitPunchFW(la); #endif - LIST_REMOVE(la, instancelist); + LIST_REMOVE(la, instancelist); free(la); } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#6 (text+ko) ==== @@ -29,10 +29,9 @@ /* * Alias_dummy is just an empty skeleton used to demostrate how to write * a module for libalias, that will run unalterated in userland or in - * kernel land + * kernel land. */ -/* Includes */ #ifdef _KERNEL #include #include @@ -72,25 +71,25 @@ fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { /* - * check here all the data that will be used later, if any field - * is empy/NULL, return a -1 value + * Check here all the data that will be used later, if any field + * is empy/NULL, return a -1 value. */ if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || ah->maxpktsize == 0) return (-1); /* - * fingerprint the incoming packet, if it matches any conditions - * return an OK value + * Fingerprint the incoming packet, if it matches any conditions + * return an OK value. */ if (ntohs(*ah->dport) == 123 || ntohs(*ah->sport) == 456) - return (0); /* i know how to handle it... */ - return (-1); /* i don't know this packet... */ + return (0); /* I know how to handle it. */ + return (-1); /* I don't recognize this packet. */ } /* * Wrap in this general purpose function, the real function used to alias the - * packets + * packets. */ static int @@ -154,6 +153,6 @@ static void AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah) { - ; /* dummy */ + ; /* Dummy. */ } From owner-p4-projects@FreeBSD.ORG Mon Jul 31 09:48:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDC1C16A4E0; Mon, 31 Jul 2006 09:48:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8177A16A4DA for ; Mon, 31 Jul 2006 09:48:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21D7E43D46 for ; Mon, 31 Jul 2006 09:48:52 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V9mq0M002285 for ; Mon, 31 Jul 2006 09:48:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V9mpvi002282 for perforce@freebsd.org; Mon, 31 Jul 2006 09:48:51 GMT (envelope-from piso@freebsd.org) Date: Mon, 31 Jul 2006 09:48:51 GMT Message-Id: <200607310948.k6V9mpvi002282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 09:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=102842 Change 102842 by piso@piso_newluxor on 2006/07/31 09:48:15 IFC Affected files ... .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libmp/mpasbn.c#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/libalias/release/doc/share/examples/Makefile.relnotesng#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#3 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/read.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/write.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kldxref/Makefile#3 integrate Differences ... ==== //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_cpio.c#2 (text+ko) ==== @@ -25,9 +25,12 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.17 2006/03/21 16:55:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.18 2006/07/30 18:33:20 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#endif #include /* #include */ /* See archive_platform.h */ ==== //depot/projects/soc2005/libalias/lib/libmp/mpasbn.c#3 (text+ko) ==== @@ -70,7 +70,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.4 2006/07/28 23:00:16 simon Exp $"); +__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.5 2006/07/30 19:29:26 simon Exp $"); #include #include @@ -95,15 +95,16 @@ static MINT *_itom(const char *, short); static void _madd(const char *, const MINT *, const MINT *, MINT *); static int _mcmpa(const char *, const MINT *, const MINT *); -static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *); +static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *, + BN_CTX *); static void _mfree(const char *, MINT *); static void _moveb(const char *, const BIGNUM *, MINT *); static void _movem(const char *, const MINT *, MINT *); static void _msub(const char *, const MINT *, const MINT *, MINT *); static char *_mtod(const char *, const MINT *); static char *_mtox(const char *, const MINT *); -static void _mult(const char *, const MINT *, const MINT *, MINT *); -static void _sdiv(const char *, const MINT *, short, MINT *, short *); +static void _mult(const char *, const MINT *, const MINT *, MINT *, BN_CTX *); +static void _sdiv(const char *, const MINT *, short, MINT *, short *, BN_CTX *); static MINT *_xtom(const char *, const char *); /* @@ -223,14 +224,11 @@ * Compute qmp=nmp/dmp and rmp=nmp%dmp. */ static void -_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp) +_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp, + BN_CTX *c) { BIGNUM q, r; - BN_CTX *c; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&r); BN_init(&q); BN_ERRCHECK(msg, BN_div(&q, &r, nmp->bn, dmp->bn, c)); @@ -238,14 +236,18 @@ _moveb(msg, &r, rmp); BN_free(&q); BN_free(&r); - BN_CTX_free(c); } void mdiv(const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp) { + BN_CTX *c; - _mdiv("mdiv", nmp, dmp, qmp, rmp); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("mdiv"); + _mdiv("mdiv", nmp, dmp, qmp, rmp, c); + BN_CTX_free(c); } /* @@ -357,11 +359,15 @@ void msqrt(const MINT *nmp, MINT *xmp, MINT *rmp) { + BN_CTX *c; MINT *tolerance; MINT *ox, *x; MINT *z1, *z2, *z3; short i; + c = BN_CTX_new(); + if (c == NULL) + _bnerr("msqrt"); tolerance = _itom("msqrt", 1); x = _itom("msqrt", 1); ox = _itom("msqrt", 0); @@ -370,13 +376,13 @@ z3 = _itom("msqrt", 0); do { _movem("msqrt", x, ox); - _mdiv("msqrt", nmp, x, z1, z2); + _mdiv("msqrt", nmp, x, z1, z2, c); _madd("msqrt", x, z1, z2); - _sdiv("msqrt", z2, 2, x, &i); + _sdiv("msqrt", z2, 2, x, &i, c); _msub("msqrt", ox, x, z3); } while (_mcmpa("msqrt", z3, tolerance) == 1); _movem("msqrt", x, xmp); - _mult("msqrt", x, x, z1); + _mult("msqrt", x, x, z1, c); _msub("msqrt", nmp, z1, z2); _movem("msqrt", z2, rmp); _mfree("msqrt", tolerance); @@ -385,6 +391,7 @@ _mfree("msqrt", z1); _mfree("msqrt", z2); _mfree("msqrt", z3); + BN_CTX_free(c); } /* @@ -470,26 +477,26 @@ * Compute rmp=mp1*mp2. */ static void -_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp) +_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp, BN_CTX *c) { BIGNUM b; - BN_CTX *c; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&b); BN_ERRCHECK(msg, BN_mul(&b, mp1->bn, mp2->bn, c)); _moveb(msg, &b, rmp); BN_free(&b); - BN_CTX_free(c); } void mult(const MINT *mp1, const MINT *mp2, MINT *rmp) { + BN_CTX *c; - _mult("mult", mp1, mp2, rmp); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("mult"); + _mult("mult", mp1, mp2, rmp, c); + BN_CTX_free(c); } /* @@ -538,16 +545,13 @@ * Compute qmp=nmp/d and ro=nmp%d. */ static void -_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro) +_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro, + BN_CTX *c) { MINT *dmp, *rmp; BIGNUM q, r; - BN_CTX *c; char *s; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&q); BN_init(&r); dmp = _itom(msg, d); @@ -565,14 +569,18 @@ _mfree(msg, rmp); BN_free(&r); BN_free(&q); - BN_CTX_free(c); } void sdiv(const MINT *nmp, short d, MINT *qmp, short *ro) { + BN_CTX *c; - _sdiv("sdiv", nmp, d, qmp, ro); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("sdiv"); + _sdiv("sdiv", nmp, d, qmp, ro, c); + BN_CTX_free(c); } /* ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../../.. @@ -11,7 +11,7 @@ # SGML content SRCS+= article.sgml -# SRCS+= proc-ia64.sgml +SRCS+= proc-ia64.sgml SRCS+= ../common/hw.ent SRCS+= ../common/artheader.sgml SRCS+= ../common/dev.sgml ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/soc2005/libalias/release/doc/share/examples/Makefile.relnotesng#2 (text+ko) ==== @@ -1,12 +1,12 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # -ARCHS= amd64 ia64 i386 pc98 sparc64 +ARCHS= amd64 ia64 i386 pc98 powerpc sparc64 MULTITEXTS= installation relnotes hardware UNITEXTS= readme errata ==== //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.69 2006/06/28 16:04:54 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.70 2006/07/30 23:25:21 wpaul Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -172,17 +172,17 @@ "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E, "RealTek 8101E PCIe 10/100baseTX" }, - { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168, - "RealTek 8168B PCIe Gigabit Ethernet" }, - { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8111, - "RealTek 8111B PCIe Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168_SPIN1, + "RealTek 8168/8111B PCIe Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168_SPIN2, + "RealTek 8168/8111B PCIe Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169, "RealTek 8169 Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S, "RealTek 8169S Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB, "RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" }, - { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC, + { RT_VENDORID, RT_DEVICEID_8169SC, RL_HWREV_8169_8110SC, "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S, "RealTek 8110S Single-chip Gigabit Ethernet" }, @@ -202,7 +202,7 @@ { RL_HWREV_8139C, RL_8139, "C" }, { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C" }, { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+"}, - { RL_HWREV_8168, RL_8169, "8168"}, + { RL_HWREV_8168_SPIN1, RL_8169, "8168"}, { RL_HWREV_8169, RL_8169, "8169"}, { RL_HWREV_8169S, RL_8169, "8169S"}, { RL_HWREV_8110S, RL_8169, "8110S"}, @@ -212,7 +212,7 @@ { RL_HWREV_8101, RL_8139, "8101"}, { RL_HWREV_8100E, RL_8169, "8100E"}, { RL_HWREV_8101E, RL_8169, "8101E"}, - { RL_HWREV_8111, RL_8169, "8111"}, + { RL_HWREV_8168_SPIN2, RL_8169, "8168"}, { 0, 0, NULL } }; @@ -935,6 +935,8 @@ struct rl_dmaload_arg *ctx; struct rl_desc *d = NULL; int i = 0, idx; + u_int32_t cmdstat; + int totlen = 0; if (error) return; @@ -960,13 +962,13 @@ */ idx = ctx->rl_idx; for (;;) { - u_int32_t cmdstat; d = &ctx->rl_ring[idx]; if (le32toh(d->rl_cmdstat) & RL_RDESC_STAT_OWN) { ctx->rl_maxsegs = 0; return; } cmdstat = segs[i].ds_len; + totlen += segs[i].ds_len; d->rl_bufaddr_lo = htole32(RL_ADDR_LO(segs[i].ds_addr)); d->rl_bufaddr_hi = htole32(RL_ADDR_HI(segs[i].ds_addr)); if (i == 0) @@ -982,6 +984,26 @@ RL_DESC_INC(idx); } + /* + * With some of the RealTek chips, using the checksum offload + * support in conjunction with the autopadding feature results + * in the transmission of corrupt frames. For example, if we + * need to send a really small IP fragment that's less than 60 + * bytes in size, and IP header checksumming is enabled, the + * resulting ethernet frame that appears on the wire will + * have garbled payload. To work around this, if TX checksum + * offload is enabled, we always manually pad short frames out + * to the minimum ethernet frame size. We do this by lying + * about the size of the final fragment in the DMA map. + */ + + if (ctx->rl_flags && totlen < (ETHER_MIN_LEN - ETHER_CRC_LEN)) { + i = cmdstat & 0xFFFF; + i += ETHER_MIN_LEN - ETHER_CRC_LEN - totlen; + cmdstat = (cmdstat & 0xFFFF) | i; + d->rl_cmdstat = htole32(cmdstat | ctx->rl_flags); + } + d->rl_cmdstat |= htole32(RL_TDESC_CMD_EOF); ctx->rl_maxsegs = nseg; ctx->rl_idx = idx; @@ -1131,8 +1153,6 @@ mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); - mtx_init(&sc->rl_intlock, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_SPIN); callout_init_mtx(&sc->rl_stat_callout, &sc->rl_mtx, 0); /* @@ -1249,7 +1269,7 @@ ifp->if_start = re_start; ifp->if_hwassist = RE_CSUM_FEATURES; ifp->if_capabilities |= IFCAP_HWCSUM|IFCAP_VLAN_HWTAGGING; - ifp->if_capenable = ifp->if_capabilities & ~IFCAP_HWCSUM; + ifp->if_capenable = ifp->if_capabilities; #ifdef DEVICE_POLLING ifp->if_capabilities |= IFCAP_POLLING; #endif @@ -1416,7 +1436,6 @@ bus_dma_tag_destroy(sc->rl_parent_tag); mtx_destroy(&sc->rl_mtx); - mtx_destroy(&sc->rl_intlock); return (0); } @@ -1895,14 +1914,10 @@ sc = arg; ifp = sc->rl_ifp; - mtx_lock_spin(&sc->rl_intlock); status = CSR_READ_2(sc, RL_ISR); - if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) { - mtx_unlock_spin(&sc->rl_intlock); + if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) return; - } CSR_WRITE_2(sc, RL_IMR, 0); - mtx_unlock_spin(&sc->rl_intlock); taskqueue_enqueue_fast(taskqueue_fast, &sc->rl_inttask); @@ -1970,9 +1985,7 @@ return; } - mtx_lock_spin(&sc->rl_intlock); CSR_WRITE_2(sc, RL_IMR, RL_INTRS_CPLUS); - mtx_unlock_spin(&sc->rl_intlock); return; } @@ -2305,13 +2318,11 @@ /* * Enable interrupts. */ - mtx_lock_spin(&sc->rl_intlock); if (sc->rl_testmode) CSR_WRITE_2(sc, RL_IMR, 0); else CSR_WRITE_2(sc, RL_IMR, RL_INTRS_CPLUS); CSR_WRITE_2(sc, RL_ISR, RL_INTRS_CPLUS); - mtx_unlock_spin(&sc->rl_intlock); /* Set initial TX threshold */ sc->rl_txthresh = RL_TX_THRESH_INIT; ==== //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.58 2006/06/28 16:04:54 wpaul Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.59 2006/07/30 23:25:20 wpaul Exp $ */ /* @@ -147,25 +147,25 @@ /* Known revision codes. */ -#define RL_HWREV_8169 0x00000000 -#define RL_HWREV_8110S 0x00800000 -#define RL_HWREV_8169S 0x04000000 -#define RL_HWREV_8169_8110SB 0x10000000 -#define RL_HWREV_8169_8110SC 0x18000000 -#define RL_HWREV_8168 0x30000000 -#define RL_HWREV_8100E 0x30800000 -#define RL_HWREV_8101E 0x34000000 -#define RL_HWREV_8111 0x38000000 -#define RL_HWREV_8139 0x60000000 -#define RL_HWREV_8139A 0x70000000 -#define RL_HWREV_8139AG 0x70800000 -#define RL_HWREV_8139B 0x78000000 -#define RL_HWREV_8130 0x7C000000 -#define RL_HWREV_8139C 0x74000000 -#define RL_HWREV_8139D 0x74400000 -#define RL_HWREV_8139CPLUS 0x74800000 -#define RL_HWREV_8101 0x74c00000 -#define RL_HWREV_8100 0x78800000 +#define RL_HWREV_8169 0x00000000 +#define RL_HWREV_8110S 0x00800000 +#define RL_HWREV_8169S 0x04000000 +#define RL_HWREV_8169_8110SB 0x10000000 +#define RL_HWREV_8169_8110SC 0x18000000 +#define RL_HWREV_8168_SPIN1 0x30000000 +#define RL_HWREV_8100E 0x30800000 +#define RL_HWREV_8101E 0x34000000 +#define RL_HWREV_8168_SPIN2 0x38000000 +#define RL_HWREV_8139 0x60000000 +#define RL_HWREV_8139A 0x70000000 +#define RL_HWREV_8139AG 0x70800000 +#define RL_HWREV_8139B 0x78000000 +#define RL_HWREV_8130 0x7C000000 +#define RL_HWREV_8139C 0x74000000 +#define RL_HWREV_8139D 0x74400000 +#define RL_HWREV_8139CPLUS 0x74800000 +#define RL_HWREV_8101 0x74c00000 +#define RL_HWREV_8100 0x78800000 #define RL_TXDMA_16BYTES 0x00000000 #define RL_TXDMA_32BYTES 0x00000100 ==== //depot/projects/soc2005/libalias/usr.bin/tar/read.c#2 (text+ko) ==== @@ -25,11 +25,14 @@ */ #include "bsdtar_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.25 2006/03/21 17:03:51 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.26 2006/07/30 18:34:40 kientzle Exp $"); +#ifdef MAJOR_IN_MKDEV +#include +#endif #include +#include #include -#include #include #include ==== //depot/projects/soc2005/libalias/usr.bin/tar/write.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "bsdtar_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.46 2006/04/02 07:13:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.47 2006/07/31 04:57:46 kientzle Exp $"); #include #include @@ -276,7 +276,6 @@ off_t end_offset; struct archive *a; struct archive_entry *entry; - const char *filename; int format; struct archive_dir_entry *p; struct archive_dir archive_dir; @@ -284,7 +283,6 @@ bsdtar->archive_dir = &archive_dir; memset(&archive_dir, 0, sizeof(archive_dir)); - filename = NULL; format = ARCHIVE_FORMAT_TAR_PAX_RESTRICTED; /* Sanity-test some arguments and the file. */ @@ -906,13 +904,9 @@ /* If the links cache is getting too full, enlarge the hash table. */ if (links_cache->number_entries > links_cache->number_buckets * 2) { - int count; - new_size = links_cache->number_buckets * 2; new_buckets = malloc(new_size * sizeof(struct links_entry *)); - count = 0; - if (new_buckets != NULL) { memset(new_buckets, 0, new_size * sizeof(struct links_entry *)); ==== //depot/projects/soc2005/libalias/usr.sbin/kldxref/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.8 2006/07/29 19:43:26 marcel Exp $ +# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.9 2006/07/30 20:51:41 marcel Exp $ PROG= kldxref MAN= kldxref.8 @@ -7,7 +7,7 @@ WARNS?= 2 .if ${MACHINE_ARCH} == powerpc -LDFLAGS+=-static +NO_SHARED=YES .endif .if exists(ef_${MACHINE_ARCH}.c) From owner-p4-projects@FreeBSD.ORG Mon Jul 31 15:20:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E9EA16A4DF; Mon, 31 Jul 2006 15:20:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8D1516A4DA for ; Mon, 31 Jul 2006 15:20:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60D1443D49 for ; Mon, 31 Jul 2006 15:20:31 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VFKVTx034262 for ; Mon, 31 Jul 2006 15:20:31 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VFKVIR034259 for perforce@freebsd.org; Mon, 31 Jul 2006 15:20:31 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 31 Jul 2006 15:20:31 GMT Message-Id: <200607311520.k6VFKVIR034259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 15:20:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102852 Change 102852 by rdivacky@rdivacky_witten on 2006/07/31 15:20:02 Implementation of exit_group() syscall. This might be changed later (the way I kill the processes). Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#14 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#27 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#14 (text+ko) ==== @@ -783,6 +783,8 @@ struct linux_emuldata_shared { int refs; pid_t group_pid; + + LIST_HEAD(, linux_emuldata) threads; /* head of list of linux threads */ }; /* modeled after similar structure in NetBSD @@ -797,6 +799,8 @@ struct linux_emuldata_shared *shared; SLIST_ENTRY(linux_emuldata) emuldatas; + + LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; #define EMUL_RLOCK(l) rw_rlock(l) ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#27 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -1184,12 +1185,16 @@ em->shared = s; s->refs = 1; s->group_pid = child; + + LIST_INIT(&s->threads); } } - if (child != 0) + + if (child != 0) { + LIST_INSERT_HEAD(&em->shared->threads, em, threads); EMUL_WUNLOCK(&emul_lock); - else + } else EMUL_RUNLOCK(&emul_lock); @@ -1249,6 +1254,7 @@ * will exit on different cpus etc. */ EMUL_WLOCK(&emul_lock); + LIST_REMOVE(em, threads); SLIST_REMOVE(&emuldata_head, em, linux_emuldata, emuldatas); EMUL_WUNLOCK(&emul_lock); @@ -1344,3 +1350,46 @@ EMUL_RUNLOCK(&emul_lock); return 0; } + +int +linux_exit_group(struct thread *td, struct linux_exit_group_args *args) +{ + struct linux_emuldata *em, *td_em; + struct proc *sp; + struct kill_args ka; + int i = 0; + + td_em = em_find(td->td_proc->p_pid, EMUL_UNLOCKED); + + if (td_em == NULL) { +#ifdef DEBUG + printf(LMSG("we didnt find emuldata in exit_group.")); +#endif + return (0); + } + + LIST_FOREACH(em, &td_em->shared->threads, threads) { + if (i++ > 10) + break; + + if (em->pid == td_em->pid) + continue; + + sp = pfind(em->pid); + PROC_UNLOCK(sp); +#ifdef DEBUG + printf(LMSG("linux_sys_exit_group: kill PID %d\n"), em->pid); +#endif + ka.pid = em->pid; + ka.signum = SIGKILL; + /* XXX: ehm? */ + kill(FIRST_THREAD_IN_PROC(sp), &ka); + + } + + EMUL_RUNLOCK(&emul_lock); + + exit1(td, W_EXITCODE(args->error_code,0)); + + return (0); +} From owner-p4-projects@FreeBSD.ORG Mon Jul 31 15:22:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C9B016A4E5; Mon, 31 Jul 2006 15:22:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4D4A16A4DA for ; Mon, 31 Jul 2006 15:22:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E81243D46 for ; Mon, 31 Jul 2006 15:22:34 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VFMYCv034416 for ; Mon, 31 Jul 2006 15:22:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VFMYxY034413 for perforce@freebsd.org; Mon, 31 Jul 2006 15:22:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 31 Jul 2006 15:22:34 GMT Message-Id: <200607311522.k6VFMYxY034413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102853 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 15:22:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=102853 Change 102853 by rdivacky@rdivacky_witten on 2006/07/31 15:22:00 Implement FUTEX_WAKE_OP. This should be correct but doesnt seem to let realplay work. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#11 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#11 (text+ko) ==== @@ -77,6 +77,14 @@ static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); static int futex_wake(struct futex *, int, struct futex *); +static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr); + +/* support.s */ +int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); +int futex_addl(int oparg, caddr_t uaddr, int *oldval); +int futex_orl(int oparg, caddr_t uaddr, int *oldval); +int futex_andnl(int oparg, caddr_t uaddr, int *oldval); +int futex_xorl(int oparg, caddr_t uaddr, int *oldval); int linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args) @@ -85,10 +93,11 @@ int ret; struct timespec timeout = { 0, 0 }; int error = 0; - struct futex *f; + struct futex *f, *f2; struct futex *newf; int timeout_hz; struct timeval tv = {0, 0}; + int op_ret; #ifdef DEBUG if (ldebug(sys_futex)) @@ -209,11 +218,46 @@ printf("linux_sys_futex: unimplemented op %d\n", args->op); break; + case LINUX_FUTEX_WAKE_OP: - /* XXX: it seems necessary for realplay */ - printf("linux_sys_futex: unimplemented op %d\n", - args->op); +#ifdef DEBUG + if (ldebug(sys_futex)) + printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n", + td->td_proc->p_pid, args->uaddr, args->op, args->val, args->uaddr2, args->val3); +#endif + f = futex_get(args->uaddr); + f2 = futex_get(args->uaddr2); + + op_ret = futex_atomic_op(td, args->val3, args->uaddr2); + if (op_ret < 0) { + + /* XXX: ? */ + if (op_ret != -EFAULT) { + futex_put(f); + futex_put(f2); + return (-op_ret); + } + + futex_put(f); + futex_put(f2); + + return (EFAULT); + + } + + ret = futex_wake(f, args->val, NULL); + futex_put(f); + if (op_ret > 0) { + printf("second wakeup\n"); + op_ret = 0; + /* Linux always puts there 0 retries */ + op_ret += futex_wake(f2, 0, NULL); + futex_put(f2); + ret += op_ret; + } + td->td_retval[0] = ret; break; + default: printf("linux_sys_futex: unknown op %d\n", args->op); @@ -321,3 +365,71 @@ return count; } + +static int +futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr) +{ + int op = (encoded_op >> 28) & 7; + int cmp = (encoded_op >> 24) & 15; + int oparg = (encoded_op << 8) >> 20; + int cmparg = (encoded_op << 20) >> 20; + int oldval = 0, ret; + + if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) + oparg = 1 << oparg; + +#ifdef DEBUG + printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d\n", + op, cmp, oparg, cmparg); +#endif + /* XXX: linux verifies access here and returns EFAULT */ + + critical_enter(); + + switch (op) { + case FUTEX_OP_SET: + ret = futex_xchgl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_ADD: + ret = futex_addl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_OR: + ret = futex_orl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_ANDN: + ret = futex_andnl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_XOR: + ret = futex_xorl(oparg, uaddr, &oldval); + break; + default: + ret = -ENOSYS; + } + + critical_exit(); + + if (!ret) + switch (cmp) { + case FUTEX_OP_CMP_EQ: + ret = (oldval == cmparg); + break; + case FUTEX_OP_CMP_NE: + ret = (oldval != cmparg); + break; + case FUTEX_OP_CMP_LT: + ret = (oldval < cmparg); + break; + case FUTEX_OP_CMP_GE: + ret = (oldval >= cmparg); + break; + case FUTEX_OP_CMP_LE: + ret = (oldval <= cmparg); + break; + case FUTEX_OP_CMP_GT: + ret = (oldval > cmparg); + break; + default: ret = -ENOSYS; + } + + return (ret); +} ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#5 (text+ko) ==== @@ -47,4 +47,13 @@ #define FUTEX_OP_ANDN 3 /* *(int *)UADDR2 &= ~OPARG; */ #define FUTEX_OP_XOR 4 /* *(int *)UADDR2 ^= OPARG; */ +#define FUTEX_OP_OPARG_SHIFT 8 /* Use (1 << OPARG) instead of OPARG. */ + +#define FUTEX_OP_CMP_EQ 0 /* if (oldval == CMPARG) wake */ +#define FUTEX_OP_CMP_NE 1 /* if (oldval != CMPARG) wake */ +#define FUTEX_OP_CMP_LT 2 /* if (oldval < CMPARG) wake */ +#define FUTEX_OP_CMP_LE 3 /* if (oldval <= CMPARG) wake */ +#define FUTEX_OP_CMP_GT 4 /* if (oldval > CMPARG) wake */ +#define FUTEX_OP_CMP_GE 5 /* if (oldval >= CMPARG) wake */ + #endif /* !_LINUX_FUTEX_H */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#2 (text+ko) ==== @@ -1522,6 +1522,12 @@ bbhead: .long 0 +#if defined(SMP) || !defined(_KERNEL) +#define MPLOCKED lock ; +#else +#define MPLOCKED +#endif + .text NON_GPROF_ENTRY(__bb_init_func) movl 4(%esp),%eax @@ -1530,3 +1536,98 @@ movl %edx,16(%eax) movl %eax,bbhead NON_GPROF_RET + +/* necessary for linux_futex support */ + .text + +futex_fault: + movl PCPU(CURPCB), %edx + movl $0, PCB_ONFAULT(%edx) + movl $-EFAULT, %eax + ret + +/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ + .globl futex_xchgl +futex_xchgl: + movl PCPU(CURPCB), %eax + movl $futex_fault, PCB_ONFAULT(%eax) + movl 4(%esp), %eax + movl 8(%esp), %edx + + xchgl %eax, (%edx) + movl 0xc(%esp), %edx + movl %eax, (%edx) + xorl %eax, %eax + + movl PCPU(CURPCB), %edx + movl $0, PCB_ONFAULT(%edx) + ret + +/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ + .globl futex_addl +futex_addl: + movl PCPU(CURPCB), %eax + movl $futex_fault, PCB_ONFAULT(%eax) + movl 4(%esp), %eax + movl 8(%esp), %edx + + MPLOCKED xaddl %eax, (%edx) + movl 0xc(%esp), %edx + movl %eax, (%edx) + xorl %eax, %eax + + movl PCPU(CURPCB), %edx + movl $0, PCB_ONFAULT(%edx) + ret + +/* int futex_orl(int oparg, caddr_t uaddr, int *oldval); */ + .globl futex_orl +futex_orl: + movl PCPU(CURPCB), %eax + movl $futex_fault, PCB_ONFAULT(%eax) + movl 4(%esp), %eax + movl 8(%esp), %edx + + orl %eax, (%edx) + movl 0xc(%esp), %edx + movl %eax, (%edx) + xorl %eax, %eax + + movl PCPU(CURPCB), %edx + movl $0, PCB_ONFAULT(%edx) + ret + +/* int futex_andnl(int oparg, caddr_t uaddr, int *oldval); */ + .globl futex_andnl +futex_andnl: + movl PCPU(CURPCB), %eax + movl $futex_fault, PCB_ONFAULT(%eax) + movl 4(%esp), %eax + movl 8(%esp), %edx + + notl (%edx) + andl %eax, (%edx) + movl 0xc(%esp), %edx + movl %eax, (%edx) + xorl %eax, %eax + + movl PCPU(CURPCB), %edx + movl $0, PCB_ONFAULT(%edx) + ret + +/* int futex_xorl(int oparg, caddr_t uaddr, int *oldval); */ + .globl futex_xorl +futex_xorl: + movl PCPU(CURPCB), %eax + movl $futex_fault, PCB_ONFAULT(%eax) + movl 4(%esp), %eax + movl 8(%esp), %edx + + xorl %eax, (%edx) + movl 0xc(%esp), %edx + movl %eax, (%edx) + xorl %eax, %eax + + movl PCPU(CURPCB), %edx + movl $0, PCB_ONFAULT(%edx) + ret From owner-p4-projects@FreeBSD.ORG Mon Jul 31 15:23:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B46A16A50E; Mon, 31 Jul 2006 15:23:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 781F616A504 for ; Mon, 31 Jul 2006 15:23:36 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44D4A43D46 for ; Mon, 31 Jul 2006 15:23:36 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VFNakq034469 for ; Mon, 31 Jul 2006 15:23:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VFNZLH034466 for perforce@freebsd.org; Mon, 31 Jul 2006 15:23:35 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 31 Jul 2006 15:23:35 GMT Message-Id: <200607311523.k6VFNZLH034466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 15:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=102854 Change 102854 by rdivacky@rdivacky_witten on 2006/07/31 15:23:16 Temporary debug print to hunt down the memleak. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#11 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#11 (text+ko) ==== @@ -956,6 +956,8 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + printf("Emuldata slist empty: %i\n", SLIST_EMPTY(&emuldata_head)); + printf("Futex slist empty: %i\n", LIST_EMPTY(&futex_list)); break; default: return EOPNOTSUPP; From owner-p4-projects@FreeBSD.ORG Mon Jul 31 15:41:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C8FC16A4DF; Mon, 31 Jul 2006 15:41:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1E6716A4DA for ; Mon, 31 Jul 2006 15:41:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EA2143D46 for ; Mon, 31 Jul 2006 15:41:01 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VFf1gu035506 for ; Mon, 31 Jul 2006 15:41:01 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VFewAO035499 for perforce@freebsd.org; Mon, 31 Jul 2006 15:40:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 31 Jul 2006 15:40:58 GMT Message-Id: <200607311540.k6VFewAO035499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 15:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=102857 Change 102857 by rdivacky@rdivacky_witten on 2006/07/31 15:40:00 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/trap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/include/db_machdep.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/Makefile.arm#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.pc98#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.powerpc#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.pc98#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/crypto/via/padlock.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/crypto/via/padlock.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/crypto/via/padlock_hash.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/gentbi.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/ip1000phy.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/miidevs#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/re/if_re.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/scc/scc_core.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sk/if_sk.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sk/if_skreg.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/stge/if_stge.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/stge/if_stgereg.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/uplcom.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/eli/g_eli.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/GENERIC#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/NOTES#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/trap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_syscall.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.isc#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.master#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.xenix#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#19 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#19 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#19 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#19 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/init_sysent.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_sx.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/sys_socket.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.master#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_sockbuf.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_socket2.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_syscalls.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_usrreq.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_syscalls.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/agp/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/asr/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/bridgestp/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/hwpmc/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/if_bridge/Makefile#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/mii/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/osf1/Makefile#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/modules/padlock/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/stge/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/bpf.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/bridgestp.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/bridgestp.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_bridge.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_bridgevar.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_enc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_gif.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/keysock.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pc98/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/if_rlreg.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/include/md_var.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/include/pcb.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/conf/GENERIC#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/conf/NOTES#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/_label.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/bufobj.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/extattr.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/mbuf.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/mutex.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/param.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/protosw.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/socket.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/socketvar.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.mk#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscallsubr.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysent.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysproto.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/unpcb.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_object.c#3 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -947,17 +947,17 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); - /* - * If Maxmem has been increased beyond what the system has detected, - * extend the last memory segment to the new limit. - */ - if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); - /* call pmap initialization to make new kernel address space */ pmap_bootstrap(&first); ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -145,9 +145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. @@ -780,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -814,17 +812,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - mtx_unlock(&Giant); - } else { - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - } + AUDIT_SYSCALL_ENTER(code, td); + error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { @@ -874,6 +864,19 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -894,9 +897,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -328,7 +328,6 @@ td->td_frame->tf_rsp = ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; - td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)entry; /* ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.58 2006/07/29 18:38:53 marcel Exp $ # # @@ -101,6 +101,44 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +# +# sio: serial ports (see sio(4)), including support for various +# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# +device sio +hint.sio.0.at="isa" +hint.sio.0.port="0x3F8" +hint.sio.0.flags="0x10" +hint.sio.0.irq="4" + +# `flags' specific to sio(4). +# 0x10 enable console support for this unit. Other console flags +# (if applicable) are ignored unless this is set. Enabling +# console support does not make the unit the preferred console. +# Boot with -h or set boot_serial=YES in the loader. For sio(4) +# specifically, the 0x20 flag can also be set (see above). +# Currently, at most one unit can have console support; the +# first one (in config file order) with this flag set is +# preferred. Setting this flag for sio0 gives the old behaviour. +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# 0x80 use this port for serial line gdb support in ddb. Also known +# as debug port. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + +# Options for sio: +options COM_ESP # Code for Hayes ESP. +options COM_MULTIPORT # Code for some cards with shared IRQs. +options CONSPEED=115200 # Speed for serial console + # (default 9600). + device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.11 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $"); /* * 386 Trap and System call handling @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -153,7 +154,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -171,12 +172,8 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, args64); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); if (error == 0) { td->td_retval[0] = 0; @@ -184,6 +181,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); AUDIT_SYSCALL_EXIT(error, td); @@ -220,12 +219,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { @@ -238,10 +231,25 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -253,11 +261,8 @@ * is not the case, this code will need to be revisited. */ STOPEVENT(p, S_SCX, code); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); + + PTRACESTOP_SC(p, td, S_PT_SCX); } ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.18 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #include @@ -21,243 +21,243 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { SYF_MPSAFE | AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { SYF_MPSAFE | AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ - { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ + { 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ - { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ + { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ - { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { SYF_MPSAFE | AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { SYF_MPSAFE | AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ - { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ - { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ - { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ - { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ - { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ + { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ + { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { SYF_MPSAFE | AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ - { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ - { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ - { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ - { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ - { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { SYF_MPSAFE | AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ - { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ - { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ - { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ - { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ + { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ - { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ - { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ - { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { SYF_MPSAFE | AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ - { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ - { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { SYF_MPSAFE | AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ + { 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = linux_readahead */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = linux_tkill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = linux_sendfile64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = linux_futex */ @@ -270,65 +270,65 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = linux_io_getevents */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = linux_io_submit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 31 15:53:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A00816A4DD; Mon, 31 Jul 2006 15:53:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35C2216A4E5 for ; Mon, 31 Jul 2006 15:53:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCBD143D46 for ; Mon, 31 Jul 2006 15:53:17 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VFrHK4036174 for ; Mon, 31 Jul 2006 15:53:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VFrHTQ036171 for perforce@freebsd.org; Mon, 31 Jul 2006 15:53:17 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 31 Jul 2006 15:53:17 GMT Message-Id: <200607311553.k6VFrHTQ036171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 15:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=102859 Change 102859 by rdivacky@rdivacky_witten on 2006/07/31 15:52:43 Add standard debuging printf at the begining of the syscall. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#12 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#28 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#12 (text+ko) ==== @@ -101,7 +101,7 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX: %x: %i, %i\n", (unsigned int)args->uaddr, args->op, args->val); + printf(ARGS(futex,"%p, %i, %i"), args->uaddr, args->op, args->val); #endif switch (args->op) { ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#28 (text+ko) ==== @@ -1083,6 +1083,11 @@ struct l_desc_struct desc; struct segment_descriptor sd; +#ifdef DEBUG + if (ldebug(get_thread_area)) + printf(ARGS(get_thread_area, "%p"), args->desc); +#endif + error = copyin(args->desc, &info, sizeof(struct l_user_desc)); if (error) return (error); @@ -1120,6 +1125,10 @@ int linux_gettid(struct thread *td, struct linux_gettid_args *args) { +#ifdef DEBUG + if (ldebug(gettid)) + printf(ARGS(gettid, "")); +#endif td->td_retval[0] = td->td_proc->p_pid; return (0); @@ -1128,6 +1137,10 @@ int linux_tkill(struct thread *td, struct linux_tkill_args *args) { +#ifdef DEBUG + if (ldebug(tkill)) + printf(ARGS(tkill, "%i, %i"), args->tid, args->sig); +#endif return (linux_kill(td, (struct linux_kill_args *) args)); } @@ -1333,6 +1346,11 @@ { struct linux_emuldata *em; +#ifdef DEBUG + if (ldebug(exit_group)) + printf(ARGS(set_tid_address, "%p"), args->tidptr); +#endif + /* find the emuldata */ em = em_find(td->td_proc->p_pid, EMUL_UNLOCKED); @@ -1359,6 +1377,11 @@ struct kill_args ka; int i = 0; +#ifdef DEBUG + if (ldebug(exit_group)) + printf(ARGS(exit_group, "%i"), args->error_code); +#endif + td_em = em_find(td->td_proc->p_pid, EMUL_UNLOCKED); if (td_em == NULL) { From owner-p4-projects@FreeBSD.ORG Mon Jul 31 16:31:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E70416A52F; Mon, 31 Jul 2006 16:31:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D792416A4DD for ; Mon, 31 Jul 2006 16:31:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99B9243D70 for ; Mon, 31 Jul 2006 16:31:05 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VGV5wk039161 for ; Mon, 31 Jul 2006 16:31:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VGV56X039158 for perforce@freebsd.org; Mon, 31 Jul 2006 16:31:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 31 Jul 2006 16:31:05 GMT Message-Id: <200607311631.k6VGV56X039158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 16:31:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=102860 Change 102860 by hselasky@hselasky_mini_itx on 2006/07/31 16:30:19 Factored out the "config thread" functions into a small library, located in "usbd_subr.c", so that it can be used by other USB device drivers also. This saves around 300 lines of code per device driver that uses it. All functions and structures related to this library are named "usbd_config_td_xxxx". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#5 (text+ko) ==== @@ -19,7 +19,7 @@ * * * NOTE: all function names beginning like "ural_cfg_" can only - * be called from within the "ural_config_thread()" function! + * be called from within the config thread function ! */ /*- @@ -36,8 +36,6 @@ #include #include #include -#include -#include #include #include @@ -56,6 +54,9 @@ #include #include +#define usbd_config_td_cc ural_config_copy +#define usbd_config_td_softc ural_softc + #include #include #include @@ -117,17 +118,14 @@ ural_cfg_rf_write(struct ural_softc *sc, u_int8_t reg, u_int32_t val); static void -ural_config_thread(void *arg); - +ural_cfg_first_time_setup(struct ural_softc *sc, + struct ural_config_copy *cc, u_int16_t refcount); static void -ural_config_copy(struct ural_softc *sc, struct ural_config_copy *cc); +ural_end_of_commands(struct ural_softc *sc); static void -ural_queue_command(struct ural_softc *sc, ural_command_t *command_func); - -static void -ural_check_gone(struct ural_softc *sc); - +ural_config_copy(struct ural_softc *sc, + struct ural_config_copy *cc, u_int16_t refcount); static const char * ural_get_rf(int rev); @@ -189,32 +187,29 @@ ural_cfg_tx_bcn(struct ural_softc *sc); static void -ural_cfg_dummy(struct ural_softc *sc, - struct ural_config_copy *cc); -static void ural_cfg_set_chan(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_set_run(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_disable_rf_tune(struct ural_softc *sc); static void ural_cfg_enable_tsf_sync(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_disable_tsf_sync(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_update_slot(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_set_txpreamble(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_set_basicrates(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_set_bssid(struct ural_softc *sc, const u_int8_t *bssid); @@ -223,7 +218,7 @@ static void ural_cfg_update_promisc(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_set_txantenna(struct ural_softc *sc, u_int8_t antenna); @@ -238,16 +233,16 @@ static void ural_cfg_init(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_stop(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_cfg_amrr_start(struct ural_softc *sc); static void ural_cfg_amrr_timeout(struct ural_softc *sc, - struct ural_config_copy *cc); + struct ural_config_copy *cc, u_int16_t refcount); static void ural_ratectl(struct ural_amrr *amrr, struct ieee80211_node *ni); @@ -563,27 +558,24 @@ goto detach; } - sc->sc_cmd_queue_ptr = - usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_cmd_free), - sizeof(struct ural_config_copy), 16); - - if (sc->sc_cmd_queue_ptr == NULL) { - device_printf(dev, "could not allocate memory for " - "command queue!\n"); + error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), + &ural_config_copy, &ural_end_of_commands, + sizeof(struct ural_config_copy), 16); + if (error) { + device_printf(dev, "could not setup config " + "thread!\n"); goto detach; } - if(usb_kthread_create1(&ural_config_thread, sc, - &(sc->sc_config_thread), "%s", sc->sc_name)) - { - sc->sc_config_thread = NULL; - device_printf(dev, "unable to create config thread!\n"); - goto detach; - } + mtx_lock(&(sc->sc_mtx)); + + /* start setup */ + + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_first_time_setup, 0); - /* start watchdog */ + /* start watchdog (will exit mutex) */ - mtx_lock(&(sc->sc_mtx)); ural_watchdog(sc); return 0; /* success */ @@ -599,31 +591,15 @@ struct ural_softc *sc = device_get_softc(dev); struct ieee80211com *ic; struct ifnet *ifp; - register int error; mtx_lock(&(sc->sc_mtx)); - sc->sc_flags |= URAL_FLAG_DEV_GONE; + usbd_config_td_stop(&(sc->sc_config_td)); __callout_stop(&sc->sc_watchdog); - ural_queue_command(sc, &ural_cfg_dummy); + ural_cfg_stop(sc, NULL, 0); - ural_cfg_stop(sc, NULL); - - if (sc->sc_config_thread) { - - while (!(sc->sc_flags & URAL_FLAG_TD_EXIT)) { - - if (cold) { - panic("cannot stop config thread!\n"); - } - - error = msleep(&(sc->sc_wakeup_td_gone), - &(sc->sc_mtx), 0, "ural wait TD", 0); - } - } - ic = &(sc->sc_ic); ifp = ic->ic_ifp; @@ -639,10 +615,7 @@ usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - if (sc->sc_cmd_queue_ptr) { - free(sc->sc_cmd_queue_ptr, M_DEVBUF); - sc->sc_cmd_queue_ptr = NULL; - } + usbd_config_td_unsetup(&(sc->sc_config_td)); mtx_destroy(&sc->sc_mtx); @@ -661,7 +634,8 @@ err = usbd_do_request_flags_mtx(sc->sc_udev, &(sc->sc_mtx), req, data, 0, NULL, 1000); - ural_check_gone(sc); + + usbd_config_td_check_gone(&(sc->sc_config_td)); if (err) { u_int16_t length = UGETW(req->wLength); @@ -854,22 +828,17 @@ return; } -/*========================================================================* - * CONFIGURE THREAD - *========================================================================*/ - static void -ural_config_thread(void *arg) +ural_cfg_first_time_setup(struct ural_softc *sc, + struct ural_config_copy *cc, u_int16_t refcount) { - struct ural_softc *sc = arg; struct ieee80211com *ic = &(sc->sc_ic); struct ifnet *ifp; - struct usbd_mbuf *m; - struct ural_config_copy *cc; - register int error; register u_int16_t i; - mtx_lock(&(sc->sc_mtx)); + if (cc == NULL) { + return; + } /* retrieve RT2570 rev. no */ sc->sc_asic_rev = ural_cfg_read(sc, RAL_MAC_CSR0); @@ -889,7 +858,7 @@ if (ifp == NULL) { printf("%s: could not if_alloc()!\n", sc->sc_name); - goto command_loop; + goto done; } sc->sc_ifp = ifp; @@ -991,49 +960,26 @@ if (bootverbose) { ieee80211_announce(ic); } + done: + return; +} - command_loop: +static void +ural_end_of_commands(struct ural_softc *sc) +{ + sc->sc_flags &= ~URAL_FLAG_WAIT_COMMAND; - while(1) { - - ural_check_gone(sc); - - USBD_IF_DEQUEUE(&(sc->sc_cmd_used), m); - - if (m) { - - cc = (void *)(m->cur_data_ptr); - - (cc->command_func)(sc, cc); - - USBD_IF_ENQUEUE(&(sc->sc_cmd_free), m); - - continue; - } - - sc->sc_flags &= ~URAL_FLAG_WAIT_COMMAND; - - if ((sc->sc_flags & URAL_FLAG_LL_READY) && - (sc->sc_flags & URAL_FLAG_HL_READY)) { - /* start write transfer, if not started */ - usbd_transfer_start(sc->sc_xfer[0]); - } - - sc->sc_flags |= URAL_FLAG_CMD_SLEEP; - - error = msleep(&(sc->sc_wakeup_cfg), &(sc->sc_mtx), - 0, "ural cfg sleep", 0); - - sc->sc_flags &= ~URAL_FLAG_CMD_SLEEP; + if ((sc->sc_flags & URAL_FLAG_LL_READY) && + (sc->sc_flags & URAL_FLAG_HL_READY)) { + /* start write transfer, if not started */ + usbd_transfer_start(sc->sc_xfer[0]); } - - mtx_unlock(&(sc->sc_mtx)); - return; } static void -ural_config_copy(struct ural_softc *sc, struct ural_config_copy *cc) +ural_config_copy(struct ural_softc *sc, + struct ural_config_copy *cc, u_int16_t refcount) { struct ieee80211com *ic = &(sc->sc_ic); struct ieee80211_channel *c = ic->ic_curchan; @@ -1084,91 +1030,10 @@ bcopy(ic->ic_myaddr, cc->ic_myaddr, sizeof(cc->ic_myaddr)); - return; -} - -static void -ural_queue_command(struct ural_softc *sc, ural_command_t *command_func) -{ - struct usbd_mbuf *m; - struct ural_config_copy *cc; - int32_t qlen; - - mtx_assert(&(sc->sc_mtx), MA_OWNED); - - /* - * first check if the command was - * already queued, and if so, remove - * it from the queue: - */ - qlen = USBD_IF_QLEN(&(sc->sc_cmd_used)); - - while (qlen--) { - - USBD_IF_DEQUEUE(&(sc->sc_cmd_used), m); - - if (m == NULL) break; - - cc = (void *)(m->cur_data_ptr); - - if (cc->command_func == command_func) { - USBD_IF_ENQUEUE(&(sc->sc_cmd_free), m); - } else { - USBD_IF_ENQUEUE(&(sc->sc_cmd_used), m); - } - } - - USBD_IF_DEQUEUE(&(sc->sc_cmd_free), m); - - if (m == NULL) { - panic("%s:%d: out of memory!\n", - __FUNCTION__, __LINE__); - } - - USBD_MBUF_RESET(m); - - cc = (void *)(m->cur_data_ptr); - - ural_config_copy(sc, cc); - - cc->command_func = command_func; - - USBD_IF_ENQUEUE(&(sc->sc_cmd_used), m); - - if (sc->sc_flags & URAL_FLAG_CMD_SLEEP) { - sc->sc_flags &= ~URAL_FLAG_CMD_SLEEP; - wakeup(&(sc->sc_wakeup_cfg)); - } - - /* early call to function */ - sc->sc_flags |= URAL_FLAG_WAIT_COMMAND; - - (command_func)(sc, NULL); - return; } -static void -ural_check_gone(struct ural_softc *sc) -{ - mtx_assert(&(sc->sc_mtx), MA_OWNED); - - if (sc->sc_flags & URAL_FLAG_DEV_GONE) { - - sc->sc_flags |= URAL_FLAG_TD_EXIT; - - wakeup(&(sc->sc_wakeup_td_gone)); - - mtx_unlock(&(sc->sc_mtx)); - - mtx_assert(&(sc->sc_mtx), MA_NOTOWNED); - - kthread_exit(0); - } - return; -} - static const char * ural_get_rf(int rev) { @@ -1824,14 +1689,16 @@ if ((sc->sc_amrr_timer) && (--sc->sc_amrr_timer == 0)) { - ural_queue_command(sc, &ural_cfg_amrr_timeout); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_amrr_timeout, 0); } if ((sc->sc_tx_timer) && (--sc->sc_tx_timer == 0)) { printf("%s: device timeout\n", sc->sc_name); - ural_queue_command(sc, &ural_cfg_init); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_init, 0); } if ((sc->sc_if_timer) && @@ -1868,7 +1735,8 @@ struct ural_softc *sc = arg; mtx_lock(&(sc->sc_mtx)); - ural_queue_command(sc, &ural_cfg_init); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_init, 0); mtx_unlock(&(sc->sc_mtx)); return; @@ -1888,13 +1756,16 @@ if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - ural_queue_command(sc, &ural_cfg_update_promisc); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_update_promisc, 0); } else { - ural_queue_command(sc, &ural_cfg_init); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_init, 0); } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - ural_queue_command(sc, &ural_cfg_stop); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_stop, 0); } } break; @@ -1907,7 +1778,8 @@ if ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (ic->ic_roaming != IEEE80211_ROAMING_MANUAL)) { - ural_queue_command(sc, &ural_cfg_init); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_init, 0); } error = 0; } @@ -1950,7 +1822,8 @@ if ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) { - ural_queue_command(sc, &ural_cfg_init); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_init, 0); } done: @@ -1976,7 +1849,8 @@ return ENETRESET; } - ural_queue_command(sc, &ural_cfg_set_chan); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_set_chan, 0); mtx_unlock(&(sc->sc_mtx)); @@ -2003,26 +1877,31 @@ switch (nstate) { case IEEE80211_S_INIT: if (sc->sc_ic.ic_state == IEEE80211_S_RUN) { - ural_queue_command(sc, &ural_cfg_disable_tsf_sync); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_disable_tsf_sync, 0); } sc->sc_if_timer = 0; break; case IEEE80211_S_SCAN: - ural_queue_command(sc, &ural_cfg_set_chan); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_set_chan, 0); sc->sc_scan_timer = 3; break; case IEEE80211_S_AUTH: - ural_queue_command(sc, &ural_cfg_set_chan); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_set_chan, 0); break; case IEEE80211_S_ASSOC: - ural_queue_command(sc, &ural_cfg_set_chan); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_set_chan, 0); break; case IEEE80211_S_RUN: - ural_queue_command(sc, &ural_cfg_set_run); + usbd_config_td_queue_command + (&(sc->sc_config_td), &ural_cfg_set_run, 0); break; } @@ -2040,18 +1919,18 @@ static void ural_cfg_sleep(struct ural_softc *sc, u_int32_t timeout) { - int error; + int error; - if (timeout == 0) { - timeout = 1; - } + if (timeout == 0) { + timeout = 1; + } - error = msleep(sc, &(sc->sc_mtx), 0, - "ural delay sleep", timeout); + error = msleep(sc, &(sc->sc_mtx), 0, + "ural delay sleep", timeout); - ural_check_gone(sc); + usbd_config_td_check_gone(&(sc->sc_config_td)); - return; + return; } static void @@ -2106,22 +1985,15 @@ error = msleep(&(sc->sc_wakeup_bcn), &(sc->sc_mtx), 0, "ural beacon sleep", 0); - ural_check_gone(sc); + usbd_config_td_check_gone(&(sc->sc_config_td)); } } return; } static void -ural_cfg_dummy(struct ural_softc *sc, - struct ural_config_copy *cc) -{ - return; -} - -static void ural_cfg_set_chan(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { u_int32_t i; u_int32_t chan; @@ -2244,7 +2116,7 @@ static void ural_cfg_set_run(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { if (cc == NULL) { @@ -2262,12 +2134,12 @@ /* delayed configuration */ - ural_cfg_set_chan(sc, cc); + ural_cfg_set_chan(sc, cc, 0); if (cc->ic_opmode != IEEE80211_M_MONITOR) { - ural_cfg_update_slot(sc, cc); - ural_cfg_set_txpreamble(sc, cc); - ural_cfg_set_basicrates(sc, cc); + ural_cfg_update_slot(sc, cc, 0); + ural_cfg_set_txpreamble(sc, cc, 0); + ural_cfg_set_basicrates(sc, cc, 0); ural_cfg_set_bssid(sc, cc->ic_bss.ni_bssid); } @@ -2280,7 +2152,7 @@ ural_cfg_write(sc, RAL_MAC_CSR20, 1); if (cc->ic_opmode != IEEE80211_M_MONITOR) { - ural_cfg_enable_tsf_sync(sc, cc); + ural_cfg_enable_tsf_sync(sc, cc , 0); } /* clear statistic registers (STA_CSR0 to STA_CSR10) */ @@ -2316,7 +2188,7 @@ *------------------------------------------------------------------------*/ static void ural_cfg_enable_tsf_sync(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { u_int16_t logcwmin; u_int16_t preload; @@ -2354,7 +2226,7 @@ static void ural_cfg_disable_tsf_sync(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { if (cc == NULL) { /* nothing to do */ @@ -2372,7 +2244,7 @@ static void ural_cfg_update_slot(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { u_int16_t slottime; u_int16_t sifs; @@ -2405,7 +2277,7 @@ static void ural_cfg_set_txpreamble(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { u_int16_t tmp; @@ -2428,7 +2300,7 @@ static void ural_cfg_set_basicrates(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { if (cc == NULL) { /* nothing to do */ @@ -2492,7 +2364,7 @@ static void ural_cfg_update_promisc(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { u_int16_t tmp; @@ -2646,7 +2518,7 @@ static void ural_cfg_init(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { u_int16_t tmp; u_int16_t i; @@ -2659,7 +2531,7 @@ struct ieee80211com *ic = &(sc->sc_ic); struct ifnet *ifp = sc->sc_ic.ic_ifp; - ural_cfg_stop(sc, NULL); + ural_cfg_stop(sc, NULL, 0); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; @@ -2685,7 +2557,7 @@ ural_cfg_write(sc, 0x308, 0x00f0); /* XXX magic */ - ural_cfg_stop(sc, cc); + ural_cfg_stop(sc, cc, 0); /* initialize MAC registers to default values */ for (i = 0; i < (sizeof(ural_def_mac)/ @@ -2721,7 +2593,7 @@ } /* set default BSS channel */ - ural_cfg_set_chan(sc, cc); + ural_cfg_set_chan(sc, cc, 0); /* clear statistic registers (STA_CSR0 to STA_CSR10) */ ural_cfg_read_multi(sc, RAL_STA_CSR0, sc->sc_sta, @@ -2780,17 +2652,17 @@ return; fail: - ural_cfg_stop(sc, NULL); + ural_cfg_stop(sc, NULL, 0); if (cc) { - ural_cfg_stop(sc, cc); + ural_cfg_stop(sc, cc, 0); } return; } static void ural_cfg_stop(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { if (cc == NULL) { @@ -2881,7 +2753,7 @@ static void ural_cfg_amrr_timeout(struct ural_softc *sc, - struct ural_config_copy *cc) + struct ural_config_copy *cc, u_int16_t refcount) { struct ural_amrr *amrr = &sc->sc_amrr; struct ifnet *ifp = sc->sc_ic.ic_ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#4 (text+ko) ==== @@ -17,11 +17,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -struct ural_softc; -struct ural_config_copy; - -typedef void (ural_command_t)(struct ural_softc *sc, - struct ural_config_copy *cc); struct ural_config_copy { struct { u_int32_t chan_to_ieee; @@ -53,8 +48,6 @@ u_int16_t ic_curmode; u_int8_t ic_myaddr[IEEE80211_ADDR_LEN]; - - ural_command_t * command_func; }; struct ural_rx_radiotap_header { @@ -116,6 +109,7 @@ struct ural_softc { + struct usbd_config_td sc_config_td; struct ural_tx_desc sc_tx_desc; struct ural_rx_desc sc_rx_desc; struct ieee80211com sc_ic; @@ -126,16 +120,12 @@ struct __callout sc_watchdog; struct ural_bbp_prom sc_bbp_prom[16]; struct usbd_xfer * sc_xfer[URAL_N_TRANSFER]; - struct usbd_ifqueue sc_cmd_free; - struct usbd_ifqueue sc_cmd_used; union ural_rxtap sc_rxtap; union ural_txtap sc_txtap; struct mbuf * sc_bcn_mbuf; - struct proc * sc_config_thread; struct ifnet * sc_ifp; struct bpf_if * sc_drvbpf; - void * sc_cmd_queue_ptr; struct usbd_device * sc_udev; int (*sc_newstate) @@ -147,18 +137,15 @@ u_int32_t sc_unit; u_int32_t sc_asic_rev; u_int32_t sc_rf_regs[4]; - u_int32_t sc_flags; -#define URAL_FLAG_DEV_GONE 0x0001 -#define URAL_FLAG_TD_EXIT 0x0002 -#define URAL_FLAG_CMD_SLEEP 0x0004 -#define URAL_FLAG_READ_STALL 0x0008 -#define URAL_FLAG_WRITE_STALL 0x0010 -#define URAL_FLAG_SEND_BYTE_FRAME 0x0020 -#define URAL_FLAG_SEND_BCN_FRAME 0x0040 -#define URAL_FLAG_LL_READY 0x0080 -#define URAL_FLAG_HL_READY 0x0100 -#define URAL_FLAG_WAIT_COMMAND 0x0200 + u_int16_t sc_flags; +#define URAL_FLAG_READ_STALL 0x0001 +#define URAL_FLAG_WRITE_STALL 0x0002 +#define URAL_FLAG_SEND_BYTE_FRAME 0x0004 +#define URAL_FLAG_SEND_BCN_FRAME 0x0008 +#define URAL_FLAG_LL_READY 0x0010 +#define URAL_FLAG_HL_READY 0x0020 +#define URAL_FLAG_WAIT_COMMAND 0x0040 u_int16_t sc_txtap_len; u_int16_t sc_rxtap_len; u_int16_t sc_sta[11]; @@ -177,8 +164,6 @@ u_int8_t sc_amrr_timer; u_int8_t sc_name[32]; - u_int8_t sc_wakeup_td_gone; - u_int8_t sc_wakeup_cfg; u_int8_t sc_wakeup_bcn; }; ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#6 (text+ko) ==== @@ -187,10 +187,8 @@ #include "opt_usb.h" -#define usb_kthread_create1(f, s, p, a0, a1) \ - kthread_create((f), (s), (p), RFHIGHPID, 0, (a0), (a1)) -#define usb_kthread_create2(f, s, p, a0) \ - kthread_create((f), (s), (p), RFHIGHPID, 0, (a0)) +#define usb_kthread_create1(f, s, p, ...) \ + kthread_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) #define usb_kthread_create kthread_create #define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0) ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#10 (text+ko) ==== @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include #include @@ -2311,3 +2313,302 @@ } return totlen; } + +/*------------------------------------------------------------------------* + * mtx_drop_recurse - drop mutex recurse level + *------------------------------------------------------------------------*/ +u_int32_t +mtx_drop_recurse(struct mtx *mtx) +{ + u_int32_t recurse_level = mtx->mtx_recurse; + u_int32_t recurse_curr = recurse_level; + + mtx_assert(mtx, MA_OWNED); + + while(recurse_curr--) { + mtx_unlock(mtx); + } + + return recurse_level; +} + +/*------------------------------------------------------------------------* + * mtx_pickup_recurse - pickup mutex recurse level + *------------------------------------------------------------------------*/ +void +mtx_pickup_recurse(struct mtx *mtx, u_int32_t recurse_level) +{ + mtx_assert(mtx, MA_OWNED); + + while(recurse_level--) { + mtx_lock(mtx); + } + return; +} + + +/*------------------------------------------------------------------------* + * usbd_config_thread + *------------------------------------------------------------------------*/ +static void +usbd_config_td_thread(void *arg) +{ + struct usbd_config_td *ctd = arg; + struct usbd_config_td_item *item; + struct usbd_mbuf *m; + register int error; + + mtx_lock(ctd->p_mtx); + + while(1) { + + usbd_config_td_check_gone(ctd); + + USBD_IF_DEQUEUE(&(ctd->cmd_used), m); + + if (m) { + + item = (void *)(m->cur_data_ptr); + + (item->command_func) + (ctd->p_softc, (void *)(item+1), item->command_ref); + + USBD_IF_ENQUEUE(&(ctd->cmd_free), m); + + continue; + } + + if (ctd->p_end_of_commands) { + (ctd->p_end_of_commands)(ctd->p_softc); + } + + ctd->flag_config_td_sleep = 1; + + error = msleep(&(ctd->wakeup_config_td), ctd->p_mtx, + 0, "cfg td sleep", 0); + + ctd->flag_config_td_sleep = 0; + } + + ctd->config_thread = NULL; + + mtx_unlock(ctd->p_mtx); + + kthread_exit(0); + + return; +} + +/*------------------------------------------------------------------------* + * usbd_config_td_setup + * + * NOTE: the structure pointed to by "ctd" must be zeroed before calling + * this function! + * + * Return values: + * 0: success + * else: failure + *------------------------------------------------------------------------*/ +u_int8_t +usbd_config_td_setup(struct usbd_config_td *ctd, void *priv_sc, + struct mtx *priv_mtx, + usbd_config_td_config_copy_t *p_func_cc, + usbd_config_td_end_of_commands_t *p_func_eoc, + u_int16_t item_size, u_int16_t item_count) +{ + ctd->p_mtx = priv_mtx; + ctd->p_softc = priv_sc; + ctd->p_config_copy = p_func_cc; + ctd->p_end_of_commands = p_func_eoc; + + if (item_count >= 256) { + PRINTFN(0,("too many items!\n")); + goto error; + } + + ctd->p_cmd_queue = + usbd_alloc_mbufs(M_DEVBUF, &(ctd->cmd_free), + (sizeof(struct usbd_config_td_item) + item_size), + item_count); + + if (ctd->p_cmd_queue == NULL) { + PRINTFN(0,("unable to allocate memory " + "for command queue!\n")); + goto error; + } + + if (usb_kthread_create1 + (&usbd_config_td_thread, ctd, &(ctd->config_thread), >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 31 16:35:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5C7316A4E0; Mon, 31 Jul 2006 16:35:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A52B16A4DE for ; Mon, 31 Jul 2006 16:35:11 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 419A143D5D for ; Mon, 31 Jul 2006 16:35:11 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VGZBKj039484 for ; Mon, 31 Jul 2006 16:35:11 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VGZAnt039477 for perforce@freebsd.org; Mon, 31 Jul 2006 16:35:10 GMT (envelope-from howardsu@FreeBSD.org) Date: Mon, 31 Jul 2006 16:35:10 GMT Message-Id: <200607311635.k6VGZAnt039477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 16:35:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=102861 Change 102861 by howardsu@su_vm on 2006/07/31 16:34:57 Check the correct flag for ptrace signal handling Affected files ... .. //depot/projects/dtrace/src/sys/kern/sys_process.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sys_process.c#6 (text+ko) ==== @@ -943,7 +943,7 @@ pl->pl_flags = 0; pl->pl_sigmask = td2->td_sigmask; pl->pl_siglist = td2->td_siglist; - if (td->td_xsig & TDF_XSIG) + if (td2->td_flags & TDF_XSIG) pl->pl_event = td2->td_xsig_why; else pl->pl_event = PL_EVENT_NONE; From owner-p4-projects@FreeBSD.ORG Mon Jul 31 16:48:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E55516A4E1; Mon, 31 Jul 2006 16:48:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 281AB16A4DD for ; Mon, 31 Jul 2006 16:48:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFE9343D45 for ; Mon, 31 Jul 2006 16:48:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VGmTc9048053 for ; Mon, 31 Jul 2006 16:48:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VGmSHu048050 for perforce@freebsd.org; Mon, 31 Jul 2006 16:48:28 GMT (envelope-from jhb@freebsd.org) Date: Mon, 31 Jul 2006 16:48:28 GMT Message-Id: <200607311648.k6VGmSHu048050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 102862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 16:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=102862 Change 102862 by jhb@jhb_mutex on 2006/07/31 16:48:01 IFC @102858. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#52 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#34 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#22 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#25 integrate .. //depot/projects/smpng/sys/conf/NOTES#126 integrate .. //depot/projects/smpng/sys/conf/files#184 integrate .. //depot/projects/smpng/sys/conf/files.amd64#45 integrate .. //depot/projects/smpng/sys/conf/files.i386#100 integrate .. //depot/projects/smpng/sys/conf/files.pc98#83 integrate .. //depot/projects/smpng/sys/conf/options#124 integrate .. //depot/projects/smpng/sys/conf/options.amd64#20 integrate .. //depot/projects/smpng/sys/conf/options.i386#58 integrate .. //depot/projects/smpng/sys/conf/options.pc98#57 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#94 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#63 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#42 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#123 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#101 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#9 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#53 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#57 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#32 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#58 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#74 integrate .. //depot/projects/smpng/sys/sys/param.h#102 integrate .. //depot/projects/smpng/sys/sys/sysent.h#17 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#26 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#52 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.306 2006/07/28 19:05:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/conf/NOTES#34 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.58 2006/07/29 18:38:53 marcel Exp $ # # @@ -101,6 +101,44 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +# +# sio: serial ports (see sio(4)), including support for various +# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# +device sio +hint.sio.0.at="isa" +hint.sio.0.port="0x3F8" +hint.sio.0.flags="0x10" +hint.sio.0.irq="4" + +# `flags' specific to sio(4). +# 0x10 enable console support for this unit. Other console flags +# (if applicable) are ignored unless this is set. Enabling +# console support does not make the unit the preferred console. +# Boot with -h or set boot_serial=YES in the loader. For sio(4) +# specifically, the 0x20 flag can also be set (see above). +# Currently, at most one unit can have console support; the +# first one (in config file order) with this flag set is +# preferred. Setting this flag for sio0 gives the old behaviour. +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# 0x80 use this port for serial line gdb support in ddb. Also known +# as debug port. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + +# Options for sio: +options COM_ESP # Code for Hayes ESP. +options COM_MULTIPORT # Code for some cards with shared IRQs. +options CONSPEED=115200 # Speed for serial console + # (default 9600). + device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.15 2006/07/28 19:05:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/arm/arm/trap.c#25 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.26 2006/07/28 19:05:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.27 2006/07/28 20:22:57 jhb Exp $"); #include ==== //depot/projects/smpng/sys/conf/NOTES#126 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1375 2006/07/25 00:45:54 yongari Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1377 2006/07/29 18:38:53 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1611,35 +1611,6 @@ hint.fd.1.drive="1" # -# sio: serial ports (see sio(4)), including support for various -# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) -# -device sio -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" - -# Options for sio: -options COM_ESP # Code for Hayes ESP. -options COM_MULTIPORT # Code for some cards with shared IRQs. -options CONSPEED=115200 # Speed for serial console - # (default 9600). - -# `flags' specific to sio(4). See below for flags used by both sio(4) and -# uart(4). -# 0x20 force this unit to be the console (unless there is another -# higher priority console). This replaces the COMCONSOLE option. -# 0x40 reserve this unit for low level console operations. Do not -# access the device in any normal way. -# PnP `flags' -# 0x1 disable probing of this device. Used to prevent your modem -# from being attached as a PnP modem. -# Other flags for sio that aren't documented in the man page. -# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for -# ST16650A-compatible UARTs. - -# # uart: newbusified driver for serial interfaces. It consolidates the sio(4), # sab(4) and zs(4) drivers. # @@ -1952,6 +1923,7 @@ # since this is unsupported at the moment...). # # snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. +# snd_ak452x: Asahi Kasei AK452x codec, needed by snd_envy24. # snd_als4000: Avance Logic ALS4000 PCI. # snd_atiixp: ATI IXP 200/300/400 PCI. # snd_au88x0 Aureal Vortex 1/2/Advantage PCI. This driver @@ -1965,6 +1937,7 @@ # snd_ds1: Yamaha DS-1 PCI. # snd_emu10k1: Creative EMU10K1 PCI and EMU10K2 (Audigy) PCI. # snd_emu10kx: Creative SoundBlaster Live! and Audigy +# snd_envy24: VIA Envy24 and compatible, needs snd_ak452x. # snd_es137x: Ensoniq AudioPCI ES137x PCI. # snd_ess: Ensoniq ESS ISA PnP/non-PnP, to be used in # conjunction with snd_sbc. @@ -1992,6 +1965,7 @@ # snd_uaudio: USB audio. device snd_ad1816 +device snd_ak452x device snd_als4000 device snd_atiixp #device snd_au88x0 @@ -2003,6 +1977,7 @@ device snd_emu10k1 device snd_emu10kx options SND_EMU10KX_MULTICHANNEL +device snd_envy24 device snd_es137x device snd_ess device snd_fm801 ==== //depot/projects/smpng/sys/conf/files#184 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1134 2006/07/27 22:32:29 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1136 2006/07/29 18:38:53 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -858,9 +858,6 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/sk/if_sk.c optional sk pci dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus @@ -878,6 +875,7 @@ dev/sound/isa/sb8.c optional snd_sb8 isa dev/sound/isa/sbc.c optional snd_sbc isa dev/sound/isa/sndbuf_dma.c optional sound isa +dev/sound/pci/ak452x.c optional snd_ak452x pci dev/sound/pci/als4000.c optional snd_als4000 pci dev/sound/pci/atiixp.c optional snd_atiixp pci #dev/sound/pci/au88x0.c optional snd_au88x0 pci @@ -903,6 +901,7 @@ dev/sound/pci/emu10kx-midi.c optional snd_emu10kx pci \ dependency "emu10k1-alsa%diked.h" \ warning "kernel contains GPL contaminated emu10kx headers" +dev/sound/pci/envy24.c optional snd_envy24 pci dev/sound/pci/es137x.c optional snd_es137x pci dev/sound/pci/fm801.c optional snd_fm801 pci dev/sound/pci/ich.c optional snd_ich pci ==== //depot/projects/smpng/sys/conf/files.amd64#45 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.90 2006/06/26 23:41:06 obrien Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.91 2006/07/29 18:38:53 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -184,6 +184,9 @@ dev/rr232x/rr232x_config.c optional rr232x dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci +dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/schistory.c optional sc ==== //depot/projects/smpng/sys/conf/files.i386#100 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.563 2006/07/22 16:18:47 pjd Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.564 2006/07/29 18:38:53 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -212,6 +212,9 @@ dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci +dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/sr/if_sr_isa.c optional sr isa dev/syscons/apm/apm_saver.c optional apm_saver apm ==== //depot/projects/smpng/sys/conf/files.pc98#83 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.343 2006/05/17 21:25:22 marius Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.344 2006/07/29 18:38:53 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -124,6 +124,9 @@ dev/mse/mse_cbus.c optional mse isa dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_pci.c optional sbni pci +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci +dev/sio/sio_puc.c optional sio puc dev/snc/dp83932.c optional snc dev/snc/dp83932subr.c optional snc dev/snc/if_snc.c optional snc ==== //depot/projects/smpng/sys/conf/options#124 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.554 2006/07/18 17:00:51 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.555 2006/07/29 18:38:53 marcel Exp $ # # On the handling of kernel options # @@ -50,7 +50,6 @@ DDB DDB_NUMSYM opt_ddb.h GDB -GDBSPEED opt_gdb.h KDB opt_global.h KDB_TRACE opt_kdb.h KDB_UNATTENDED opt_kdb.h @@ -69,7 +68,6 @@ COMPAT_FREEBSD4 opt_compat.h COMPAT_FREEBSD5 opt_compat.h COMPILING_LINT opt_global.h -CONSPEED opt_comconsole.h CY_PCI_FASTINTR DIRECTIO FULL_PREEMPTION opt_sched.h @@ -574,9 +572,6 @@ BKTR_USE_FREEBSD_SMBUS opt_bktr.h BKTR_NEW_MSP34XX_DRIVER opt_bktr.h -# options for serial support -COM_ESP opt_sio.h -COM_MULTIPORT opt_sio.h BREAK_TO_DEBUGGER opt_comconsole.h ALT_BREAK_TO_DEBUGGER opt_comconsole.h ==== //depot/projects/smpng/sys/conf/options.amd64#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.27 2006/05/10 03:25:45 ambrisko Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.28 2006/07/29 18:38:53 marcel Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -25,6 +25,12 @@ CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h +# options for serial support +COM_ESP opt_sio.h +COM_MULTIPORT opt_sio.h +CONSPEED opt_sio.h +GDBSPEED opt_sio.h + VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h VGA_NO_FONT_LOADING opt_vga.h ==== //depot/projects/smpng/sys/conf/options.i386#58 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.236 2006/05/17 09:33:07 phk Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.237 2006/07/29 18:38:53 marcel Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -75,6 +75,12 @@ I586_CPU opt_global.h I686_CPU opt_global.h +# options for serial support +COM_ESP opt_sio.h +COM_MULTIPORT opt_sio.h +CONSPEED opt_sio.h +GDBSPEED opt_sio.h + VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h VGA_NO_FONT_LOADING opt_vga.h ==== //depot/projects/smpng/sys/conf/options.pc98#57 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.199 2006/05/10 03:25:45 ambrisko Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.200 2006/07/29 18:38:53 marcel Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -35,6 +35,12 @@ CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h +# options for serial support +COM_ESP opt_sio.h +COM_MULTIPORT opt_sio.h +CONSPEED opt_sio.h +GDBSPEED opt_sio.h + CPU_BLUELIGHTNING_3X opt_cpu.h CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h CPU_BTB_EN opt_cpu.h ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#94 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.226 2006/06/11 20:31:41 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.227 2006/07/29 21:46:16 njl Exp $"); #include "opt_acpi.h" #include @@ -525,6 +525,9 @@ SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "disable_on_reboot", CTLFLAG_RW, &sc->acpi_do_disable, 0, "Disable ACPI when rebooting/halting system"); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "handle_reboot", CTLFLAG_RW, + &sc->acpi_handle_reboot, 0, "Use ACPI Reset Register to reboot"); /* * Default to 1 second before sleeping to give some machines time to @@ -1658,7 +1661,8 @@ DELAY(1000000); printf("ACPI power-off failed - timeout\n"); } - } else if ((howto & RB_HALT) == 0 && AcpiGbl_FADT->ResetRegSup) { + } else if ((howto & RB_HALT) == 0 && AcpiGbl_FADT->ResetRegSup && + sc->acpi_handle_reboot) { /* Reboot using the reset register. */ status = AcpiHwLowLevelWrite( AcpiGbl_FADT->ResetRegister.RegisterBitWidth, ==== //depot/projects/smpng/sys/dev/acpica/acpivar.h#63 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.101 2006/06/12 17:13:57 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.102 2006/07/29 21:46:15 njl Exp $ */ #ifndef _ACPIVAR_H_ @@ -47,7 +47,7 @@ struct acpi_softc { device_t acpi_dev; - struct cdev *acpi_dev_t; + struct cdev *acpi_dev_t; struct resource *acpi_irq; int acpi_irq_rid; @@ -70,6 +70,7 @@ int acpi_s4bios; int acpi_do_disable; int acpi_verbose; + int acpi_handle_reboot; bus_dma_tag_t acpi_waketag; bus_dmamap_t acpi_wakemap; ==== //depot/projects/smpng/sys/dev/re/if_re.c#42 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.69 2006/06/28 16:04:54 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.70 2006/07/30 23:25:21 wpaul Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -172,17 +172,17 @@ "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E, "RealTek 8101E PCIe 10/100baseTX" }, - { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168, - "RealTek 8168B PCIe Gigabit Ethernet" }, - { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8111, - "RealTek 8111B PCIe Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168_SPIN1, + "RealTek 8168/8111B PCIe Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168_SPIN2, + "RealTek 8168/8111B PCIe Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169, "RealTek 8169 Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S, "RealTek 8169S Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB, "RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" }, - { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC, + { RT_VENDORID, RT_DEVICEID_8169SC, RL_HWREV_8169_8110SC, "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S, "RealTek 8110S Single-chip Gigabit Ethernet" }, @@ -202,7 +202,7 @@ { RL_HWREV_8139C, RL_8139, "C" }, { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C" }, { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+"}, - { RL_HWREV_8168, RL_8169, "8168"}, + { RL_HWREV_8168_SPIN1, RL_8169, "8168"}, { RL_HWREV_8169, RL_8169, "8169"}, { RL_HWREV_8169S, RL_8169, "8169S"}, { RL_HWREV_8110S, RL_8169, "8110S"}, @@ -212,7 +212,7 @@ { RL_HWREV_8101, RL_8139, "8101"}, { RL_HWREV_8100E, RL_8169, "8100E"}, { RL_HWREV_8101E, RL_8169, "8101E"}, - { RL_HWREV_8111, RL_8169, "8111"}, + { RL_HWREV_8168_SPIN2, RL_8169, "8168"}, { 0, 0, NULL } }; @@ -935,6 +935,8 @@ struct rl_dmaload_arg *ctx; struct rl_desc *d = NULL; int i = 0, idx; + u_int32_t cmdstat; + int totlen = 0; if (error) return; @@ -960,13 +962,13 @@ */ idx = ctx->rl_idx; for (;;) { - u_int32_t cmdstat; d = &ctx->rl_ring[idx]; if (le32toh(d->rl_cmdstat) & RL_RDESC_STAT_OWN) { ctx->rl_maxsegs = 0; return; } cmdstat = segs[i].ds_len; + totlen += segs[i].ds_len; d->rl_bufaddr_lo = htole32(RL_ADDR_LO(segs[i].ds_addr)); d->rl_bufaddr_hi = htole32(RL_ADDR_HI(segs[i].ds_addr)); if (i == 0) @@ -982,6 +984,26 @@ RL_DESC_INC(idx); } + /* + * With some of the RealTek chips, using the checksum offload + * support in conjunction with the autopadding feature results + * in the transmission of corrupt frames. For example, if we + * need to send a really small IP fragment that's less than 60 + * bytes in size, and IP header checksumming is enabled, the + * resulting ethernet frame that appears on the wire will + * have garbled payload. To work around this, if TX checksum + * offload is enabled, we always manually pad short frames out + * to the minimum ethernet frame size. We do this by lying + * about the size of the final fragment in the DMA map. + */ + + if (ctx->rl_flags && totlen < (ETHER_MIN_LEN - ETHER_CRC_LEN)) { + i = cmdstat & 0xFFFF; + i += ETHER_MIN_LEN - ETHER_CRC_LEN - totlen; + cmdstat = (cmdstat & 0xFFFF) | i; + d->rl_cmdstat = htole32(cmdstat | ctx->rl_flags); + } + d->rl_cmdstat |= htole32(RL_TDESC_CMD_EOF); ctx->rl_maxsegs = nseg; ctx->rl_idx = idx; @@ -1131,8 +1153,6 @@ mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); - mtx_init(&sc->rl_intlock, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_SPIN); callout_init_mtx(&sc->rl_stat_callout, &sc->rl_mtx, 0); /* @@ -1249,7 +1269,7 @@ ifp->if_start = re_start; ifp->if_hwassist = RE_CSUM_FEATURES; ifp->if_capabilities |= IFCAP_HWCSUM|IFCAP_VLAN_HWTAGGING; - ifp->if_capenable = ifp->if_capabilities & ~IFCAP_HWCSUM; + ifp->if_capenable = ifp->if_capabilities; #ifdef DEVICE_POLLING ifp->if_capabilities |= IFCAP_POLLING; #endif @@ -1416,7 +1436,6 @@ bus_dma_tag_destroy(sc->rl_parent_tag); mtx_destroy(&sc->rl_mtx); - mtx_destroy(&sc->rl_intlock); return (0); } @@ -1895,14 +1914,10 @@ sc = arg; ifp = sc->rl_ifp; - mtx_lock_spin(&sc->rl_intlock); status = CSR_READ_2(sc, RL_ISR); - if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) { - mtx_unlock_spin(&sc->rl_intlock); + if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) return; - } CSR_WRITE_2(sc, RL_IMR, 0); - mtx_unlock_spin(&sc->rl_intlock); taskqueue_enqueue_fast(taskqueue_fast, &sc->rl_inttask); @@ -1970,9 +1985,7 @@ return; } - mtx_lock_spin(&sc->rl_intlock); CSR_WRITE_2(sc, RL_IMR, RL_INTRS_CPLUS); - mtx_unlock_spin(&sc->rl_intlock); return; } @@ -2305,13 +2318,11 @@ /* * Enable interrupts. */ - mtx_lock_spin(&sc->rl_intlock); if (sc->rl_testmode) CSR_WRITE_2(sc, RL_IMR, 0); else CSR_WRITE_2(sc, RL_IMR, RL_INTRS_CPLUS); CSR_WRITE_2(sc, RL_ISR, RL_INTRS_CPLUS); - mtx_unlock_spin(&sc->rl_intlock); /* Set initial TX threshold */ sc->rl_txthresh = RL_TX_THRESH_INIT; ==== //depot/projects/smpng/sys/i386/conf/NOTES#123 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1229 2006/06/26 23:41:07 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1230 2006/07/29 18:38:54 marcel Exp $ # # @@ -272,6 +272,44 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +# +# sio: serial ports (see sio(4)), including support for various +# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# +device sio +hint.sio.0.at="isa" +hint.sio.0.port="0x3F8" +hint.sio.0.flags="0x10" +hint.sio.0.irq="4" + +# `flags' specific to sio(4). +# 0x10 enable console support for this unit. Other console flags +# (if applicable) are ignored unless this is set. Enabling +# console support does not make the unit the preferred console. +# Boot with -h or set boot_serial=YES in the loader. For sio(4) +# specifically, the 0x20 flag can also be set (see above). +# Currently, at most one unit can have console support; the +# first one (in config file order) with this flag set is +# preferred. Setting this flag for sio0 gives the old behaviour. +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# 0x80 use this port for serial line gdb support in ddb. Also known +# as debug port. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + +# Options for sio: +options COM_ESP # Code for Hayes ESP. +options COM_MULTIPORT # Code for some cards with shared IRQs. +options CONSPEED=115200 # Speed for serial console + # (default 9600). + device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" ==== //depot/projects/smpng/sys/i386/i386/trap.c#101 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.294 2006/07/28 19:05:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.295 2006/07/28 20:22:57 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/ia64/conf/NOTES#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/ia64/conf/NOTES,v 1.10 2006/06/02 04:46:26 imp Exp $ +# $FreeBSD: src/sys/ia64/conf/NOTES,v 1.11 2006/07/29 18:38:54 marcel Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -49,6 +49,3 @@ # The following devices are not supported. nodevice fdc nooption FDC_DEBUG -nodevice sio -nooption COM_ESP -nooption CONSPEED ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.11 2006/07/28 19:05:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.12 2006/07/28 20:22:58 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#89 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.122 2006/07/28 19:05:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.123 2006/07/28 20:22:58 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#53 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.109 2006/06/27 11:29:38 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.110 2006/07/31 15:31:43 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -483,15 +483,6 @@ ktr_submitrequest(curthread, req); } -/* - * Since the uio may not stay valid, we can not hand off this request to - * the thread and need to process it synchronously. However, we wish to - * keep the relative order of records in a trace file correct, so we - * do put this request on the queue (if it isn't empty) and then block. - * The ktrace thread waks us back up when it is time for this event to - * be posted and blocks until we have completed writing out the event - * and woken it back up. - */ void ktrgenio(fd, rw, uio, error) int fd; ==== //depot/projects/smpng/sys/pc98/conf/NOTES#57 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.78 2006/06/12 20:38:17 jhb Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.79 2006/07/29 18:38:54 marcel Exp $ # options PC98 @@ -214,6 +214,44 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +# +# sio: serial ports (see sio(4)), including support for various +# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# +device sio +hint.sio.0.at="isa" +hint.sio.0.port="0x3F8" +hint.sio.0.flags="0x10" +hint.sio.0.irq="4" + +# `flags' specific to sio(4). +# 0x10 enable console support for this unit. Other console flags +# (if applicable) are ignored unless this is set. Enabling +# console support does not make the unit the preferred console. +# Boot with -h or set boot_serial=YES in the loader. For sio(4) +# specifically, the 0x20 flag can also be set (see above). +# Currently, at most one unit can have console support; the +# first one (in config file order) with this flag set is +# preferred. Setting this flag for sio0 gives the old behaviour. +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# 0x80 use this port for serial line gdb support in ddb. Also known +# as debug port. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + +# Options for sio: +options COM_ESP # Code for Hayes ESP. +options COM_MULTIPORT # Code for some cards with shared IRQs. +options CONSPEED=115200 # Speed for serial console + # (default 9600). + device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x35" ==== //depot/projects/smpng/sys/pci/if_rlreg.h#32 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.58 2006/06/28 16:04:54 wpaul Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.59 2006/07/30 23:25:20 wpaul Exp $ */ /* @@ -147,25 +147,25 @@ /* Known revision codes. */ -#define RL_HWREV_8169 0x00000000 -#define RL_HWREV_8110S 0x00800000 -#define RL_HWREV_8169S 0x04000000 -#define RL_HWREV_8169_8110SB 0x10000000 -#define RL_HWREV_8169_8110SC 0x18000000 -#define RL_HWREV_8168 0x30000000 -#define RL_HWREV_8100E 0x30800000 -#define RL_HWREV_8101E 0x34000000 -#define RL_HWREV_8111 0x38000000 -#define RL_HWREV_8139 0x60000000 -#define RL_HWREV_8139A 0x70000000 -#define RL_HWREV_8139AG 0x70800000 -#define RL_HWREV_8139B 0x78000000 -#define RL_HWREV_8130 0x7C000000 -#define RL_HWREV_8139C 0x74000000 -#define RL_HWREV_8139D 0x74400000 -#define RL_HWREV_8139CPLUS 0x74800000 -#define RL_HWREV_8101 0x74c00000 -#define RL_HWREV_8100 0x78800000 +#define RL_HWREV_8169 0x00000000 +#define RL_HWREV_8110S 0x00800000 +#define RL_HWREV_8169S 0x04000000 +#define RL_HWREV_8169_8110SB 0x10000000 +#define RL_HWREV_8169_8110SC 0x18000000 +#define RL_HWREV_8168_SPIN1 0x30000000 +#define RL_HWREV_8100E 0x30800000 +#define RL_HWREV_8101E 0x34000000 +#define RL_HWREV_8168_SPIN2 0x38000000 +#define RL_HWREV_8139 0x60000000 +#define RL_HWREV_8139A 0x70000000 +#define RL_HWREV_8139AG 0x70800000 +#define RL_HWREV_8139B 0x78000000 +#define RL_HWREV_8130 0x7C000000 +#define RL_HWREV_8139C 0x74000000 +#define RL_HWREV_8139D 0x74400000 +#define RL_HWREV_8139CPLUS 0x74800000 +#define RL_HWREV_8101 0x74c00000 +#define RL_HWREV_8100 0x78800000 #define RL_TXDMA_16BYTES 0x00000000 #define RL_TXDMA_32BYTES 0x00000100 ==== //depot/projects/smpng/sys/powerpc/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.3 2006/07/26 17:35:40 marcel Exp $ +# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.4 2006/07/29 18:38:54 marcel Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -30,7 +30,6 @@ nodevice atkbdc nodevice atkbd nodevice psm -nodevice sio nodevice vga nodevice fdc nodevice ppc ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#58 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.60 2006/07/28 19:05:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.61 2006/07/28 20:22:58 jhb Exp $"); #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/sparc64/conf/NOTES#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.23 2006/04/19 19:39:35 marcel Exp $ +# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.24 2006/07/29 18:38:54 marcel Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -92,15 +92,12 @@ nodevice wds nodevice ep nodevice ex -nodevice sio ##################################################################### # Options we don't want to deal with nooption FDC_DEBUG -nooption COM_ESP -nooption CONSPEED nooption VGA_DEBUG nooption SC_RENDER_DEBUG nooption SC_DEBUG_LEVEL ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#74 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.84 2006/07/28 19:05:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.85 2006/07/28 20:22:58 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktr.h" ==== //depot/projects/smpng/sys/sys/param.h#102 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.268 2006/07/15 20:22:39 netchild Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700018 /* Master, propagated to newvers */ +#define __FreeBSD_version 700019 /* Master, propagated to newvers */ #ifndef LOCORE #include ==== //depot/projects/smpng/sys/sys/sysent.h#17 (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/sys/sysent.h,v 1.47 2005/11/02 21:18:07 ps Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.48 2006/07/28 20:22:58 jhb Exp $ */ #ifndef _SYS_SYSENT_H_ ==== //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#26 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.81 2006/07/11 17:27:04 daichi Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 31 17:00:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6ABB16A533; Mon, 31 Jul 2006 17:00:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88D3516A530 for ; Mon, 31 Jul 2006 17:00:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5091543D45 for ; Mon, 31 Jul 2006 17:00:45 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VH0jHw048732 for ; Mon, 31 Jul 2006 17:00:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VH0iCX048729 for perforce@freebsd.org; Mon, 31 Jul 2006 17:00:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 31 Jul 2006 17:00:44 GMT Message-Id: <200607311700.k6VH0iCX048729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 17:00:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=102863 Change 102863 by hselasky@hselasky_mini_itx on 2006/07/31 17:00:40 Factorize "ural_cfg_sleep()" into "usbd_config_td_sleep()". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#6 (text+ko) ==== @@ -178,9 +178,6 @@ ural_newstate_cb(struct ieee80211com *ic, enum ieee80211_state nstate, int arg); static void -ural_cfg_sleep(struct ural_softc *sc, u_int32_t timeout); - -static void ural_tx_bcn_complete(struct ural_softc *sc); static void @@ -1917,23 +1914,6 @@ *========================================================================*/ static void -ural_cfg_sleep(struct ural_softc *sc, u_int32_t timeout) -{ - int error; - - if (timeout == 0) { - timeout = 1; - } - - error = msleep(sc, &(sc->sc_mtx), 0, - "ural delay sleep", timeout); - - usbd_config_td_check_gone(&(sc->sc_config_td)); - - return; -} - -static void ural_tx_bcn_complete(struct ural_softc *sc) { if (sc->sc_bcn_mbuf) { @@ -2107,7 +2087,7 @@ ural_cfg_read(sc, RAL_STA_CSR0); /* wait a little */ - ural_cfg_sleep(sc, hz/100); + usbd_config_td_sleep(&(sc->sc_config_td), hz/100); ural_cfg_disable_rf_tune(sc); } @@ -2489,7 +2469,7 @@ if (ural_cfg_bbp_read(sc, RAL_BBP_VERSION) != 0) { break; } - ural_cfg_sleep(sc, hz/100); + usbd_config_td_sleep(&(sc->sc_config_td), hz/100); } else { printf("%s: timeout waiting for BBP\n", sc->sc_name); @@ -2574,7 +2554,7 @@ (RAL_BBP_AWAKE | RAL_RF_AWAKE)) { break; } - ural_cfg_sleep(sc, hz/100); + usbd_config_td_sleep(&(sc->sc_config_td), hz/100); } else { printf("%s: timeout waiting for " "BBP/RF to wakeup\n", sc->sc_name); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#11 (text+ko) ==== @@ -2612,3 +2612,29 @@ } return; } + +/*------------------------------------------------------------------------* + * usbd_config_td_sleep + * + * NOTE: this function can only be called from the config thread + *------------------------------------------------------------------------*/ +void +usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout) +{ + register int error; + + if (timeout == 0) { + /* zero means no timeout, + * so avoid that by setting + * timeout to one: + */ + timeout = 1; + } + + error = msleep(ctd, ctd->p_mtx, 0, + "config td sleep", timeout); + + usbd_config_td_check_gone(ctd); + + return; +} ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#16 (text+ko) ==== @@ -772,6 +772,9 @@ void usbd_config_td_check_gone(struct usbd_config_td *ctd); +void +usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout); + /* routines from usb.c */ #if 0 From owner-p4-projects@FreeBSD.ORG Mon Jul 31 18:06:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A3E016A4E0; Mon, 31 Jul 2006 18:06:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77D5216A4DE for ; Mon, 31 Jul 2006 18:06:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D95B43D62 for ; Mon, 31 Jul 2006 18:06:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VI69hr054774 for ; Mon, 31 Jul 2006 18:06:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VI68kf054771 for perforce@freebsd.org; Mon, 31 Jul 2006 18:06:08 GMT (envelope-from jhb@freebsd.org) Date: Mon, 31 Jul 2006 18:06:08 GMT Message-Id: <200607311806.k6VI68kf054771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 102867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 18:06:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=102867 Change 102867 by jhb@jhb_mutex on 2006/07/31 18:05:32 Consistently use bad whitespace. Affected files ... .. //depot/projects/smpng/sys/sys/sysent.h#18 edit Differences ... ==== //depot/projects/smpng/sys/sys/sysent.h#18 (text+ko) ==== @@ -115,13 +115,13 @@ }; \ DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE) -#define SYSCALL_MODULE_HELPER(syscallname) \ +#define SYSCALL_MODULE_HELPER(syscallname) \ static int syscallname##_syscall = SYS_##syscallname; \ static struct sysent syscallname##_sysent = { \ (sizeof(struct syscallname ## _args ) \ / sizeof(register_t)), \ - (sy_call_t *)& syscallname, \ - SYS_AUE_##syscallname \ + (sy_call_t *)& syscallname, \ + SYS_AUE_##syscallname \ }; \ SYSCALL_MODULE(syscallname, \ & syscallname##_syscall, & syscallname##_sysent, \ From owner-p4-projects@FreeBSD.ORG Mon Jul 31 19:06:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA41816A4E7; Mon, 31 Jul 2006 19:06:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABE6D16A4DE for ; Mon, 31 Jul 2006 19:06:43 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 388C143D88 for ; Mon, 31 Jul 2006 19:06:28 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6VJ6SkF060129 for ; Mon, 31 Jul 2006 19:06:28 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6VJ6RZ8060126 for perforce@freebsd.org; Mon, 31 Jul 2006 19:06:27 GMT (envelope-from bushman@freebsd.org) Date: Mon, 31 Jul 2006 19:06:27 GMT Message-Id: <200607311906.k6VJ6RZ8060126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 102872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 19:06:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=102872 Change 102872 by bushman@bushman_nss_ldap_cached on 2006/07/31 19:05:39 "passwd", "services" and "group" sources are fully implemented in terms of RFC2307 + several fixes Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.h#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.h#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#6 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#6 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#5 (text+ko) ==== @@ -65,14 +65,14 @@ rv = __nss_ldap_assign_attr_gid(sctx, _ATM(schema, GROUP, gidNumber), &grp->gr_gid); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; printf("==> %d %s\n", __LINE__, __FILE__); rv = __nss_ldap_assign_rdn_str(sctx, _ATM(schema, GROUP, cn), &grp->gr_name, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; @@ -81,7 +81,7 @@ rv = __nss_ldap_assign_attr_password(sctx, _ATM(schema, GROUP, userPassword), &grp->gr_passwd, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; @@ -90,17 +90,15 @@ rv = __nss_ldap_assign_attr_multi_str(sctx, _ATM(schema, GROUP, memberUid), &grp->gr_mem, &memlen, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; printf("%s %d\n", __FILE__, __LINE__); -fin: - return (0); errfin: - return (-1); + return (rv); /* if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS)) @@ -271,7 +269,7 @@ return (NS_UNAVAIL); rv = __nss_ldap_getent(NSS_LDAP_MAP_GROUP, filter, (void *)grp, - buffer, bufsize, nss_ldap_parse_group); + buffer, bufsize, nss_ldap_parse_group, NULL); if (rv == NS_SUCCESS) *result = grp; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.h#5 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#6 (text+ko) ==== @@ -52,6 +52,7 @@ char *buf; size_t buflen; size_t len; + time_t temp_time; int rv; assert(pctx != NULL); @@ -60,43 +61,45 @@ pwd = (struct passwd *)pctx->mdata; buf = pctx->buffer; buflen = pctx->bufsize; -/* >>>for debug only */ -// pwd = (struct passwd *)malloc(sizeof(struct passwd)); -// memset(pwd, 0, sizeof(struct passwd)); -// buf = malloc(1024); -// memset(buf, 0, 1024); -/* <<conf->schema; + + printf("here %s %d %p\n", __FILE__, __LINE__, (void *)sctx); + if ((__nss_ldap_check_oc(sctx, "shadowAccount") == NSS_LDAP_SUCCESS) + || (geteuid() != 0)) + rv = __nss_ldap_assign_str("*", &pwd->pw_dir, &len, buf, + buflen); + else + rv = __nss_ldap_assign_attr_password(sctx, + _ATM(schema, PASSWD, userPassword), + &pwd->pw_passwd, &len, buf, buflen); + + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + buflen -= len; + buf += len; printf("==> %d %s\n", __LINE__, __FILE__); rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, uid), &pwd->pw_name, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_uid(sctx, - _AT(schema, uidNumber), - &pwd->pw_uid); - if (rv != 0) - goto errfin; - printf("==> %d %s\n", __LINE__, __FILE__); rv = __nss_ldap_assign_attr_str(sctx, _AT(schema, gecos), &pwd->pw_gecos, &len, buf, buflen); - if (rv != 0) { + if (rv != NSS_LDAP_SUCCESS) { pwd->pw_gecos = NULL; rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, cn), &pwd->pw_gecos, &len, buf, buflen); } - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; @@ -105,10 +108,10 @@ rv = __nss_ldap_assign_attr_str(sctx, _AT(schema, homeDirectory), &pwd->pw_dir, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) rv = __nss_ldap_assign_str("", &pwd->pw_dir, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; @@ -117,19 +120,53 @@ rv = __nss_ldap_assign_attr_str(sctx, _AT(schema, loginShell), &pwd->pw_shell, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) rv = __nss_ldap_assign_str("", &pwd->pw_shell, &len, buf, buflen); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; -fin: - return (0); + printf("==> %d %s\n", __LINE__, __FILE__); + rv = __nss_ldap_assign_attr_uid(sctx, + _AT(schema, uidNumber), + &pwd->pw_uid); + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + + rv = __nss_ldap_assign_attr_gid(sctx, + _ATM(schema, PASSWD, gidNumber), + &pwd->pw_gid); + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + + rv = __nss_ldap_assign_attr_time(sctx, _AT(schema, shadowMax), + &pwd->pw_change); + if (rv == NSS_LDAP_SUCCESS) + pwd->pw_change *= 24*60*60; + else + pwd->pw_change = 0; + + if (pwd->pw_change > 0) { + rv = __nss_ldap_assign_attr_time(sctx, + _AT(schema, shadowLastChange), &temp_time); + if (rv == NSS_LDAP_SUCCESS) + pwd->pw_change += temp_time; + else + pwd->pw_change = 0; + } + + rv = __nss_ldap_assign_attr_time(sctx, _AT(schema, shadowExpire), + &pwd->pw_expire); + if (rv == NSS_LDAP_SUCCESS) + pwd->pw_expire *= 24*60*60; + else + pwd->pw_expire = 0; + rv = NS_SUCCESS; errfin: - return (-1); + return (rv); } int @@ -195,7 +232,7 @@ return (NS_UNAVAIL); rv = __nss_ldap_getent(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, - buffer, bufsize, nss_ldap_parse_passwd); + buffer, bufsize, nss_ldap_parse_passwd, NULL); if (rv == NS_SUCCESS) *result = pwd; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.h#6 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#2 (text+ko) ==== @@ -40,13 +40,32 @@ #include "ldapconf.h" #include "nss_ldap.h" -static int +#define NSS_LDAP_SERVICES_BY_KEY 0 +#define NSS_LDAP_SERVICES_ALL 1 + +struct services_mdata +{ + struct servent *serv; + char const *proto; + int type; +}; + +struct services_mdata_ext +{ + ssize_t offset; + size_t count; +}; + +static int nss_ldap_parse_servent(struct nss_ldap_parse_context *pctx) { struct nss_ldap_schema *schema; struct nss_ldap_search_context *sctx; + struct services_mdata *serv_mdata; + struct services_mdata_ext *serv_mdata_ext; + struct servent *serv; - char *buf; + char *buf, **values; size_t buflen; size_t len, memlen; int rv; @@ -54,52 +73,110 @@ assert(pctx != NULL); sctx = pctx->sctx; - serv = (struct servent *)pctx->mdata; + serv_mdata = (struct services_mdata *)pctx->mdata; + serv_mdata_ext = (struct services_mdata_ext *)pctx->mdata_ext; + + serv = serv_mdata->serv; buf = pctx->buffer; buflen = pctx->bufsize; schema = &sctx->conf->schema; + + if (serv_mdata->type == NSS_LDAP_SERVICES_BY_KEY) { + if (serv_mdata->proto != NULL) { + rv = __nss_ldap_assign_str(serv_mdata->proto, + &serv->s_proto, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + buflen -= len; + buf += len; + } else { + rv = __nss_ldap_assign_attr_str(sctx, + _AT(schema, ipServiceProtocol), + &serv->s_proto, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + buflen -= len; + buf += len; + } + } else { + if (serv_mdata_ext == NULL) { + serv_mdata_ext = (struct services_mdata_ext *)malloc( + sizeof(struct services_mdata_ext)); + assert(serv_mdata_ext != NULL); + + serv_mdata_ext->offset = -1; + serv_mdata_ext->count = 0; + + pctx->mdata_ext = serv_mdata_ext; + } + + if (serv_mdata_ext->offset == -1) { + rv = __nss_ldap_assign_attr_indexed_str(sctx, + _AT(schema, ipServiceProtocol), + serv_mdata_ext->offset, &serv_mdata_ext->count, + &serv->s_proto, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + + serv_mdata_ext->offset = 0; + } + + if (serv_mdata_ext->offset < serv_mdata_ext->count) { + rv = __nss_ldap_assign_attr_indexed_str(sctx, + _AT(schema, ipServiceProtocol), + serv_mdata_ext->offset, NULL, + &serv->s_proto, &len, buf, buflen); -/* printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_gid(sctx, - _ATM(schema, GROUP, gidNumber), - &grp->gr_gid); - if (rv != 0) - goto errfin; + if (++serv_mdata_ext->offset >= serv_mdata_ext->count) { + serv_mdata_ext->offset = -1; + serv_mdata_ext->count = 0; + pctx->need_no_more = 0; + } else + pctx->need_no_more = 1; + + buflen -= len; + buf += len; + } else { + /* this shouldn't happen, actually - that's why + * we're returning NSS_LDAP_GENERIC_ERROR instead + * of NSS_LDAP_PARSE_ERROR */ + rv = NSS_LDAP_GENERIC_ERROR; + goto errfin; + } + } - printf("==> %d %s\n", __LINE__, __FILE__); rv = __nss_ldap_assign_rdn_str(sctx, - _ATM(schema, GROUP, cn), - &grp->gr_name, &len, buf, buflen); - if (rv != 0) + _ATM(schema, SERVICES, cn), + &serv->s_name, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) goto errfin; - buflen -= len; - buf += len; - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_password(sctx, - _ATM(schema, GROUP, userPassword), - &grp->gr_passwd, &len, buf, buflen); - if (rv != 0) - goto errfin; buflen -= len; buf += len; - - printf("==> %d %s\n", __LINE__, __FILE__); + rv = __nss_ldap_assign_attr_multi_str(sctx, - _ATM(schema, GROUP, memberUid), - &grp->gr_mem, &memlen, &len, buf, buflen); - if (rv != 0) + _ATM(schema, SERVICES, cn), + &serv->s_aliases, &memlen, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) goto errfin; buflen -= len; buf += len; - printf("%s %d\n", __FILE__, __LINE__);*/ -fin: - return (0); + rv = __nss_ldap_assign_attr_int(sctx, + _AT(schema, ipServicePort), + &serv->s_port); errfin: - return (-1); + return (rv); +} + +static void +nss_ldap_destroy_servent(struct nss_ldap_parse_context *pctx) +{ + + assert(pctx != NULL); + free(pctx->mdata_ext); } int @@ -107,6 +184,7 @@ char *buffer, size_t bufsize, struct servent **result) { char filter[NSS_LDAP_FILTER_MAX_SIZE]; + struct services_mdata mdata; char const *fmt; int rv; @@ -121,9 +199,15 @@ else __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR_ANY, filter, sizeof(filter), name); + + memset(&mdata, 0, sizeof(struct services_mdata)); + mdata.serv = serv; + mdata.proto = proto; + mdata.type = NSS_LDAP_SERVICES_BY_KEY; - rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICE, filter, (void *)serv, - buffer, bufsize, nss_ldap_parse_servent); + rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, + (void *)&mdata, buffer, bufsize, + nss_ldap_parse_servent); if (rv == NS_SUCCESS) *result = serv; @@ -136,6 +220,7 @@ char *buffer, size_t bufsize, struct servent **result) { char filter[NSS_LDAP_FILTER_MAX_SIZE]; + struct services_mdata mdata; char const *fmt; int rv; @@ -151,8 +236,14 @@ __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_INT_ANY, filter, sizeof(filter), port); - rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICE, filter, (void *)serv, - buffer, bufsize, nss_ldap_parse_servent); + memset(&mdata, 0, sizeof(struct services_mdata)); + mdata.serv = serv; + mdata.proto = proto; + mdata.type = NSS_LDAP_SERVICES_BY_KEY; + + rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, + (void *)&mdata, buffer, bufsize, + nss_ldap_parse_servent); if (rv == NS_SUCCESS) *result = serv; @@ -164,6 +255,7 @@ ldap_getservent_r(struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { + struct services_mdata mdata; char const *filter; int rv; @@ -172,8 +264,13 @@ if (filter == NULL) return (NS_UNAVAIL); - rv = __nss_ldap_getent(NSS_LDAP_MAP_SERVICE, filter, (void *)serv, - buffer, bufsize, nss_ldap_parse_servent); + memset(&mdata, 0, sizeof(struct services_mdata)); + mdata.serv = serv; + mdata.type = NSS_LDAP_SERVICES_ALL; + + rv = __nss_ldap_getent(NSS_LDAP_MAP_SERVICES, filter, (void *)&mdata, + buffer, bufsize, nss_ldap_parse_servent, + nss_ldap_destroy_servent); if (rv == NS_SUCCESS) *result = serv; @@ -185,7 +282,7 @@ ldap_setservent() { - __nss_ldap_setent(NSS_LDAP_MAP_SERVICE); + __nss_ldap_setent(NSS_LDAP_MAP_SERVICES); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.h#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#6 (text+ko) ==== @@ -39,6 +39,7 @@ #include "ldapsearch.h" #include "ldaptls.h" #include "ldapconf.h" +#include "nss_ldap.h" #define NSS_BASE_PREFIX ("nss_base_") #define NSS_BASE_PREFIX_SIZE (9) @@ -74,13 +75,13 @@ res = strtol(str, &end, 10); if (*end != '\0') - return (-1); + return (NSS_LDAP_PARSE_ERROR); else if (((res >= low) || (low == -1)) && ((res <= max) || (max == -1))) return (res); else - return (-2); + return (NSS_LDAP_PARSE_ERROR); } static int @@ -90,7 +91,7 @@ int rv; left_arg = left_arg + NSS_BASE_PREFIX_SIZE; - rv = -1; + rv = NSS_LDAP_ARGS_ERROR; if (strcmp(left_arg, "passwd") == 0) rv = __nss_ldap_set_schema_filter_base(&conf->schema, @@ -98,9 +99,9 @@ else if (strcmp(left_arg, "group") == 0) rv = __nss_ldap_set_schema_filter_base(&conf->schema, NSS_LDAP_MAP_GROUP, right_arg); - else if (strcmp(left_arg, "service") == 0) + else if (strcmp(left_arg, "services") == 0) rv = __nss_ldap_set_schema_filter_base(&conf->schema, - NSS_LDAP_MAP_SERVICE, right_arg); + NSS_LDAP_MAP_SERVICES, right_arg); return (rv); } @@ -118,12 +119,12 @@ assert(arg2 != NULL); rv = __nss_ldap_init_rule(&rule, arg1, arg2); - if (rv != 0) - return (-1); + if (rv != NSS_LDAP_SUCCESS) + return (rv); rules_coll = __nss_ldap_get_schema_rules(&conf->schema, rule_id); if (rules_coll == NULL) - return (-1); + return (NSS_LDAP_GENERIC_ERROR); rv = __nss_ldap_add_rule(rules_coll, &rule); return (rv); @@ -175,9 +176,9 @@ printf("fname: %s %d\n", fname, conf->proto_version); fin = fopen(fname, "r"); if (fin == NULL) - return (-1); + return (NSS_LDAP_GENERIC_ERROR); - res = 0; + res = NSS_LDAP_SUCCESS; line_num = 0; memset(buffer, 0, sizeof(buffer)); while ((res == 0) && (fgets(buffer, sizeof(buffer) - 1, fin) != NULL)) { @@ -238,7 +239,8 @@ * NSS_LDAP_PROTO_VERSION_3 constants here */ if (strcmp(fields[0], "ldap-version") == 0) { if ((field_count == 2) && - (value = get_number(fields[1], 2, 3) != -1)) { + (value = get_number(fields[1], 2, 3) == + NSS_LDAP_SUCCESS)) { conf->proto_version = value; continue; } @@ -250,35 +252,35 @@ NSS_BASE_PREFIX_SIZE) == 0) { if ((field_count == 2) && (set_base_map(conf, - fields[0], fields[1]) != -1)) + fields[0], fields[1]) == NSS_LDAP_SUCCESS)) continue; } else if (strcmp(fields[0], "nss_map_attribute") == 0) { if ((field_count == 3) && (set_schema_rule(conf, NSS_LDAP_SCHEMA_MAP_ATTRIBUTE_RULES, fields[1], - fields[2]) == 0)) + fields[2]) == NSS_LDAP_SUCCESS)) continue; } else if (strcmp(fields[0], "nss_map_objectclass") == 0) { if ((field_count == 3) && (set_schema_rule(conf, NSS_LDAP_SCHEMA_MAP_OBJECTCLASS_RULES, fields[1], - fields[2]) == 0)) + fields[2]) == NSS_LDAP_SUCCESS)) continue; } else if (strcmp(fields[0], "nss_default_attribute_value") == 0) { if ((field_count == 3) && (set_schema_rule(conf, NSS_LDAP_SCHEMA_DEFAULT_VALUE_RULES, fields[1], - fields[2]) == 0)) + fields[2]) == NSS_LDAP_SUCCESS)) continue; } else if (strcmp(fields[0], "nss_override_attribute_value") == 0) { if ((field_count == 3) && (set_schema_rule(conf, NSS_LDAP_SCHEMA_OVERRIDE_VALUE_RULES, fields[1], - fields[2]) == 0)) + fields[2]) == NSS_LDAP_SUCCESS)) continue; } break; @@ -286,7 +288,8 @@ printf("== %s, %d ==\n", __FILE__, __LINE__); if (strcmp(fields[0], "port") == 0) { if ((field_count == 2) && - (value = get_number(fields[1], 0, -1) != -1)) { + (value = get_number(fields[1], 0, -1) == + NSS_LDAP_SUCCESS)) { conf->port = value; continue; } @@ -324,7 +327,7 @@ break; } - res = -1; + res = NSS_LDAP_PARSE_ERROR; } fclose(fin); @@ -334,5 +337,13 @@ void __nss_ldap_destroy_config(struct nss_ldap_configuration *config) { + + assert(config != NULL); + free(config->host); + free(config->root_bind_dn); + free(config->bind_dn); + free(config->bind_pw); + + __nss_ldap_destroy_schema(&config->schema); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#6 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#6 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,7 @@ #include "ldaputil.h" #include "ldapconn.h" #include "ldapconf.h" +#include "nss_ldap.h" struct nss_ldap_connection * __nss_ldap_connect(struct nss_ldap_connection_method *method, @@ -157,8 +159,10 @@ conn->ld = (LDAP *)ldap_init(conf->host, conf->port); if (conn->ld == NULL) { - printf("--> %s %d\n", __FILE__, __LINE__); - // TODO: error handling here + snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_init() error: %s\n", strerror(errno) + ); + err->err_num = errno; free(conn); return (NULL); } @@ -179,14 +183,13 @@ rv = ldap_set_option(conn->ld, LDAP_OPT_PROTOCOL_VERSION, &ldap_version); if (rv != LDAP_SUCCESS) { - printf("--> %s %d %d %d %d\n", __FILE__, __LINE__, rv, LDAP_SUCCESS, ldap_version); - ldap_perror(conn->ld, "----->"); - // TODO: error checking + err->err_num = rv; + snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_set_option() error: %s\n", ldap_err2string(rv)); ldap_unbind(conn->ld); free(conn); return (NULL); } - return (conn); } @@ -227,10 +230,11 @@ /* If the returned message ID is less than zero, an error occurred. */ if ( msgid < 0 ) { /* NOTE: can't use ldap_result2error here */ - err->err_num = msgid; - strlcpy(err->description, ldap_err2string(rc), - sizeof(err->description)); - return (-1); + err->err_num = ldap_result2error(conn->ld, res, 0); + snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_simple_bind() error: %s\n", + ldap_err2string(err->err_num)); + return (NSS_LDAP_CONNECTION_ERROR); } /* Check to see if the bind operation completed. */ @@ -240,9 +244,10 @@ /* If ldap_result() returns -1, error occurred. */ case -1: err->err_num = ldap_result2error(conn->ld, res, 0); - strlcpy(err->description, ldap_err2string(rc), - sizeof(err->description)); - return (-1); + snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_result() error: %s\n", + ldap_err2string(err->err_num)); + return (NSS_LDAP_CONNECTION_ERROR); /* If ldap_result() returns 0, the timeout (specified by the timeout argument) has been exceeded before the client received @@ -262,54 +267,52 @@ parse_rc = ldap_parse_result( conn->ld, res, &rc, &matched_msg, &error_msg, &referrals, &serverctrls, 1 ); + /* TODO: probably don't need this, check */ if ( parse_rc != LDAP_SUCCESS ) { err->err_num = parse_rc; - strlcpy(err->description, ldap_err2string(rc), - sizeof(err->description)); - return (-1); + snprintf(err->description, + NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_parse_result() error: %s\n", + ldap_err2string(parse_rc)); + return (NSS_LDAP_CONNECTION_ERROR); } /* Check the results of the operation. */ - if ( rc != LDAP_SUCCESS ) { - err->err_num = rc; - strlcpy(err->description, ldap_err2string(rc), - sizeof(err->description)); + if (rc != LDAP_SUCCESS) { + err->err_num = rc; + /* If an entry specified by a DN could not be + found, the server may also return the portion + of the DN that identifies an existing entry. + (See "Receiving the Portion of the DN Matching + an Entry" for an explanation.) */ + snprintf(err->description, + NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_parse_result() error: %s, " + "(server response: %s) " + "(matched msg: %s)\n", + ldap_err2string(rc), + (error_msg != NULL && *error_msg != '\0') ? + error_msg : "[unknown]", + (matched_msg != NULL && *matched_msg != '\0') ? + matched_msg : "[unknown]" + ); - /* If the server sent an additional error message, - print it out. */ - if ( error_msg != NULL && *error_msg != '\0' ) { - strlcat(err->description, ", ", - sizeof(err->description)); - strlcat(err->description, error_msg, - sizeof(err->description)); - } - - /* If an entry specified by a DN could not be found, - the server may also return the portion of the DN - that identifies an existing entry. - (See"Receiving the Portion of the DN Matching an Entry" - for an explanation.) */ - if ( matched_msg != NULL && *matched_msg != '\0' ) { - strlcat(err->description, - ", matched part:", - sizeof(err->description)); - strlcat(err->description, matched_msg, - sizeof(err->description)); - } - return (-1); + return (NSS_LDAP_CONNECTION_ERROR); } else - return (0); + return (NSS_LDAP_SUCCESS); break; - } + } } + + /* UNREACHABLE */ + return (NSS_LDAP_CONNECTION_ERROR); } int __nss_ldap_simple_disconnect(struct nss_ldap_connection *conn, struct nss_ldap_configuration *conf, struct nss_ldap_connection_error *err) -{ - +{ int rv; assert(conn != NULL); @@ -318,11 +321,14 @@ rv = ldap_unbind(conn->ld); if (rv != LDAP_SUCCESS) { - //TODO: error checking - return (-1); + err->err_num = rv; + snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_result() error: %s\n", + ldap_err2string(err->err_num)); + return (NSS_LDAP_CONNECTION_ERROR); } - return (0); + return (NSS_LDAP_SUCCESS); } int @@ -336,7 +342,7 @@ method->auth_fn = __nss_ldap_simple_auth; method->disconnect_fn = __nss_ldap_simple_disconnect; - return (0); + return (NSS_LDAP_SUCCESS); } #endif @@ -345,7 +351,7 @@ __nss_ldap_init_ssl_auth_method(struct nss_ldap_connection_method *method) { - return (0); + return (NSS_LDAP_SUCCESS); } #endif @@ -363,7 +369,10 @@ rv = ldap_start_tls_s(conn->ld, NULL, NULL); if (rv != LDAP_SUCCESS) { - /* TODO: error checking */ + err->err_num = rv; + snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, + "ldap_start_tls_s() error: %s\n", + ldap_err2string(err->err_num)); __nss_ldap_simple_disconnect(conn, conf, err); return (NULL); } @@ -379,12 +388,12 @@ assert(method != NULL); rv = __nss_ldap_init_simple_auth_method(method); - if (rv != 0) + if (rv != NSS_LDAP_SUCCESS) return (rv); /* Replacing standard connect routine with start-tls specific */ method->connect_fn = __nss_ldap_start_tls_connect; - return (0); + return (NSS_LDAP_SUCCESS); } #endif ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#6 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#6 (text+ko) ==== @@ -28,10 +28,14 @@ #include __FBSDID("$FreeBSD$"); +#include #include +#include #include #include #include "ldapschema.h" +#include "ldapsearch.h" +#include "nss_ldap.h" static void init_schema_common(struct nss_ldap_schema *); @@ -129,21 +133,21 @@ snprintf(schema->filters[NSS_LDAP_FILTER_GETSERVBYNAME], NSS_LDAP_FILTER_MAX_SIZE, "(&(objectclass=%s)(%s=%s)(%s=%s))", - _OC(schema, ipServices), _ATM(schema, SERVICES, cn), "%s", + _OC(schema, ipService), _ATM(schema, SERVICES, cn), "%s", _AT(schema, ipServiceProtocol), "%s"); snprintf(schema->filters[NSS_LDAP_FILTER_GETSERVBYPORT], NSS_LDAP_FILTER_MAX_SIZE, "(&(objectclass=%s)(%s=%s)(%s=%s))", - _OC(schema, ipServices), _AT(schema, ipServicePort), "%d", + _OC(schema, ipService), _AT(schema, ipServicePort), "%d", _AT(schema, ipServiceProtocol), "%s"); snprintf(schema->filters[NSS_LDAP_FILTER_GETSERVENT], NSS_LDAP_FILTER_MAX_SIZE, "(objectclass=%s)", - _OC(schema, ipServices)); + _OC(schema, ipService)); } void -__nss_destroy_schema(struct nss_ldap_schema *schema) +__nss_ldap_destroy_schema(struct nss_ldap_schema *schema) { assert(schema != NULL); @@ -171,7 +175,7 @@ rule->right_arg = strdup(right_arg); assert(rule->right_arg != NULL); - return (0); + return (NSS_LDAP_SUCCESS); } void @@ -196,9 +200,9 @@ res = strlcpy(schema->filters[filter_id], filter_str, NSS_LDAP_FILTER_MAX_SIZE); if (res > NSS_LDAP_FILTER_MAX_SIZE - 1) - return (-1); + return (NSS_LDAP_BUFFER_ERROR); - return (0); + return (NSS_LDAP_SUCCESS); } char * @@ -224,9 +228,9 @@ res = strlcpy(schema->filter_bases[filter_base_id], filter_base_str, NSS_LDAP_FILTER_MAX_SIZE); if (res > NSS_LDAP_FILTER_MAX_SIZE - 1) - return (-1); + return (NSS_LDAP_BUFFER_ERROR); - return (0); + return (NSS_LDAP_SUCCESS); } char * @@ -255,7 +259,7 @@ assert(rules->rules != NULL); memset(rules, 0, sizeof(struct nss_ldap_schema_rule) * rules->rules_eff_size); - return (0); + return (NSS_LDAP_SUCCESS); } int @@ -287,7 +291,7 @@ memcpy(rules->rules + rules->rules_size, rule, sizeof(struct nss_ldap_schema_rule)); ++rules->rules_size; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 1 01:13:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B10B16A4E1; Tue, 1 Aug 2006 01:13:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C7E416A4DA for ; Tue, 1 Aug 2006 01:13:07 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA6EF43D45 for ; Tue, 1 Aug 2006 01:13:06 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k711D6Wt008184 for ; Tue, 1 Aug 2006 01:13:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k711D622008181 for perforce@freebsd.org; Tue, 1 Aug 2006 01:13:06 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 1 Aug 2006 01:13:06 GMT Message-Id: <200608010113.k711D622008181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 102887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 01:13:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102887 Change 102887 by kmacy@kmacy_storage:sun4v_work_stable on 2006/08/01 01:12:06 integrate latest to get working uipc_usrreq.c Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ufs/ufs/ufs_lookup.c#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_ktrace.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.109 2006/06/27 11:29:38 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.110 2006/07/31 15:31:43 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -483,15 +483,6 @@ ktr_submitrequest(curthread, req); } -/* - * Since the uio may not stay valid, we can not hand off this request to - * the thread and need to process it synchronously. However, we wish to - * keep the relative order of records in a trace file correct, so we - * do put this request on the queue (if it isn't empty) and then block. - * The ktrace thread waks us back up when it is time for this event to - * be posted and blocks until we have completed writing out the event - * and woken it back up. - */ void ktrgenio(fd, rw, uio, error) int fd; ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/uipc_usrreq.c#2 (text+ko) ==== @@ -31,8 +31,26 @@ * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 */ +/* + * UNIX Domain (Local) Sockets + * + * This is an implementation of UNIX (local) domain sockets. Each socket has + * an associated struct unpcb (UNIX protocol control block). Stream sockets + * may be connected to 0 or 1 other socket. Datagram sockets may be + * connected to 0, 1, or many other sockets. Sockets may be created and + * connected in pairs (socketpair(2)), or bound/connected to using the file + * system name space. For most purposes, only the receive socket buffer is + * used, as sending on one socket delivers directly to the receive socket + * buffer of a second socket. The implementation is substantially + * complicated by the fact that "ancillary data", such as file descriptors or + * credentials, may be passed across UNIX domain sockets. The potential for + * passing UNIX domain sockets over other UNIX domain sockets requires the + * implementation of a simple garbage collector to find and tear down cycles + * of disconnected sockets. + */ + #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.167 2006/04/24 19:09:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.183 2006/07/31 23:00:05 rwatson Exp $"); #include "opt_mac.h" @@ -88,6 +106,38 @@ struct mbuf *unp_addsockcred(struct thread *, struct mbuf *); /* + * Both send and receive buffers are allocated PIPSIZ bytes of buffering for + * stream sockets, although the total for sender and receiver is actually + * only PIPSIZ. + * + * Datagram sockets really use the sendspace as the maximum datagram size, + * and don't really want to reserve the sendspace. Their recvspace should be + * large enough for at least one max-size datagram plus address. + */ +#ifndef PIPSIZ +#define PIPSIZ 8192 +#endif +static u_long unpst_sendspace = PIPSIZ; +static u_long unpst_recvspace = PIPSIZ; +static u_long unpdg_sendspace = 2*1024; /* really max datagram size */ +static u_long unpdg_recvspace = 4*1024; + +static int unp_rights; /* file descriptors in flight */ + +SYSCTL_DECL(_net_local_stream); +SYSCTL_ULONG(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW, + &unpst_sendspace, 0, ""); +SYSCTL_ULONG(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW, + &unpst_recvspace, 0, ""); +SYSCTL_DECL(_net_local_dgram); +SYSCTL_ULONG(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW, + &unpdg_sendspace, 0, ""); +SYSCTL_ULONG(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW, + &unpdg_recvspace, 0, ""); +SYSCTL_DECL(_net_local); +SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, ""); + +/* * Currently, UNIX domain sockets are protected by a single subsystem lock, * which covers global data structures and variables, the contents of each * per-socket unpcb structure, and the so_pcb field in sockets attached to @@ -123,9 +173,6 @@ */ static struct task unp_gc_task; -static int unp_attach(struct socket *); -static void unp_detach(struct unpcb *); -static int unp_bind(struct unpcb *,struct sockaddr *, struct thread *); static int unp_connect(struct socket *,struct sockaddr *, struct thread *); static int unp_connect2(struct socket *so, struct socket *so2, int); static void unp_disconnect(struct unpcb *); @@ -149,8 +196,7 @@ KASSERT(unp != NULL, ("uipc_abort: unp == NULL")); UNP_LOCK(); unp_drop(unp, ECONNABORTED); - unp_detach(unp); - UNP_UNLOCK_ASSERT(); + UNP_UNLOCK(); } static int @@ -160,9 +206,8 @@ const struct sockaddr *sa; /* - * Pass back name of connected socket, - * if it was bound and we are still connected - * (our peer may have closed already!). + * Pass back name of connected socket, if it was bound and we are + * still connected (our peer may have closed already!). */ unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_accept: unp == NULL")); @@ -180,39 +225,181 @@ static int uipc_attach(struct socket *so, int proto, struct thread *td) { + struct unpcb *unp; + int error; + + KASSERT(so->so_pcb == NULL, ("uipc_attach: so_pcb != NULL")); + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + switch (so->so_type) { + + case SOCK_STREAM: + error = soreserve(so, unpst_sendspace, unpst_recvspace); + break; + + case SOCK_DGRAM: + error = soreserve(so, unpdg_sendspace, unpdg_recvspace); + break; + + default: + panic("unp_attach"); + } + if (error) + return (error); + } + unp = uma_zalloc(unp_zone, M_WAITOK | M_ZERO); + if (unp == NULL) + return (ENOBUFS); + LIST_INIT(&unp->unp_refs); + unp->unp_socket = so; + so->so_pcb = unp; + + UNP_LOCK(); + unp->unp_gencnt = ++unp_gencnt; + unp_count++; + LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead + : &unp_shead, unp, unp_link); + UNP_UNLOCK(); - return (unp_attach(so)); + return (0); } static int uipc_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { + struct sockaddr_un *soun = (struct sockaddr_un *)nam; + struct vattr vattr; + int error, namelen; + struct nameidata nd; struct unpcb *unp; - int error; + struct vnode *vp; + struct mount *mp; + char *buf; unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_bind: unp == NULL")); + + namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path); + if (namelen <= 0) + return (EINVAL); + + /* + * We don't allow simultaneous bind() calls on a single UNIX domain + * socket, so flag in-progress operations, and return an error if an + * operation is already in progress. + * + * Historically, we have not allowed a socket to be rebound, so this + * also returns an error. Not allowing re-binding certainly + * simplifies the implementation and avoids a great many possible + * failure modes. + */ UNP_LOCK(); - error = unp_bind(unp, nam, td); + if (unp->unp_vnode != NULL) { + UNP_UNLOCK(); + return (EINVAL); + } + if (unp->unp_flags & UNP_BINDING) { + UNP_UNLOCK(); + return (EALREADY); + } + unp->unp_flags |= UNP_BINDING; + UNP_UNLOCK(); + + buf = malloc(namelen + 1, M_TEMP, M_WAITOK); + strlcpy(buf, soun->sun_path, namelen + 1); + + mtx_lock(&Giant); +restart: + mtx_assert(&Giant, MA_OWNED); + NDINIT(&nd, CREATE, NOFOLLOW | LOCKPARENT | SAVENAME, UIO_SYSSPACE, + buf, td); +/* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */ + error = namei(&nd); + if (error) + goto error; + vp = nd.ni_vp; + if (vp != NULL || vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { + NDFREE(&nd, NDF_ONLY_PNBUF); + if (nd.ni_dvp == vp) + vrele(nd.ni_dvp); + else + vput(nd.ni_dvp); + if (vp != NULL) { + vrele(vp); + error = EADDRINUSE; + goto error; + } + error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH); + if (error) + goto error; + goto restart; + } + VATTR_NULL(&vattr); + vattr.va_type = VSOCK; + vattr.va_mode = (ACCESSPERMS & ~td->td_proc->p_fd->fd_cmask); +#ifdef MAC + error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + &vattr); +#endif + if (error == 0) { + VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + } + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(nd.ni_dvp); + if (error) { + vn_finished_write(mp); + goto error; + } + vp = nd.ni_vp; + ASSERT_VOP_LOCKED(vp, "uipc_bind"); + soun = (struct sockaddr_un *)sodupsockaddr(nam, M_WAITOK); + UNP_LOCK(); + vp->v_socket = unp->unp_socket; + unp->unp_vnode = vp; + unp->unp_addr = soun; + unp->unp_flags &= ~UNP_BINDING; + UNP_UNLOCK(); + VOP_UNLOCK(vp, 0, td); + vn_finished_write(mp); + mtx_unlock(&Giant); + free(buf, M_TEMP); + return (0); +error: + UNP_LOCK(); + unp->unp_flags &= ~UNP_BINDING; UNP_UNLOCK(); + mtx_unlock(&Giant); + free(buf, M_TEMP); return (error); } static int uipc_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - struct unpcb *unp; int error; KASSERT(td == curthread, ("uipc_connect: td != curthread")); - unp = sotounpcb(so); - KASSERT(unp != NULL, ("uipc_connect: unp == NULL")); UNP_LOCK(); error = unp_connect(so, nam, td); UNP_UNLOCK(); return (error); } +/* + * XXXRW: Should also unbind? + */ +static void +uipc_close(struct socket *so) +{ + struct unpcb *unp; + + unp = sotounpcb(so); + KASSERT(unp != NULL, ("uipc_close: unp == NULL")); + UNP_LOCK(); + unp_disconnect(unp); + UNP_UNLOCK(); +} + int uipc_connect2(struct socket *so1, struct socket *so2) { @@ -232,13 +419,45 @@ static void uipc_detach(struct socket *so) { + int local_unp_rights; struct unpcb *unp; + struct vnode *vp; unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_detach: unp == NULL")); UNP_LOCK(); - unp_detach(unp); - UNP_UNLOCK_ASSERT(); + LIST_REMOVE(unp, unp_link); + unp->unp_gencnt = ++unp_gencnt; + --unp_count; + if ((vp = unp->unp_vnode) != NULL) { + /* + * XXXRW: should v_socket be frobbed only while holding + * Giant? + */ + unp->unp_vnode->v_socket = NULL; + unp->unp_vnode = NULL; + } + if (unp->unp_conn != NULL) + unp_disconnect(unp); + while (!LIST_EMPTY(&unp->unp_refs)) { + struct unpcb *ref = LIST_FIRST(&unp->unp_refs); + unp_drop(ref, ECONNRESET); + } + unp->unp_socket->so_pcb = NULL; + local_unp_rights = unp_rights; + UNP_UNLOCK(); + if (unp->unp_addr != NULL) + FREE(unp->unp_addr, M_SONAME); + uma_zfree(unp_zone, unp); + if (vp) { + int vfslocked; + + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + vrele(vp); + VFS_UNLOCK_GIANT(vfslocked); + } + if (local_unp_rights) + taskqueue_enqueue(taskqueue_thread, &unp_gc_task); } static int @@ -302,41 +521,45 @@ { struct unpcb *unp; struct socket *so2; + u_int mbcnt, sbcc; u_long newhiwat; unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_rcvd: unp == NULL")); - UNP_LOCK(); switch (so->so_type) { case SOCK_DGRAM: panic("uipc_rcvd DGRAM?"); /*NOTREACHED*/ case SOCK_STREAM: - if (unp->unp_conn == NULL) + /* + * Adjust backpressure on sender and wakeup any waiting to + * write. + */ + SOCKBUF_LOCK(&so->so_rcv); + mbcnt = so->so_rcv.sb_mbcnt; + sbcc = so->so_rcv.sb_cc; + SOCKBUF_UNLOCK(&so->so_rcv); + UNP_LOCK(); + if (unp->unp_conn == NULL) { + UNP_UNLOCK(); break; + } so2 = unp->unp_conn->unp_socket; SOCKBUF_LOCK(&so2->so_snd); - SOCKBUF_LOCK(&so->so_rcv); - /* - * Adjust backpressure on sender - * and wakeup any waiting to write. - */ - so2->so_snd.sb_mbmax += unp->unp_mbcnt - so->so_rcv.sb_mbcnt; - unp->unp_mbcnt = so->so_rcv.sb_mbcnt; - newhiwat = so2->so_snd.sb_hiwat + unp->unp_cc - - so->so_rcv.sb_cc; + so2->so_snd.sb_mbmax += unp->unp_mbcnt - mbcnt; + newhiwat = so2->so_snd.sb_hiwat + unp->unp_cc - sbcc; (void)chgsbsize(so2->so_cred->cr_uidinfo, &so2->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); - unp->unp_cc = so->so_rcv.sb_cc; - SOCKBUF_UNLOCK(&so->so_rcv); sowwakeup_locked(so2); + unp->unp_mbcnt = mbcnt; + unp->unp_cc = sbcc; + UNP_UNLOCK(); break; default: panic("uipc_rcvd unknown socktype"); } - UNP_UNLOCK(); return (0); } @@ -346,10 +569,11 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - int error = 0; - struct unpcb *unp; + struct unpcb *unp, *unp2; struct socket *so2; + u_int mbcnt, sbcc; u_long newhiwat; + int error = 0; unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_send: unp == NULL")); @@ -381,12 +605,24 @@ break; } } - so2 = unp->unp_conn->unp_socket; + /* + * Because connect() and send() are non-atomic in a sendto() + * with a target address, it's possible that the socket will + * have disconnected before the send() can run. In that case + * return the slightly counter-intuitive but otherwise + * correct error that the socket is not connected. + */ + unp2 = unp->unp_conn; + if (unp2 == NULL) { + error = ENOTCONN; + break; + } + so2 = unp2->unp_socket; if (unp->unp_addr != NULL) from = (struct sockaddr *)unp->unp_addr; else from = &sun_noname; - if (unp->unp_conn->unp_flags & UNP_WANTCRED) + if (unp2->unp_flags & UNP_WANTCRED) control = unp_addsockcred(td, control); SOCKBUF_LOCK(&so2->so_rcv); if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { @@ -403,10 +639,11 @@ } case SOCK_STREAM: - /* Connect if not connected yet. */ /* - * Note: A better implementation would complain - * if not equal to the peer's address. + * Connect if not connected yet. + * + * Note: A better implementation would complain if not equal + * to the peer's address. */ if ((so->so_state & SS_ISCONNECTED) == 0) { if (nam != NULL) { @@ -419,28 +656,36 @@ } } - SOCKBUF_LOCK(&so->so_snd); + /* Lockless read. */ if (so->so_snd.sb_state & SBS_CANTSENDMORE) { - SOCKBUF_UNLOCK(&so->so_snd); error = EPIPE; break; } - if (unp->unp_conn == NULL) - panic("uipc_send connected but no connection?"); - so2 = unp->unp_conn->unp_socket; + /* + * Because connect() and send() are non-atomic in a sendto() + * with a target address, it's possible that the socket will + * have disconnected before the send() can run. In that case + * return the slightly counter-intuitive but otherwise + * correct error that the socket is not connected. + */ + unp2 = unp->unp_conn; + if (unp2 == NULL) { + error = ENOTCONN; + break; + } + so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); - if (unp->unp_conn->unp_flags & UNP_WANTCRED) { + if (unp2->unp_flags & UNP_WANTCRED) { /* * Credentials are passed only once on * SOCK_STREAM. */ - unp->unp_conn->unp_flags &= ~UNP_WANTCRED; + unp2->unp_flags &= ~UNP_WANTCRED; control = unp_addsockcred(td, control); } /* - * Send to paired receive port, and then reduce - * send buffer hiwater marks to maintain backpressure. - * Wake up readers. + * Send to paired receive port, and then reduce send buffer + * hiwater marks to maintain backpressure. Wake up readers. */ if (control != NULL) { if (sbappendcontrol_locked(&so2->so_rcv, m, control)) @@ -448,16 +693,19 @@ } else { sbappend_locked(&so2->so_rcv, m); } - so->so_snd.sb_mbmax -= - so2->so_rcv.sb_mbcnt - unp->unp_conn->unp_mbcnt; - unp->unp_conn->unp_mbcnt = so2->so_rcv.sb_mbcnt; - newhiwat = so->so_snd.sb_hiwat - - (so2->so_rcv.sb_cc - unp->unp_conn->unp_cc); + mbcnt = so2->so_rcv.sb_mbcnt - unp2->unp_mbcnt; + unp2->unp_mbcnt = so2->so_rcv.sb_mbcnt; + sbcc = so2->so_rcv.sb_cc; + sorwakeup_locked(so2); + + SOCKBUF_LOCK(&so->so_snd); + newhiwat = so->so_snd.sb_hiwat - (sbcc - unp2->unp_cc); (void)chgsbsize(so->so_cred->cr_uidinfo, &so->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); + so->so_snd.sb_mbmax -= mbcnt; SOCKBUF_UNLOCK(&so->so_snd); - unp->unp_conn->unp_cc = so2->so_rcv.sb_cc; - sorwakeup_locked(so2); + + unp2->unp_cc = sbcc; m = NULL; break; @@ -557,9 +805,10 @@ .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, - .pru_sosend = sosend, - .pru_soreceive = soreceive, - .pru_sopoll = sopoll, + .pru_sosend = sosend_generic, + .pru_soreceive = soreceive_generic, + .pru_sopoll = sopoll_generic, + .pru_close = uipc_close, }; int @@ -644,212 +893,6 @@ return (error); } -/* - * Both send and receive buffers are allocated PIPSIZ bytes of buffering - * for stream sockets, although the total for sender and receiver is - * actually only PIPSIZ. - * Datagram sockets really use the sendspace as the maximum datagram size, - * and don't really want to reserve the sendspace. Their recvspace should - * be large enough for at least one max-size datagram plus address. - */ -#ifndef PIPSIZ -#define PIPSIZ 8192 -#endif -static u_long unpst_sendspace = PIPSIZ; -static u_long unpst_recvspace = PIPSIZ; -static u_long unpdg_sendspace = 2*1024; /* really max datagram size */ -static u_long unpdg_recvspace = 4*1024; - -static int unp_rights; /* file descriptors in flight */ - -SYSCTL_DECL(_net_local_stream); -SYSCTL_ULONG(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW, - &unpst_sendspace, 0, ""); -SYSCTL_ULONG(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW, - &unpst_recvspace, 0, ""); -SYSCTL_DECL(_net_local_dgram); -SYSCTL_ULONG(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW, - &unpdg_sendspace, 0, ""); -SYSCTL_ULONG(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW, - &unpdg_recvspace, 0, ""); -SYSCTL_DECL(_net_local); -SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, ""); - -static int -unp_attach(struct socket *so) -{ - struct unpcb *unp; - int error; - - KASSERT(so->so_pcb == NULL, ("unp_attach: so_pcb != NULL")); - if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { - switch (so->so_type) { - - case SOCK_STREAM: - error = soreserve(so, unpst_sendspace, unpst_recvspace); - break; - - case SOCK_DGRAM: - error = soreserve(so, unpdg_sendspace, unpdg_recvspace); - break; - - default: - panic("unp_attach"); - } - if (error) - return (error); - } - unp = uma_zalloc(unp_zone, M_WAITOK | M_ZERO); - if (unp == NULL) - return (ENOBUFS); - LIST_INIT(&unp->unp_refs); - unp->unp_socket = so; - so->so_pcb = unp; - - UNP_LOCK(); - unp->unp_gencnt = ++unp_gencnt; - unp_count++; - LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead - : &unp_shead, unp, unp_link); - UNP_UNLOCK(); - - return (0); -} - -static void -unp_detach(struct unpcb *unp) -{ - struct vnode *vp; - int local_unp_rights; - - UNP_LOCK_ASSERT(); - - LIST_REMOVE(unp, unp_link); - unp->unp_gencnt = ++unp_gencnt; - --unp_count; - if ((vp = unp->unp_vnode) != NULL) { - /* - * XXXRW: should v_socket be frobbed only while holding - * Giant? - */ - unp->unp_vnode->v_socket = NULL; - unp->unp_vnode = NULL; - } - if (unp->unp_conn != NULL) - unp_disconnect(unp); - while (!LIST_EMPTY(&unp->unp_refs)) { - struct unpcb *ref = LIST_FIRST(&unp->unp_refs); - unp_drop(ref, ECONNRESET); - } - soisdisconnected(unp->unp_socket); - unp->unp_socket->so_pcb = NULL; - local_unp_rights = unp_rights; - UNP_UNLOCK(); - if (unp->unp_addr != NULL) - FREE(unp->unp_addr, M_SONAME); - uma_zfree(unp_zone, unp); - if (vp) { - int vfslocked; - - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vrele(vp); - VFS_UNLOCK_GIANT(vfslocked); - } - if (local_unp_rights) - taskqueue_enqueue(taskqueue_thread, &unp_gc_task); -} - -static int -unp_bind(struct unpcb *unp, struct sockaddr *nam, struct thread *td) -{ - struct sockaddr_un *soun = (struct sockaddr_un *)nam; - struct vnode *vp; - struct mount *mp; - struct vattr vattr; - int error, namelen; - struct nameidata nd; - char *buf; - - UNP_LOCK_ASSERT(); - - /* - * XXXRW: This test-and-set of unp_vnode is non-atomic; the - * unlocked read here is fine, but the value of unp_vnode needs - * to be tested again after we do all the lookups to see if the - * pcb is still unbound? - */ - if (unp->unp_vnode != NULL) - return (EINVAL); - - namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path); - if (namelen <= 0) - return (EINVAL); - - UNP_UNLOCK(); - - buf = malloc(namelen + 1, M_TEMP, M_WAITOK); - strlcpy(buf, soun->sun_path, namelen + 1); - - mtx_lock(&Giant); -restart: - mtx_assert(&Giant, MA_OWNED); - NDINIT(&nd, CREATE, NOFOLLOW | LOCKPARENT | SAVENAME, UIO_SYSSPACE, - buf, td); -/* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */ - error = namei(&nd); - if (error) - goto done; - vp = nd.ni_vp; - if (vp != NULL || vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { - NDFREE(&nd, NDF_ONLY_PNBUF); - if (nd.ni_dvp == vp) - vrele(nd.ni_dvp); - else - vput(nd.ni_dvp); - if (vp != NULL) { - vrele(vp); - error = EADDRINUSE; - goto done; - } - error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH); - if (error) - goto done; - goto restart; - } - VATTR_NULL(&vattr); - vattr.va_type = VSOCK; - vattr.va_mode = (ACCESSPERMS & ~td->td_proc->p_fd->fd_cmask); -#ifdef MAC - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, - &vattr); -#endif - if (error == 0) { - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); - } - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(nd.ni_dvp); - if (error) { - vn_finished_write(mp); - goto done; - } - vp = nd.ni_vp; - ASSERT_VOP_LOCKED(vp, "unp_bind"); - soun = (struct sockaddr_un *)sodupsockaddr(nam, M_WAITOK); - UNP_LOCK(); - vp->v_socket = unp->unp_socket; - unp->unp_vnode = vp; - unp->unp_addr = soun; - UNP_UNLOCK(); - VOP_UNLOCK(vp, 0, td); - vn_finished_write(mp); -done: - mtx_unlock(&Giant); - free(buf, M_TEMP); - UNP_LOCK(); - return (error); -} - static int unp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { @@ -870,6 +913,10 @@ if (len <= 0) return (EINVAL); strlcpy(buf, soun->sun_path, len + 1); + if (unp->unp_flags & UNP_CONNECTING) { + UNP_UNLOCK(); + return (EALREADY); + } UNP_UNLOCK(); sa = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); mtx_lock(&Giant); @@ -907,10 +954,10 @@ if (so->so_proto->pr_flags & PR_CONNREQUIRED) { if (so2->so_options & SO_ACCEPTCONN) { /* - * NB: drop locks here so unp_attach is entered - * w/o locks; this avoids a recursive lock - * of the head and holding sleep locks across - * a (potentially) blocking malloc. + * NB: drop locks here so unp_attach is entered w/o + * locks; this avoids a recursive lock of the head + * and holding sleep locks across a (potentially) + * blocking malloc. */ UNP_UNLOCK(); so3 = sonewconn(so2, 0); @@ -932,18 +979,16 @@ /* * unp_peercred management: * - * The connecter's (client's) credentials are copied - * from its process structure at the time of connect() - * (which is now). + * The connecter's (client's) credentials are copied from its + * process structure at the time of connect() (which is now). */ cru2x(td->td_ucred, &unp3->unp_peercred); unp3->unp_flags |= UNP_HAVEPC; /* - * The receiver's (server's) credentials are copied - * from the unp_peercred member of socket on which the - * former called listen(); unp_listen() cached that - * process's credentials at that time so we can use - * them now. + * The receiver's (server's) credentials are copied from the + * unp_peercred member of socket on which the former called + * listen(); unp_listen() cached that process's credentials + * at that time so we can use them now. */ KASSERT(unp2->unp_flags & UNP_HAVEPCCACHED, ("unp_connect: listener without cached peercred")); @@ -972,6 +1017,7 @@ mtx_unlock(&Giant); free(sa, M_SONAME); UNP_LOCK(); + unp->unp_flags &= ~UNP_CONNECTING; return (error); } @@ -1039,21 +1085,11 @@ } } -#ifdef notdef -void -unp_abort(struct unpcb *unp) -{ - - unp_detach(unp); - UNP_UNLOCK_ASSERT(); -} -#endif - /* - * unp_pcblist() assumes that UNIX domain socket memory is never reclaimed - * by the zone (UMA_ZONE_NOFREE), and as such potentially stale pointers - * are safe to reference. It first scans the list of struct unpcb's to - * generate a pointer list, then it rescans its list one entry at a time to + * unp_pcblist() assumes that UNIX domain socket memory is never reclaimed by + * the zone (UMA_ZONE_NOFREE), and as such potentially stale pointers are + * safe to reference. It first scans the list of struct unpcb's to generate + * a pointer list, then it rescans its list one entry at a time to * externalize and copyout. It checks the generation number to see if a * struct unpcb has been reused, and will skip it if so. */ @@ -1115,7 +1151,7 @@ } } UNP_UNLOCK(); - n = i; /* in case we lost some during malloc */ + n = i; /* In case we lost some during malloc. */ error = 0; xu = malloc(sizeof(*xu), M_TEMP, M_WAITOK | M_ZERO); @@ -1144,11 +1180,10 @@ free(xu, M_TEMP); if (!error) { /* - * Give the user an updated idea of our state. - * If the generation differs from what we told - * her before, she knows that something happened - * while we were processing this request, and it - * might be necessary to retry. + * Give the user an updated idea of our state. If the + * generation differs from what we told her before, she knows + * that something happened while we were processing this + * request, and it might be necessary to retry. */ xug->xug_gen = unp_gencnt; xug->xug_sogen = so_gencnt; @@ -1190,14 +1225,6 @@ unp_disconnect(unp); } -#ifdef notdef -void -unp_drain(void) -{ - -} -#endif - static void unp_freerights(struct file **rp, int fdcount) { @@ -1207,9 +1234,8 @@ for (i = 0; i < fdcount; i++) { fp = *rp; /* - * zero the pointer before calling - * unp_discard since it may end up - * in unp_gc().. + * Zero the pointer before calling unp_discard since it may + * end up in unp_gc().. * * XXXRW: This is less true than it used to be. */ @@ -1267,10 +1293,10 @@ goto next; } /* - * now change each pointer to an fd in the global - * table to an integer that is the index to the - * local fd table entry that we set up to point - * to the global one we are transferring. + * Now change each pointer to an fd in the global + * table to an integer that is the index to the local + * fd table entry that we set up to point to the + * global one we are transferring. */ newlen = newfds * sizeof(int); *controlp = sbcreatecontrol(NULL, newlen, @@ -1296,7 +1322,8 @@ *fdp++ = f; } FILEDESC_UNLOCK(td->td_proc->p_fd); - } else { /* We can just copy anything else across */ + } else { + /* We can just copy anything else across. */ if (error || controlp == NULL) goto next; *controlp = sbcreatecontrol(NULL, datalen, @@ -1338,6 +1365,7 @@ void unp_init(void) { + unp_zone = uma_zcreate("unpcb", sizeof(struct unpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); if (unp_zone == NULL) @@ -1411,8 +1439,8 @@ case SCM_RIGHTS: oldfds = datalen / sizeof (int); /* - * check that all the FDs passed in refer to legal files - * If not, reject the entire operation. + * Check that all the FDs passed in refer to legal + * files. If not, reject the entire operation. */ fdp = data; FILEDESC_LOCK(fdescp); @@ -1433,8 +1461,8 @@ } /* - * Now replace the integer FDs with pointers to - * the associated global file table entry.. + * Now replace the integer FDs with pointers to the + * associated global file table entry.. */ newlen = oldfds * sizeof(struct file *); *controlp = sbcreatecontrol(NULL, newlen, @@ -1498,8 +1526,9 @@ struct mbuf * unp_addsockcred(struct thread *td, struct mbuf *control) { - struct mbuf *m, *n; + struct mbuf *m, *n, *n_prev; struct sockcred *sc; + const struct cmsghdr *cm; int ngroups; int i; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 1 05:33:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B969D16D6A7; Tue, 1 Aug 2006 05:32:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8743F16C619 for ; Tue, 1 Aug 2006 05:30:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4853043D49 for ; Tue, 1 Aug 2006 05:30:30 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k715UUfT034973 for ; Tue, 1 Aug 2006 05:30:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k715UTw0034970 for perforce@freebsd.org; Tue, 1 Aug 2006 05:30:29 GMT (envelope-from marcel@freebsd.org) Date: Tue, 1 Aug 2006 05:30:29 GMT Message-Id: <200608010530.k715UTw0034970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 05:33:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=102892 Change 102892 by marcel@marcel_nfs on 2006/08/01 05:30:06 Core/NG note types. Affected files ... .. //depot/projects/gdb/sys/sys/elf_common.h#4 edit Differences ... ==== //depot/projects/gdb/sys/sys/elf_common.h#4 (text+ko) ==== @@ -325,11 +325,18 @@ executable contains code using a static thread-local storage scheme. */ -/* Values for n_type. Used in core files. */ +/* Values for n_type. Used by 6.x and older core files. */ #define NT_PRSTATUS 1 /* Process status. */ #define NT_FPREGSET 2 /* Floating point registers. */ #define NT_PRPSINFO 3 /* Process state info. */ +/* Note types used by Core/NG (7.x and up). */ +#define _NT_CORE(x) ((ET_CORE << 16) | ((x) & 0xffff)) +#define NT_CORE_PROC _NT_CORE(0x0000) +#define NT_CORE_THREAD _NT_CORE(0x0001) +#define NT_CORE_KERNEL _NT_CORE(0x0100) +#define NT_CORE_CPU _NT_CORE(0x0101) + /* Symbol Binding - ELFNN_ST_BIND - st_info */ #define STB_LOCAL 0 /* Local symbol */ #define STB_GLOBAL 1 /* Global symbol */ From owner-p4-projects@FreeBSD.ORG Tue Aug 1 08:23:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D658216A4E0; Tue, 1 Aug 2006 08:23:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80CF416A4DD for ; Tue, 1 Aug 2006 08:23:15 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEAE943D5A for ; Tue, 1 Aug 2006 08:23:14 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k718NEFd047331 for ; Tue, 1 Aug 2006 08:23:14 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k718NEZg047328 for perforce@freebsd.org; Tue, 1 Aug 2006 08:23:14 GMT (envelope-from cdjones@FreeBSD.org) Date: Tue, 1 Aug 2006 08:23:14 GMT Message-Id: <200608010823.k718NEZg047328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 08:23:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=102900 Change 102900 by cdjones@cdjones-impulse on 2006/08/01 08:22:36 Memory limitation now works. Implementation: a kernel thread (per jail) checks to see whether the jail's RSS exceeds the jail's memory limit. If so, the kernel thread tries to page out 5% of each jailed process until the RSS is no longer over the memory limit. This could probably use tuning / more intelligence. Patch to go on wiki & note to mailing list for beta testers coming later today. Next up, scheduling. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#18 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#18 (text+ko) ==== @@ -128,13 +128,13 @@ struct proc *p; struct prison *pr; struct thread *td; - vm_pindex_t limit, size, usage; + long limit, cursize, newsize, usage; int breakout; pr = arg; printf("Starting jpager/%d with memory limit %ld bytes\n", - pr->pr_id, (long) prison_memory_limit(pr)); + pr->pr_id, (long) prison_memory_limit(pr)); for (;;) { if (pr->pr_pager_flags & J_PAGER_TD_DIE) @@ -144,8 +144,8 @@ * pushing back when we approach the limit, rather than * when we hit it. */ - limit = prison_memory_limit(pr); - usage = prison_memory(pr); + limit = (long) prison_memory_limit(pr); + usage = (long) prison_memory(pr); /* The logic from vm_daemon() really needs to go here. * Problem: we want to push things below their rlimits. @@ -153,13 +153,13 @@ * TODO: refactor vm_daemon to optionally act on specific jails? */ - printf("jthread/%d: memory %ld / %ld bytes\n", - pr->pr_id, (long) usage, (long) limit); + printf("jpager/%d: memory %ld / %ld bytes\n", + pr->pr_id, usage, limit); if ((usage - limit) > 0) { - printf("jthread/%d: overcommitted by %ld bytes (%d %%)\n", - pr->pr_id, (long) (usage - limit), - (int) (100 * (usage - limit) / limit)); + printf("jpager/%d: overcommitted by %ld bytes (%lf percent)\n", + pr->pr_id, usage - limit, + (double) 100 * ((double) (usage - limit) / (double) limit)); sx_slock(&allproc_lock); LIST_FOREACH(p, &allproc, p_list) { @@ -197,25 +197,28 @@ */ /* TODO: this arbitrarily reduces each process's space by - * one page (until it's completely swapped out) while + * 5% (until it's completely swapped out) while * we're under memory pressure. A better way would be * to either hit large processes first, or to hit the * least-active processes first, or go proportionally, - * .... + * or .... */ - size = vmspace_resident_count(p->p_vmspace) - 1; - if (size < 0) - size = 0; - printf("jpager_td: squeezing process %d to %ld\n", p->p_pid, (long) size); - vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, (long) size); - - sx_sunlock(&allproc_lock); + newsize = cursize = (long) vmspace_resident_count(p->p_vmspace); + newsize -= newsize / 20; + if (cursize < 0) + newsize = 0; + PROC_UNLOCK(p); + printf("jpager/%d: squeezing process %d from %ld to %ld\n", + pr->pr_id, p->p_pid, cursize, newsize); + vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, newsize); } /* end LIST_FOREACH procs */ + sx_sunlock(&allproc_lock); } /* TODO --- make interval into a sysctl. */ + /* 6 seconds because VM recomputes totals every 5. */ printf("jpager_td sleeping\n"); - tsleep(pr, 0, "-", 3 * hz); + tsleep(pr, 0, "-", 6 * hz); } printf("Exiting jpager_td\n"); From owner-p4-projects@FreeBSD.ORG Tue Aug 1 08:55:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC4916A4E1; Tue, 1 Aug 2006 08:55:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC04C16A4DD for ; Tue, 1 Aug 2006 08:54:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F91943D45 for ; Tue, 1 Aug 2006 08:54:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k718sxgo056735 for ; Tue, 1 Aug 2006 08:54:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k718sxXH056722 for perforce@freebsd.org; Tue, 1 Aug 2006 08:54:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 1 Aug 2006 08:54:59 GMT Message-Id: <200608010854.k718sxXH056722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 08:55:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=102905 Change 102905 by rdivacky@rdivacky_witten on 2006/08/01 08:54:21 Install/deinstall ntpl-related stuff in module loading/unloading only in a case of previous success. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#12 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#12 (text+ko) ==== @@ -916,20 +916,20 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); + SLIST_INIT(&emuldata_head); + rw_init(&emul_lock, "emuldata lock"); + LIST_INIT(&futex_list); + mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, + NULL, 1000); + linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, + NULL, 1000); + linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, + NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else printf("cannot insert Linux ELF brand handler\n"); - SLIST_INIT(&emuldata_head); - rw_init(&emul_lock, "emuldata lock"); - LIST_INIT(&futex_list); - mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); - linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, - NULL, 1000); - linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, - NULL, 1000); - linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, - NULL, 1000); break; case MOD_UNLOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; @@ -947,17 +947,17 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); + rw_destroy(&emul_lock); + mtx_destroy(&futex_mtx); + EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); + EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); + EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + printf("Emuldata slist empty: %i\n", SLIST_EMPTY(&emuldata_head)); + printf("Futex slist empty: %i\n", LIST_EMPTY(&futex_list)); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else printf("Could not deinstall ELF interpreter entry\n"); - rw_destroy(&emul_lock); - mtx_destroy(&futex_mtx); - EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); - EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); - EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); - printf("Emuldata slist empty: %i\n", SLIST_EMPTY(&emuldata_head)); - printf("Futex slist empty: %i\n", LIST_EMPTY(&futex_list)); break; default: return EOPNOTSUPP; From owner-p4-projects@FreeBSD.ORG Tue Aug 1 09:27:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE06816A537; Tue, 1 Aug 2006 09:27:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70CA816A535 for ; Tue, 1 Aug 2006 09:27:41 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28A7B43D49 for ; Tue, 1 Aug 2006 09:27:41 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k719Rf5T060121 for ; Tue, 1 Aug 2006 09:27:41 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k719ReVa060118 for perforce@freebsd.org; Tue, 1 Aug 2006 09:27:40 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 1 Aug 2006 09:27:40 GMT Message-Id: <200608010927.k719ReVa060118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 09:27:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=102907 Change 102907 by rdivacky@rdivacky_witten on 2006/08/01 09:27:17 Dont clear the address we are about to use for futex wakeup. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#29 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#29 (text+ko) ==== @@ -1243,8 +1243,6 @@ return; } - em->child_clear_tid = NULL; - /* futexes stuff */ cup.uaddr = em->child_clear_tid; cup.op = LINUX_FUTEX_WAKE; From owner-p4-projects@FreeBSD.ORG Tue Aug 1 10:11:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F73A16A4E1; Tue, 1 Aug 2006 10:11:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1977B16A4DF for ; Tue, 1 Aug 2006 10:11:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF7AC43D45 for ; Tue, 1 Aug 2006 10:11:39 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71ABdsu063887 for ; Tue, 1 Aug 2006 10:11:39 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71ABd1T063884 for perforce@freebsd.org; Tue, 1 Aug 2006 10:11:39 GMT (envelope-from piso@freebsd.org) Date: Tue, 1 Aug 2006 10:11:39 GMT Message-Id: <200608011011.k71ABd1T063884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 10:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=102914 Change 102914 by piso@piso_newluxor on 2006/08/01 10:11:37 Setting up a filtered interrupt can't fail anymore: axe the fall back branch and the taskqueue related code. While here, mask/unmask correctly the interrupts in the filter+ithread case. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#6 (text+ko) ==== @@ -74,8 +74,7 @@ /* Command Processing */ static void aac_timeout(struct aac_softc *sc); -static void aac_complete(void *context, int pending); -static void aac_complete_wrapper(void *context); +static void aac_complete(void *context); static int aac_bio_command(struct aac_softc *sc, struct aac_command **cmp); static void aac_bio_complete(struct aac_command *cm); static int aac_wait_command(struct aac_command *cm); @@ -261,11 +260,6 @@ aac_initq_busy(sc); aac_initq_bio(sc); - /* - * Initialise command-completion task. - */ - TASK_INIT(&sc->aac_task_complete, 0, aac_complete, sc); - /* mark controller as suspended until we get ourselves organised */ sc->aac_state |= AAC_STATE_SUSPEND; @@ -314,17 +308,11 @@ } else { if (bus_setup_intr(sc->aac_dev, sc->aac_irq, INTR_TYPE_BIO, - aac_fast_intr, aac_complete_wrapper, + aac_fast_intr, aac_complete, sc, &sc->aac_intr)) { device_printf(sc->aac_dev, - "can't set up FAST interrupt\n"); - if (bus_setup_intr(sc->aac_dev, sc->aac_irq, - INTR_MPSAFE|INTR_TYPE_BIO, - NULL, aac_intr, sc, &sc->aac_intr)) { - device_printf(sc->aac_dev, - "can't set up MPSAFE interrupt\n"); - return (EINVAL); - } + "can't set up FILTERed handler\n"); + return (EINVAL); } } @@ -826,6 +814,8 @@ */ wakeup(sc->aifthread); } + if (ret & FILTER_SCHEDULE_THREAD) + AAC_MASK_INTERRUPTS(sc); return((ret)?ret:FILTER_STRAY); } @@ -1044,7 +1034,7 @@ * Process completed commands. */ static void -aac_complete(void *context, int pending) +aac_complete(void *context) { struct aac_softc *sc; struct aac_command *cm; @@ -1089,12 +1079,7 @@ aac_startio(sc); mtx_unlock(&sc->aac_io_lock); -} - -static void -aac_complete_wrapper(void *context) -{ - aac_complete(context, 0); + AAC_UNMASK_INTERRUPTS(sc); } /* From owner-p4-projects@FreeBSD.ORG Tue Aug 1 13:08:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AA8D16A4E7; Tue, 1 Aug 2006 13:08:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC96216A4DD for ; Tue, 1 Aug 2006 13:08:24 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C941443D5E for ; Tue, 1 Aug 2006 13:08:22 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71D8MHl086146 for ; Tue, 1 Aug 2006 13:08:22 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71D8MgJ086143 for perforce@freebsd.org; Tue, 1 Aug 2006 13:08:22 GMT (envelope-from gabor@FreeBSD.org) Date: Tue, 1 Aug 2006 13:08:22 GMT Message-Id: <200608011308.k71D8MgJ086143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 13:08:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=102919 Change 102919 by gabor@gabor_spitfire on 2006/08/01 13:07:43 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/LEGAL#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages.wrapper#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#4 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#11 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/LEGAL#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.483 2006/07/21 23:13:13 sat Exp $ +# $FreeBSD: ports/LEGAL,v 1.486 2006/07/30 21:12:29 sat Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -66,6 +66,7 @@ asWedit-* www/aswedit Commercial software atari800/* emulators/atari800 xf25 contains copyright ROMs and cannot be distributed +autopano-sift graphics/autopano-sift May be covered by patents antivir-milter-* security/antivir-milter No redistribution allowed bamg* math/bamg Contact author personally regarding commercial use @@ -378,6 +379,8 @@ libots-*.alpha.rpm lang/compaq-cc Distribution not allowed libSDLx11.so.tar.gz multimedia/mtv No redistribution LimeWireLinux.tgz net-p2p/limewire No redistribution allowed +linunace* archivers/linux-unace Distribution is permitted within the + original package only Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed linux_devtools devel/linux_devtools GPL binaries linux-gtk2 x11-toolkits/linux-gtk2 LGPL binary, no source @@ -453,8 +456,7 @@ openssl-* security/openssl Crypto; export/import-controlled opera-* www/linux-opera No redistribution, commercial software -optimfrog-* audio/optimfrog No commercial use, no distribution - of a modified package +optimfrog-* audio/optimfrog No commercial use oracle/* databases/jdbc-oracle* This software is under license and export controls otojiro*.txt japanese/otojiro-fpw The original dictionary is not free ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#3 (text+ko) ==== @@ -6,7 +6,7 @@ # Created by: Michael Johnson # Date: 4 Oct 2004 # -# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.21 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.22 2006/08/01 04:52:35 ahze Exp $ # $MCom: ports/Mk/bsd.gstreamer.mk,v 1.24 2006/04/25 14:45:31 ahze Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -64,7 +64,7 @@ dv dvd esound faac faad ffmpeg flac gconf gnomevfs \ gnonlin good gsm ivorbis jpeg ladspa lame libcaca \ libmms libpng libvisual mad mpeg2dec \ - musepack ogg pango sdl shout2 sidplay \ + musepack ogg pango python sdl shout2 sidplay \ speex theora ugly vorbis wavpack xvid _USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \ dirac dts dv dvd esound faac faad ffmpeg flac \ @@ -72,7 +72,7 @@ jpeg-mmx ladspa lame libcaca libfame libmms libmng \ libpng libvisual mad mikmod mpeg2dec mpeg2enc mplex \ musepack musicbrainz nas sdl shout shout2 sidplay \ - smoothwave sndfile speex theora ogg pango polyp \ + smoothwave sndfile speex theora ogg pango polyp python \ swfdec vorbis wavpack x264 xvid # other plugins OTHER_GSTREAMER_PLUGINS+= core yes @@ -210,6 +210,15 @@ mplex_DEPENDS= multimedia/gstreamer-plugins-mplex +python_DEPENDS= multimedia/py-gstreamer +python_NAME= gstreamer +python_GST80_SUFX= 80 +python_GST80_PREFIX= ${PYTHON_PKGNAMEPREFIX} +python_GST_PREFIX= ${PYTHON_PKGNAMEPREFIX} +python_GST_SUFX= # empty +python_GST80_VERSION= 0.8.2 +python_GST_VERSION= 0.10.4 + theora_DEPENDS= multimedia/gstreamer-plugins-theora ugly_DEPENDS= multimedia/gstreamer-plugins-ugly ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.8 2006/07/13 12:35:12 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.9 2006/07/30 22:34:30 sat Exp $ # # Variables: @@ -65,11 +65,13 @@ DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER} . if ${LINUX_DIST} == "fedora" +. ifndef MASTER_SITES MASTER_SITES?= ${MASTER_SITE_FEDORA_LINUX} MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \ updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH} MASTER_SITE_SRC_SUBDIR?= ${LINUX_DIST_VER}/SRPMS \ updates/${LINUX_DIST_VER}/SRPMS +. endif . else IGNORE= unknown LINUX_DIST in port Makefile . endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#6 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.390 2006/07/25 16:11:37 jmelo Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.392 2006/07/30 22:22:50 sat Exp $ # # Where to put distfiles that don't have any other master site @@ -115,6 +115,13 @@ ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_CSME) +MASTER_SITE_CSME+= \ + http://bsd1.csme.ru/%SUBDIR%/ \ + http://bsd2.csme.ru/%SUBDIR%/ \ + http://bsd3.csme.ru/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_DEBIAN) MASTER_SITE_DEBIAN+= \ http://www.gtlib.cc.gatech.edu/pub/debian/%SUBDIR%/ \ @@ -1217,3 +1224,53 @@ http://xorg.freedesktop.org/%SUBDIR%/ \ ftp://ftp.x.org/pub/%SUBDIR%/ .endif + +# Macro magic + +MASTER_SITES_ABBREVS= CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED +MASTER_SITES_SUBDIRS= \ + APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \ + BERLIOS:${PORTNAME:L} \ + CSME:myports \ + DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \ + GCC:releases/${DISTNAME} \ + GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ + MOZDEV:${PORTNAME:L} \ + PERL_CPAN:${PORTNAME:C/-.*//} \ + PNET:${PNET_MASTER_SITE_SUBDIR} \ + PYTHON:${PYTHON_MASTER_SITE_SUBDIR} \ + RUBY_DBI:${RUBY_DBI_MASTER_SITE_SUBDIR} \ + RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \ + SAVANNAH:${PORTNAME:L} \ + SOURCEFORGE:${PORTNAME:L} \ + SOURCEFORGE_EXTENDED:${PORTNAME:L} + +.if defined(MASTER_SITES) && ${MASTER_SITES:N*/*} + +.for _site__ in ${MASTER_SITES} +_site_=${_site__} +. if ${_site_:M*/*} +MASTER_SITES_EXP+= ${_site_} +MASTER_SITES_EXP:= ${MASTER_SITES_EXP} +. else +_site_url_= ${_site_:C@^(.*):[^/:]+$@\1@} +_site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://} +. for _abbrev_ in ${MASTER_SITES_ABBREVS} +. if ${_site_url_} == ${_abbrev_:C/:.*//} +_site_url_= ${_abbrev_:C/.*://} +. endif +. endfor +. for _subdir_ in ${MASTER_SITES_SUBDIRS} +. if ${_site_url_} == ${_subdir_:C/:.*//} +MASTER_SITE_SUBDIR?= ${_subdir_:C/.*://} +. endif +. endfor +. ifdef MASTER_SITE_${_site_url_} +MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//} +MASTER_SITES_EXP:= ${MASTER_SITES_EXP} +. endif +. endif +.endfor +MASTER_SITES= ${MASTER_SITES_EXP} + +.endif ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages.wrapper#2 (text+ko) ==== @@ -17,12 +17,13 @@ . ${pb}/${arch}/portbuild.conf -lock=${pb}/${arch}/lock +lock=${pb}/${arch}/${branch}/lock status=${pb}/${arch}/status date=$(date '+%Y%m%d%H') shortdate=$(date '+%Y%m%d') if [ -e ${lock} ]; then + echo "Already locked." exit 1 fi ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#4 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.8 2006/07/08 21:38:55 linimon Exp $ +# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.9 2006/07/31 20:05:12 linimon Exp $ # # Read a single errorlogfile and output a line of the format # $filename|$portname|$affected|$logsize|$dir|$maintainer|\ @@ -90,7 +90,7 @@ reason="runaway_process"; tag="runaway" elif grep -q "pnohang: killing make package" $1; then reason="runaway_process"; tag="runaway" -elif grep -qE "pkg_add:.*(can't find enough temporary space|projected size of .* exceeds available free space)" $1; then +elif grep -qE "pkg_(add|create):.*(can't find enough temporary space|projected size of .* exceeds available free space)" $1; then reason="disk_full"; tag="df" elif grep -qE '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \(first use (in |)this function\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)' $1; then reason="compiler_error"; tag="cc" ==== //depot/projects/soc2006/gabor_ports/UPDATING#11 (text+ko) ==== @@ -6,6 +6,36 @@ time you update your ports collection, before attempting any port upgrades. +20060801: + AFFECTS: users of audio/libtunepimp and any port that depends on it + AUTHOR: clsung@FreeBSD.org + + libtunepimp has been updated to 0.5. But it breaks some ports depend + on it such as audio/juk and audio/amarok. To fix this kind of problem, + try to install audio/libtunepimp-old, which is previous version of + audio/libtunepimp. + +20060731: + AFFECTS: users of graphics/GraphicsMagick + AUTHOR: mat@FreeBSD.org + + In order to fix a symbol collision between GraphicsMagick and libtidy, + GraphicsMagick has been updated so that all its symbols are now prefixed with + 'Gm'. Consequently, all dependencies should be upgraded when you perform this + upgrade with this command : + + portupgrade -rf graphics/GraphicsMagick + +20060729: + AFFECTS: users of net/nss_ldap + AUTHOR: tmclaugh@sdf.lonestar.org + + The krb5_ccname option in ldap.conf has been fixed in the port so that it + now works. Please be aware of this when updating if you have it in your + config and are using GSSAPI when use_sasl is enabled. Using GSSAPI with a + misconfigured krb5_ccname combined with one of the 'hard' bind_policy + options can effectivly lockout users. + 20060728: AFFECTS: users of polish/ekg and polish/ibgadu AUTHOR: mwisnicki+freebsd@gmail.com @@ -260,6 +290,12 @@ portupgrade -f -o emulators/linux_base-fc4 linux_base\* portupgrade -f -o x11/linux-xorg-libs linux-XFree86-libs + You need to make sure that you have not changed the sysctl + compat.linux.osrelease. FC4 behaves differently depending on the + content of this sysctl. Only the default value of this sysctl is + supported. In case of problems also revert to the default of the + compat.linux.osname if changed. + In case "printenv | grep LD_" prints something, e.g., LD_LIBRARY_PATH or LD_PRELOAD, you have to make sure it is not set when starting linux programs, else FreeBSD libraries will be picked up and the @@ -3914,4 +3950,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.371 2006/07/28 17:19:34 itetcu Exp $ +$FreeBSD: ports/UPDATING,v 1.375 2006/08/01 01:51:47 clsung Exp $ From owner-p4-projects@FreeBSD.ORG Tue Aug 1 13:16:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5368816A4DE; Tue, 1 Aug 2006 13:16:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E88C816A4E1 for ; Tue, 1 Aug 2006 13:16:39 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A80EF43D69 for ; Tue, 1 Aug 2006 13:16:33 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71DGXKJ086585 for ; Tue, 1 Aug 2006 13:16:33 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71DGXPp086582 for perforce@freebsd.org; Tue, 1 Aug 2006 13:16:33 GMT (envelope-from gabor@FreeBSD.org) Date: Tue, 1 Aug 2006 13:16:33 GMT Message-Id: <200608011316.k71DGXPp086582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 13:16:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=102920 Change 102920 by gabor@gabor_spitfire on 2006/08/01 13:16:04 Shellify make :M substitutions Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#13 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#13 (text+ko) ==== @@ -44,13 +44,13 @@ if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"` else - _S_TEMP_TEMP= $${_MASTER_SITES_${_group}:M*%SUBDIR%/*} + _S_TEMP_TEMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP= $${_MASTER_SITES_${_group}} else MASTER_SITES_TMP= for site in $${_MASTER_SITES_${_group}}; do - _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP+= ${site} else @@ -66,13 +66,13 @@ fi done if [ -n "${_MASTER_SITE_SUBDIR_DEFAULT}" ] ; then - _S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*} + _S_TEMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP}" ] ; then MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT} else MASTER_SITES_TMP= for site in ${_MASTER_SITES_DEFAULT}; do - _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP+= ${site} else @@ -131,7 +131,7 @@ if [ -n "${_D_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then - _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} + _G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/` if [ -z "${_G_TEMP_TEMP}" ; then _G_TEMP+= ${_group} _MASTER_SITES_ALL+= $${_MASTER_SITES_${_group}} @@ -285,13 +285,13 @@ if [ -n "${_S_TEMP}" } ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then - _S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} + _S_TEMP_TEMP= `${ECHO_CMD} ${_PATCH_SITES_${_group}} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP= ${_PATCH_SITES_${_group}} else PATCH_SITES_TMP= for site in $${_PATCH_SITES_${_group}}; do - _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP+= ${site} else @@ -307,13 +307,13 @@ fi done if [ -n "${_PATCH_SITE_SUBDIR_DEFAULT}" ] ; then - _S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*} + _S_TEMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP}" ] ; then PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT} else PATCH_SITES_TMP= for site in ${_PATCH_SITES_DEFAULT}; do - _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP+= ${site} else @@ -335,7 +335,7 @@ if [ -n "${_P_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_P_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do if [ -z "$${_PATCH_SITES_${_group}}" ] ; then - _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} + _G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/` if [ -z "${_G_TEMP_TEMP}" ] ; then _G_TEMP+= ${_group} _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} From owner-p4-projects@FreeBSD.ORG Tue Aug 1 13:41:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B7C516A4E0; Tue, 1 Aug 2006 13:41:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C7F716A4DA for ; Tue, 1 Aug 2006 13:41:13 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EFEB43D46 for ; Tue, 1 Aug 2006 13:41:13 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71Df7Wf092266 for ; Tue, 1 Aug 2006 13:41:07 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71Df731092254 for perforce@freebsd.org; Tue, 1 Aug 2006 13:41:07 GMT (envelope-from gabor@FreeBSD.org) Date: Tue, 1 Aug 2006 13:41:07 GMT Message-Id: <200608011341.k71Df731092254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 13:41:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=102926 Change 102926 by gabor@gabor_spitfire on 2006/08/01 13:41:03 Eliminate some more :S substitutions. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#14 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#14 (text+ko) ==== @@ -2,7 +2,8 @@ cd ${_DISTDIR} for _S in ${MASTER_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@}"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -18,7 +19,8 @@ fi done for _S in ${MASTER_SITE_SUBDIR}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -38,7 +40,8 @@ fi done for _S in ${MASTER_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" "s/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then @@ -127,7 +130,8 @@ _MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} _G_TEMP= DEFAULT for _D in ${DISTFILES}; do - _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} + __TMP= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//" + _D_TEMP= `${ECHO_CMD} ${_D} | ${SED} "s/^${__TMP}//" if [ -n "${_D_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then @@ -167,7 +171,8 @@ # # for use in the fetch targets for _S in ${MASTER_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@" + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//" if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites--${_group} @@ -245,7 +250,8 @@ if [ -z "${PATCHFILES}" ] ; then for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" ; then \ for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -261,7 +267,8 @@ fi done for _S in ${PATCH_SITE_SUBDIR}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -281,7 +288,8 @@ fi done for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" } ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then @@ -331,7 +339,8 @@ _PATCH_SITES_ALL= ${_PATCH_SITES_DEFAULT} _G_TEMP= DEFAULT for _P in ${PATCHFILES}; do - _P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} + __TMP= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + _P_TEMP= `${ECHO_CMD} ${_P} | ${SED} "s/^${__TMP}//" if [ -n "${_P_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_P_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do if [ -z "$${_PATCH_SITES_${_group}}" ] ; then @@ -348,7 +357,8 @@ fi done for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" "s/,/ /g"`; do SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group} From owner-p4-projects@FreeBSD.ORG Tue Aug 1 14:15:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 973CC16A58C; Tue, 1 Aug 2006 14:15:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30FA616A500 for ; Tue, 1 Aug 2006 14:15:54 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A962C43D49 for ; Tue, 1 Aug 2006 14:15:53 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71EFrfm096287 for ; Tue, 1 Aug 2006 14:15:53 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71EFrF8096284 for perforce@freebsd.org; Tue, 1 Aug 2006 14:15:53 GMT (envelope-from piso@freebsd.org) Date: Tue, 1 Aug 2006 14:15:53 GMT Message-Id: <200608011415.k71EFrF8096284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 14:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=102928 Change 102928 by piso@piso_newluxor on 2006/08/01 14:15:37 Convert iwi to use a filter+ithread: to synchronize the filter with the ithread handler, and to avoid any race between different parts of the driver working on the same registers, use a spin lock placed into softc. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#3 (text+ko) ==== @@ -144,6 +144,7 @@ static void iwi_rx_intr(struct iwi_softc *); static void iwi_tx_intr(struct iwi_softc *, struct iwi_tx_ring *); static void iwi_intr(void *); +static int iwi_filter(void *); static int iwi_cmd(struct iwi_softc *, uint8_t, void *, uint8_t); static void iwi_write_ibssnode(struct iwi_softc *, const u_int8_t [], int); static int iwi_tx_start(struct ifnet *, struct mbuf *, @@ -262,7 +263,9 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); - + mtx_init(&sc->sc_smtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_SPIN); + sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); #if __FreeBSD_version >= 700000 @@ -465,7 +468,7 @@ * Hook our interrupt after all initialization is complete. */ error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE, - NULL, iwi_intr, sc, &sc->sc_ih); + iwi_filter, iwi_intr, sc, &sc->sc_ih); if (error != 0) { device_printf(dev, "could not set up interrupt\n"); goto fail; @@ -519,6 +522,7 @@ delete_unrhdr(sc->sc_unr); mtx_destroy(&sc->sc_mtx); + mtx_destroy(&sc->sc_smtx); return 0; } @@ -1639,41 +1643,70 @@ iwi_start(ifp); } -static void -iwi_intr(void *arg) +static int +iwi_filter(void *arg) { struct iwi_softc *sc = arg; uint32_t r; - IWI_LOCK_DECL; + int ret = FILTER_HANDLED; - IWI_LOCK(sc); - + mtx_lock_spin(&sc->sc_smtx); if ((r = CSR_READ_4(sc, IWI_CSR_INTR)) == 0 || r == 0xffffffff) { - IWI_UNLOCK(sc); - return; + mtx_unlock_spin(&sc->sc_smtx); + return (FILTER_STRAY); } /* acknowledge interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR, r); - if (r & IWI_INTR_FATAL_ERROR) { - device_printf(sc->sc_dev, "firmware error\n"); - taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); - } - if (r & IWI_INTR_FW_INITED) { if (!(r & (IWI_INTR_FATAL_ERROR | IWI_INTR_PARITY_ERROR))) wakeup(sc); + r &= ~(IWI_INTR_FW_INITED | IWI_INTR_FATAL_ERROR | + IWI_INTR_PARITY_ERROR); } - - if (r & IWI_INTR_RADIO_OFF) - taskqueue_enqueue(sc->sc_tq, &sc->sc_radiofftask); - + if (r & IWI_INTR_CMD_DONE) { sc->flags &= ~IWI_FLAG_BUSY; wakeup(sc); + r &= ~IWI_INTR_CMD_DONE; + } + + if (r & IWI_INTR_PARITY_ERROR) { + /* XXX rate-limit */ + device_printf(sc->sc_dev, "parity error\n"); + r &= ~IWI_INTR_PARITY_ERROR; } + if (r) { + /* disable interrupts */ + CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); + ret |= FILTER_SCHEDULE_THREAD; + } + sc->intr = r; + mtx_unlock_spin(&sc->sc_smtx); + return (ret); +} + +static void +iwi_intr(void *arg) +{ + struct iwi_softc *sc = arg; + uint32_t r; + IWI_LOCK_DECL; + + IWI_LOCK(sc); + mtx_lock_spin(&sc->sc_smtx); + r = sc->intr; + + if (r & IWI_INTR_FATAL_ERROR) { + device_printf(sc->sc_dev, "firmware error\n"); + taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); + } + + if (r & IWI_INTR_RADIO_OFF) + taskqueue_enqueue(sc->sc_tq, &sc->sc_radiofftask); + if (r & IWI_INTR_TX1_DONE) iwi_tx_intr(sc, &sc->txq[0]); @@ -1689,12 +1722,9 @@ if (r & IWI_INTR_RX_DONE) iwi_rx_intr(sc); - if (r & IWI_INTR_PARITY_ERROR) { - /* XXX rate-limit */ - device_printf(sc->sc_dev, "parity error\n"); - } - IWI_UNLOCK(sc); + CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK); + mtx_unlock_spin(&sc->sc_smtx); } static int @@ -2100,8 +2130,10 @@ uint32_t tmp; int ntries; + mtx_lock_spin(&sc->sc_smtx); /* disable interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); + mtx_unlock_spin(&sc->sc_smtx); CSR_WRITE_4(sc, IWI_CSR_RST, IWI_RST_STOP_MASTER); for (ntries = 0; ntries < 5; ntries++) { @@ -2116,6 +2148,7 @@ CSR_WRITE_4(sc, IWI_CSR_RST, tmp | IWI_RST_PRINCETON_RESET); sc->flags &= ~IWI_FLAG_FW_INITED; + } static int @@ -2502,8 +2535,10 @@ /* we're done with command blocks processing */ MEM_WRITE_4(sc, 0x3000a4, 0x540c00); + mtx_lock_spin(&sc->sc_smtx); /* allow interrupts so we know when the firmware is ready */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK); + mtx_unlock_spin(&sc->sc_smtx); /* tell the adapter to initialize the firmware */ CSR_WRITE_4(sc, IWI_CSR_RST, 0); ==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#2 (text+ko) ==== @@ -123,6 +123,7 @@ device_t sc_dev; struct mtx sc_mtx; + struct mtx sc_smtx; uint8_t sc_mcast[IEEE80211_ADDR_LEN]; struct unrhdr *sc_unr; struct taskqueue *sc_tq; /* private task queue */ @@ -131,6 +132,7 @@ #endif uint32_t flags; + uint32_t intr; #define IWI_FLAG_FW_INITED (1 << 0) #define IWI_FLAG_SCANNING (1 << 1) #define IWI_FLAG_FW_LOADING (1 << 2) From owner-p4-projects@FreeBSD.ORG Tue Aug 1 15:02:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B5B716A4DF; Tue, 1 Aug 2006 15:02:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAF5916A4DA for ; Tue, 1 Aug 2006 15:02:56 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E1D743D45 for ; Tue, 1 Aug 2006 15:02:55 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71F2s3S098782 for ; Tue, 1 Aug 2006 15:02:54 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71F2sgw098779 for perforce@freebsd.org; Tue, 1 Aug 2006 15:02:54 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 1 Aug 2006 15:02:54 GMT Message-Id: <200608011502.k71F2sgw098779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 15:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=102934 Change 102934 by rdivacky@rdivacky_witten on 2006/08/01 15:02:13 Copy out the pid of the correct process (ie. the new one). I copied this from Linux, NetBSD seems to have the same bug. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#30 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#30 (text+ko) ==== @@ -432,7 +432,7 @@ EMUL_RUNLOCK(&emul_lock); return (EINVAL); } - error = copyout(&td->td_proc->p_pid, args->parent_tidptr, sizeof(td->td_proc->p_pid)); + error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(td->td_proc->p_pid)); if (error) { EMUL_RUNLOCK(&emul_lock); return (error); From owner-p4-projects@FreeBSD.ORG Tue Aug 1 15:40:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEC2416A4E5; Tue, 1 Aug 2006 15:40:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4BDC16A4E1 for ; Tue, 1 Aug 2006 15:40:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5445843D76 for ; Tue, 1 Aug 2006 15:40:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71FelgF002676 for ; Tue, 1 Aug 2006 15:40:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71FekG8002672 for perforce@freebsd.org; Tue, 1 Aug 2006 15:40:46 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Aug 2006 15:40:46 GMT Message-Id: <200608011540.k71FekG8002672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 102941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 15:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=102941 Change 102941 by jhb@jhb_mutex on 2006/08/01 15:40:34 Add an audit event identifier just for completeness. Affected files ... .. //depot/projects/smpng/sys/sys/sysent.h#19 edit Differences ... ==== //depot/projects/smpng/sys/sys/sysent.h#19 (text+ko) ==== @@ -105,7 +105,7 @@ #define SYSCALL_MODULE(name, offset, new_sysent, evh, arg) \ static struct syscall_module_data name##_syscall_mod = { \ - evh, arg, offset, new_sysent, { 0, NULL } \ + evh, arg, offset, new_sysent, { 0, NULL, AUE_NULL } \ }; \ \ static moduledata_t name##_mod = { \ From owner-p4-projects@FreeBSD.ORG Tue Aug 1 16:15:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C31FE16A4E7; Tue, 1 Aug 2006 16:15:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65A2716A4DF for ; Tue, 1 Aug 2006 16:15:35 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E356843D79 for ; Tue, 1 Aug 2006 16:15:33 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71GFXFw005981 for ; Tue, 1 Aug 2006 16:15:33 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71GFXZA005978 for perforce@freebsd.org; Tue, 1 Aug 2006 16:15:33 GMT (envelope-from howardsu@FreeBSD.org) Date: Tue, 1 Aug 2006 16:15:33 GMT Message-Id: <200608011615.k71GFXZA005978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 16:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=102946 Change 102946 by howardsu@su_vm on 2006/08/01 16:15:10 handle the event returned from waitpid correctly. this close the race condition when catching the events. Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/setup.c#5 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/setup.c#5 (text+ko) ==== @@ -59,24 +59,6 @@ #include "extern.h" -static siginfo_t myinfo; - -static void handler(int si __unused, siginfo_t *info, void *uap __unused) -{ - memcpy(&myinfo, info, sizeof(myinfo)); -} - -static void -installhandler(void) -{ - int error; - struct sigaction act; - act.sa_sigaction = handler; - act.sa_flags = SA_SIGINFO; - error = sigaction(SIGCHLD, &act, NULL); - if (error) - errx(1, "install signal failed"); -} /* * setup_and_wait() is called to start a process. All it really does * is fork(), set itself up to stop on exec or exit, and then exec @@ -89,18 +71,18 @@ { int pid; - installhandler(); - - pid = fork(); + pid = vfork(); if (pid == -1) { - err(1, "fork failed"); + err(1, "vfork failed"); } if (pid == 0) { /* Child */ ptrace(PT_TRACE_ME, 0, 0, 0); + setpgid (0, 0); execvp(command[0], command); err(1, "execvp failed"); } + waitpid(pid, NULL, WNOHANG); /* Only in the parent here */ return (pid); } @@ -114,7 +96,6 @@ int start_tracing(int pid) { - installhandler(); if (ptrace(PT_ATTACH, pid, NULL, 0)) err(1, "can not attach to target process"); return (0); @@ -138,31 +119,38 @@ struct ptrace_lwpinfo lwpinfo; ptrace(PT_SYSCALL, info->pid, (caddr_t)1, 0); - if (waitpid(info->pid, &waitval, 0) == -1) - err(1, "unexpect stop"); - switch(myinfo.si_code) { - case CLD_TRAPPED: + if (waitpid(info->pid, &waitval, WNOHANG) == -1) { + switch (errno) + { + case EINTR: + break; + default: + err(1, "failed"); + } + } + if (WIFCONTINUED(waitval)) printf("WIFCONTINUED"); + if (WIFEXITED(waitval)) { + info->pr_why = S_EXIT; + return; + } + if (WIFSIGNALED(waitval)) printf("WIFSIGNALED"); + if (WIFSTOPPED(waitval)) { ptrace(PT_LWPINFO, info->pid, (caddr_t)&lwpinfo, sizeof(lwpinfo)); info->tid = lwpinfo.pl_lwpid; switch(lwpinfo.pl_event) { case PL_EVENT_SYSENTER: info->pr_why = S_SCE; - break; - case PL_EVENT_SYSEXIT: - info->pr_why = S_SCX; - break; - case PL_EVENT_SIGNAL: - info->pr_why = S_SIG; - info->pr_data = lwpinfo.pl_signal; - break; - default: - info->pr_why = S_NONE; - } - break; - case CLD_EXITED: - info->pr_why = S_EXIT; - break; - default: - info->pr_why = S_NONE; + break; + case PL_EVENT_SYSEXIT: + info->pr_why = S_SCX; + break; + case PL_EVENT_SIGNAL: + info->pr_why = S_SIG; + info->pr_data = lwpinfo.pl_signal; + break; + default: + info->pr_why = S_NONE; + } + return; } } From owner-p4-projects@FreeBSD.ORG Tue Aug 1 16:20:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93BDD16A4E5; Tue, 1 Aug 2006 16:20:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BD7A16A4E1 for ; Tue, 1 Aug 2006 16:20:41 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 289CD43D6E for ; Tue, 1 Aug 2006 16:20:41 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71GKfi2006243 for ; Tue, 1 Aug 2006 16:20:41 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71GKej2006240 for perforce@freebsd.org; Tue, 1 Aug 2006 16:20:40 GMT (envelope-from howardsu@FreeBSD.org) Date: Tue, 1 Aug 2006 16:20:40 GMT Message-Id: <200608011620.k71GKej2006240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 16:20:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=102947 Change 102947 by howardsu@su_vm on 2006/08/01 16:20:03 remove debug printf Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/setup.c#6 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/setup.c#6 (text+ko) ==== @@ -128,13 +128,17 @@ err(1, "failed"); } } - if (WIFCONTINUED(waitval)) printf("WIFCONTINUED"); + if (WIFCONTINUED(waitval)) { + info->pr_why = S_NONE; + return; + } + if (WIFEXITED(waitval)) { info->pr_why = S_EXIT; return; } - if (WIFSIGNALED(waitval)) printf("WIFSIGNALED"); - if (WIFSTOPPED(waitval)) { + + if (WIFSTOPPED(waitval) || WIFSIGNALED(waitval)) { ptrace(PT_LWPINFO, info->pid, (caddr_t)&lwpinfo, sizeof(lwpinfo)); info->tid = lwpinfo.pl_lwpid; switch(lwpinfo.pl_event) { From owner-p4-projects@FreeBSD.ORG Tue Aug 1 16:53:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7559816A4E5; Tue, 1 Aug 2006 16:53:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F98D16A4DE for ; Tue, 1 Aug 2006 16:53:24 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C0A443D6D for ; Tue, 1 Aug 2006 16:53:24 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71GrNDw015776 for ; Tue, 1 Aug 2006 16:53:23 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71GrNeC015773 for perforce@freebsd.org; Tue, 1 Aug 2006 16:53:23 GMT (envelope-from howardsu@FreeBSD.org) Date: Tue, 1 Aug 2006 16:53:23 GMT Message-Id: <200608011653.k71GrNeC015773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 102952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 16:53:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=102952 Change 102952 by howardsu@su_vm on 2006/08/01 16:52:29 Respect -S switch. Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/main.c#5 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/main.c#5 (text+ko) ==== @@ -290,6 +290,7 @@ */ if (fork() == 0) { trussinfo->pid = childpid; + start_tracing(trussinfo->pid); goto START_TRACE; } break; @@ -297,6 +298,9 @@ funcs->exit_syscall(trussinfo, MAXARGS); break; case S_SIG: + sigexit = trussinfo->pr_data; + if (trussinfo->flags & NOSIGS) + break; if (trussinfo->flags & FOLLOWFORKS) fprintf(trussinfo->outfile, "%5d: ", trussinfo->pid); @@ -319,7 +323,6 @@ "SIGNAL %u (%s)\n", trussinfo->pr_data, signame == NULL ? "?" : signame); free(signame); - sigexit = trussinfo->pr_data; break; case S_EXIT: if (trussinfo->flags & FOLLOWFORKS) From owner-p4-projects@FreeBSD.ORG Tue Aug 1 17:25:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65EDB16A4DE; Tue, 1 Aug 2006 17:25:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1317E16A4DA for ; Tue, 1 Aug 2006 17:25:05 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABFEE43D45 for ; Tue, 1 Aug 2006 17:25:04 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71HP496019345 for ; Tue, 1 Aug 2006 17:25:04 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71HP4ol019342 for perforce@freebsd.org; Tue, 1 Aug 2006 17:25:04 GMT (envelope-from piso@freebsd.org) Date: Tue, 1 Aug 2006 17:25:04 GMT Message-Id: <200608011725.k71HP4ol019342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 17:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=102954 Change 102954 by piso@piso_newluxor on 2006/08/01 17:24:16 Convert ath to use a filter+ithread handler: use a spinlock (inside softc) to guard against races when accessing sc_status or the interrupt registers, and axe all the taskqueue jobs from ath_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath_pci.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#3 (text+ko) ==== @@ -115,8 +115,8 @@ static void ath_watchdog(struct ifnet *); static int ath_ioctl(struct ifnet *, u_long, caddr_t); static void ath_fatal_proc(void *, int); -static void ath_rxorn_proc(void *, int); -static void ath_bmiss_proc(void *, int); +static void ath_rxorn_proc(void *); +static void ath_bmiss_proc(void *); static void ath_radar_proc(void *, int); static int ath_key_alloc(struct ieee80211com *, const struct ieee80211_key *, @@ -149,7 +149,7 @@ struct ieee80211_node *ni, int subtype, int rssi, u_int32_t rstamp); static void ath_setdefantenna(struct ath_softc *, u_int); -static void ath_rx_proc(void *, int); +static void ath_rx_proc(void *); static void ath_txq_init(struct ath_softc *sc, struct ath_txq *, int); static struct ath_txq *ath_txq_setup(struct ath_softc*, int qtype, int subtype); static int ath_tx_setup(struct ath_softc *, int, int); @@ -158,9 +158,9 @@ static void ath_tx_cleanup(struct ath_softc *); static int ath_tx_start(struct ath_softc *, struct ieee80211_node *, struct ath_buf *, struct mbuf *); -static void ath_tx_proc_q0(void *, int); -static void ath_tx_proc_q0123(void *, int); -static void ath_tx_proc(void *, int); +static void ath_tx_proc_q0(void *); +static void ath_tx_proc_q0123(void *); +static void ath_tx_proc(void *); static int ath_chan_set(struct ath_softc *, struct ieee80211_channel *); static void ath_draintxq(struct ath_softc *); static void ath_stoprecv(struct ath_softc *); @@ -396,10 +396,7 @@ taskqueue_thread_enqueue, &sc->sc_tq); taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", ifp->if_xname); - - TASK_INIT(&sc->sc_rxtask, 0, ath_rx_proc, sc); - TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); - TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); + TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); TASK_INIT(&sc->sc_radartask, 0, ath_radar_proc, sc); @@ -457,13 +454,13 @@ */ switch (sc->sc_txqsetup &~ (1<sc_cabq->axq_qnum)) { case 0x01: - TASK_INIT(&sc->sc_txtask, 0, ath_tx_proc_q0, sc); + sc->tx_func = &ath_tx_proc_q0; break; case 0x0f: - TASK_INIT(&sc->sc_txtask, 0, ath_tx_proc_q0123, sc); + sc->tx_func = &ath_tx_proc_q0123; break; default: - TASK_INIT(&sc->sc_txtask, 0, ath_tx_proc, sc); + sc->tx_func = &ath_tx_proc; break; } @@ -711,16 +708,13 @@ ath_stop(ifp); } -/* - * Interrupt handler. Most of the actual processing is deferred. - */ -void -ath_intr(void *arg) +int +ath_filter(void *arg) { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; - HAL_INT status; + int ret = FILTER_HANDLED; if (sc->sc_invalid) { /* @@ -728,17 +722,19 @@ * Note this can happen early on if the IRQ is shared. */ DPRINTF(sc, ATH_DEBUG_ANY, "%s: invalid; ignored\n", __func__); - return; + return (FILTER_STRAY); } + mtx_lock_spin(&sc->sc_smtx); if (!ath_hal_intrpend(ah)) /* shared irq, not for us */ - return; + return (FILTER_STRAY); if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & - IFF_DRV_RUNNING))) { + IFF_DRV_RUNNING))) { DPRINTF(sc, ATH_DEBUG_ANY, "%s: if_flags 0x%x\n", __func__, ifp->if_flags); - ath_hal_getisr(ah, &status); /* clear ISR */ + ath_hal_getisr(ah, &sc->sc_status); /* clear ISR */ ath_hal_intrset(ah, 0); /* disable further intr's */ - return; + mtx_unlock_spin(&sc->sc_smtx); + return (ret); } /* * Figure out the reason(s) for the interrupt. Note @@ -746,9 +742,40 @@ * bits we haven't explicitly enabled so we mask the * value to insure we only process bits we requested. */ - ath_hal_getisr(ah, &status); /* NB: clears ISR too */ - DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status); - status &= sc->sc_imask; /* discard unasked for bits */ + ath_hal_getisr(ah, &sc->sc_status); /* NB: clears ISR too */ + DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, sc->sc_status); + sc->sc_status &= sc->sc_imask; /* discard unasked for bits */ + if (sc->sc_status & HAL_INT_RXEOL) { + /* + * NB: the hardware should re-read the link when + * RXE bit is written, but it doesn't work at + * least on older hardware revs. + */ + sc->sc_stats.ast_rxeol++; + sc->sc_rxlink = NULL; + sc->sc_status &= ~HAL_INT_RXEOL; + } + + if (sc->sc_status) { + ath_hal_intrset(ah, 0); + ret |= FILTER_SCHEDULE_THREAD; + } + mtx_unlock_spin(&sc->sc_smtx); + return (ret); +} + +/* + * Interrupt handler. Most of the actual processing is deferred. + */ +void +ath_intr(void *arg) +{ + struct ath_softc *sc = arg; + struct ath_hal *ah = sc->sc_ah; + HAL_INT status; + + mtx_lock_spin(&sc->sc_smtx); + status = sc->sc_status; if (status & HAL_INT_FATAL) { sc->sc_stats.ast_hardware++; ath_hal_intrset(ah, 0); /* disable intr's until reset */ @@ -756,7 +783,7 @@ } else if (status & HAL_INT_RXORN) { sc->sc_stats.ast_rxorn++; ath_hal_intrset(ah, 0); /* disable intr's until reset */ - taskqueue_enqueue(sc->sc_tq, &sc->sc_rxorntask); + ath_rxorn_proc(sc); } else { if (status & HAL_INT_SWBA) { /* @@ -767,27 +794,18 @@ */ ath_beacon_proc(sc, 0); } - if (status & HAL_INT_RXEOL) { - /* - * NB: the hardware should re-read the link when - * RXE bit is written, but it doesn't work at - * least on older hardware revs. - */ - sc->sc_stats.ast_rxeol++; - sc->sc_rxlink = NULL; - } if (status & HAL_INT_TXURN) { sc->sc_stats.ast_txurn++; /* bump tx trigger level */ ath_hal_updatetxtriglevel(ah, AH_TRUE); } if (status & HAL_INT_RX) - taskqueue_enqueue(sc->sc_tq, &sc->sc_rxtask); + ath_rx_proc(sc); if (status & HAL_INT_TX) - taskqueue_enqueue(sc->sc_tq, &sc->sc_txtask); + sc->tx_func(sc); if (status & HAL_INT_BMISS) { sc->sc_stats.ast_bmiss++; - taskqueue_enqueue(sc->sc_tq, &sc->sc_bmisstask); + ath_bmiss_proc(sc); } if (status & HAL_INT_MIB) { sc->sc_stats.ast_mib++; @@ -804,6 +822,9 @@ ath_hal_intrset(ah, sc->sc_imask); } } + /* Enable interrupts */ + ath_hal_intrset(ah, sc->sc_imask); + mtx_unlock_spin(&sc->sc_smtx); } static void @@ -830,7 +851,7 @@ } static void -ath_rxorn_proc(void *arg, int pending) +ath_rxorn_proc(void *arg) { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; @@ -840,12 +861,12 @@ } static void -ath_bmiss_proc(void *arg, int pending) +ath_bmiss_proc(void *arg) { struct ath_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - DPRINTF(sc, ATH_DEBUG_ANY, "%s: pending %u\n", __func__, pending); + DPRINTF(sc, ATH_DEBUG_ANY, "%s\n", __func__); KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); if (ic->ic_state == IEEE80211_S_RUN) { @@ -985,7 +1006,9 @@ */ if (sc->sc_needmib && ic->ic_opmode == IEEE80211_M_STA) sc->sc_imask |= HAL_INT_MIB; + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask); + mtx_unlock_spin(&sc->sc_smtx); ifp->if_drv_flags |= IFF_DRV_RUNNING; ic->ic_state = IEEE80211_S_INIT; @@ -1051,7 +1074,9 @@ !sc->sc_ledon); sc->sc_blinking = 0; } + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, 0); + mtx_unlock_spin(&sc->sc_smtx); } ath_draintxq(sc); if (!sc->sc_invalid) { @@ -1109,8 +1134,10 @@ c = ic->ic_curchan; sc->sc_curchan.channel = c->ic_freq; sc->sc_curchan.channelFlags = ath_chan2flags(ic, c); - + + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, 0); /* disable interrupts */ + mtx_unlock_spin(&sc->sc_smtx); ath_draintxq(sc); /* stop xmit side */ ath_stoprecv(sc); /* stop recv side */ /* NB: indicate channel change so we do a full reset */ @@ -1131,7 +1158,9 @@ if_printf(ifp, "%s: unable to start recv logic\n", __func__); if (ic->ic_state == IEEE80211_S_RUN) ath_beacon_config(sc); /* restart beacons */ + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask); + mtx_unlock_spin(&sc->sc_smtx); ath_start(ifp); /* restart xmit */ return 0; @@ -2336,12 +2365,18 @@ , bs.bs_cfpnext , bs.bs_timoffset ); + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, 0); + mtx_unlock_spin(&sc->sc_smtx); ath_hal_beacontimers(ah, &bs); sc->sc_imask |= HAL_INT_BMISS; + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask); + mtx_unlock_spin(&sc->sc_smtx); } else { + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, 0); + mtx_unlock_spin(&sc->sc_smtx); if (nexttbtt == intval) intval |= HAL_BEACON_RESET_TSF; if (ic->ic_opmode == IEEE80211_M_IBSS) { @@ -2378,7 +2413,9 @@ } ath_hal_beaconinit(ah, nexttbtt, intval); sc->sc_bmisscount = 0; + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask); + mtx_unlock_spin(&sc->sc_smtx); /* * When using a self-linked beacon descriptor in * ibss mode load it once here. @@ -2826,7 +2863,7 @@ } static void -ath_rx_proc(void *arg, int npending) +ath_rx_proc(void *arg) { #define PA2DESC(_sc, _pa) \ ((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc + \ @@ -2848,7 +2885,7 @@ NET_LOCK_GIANT(); /* XXX */ - DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s: pending %u\n", __func__, npending); + DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__); ngood = 0; nf = ath_hal_getchannoise(ah, &sc->sc_curchan); tsf = ath_hal_gettsf64(ah); @@ -3941,7 +3978,7 @@ * for a single hardware transmit queue (e.g. 5210 and 5211). */ static void -ath_tx_proc_q0(void *arg, int npending) +ath_tx_proc_q0(void *arg) { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; @@ -3964,7 +4001,7 @@ * for four hardware queues, 0-3 (e.g. 5212 w/ WME support). */ static void -ath_tx_proc_q0123(void *arg, int npending) +ath_tx_proc_q0123(void *arg) { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; @@ -4000,7 +4037,7 @@ * Deferred processing of transmit interrupt. */ static void -ath_tx_proc(void *arg, int npending) +ath_tx_proc(void *arg) { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; @@ -4304,7 +4341,9 @@ * hardware at the new frequency, and then re-enable * the relevant bits of the h/w. */ + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, 0); /* disable interrupts */ + mtx_unlock_spin(&sc->sc_smtx); ath_draintxq(sc); /* clear pending tx frames */ ath_stoprecv(sc); /* turn off frame recv */ if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) { @@ -4358,7 +4397,9 @@ /* * Re-enable interrupts. */ + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask); + mtx_unlock_spin(&sc->sc_smtx); } return 0; } @@ -4464,7 +4505,9 @@ /* * NB: disable interrupts so we don't rx frames. */ + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); + mtx_unlock_spin(&sc->sc_smtx); /* * Notify the rate control algorithm. */ @@ -4573,8 +4616,10 @@ sc->sc_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER; sc->sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER; } else { + mtx_lock_spin(&sc->sc_smtx); ath_hal_intrset(ah, sc->sc_imask &~ (HAL_INT_SWBA | HAL_INT_BMISS)); + mtx_unlock_spin(&sc->sc_smtx); sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); } done: ==== //depot/projects/soc2006/intr_filter/dev/ath/if_ath_pci.c#3 (text+ko) ==== @@ -168,7 +168,7 @@ goto bad1; } if (bus_setup_intr(dev, psc->sc_irq, - INTR_TYPE_NET | INTR_MPSAFE, NULL, + INTR_TYPE_NET | INTR_MPSAFE, ath_filter, ath_intr, sc, &psc->sc_ih)) { device_printf(dev, "could not establish interrupt\n"); goto bad2; @@ -194,11 +194,14 @@ } ATH_LOCK_INIT(sc); + mtx_init(&sc->sc_smtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_SPIN); error = ath_attach(pci_get_device(dev), sc); if (error == 0) return error; + mtx_destroy(&sc->sc_smtx); ATH_LOCK_DESTROY(sc); bus_dma_tag_destroy(sc->sc_dmat); bad3: ==== //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#3 (text+ko) ==== @@ -223,6 +223,13 @@ u_int sc_mcastrate; /* ieee rate for mcastrateix */ u_int sc_txantenna; /* tx antenna (fixed or auto) */ HAL_INT sc_imask; /* interrupt mask copy */ + HAL_INT sc_status; + struct mtx sc_smtx; /* + * guard access to sc_status + * and to the interrupt handling + * registers (?!?!?!?!) + */ + void (*tx_func)(void *); u_int sc_keymax; /* size of key cache */ u_int8_t sc_keymap[ATH_KEYBYTES];/* key use bit map */ @@ -254,7 +261,6 @@ struct ath_descdma sc_rxdma; /* RX descriptos */ ath_bufhead sc_rxbuf; /* receive buffer */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ - struct task sc_rxtask; /* rx int processing */ struct task sc_rxorntask; /* rxorn int processing */ struct task sc_radartask; /* radar processing */ u_int8_t sc_defant; /* current default antenna */ @@ -270,7 +276,6 @@ u_int sc_txintrperiod;/* tx interrupt batching */ struct ath_txq sc_txq[HAL_NUM_TX_QUEUES]; struct ath_txq *sc_ac2q[5]; /* WME AC -> h/w q map */ - struct task sc_txtask; /* tx int processing */ struct ath_descdma sc_bdma; /* beacon descriptors */ ath_bufhead sc_bbuf; /* beacon buffers */ @@ -324,6 +329,7 @@ void ath_resume(struct ath_softc *); void ath_suspend(struct ath_softc *); void ath_shutdown(struct ath_softc *); +int ath_filter(void *); void ath_intr(void *); /* From owner-p4-projects@FreeBSD.ORG Tue Aug 1 17:32:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59B2416A4E8; Tue, 1 Aug 2006 17:32:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EDD716A4E1 for ; Tue, 1 Aug 2006 17:32:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9269943D58 for ; Tue, 1 Aug 2006 17:32:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71HWEfN019790 for ; Tue, 1 Aug 2006 17:32:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71HWDTr019786 for perforce@freebsd.org; Tue, 1 Aug 2006 17:32:13 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Aug 2006 17:32:13 GMT Message-Id: <200608011732.k71HWDTr019786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 102956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 17:32:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=102956 Change 102956 by jhb@jhb_mutex on 2006/08/01 17:31:29 IFC @102951. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#20 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#35 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_syscalls.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#89 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#64 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#9 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#2 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#35 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#18 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#34 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#28 integrate .. //depot/projects/smpng/sys/sys/kernel.h#34 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#54 integrate .. //depot/projects/smpng/sys/sys/sysent.h#20 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#20 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } ==== //depot/projects/smpng/sys/ddb/db_ps.c#35 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.61 2006/07/12 21:22:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.62 2006/08/01 15:29:46 jhb Exp $"); #include #include @@ -57,10 +57,10 @@ * * 1 2 3 4 5 6 7 * 1234567890123456789012345678901234567890123456789012345678901234567890 - * pid uid ppid pgrp state wmesg wchan cmd - * < wmesg > < wchan > - * (threaded) - * < wmesg > < wchan > + * pid ppid pgrp uid state wmesg wchan cmd + * < wmesg > < wchan > + * (threaded) + * < wmesg > < wchan > * * For machines with 64-bit pointers, we expand the wchan field 8 more * characters. @@ -83,9 +83,9 @@ p = &proc0; #ifdef __LP64__ - db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #else - db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #endif while (--np >= 0 && !db_pager_quit) { if (p == NULL) { @@ -98,9 +98,9 @@ cred = p->p_ucred; pgrp = p->p_pgrp; - db_printf("%5d %4d %5d %5d ", p->p_pid, - cred != NULL ? cred->cr_ruid : 0, pp->p_pid, - pgrp != NULL ? pgrp->pg_id : 0); + db_printf("%5d %5d %5d %5d ", p->p_pid, pp->p_pid, + pgrp != NULL ? pgrp->pg_id : 0, + cred != NULL ? cred->cr_ruid : 0); /* Determine our primary process state. */ switch (p->p_state) { @@ -207,7 +207,7 @@ void *wchan; if (all) { - db_printf(" %9d ", td->td_tid); + db_printf("%6d ", td->td_tid); switch (td->td_state) { case TDS_RUNNING: snprintf(state, sizeof(state), "Run"); ==== //depot/projects/smpng/sys/dev/mxge/if_mxge.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.7 2006/07/17 22:17:05 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.8 2006/08/01 14:02:54 gallatin Exp $"); #include #include @@ -765,7 +765,6 @@ return ENXIO; } - mxge_dummy_rdma(sc, 1); return 0; } @@ -843,6 +842,8 @@ return ENXIO; } + mxge_dummy_rdma(sc, 1); + /* Now exchange information about interrupts */ bytes = mxge_max_intr_slots * sizeof (*sc->rx_done.entry);\ memset(sc->rx_done.entry, 0, bytes); @@ -1025,6 +1026,10 @@ CTLFLAG_RD, &sc->tx.boundary, 0, "tx_boundary"); SYSCTL_ADD_INT(ctx, children, OID_AUTO, + "write_combine", + CTLFLAG_RD, &sc->wc, + 0, "write combining PIO?"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "read_dma_MBs", CTLFLAG_RD, &sc->read_dma, 0, "DMA Read speed in MB/s"); @@ -2544,6 +2549,7 @@ mxge_close(sc); sx_xunlock(&sc->driver_lock); ether_ifdetach(sc->ifp); + mxge_dummy_rdma(sc, 0); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); sc->rx_done.entry = NULL; mxge_dma_free(&sc->rx_done.dma); ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#47 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.167 2006/07/12 16:52:55 mr Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.168 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -815,8 +815,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } ==== //depot/projects/smpng/sys/kern/kern_fork.c#100 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.259 2006/06/27 11:28:50 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.260 2006/08/01 15:30:56 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -377,17 +377,14 @@ p2 = LIST_FIRST(&allproc); again: for (; p2 != NULL; p2 = LIST_NEXT(p2, p_list)) { - PROC_LOCK(p2); while (p2->p_pid == trypid || (p2->p_pgrp != NULL && (p2->p_pgrp->pg_id == trypid || (p2->p_session != NULL && p2->p_session->s_sid == trypid)))) { trypid++; - if (trypid >= pidchecked) { - PROC_UNLOCK(p2); + if (trypid >= pidchecked) goto retry; - } } if (p2->p_pid > trypid && pidchecked > p2->p_pid) pidchecked = p2->p_pid; @@ -400,7 +397,6 @@ pidchecked > p2->p_session->s_sid) pidchecked = p2->p_session->s_sid; } - PROC_UNLOCK(p2); } if (!doingzomb) { doingzomb = 1; ==== //depot/projects/smpng/sys/kern/kern_syscalls.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.11 2004/07/15 08:26:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.12 2006/08/01 16:32:20 jhb Exp $"); #include #include @@ -97,8 +97,11 @@ case MOD_LOAD : error = syscall_register(data->offset, data->new_sysent, &data->old_sysent); - if (error) + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; return error; + } ms.intval = *data->offset; MOD_XLOCK; module_setspecific(mod, &ms); @@ -108,6 +111,13 @@ return error; case MOD_UNLOAD : + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); if (data->chainevh) { error = data->chainevh(mod, what, data->chainarg); if (error) ==== //depot/projects/smpng/sys/kern/uipc_sockbuf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.162 2006/07/24 16:21:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.163 2006/08/01 10:30:26 rwatson Exp $"); #include "opt_param.h" @@ -64,6 +64,10 @@ static u_long sb_efficiency = 8; /* parameter for sbreserve() */ +static void sbdrop_internal(register struct sockbuf *sb, register int len); +static void sbflush_internal(register struct sockbuf *sb); +static void sbrelease_internal(struct sockbuf *sb, struct socket *so); + /* * Socantsendmore indicates that no more data will be sent on the * socket; it would normally be applied to a socket when the user @@ -331,6 +335,18 @@ /* * Free mbufs held by a socket, and reserved mbuf space. */ +static void +sbrelease_internal(sb, so) + struct sockbuf *sb; + struct socket *so; +{ + + sbflush_internal(sb); + (void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0, + RLIM_INFINITY); + sb->sb_mbmax = 0; +} + void sbrelease_locked(sb, so) struct sockbuf *sb; @@ -339,10 +355,7 @@ SOCKBUF_LOCK_ASSERT(sb); - sbflush_locked(sb); - (void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0, - RLIM_INFINITY); - sb->sb_mbmax = 0; + sbrelease_internal(sb, so); } void @@ -355,6 +368,17 @@ sbrelease_locked(sb, so); SOCKBUF_UNLOCK(sb); } + +void +sbdestroy(sb, so) + struct sockbuf *sb; + struct socket *so; +{ + + sbrelease_internal(sb, so); +} + + /* * Routines to add and remove * data from an mbuf queue. @@ -823,13 +847,11 @@ * Free all mbufs in a sockbuf. * Check that all resources are reclaimed. */ -void -sbflush_locked(sb) +static void +sbflush_internal(sb) register struct sockbuf *sb; { - SOCKBUF_LOCK_ASSERT(sb); - if (sb->sb_flags & SB_LOCK) panic("sbflush_locked: locked"); while (sb->sb_mbcnt) { @@ -839,13 +861,22 @@ */ if (!sb->sb_cc && (sb->sb_mb == NULL || sb->sb_mb->m_len)) break; - sbdrop_locked(sb, (int)sb->sb_cc); + sbdrop_internal(sb, (int)sb->sb_cc); } if (sb->sb_cc || sb->sb_mb || sb->sb_mbcnt) panic("sbflush_locked: cc %u || mb %p || mbcnt %u", sb->sb_cc, (void *)sb->sb_mb, sb->sb_mbcnt); } void +sbflush_locked(sb) + register struct sockbuf *sb; +{ + + SOCKBUF_LOCK_ASSERT(sb); + sbflush_internal(sb); +} + +void sbflush(sb) register struct sockbuf *sb; { @@ -858,16 +889,14 @@ /* * Drop data from (the front of) a sockbuf. */ -void -sbdrop_locked(sb, len) +static void +sbdrop_internal(sb, len) register struct sockbuf *sb; register int len; { register struct mbuf *m; struct mbuf *next; - SOCKBUF_LOCK_ASSERT(sb); - next = (m = sb->sb_mb) ? m->m_nextpkt : 0; while (len > 0) { if (m == 0) { @@ -916,6 +945,17 @@ * Drop data from (the front of) a sockbuf. */ void +sbdrop_locked(sb, len) + register struct sockbuf *sb; + register int len; +{ + + SOCKBUF_LOCK_ASSERT(sb); + + sbdrop_internal(sb, len); +} + +void sbdrop(sb, len) register struct sockbuf *sb; register int len; ==== //depot/projects/smpng/sys/kern/uipc_socket.c#89 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.275 2006/07/24 15:20:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.276 2006/08/01 10:30:26 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -555,6 +555,7 @@ sofree(so) struct socket *so; { + struct protosw *pr = so->so_proto; struct socket *head; ACCEPT_LOCK_ASSERT(); @@ -588,24 +589,31 @@ SOCK_UNLOCK(so); ACCEPT_UNLOCK(); - SOCKBUF_LOCK(&so->so_snd); - so->so_snd.sb_flags |= SB_NOINTR; - (void)sblock(&so->so_snd, M_WAITOK); /* - * socantsendmore_locked() drops the socket buffer mutex so that it - * can safely perform wakeups. Re-acquire the mutex before - * continuing. + * From this point on, we assume that no other references to this + * socket exist anywhere else in the stack. Therefore, no locks need + * to be acquired or held. + * + * We used to do a lot of socket buffer and socket locking here, as + * well as invoke sorflush() and perform wakeups. The direct call to + * dom_dispose() and sbrelease_internal() are an inlining of what was + * necessary from sorflush(). + * + * Notice that the socket buffer and kqueue state are torn down + * before calling pru_detach. This means that protocols shold not + * assume they can perform socket wakeups, etc, in their detach + * code. */ - socantsendmore_locked(so); - SOCKBUF_LOCK(&so->so_snd); - sbunlock(&so->so_snd); - sbrelease_locked(&so->so_snd, so); - SOCKBUF_UNLOCK(&so->so_snd); - sorflush(so); + KASSERT((so->so_snd.sb_flags & SB_LOCK) == 0, ("sofree: snd sblock")); + KASSERT((so->so_rcv.sb_flags & SB_LOCK) == 0, ("sofree: rcv sblock")); + sbdestroy(&so->so_snd, so); + if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) + (*pr->pr_domain->dom_dispose)(so->so_rcv.sb_mb); + sbdestroy(&so->so_rcv, so); knlist_destroy(&so->so_rcv.sb_sel.si_note); knlist_destroy(&so->so_snd.sb_sel.si_note); - if (so->so_proto->pr_usrreqs->pru_detach != NULL) - (*so->so_proto->pr_usrreqs->pru_detach)(so); + if (pr->pr_usrreqs->pru_detach != NULL) + (*pr->pr_usrreqs->pru_detach)(so); sodealloc(so); } ==== //depot/projects/smpng/sys/kern/uipc_usrreq.c#64 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.182 2006/07/26 19:16:34 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.183 2006/07/31 23:00:05 rwatson Exp $"); #include "opt_mac.h" @@ -605,7 +605,18 @@ break; } } + /* + * Because connect() and send() are non-atomic in a sendto() + * with a target address, it's possible that the socket will + * have disconnected before the send() can run. In that case + * return the slightly counter-intuitive but otherwise + * correct error that the socket is not connected. + */ unp2 = unp->unp_conn; + if (unp2 == NULL) { + error = ENOTCONN; + break; + } so2 = unp2->unp_socket; if (unp->unp_addr != NULL) from = (struct sockaddr *)unp->unp_addr; @@ -650,9 +661,18 @@ error = EPIPE; break; } + /* + * Because connect() and send() are non-atomic in a sendto() + * with a target address, it's possible that the socket will + * have disconnected before the send() can run. In that case + * return the slightly counter-intuitive but otherwise + * correct error that the socket is not connected. + */ unp2 = unp->unp_conn; - if (unp2 == NULL) - panic("uipc_send connected but no connection?"); + if (unp2 == NULL) { + error = ENOTCONN; + break; + } so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); if (unp2->unp_flags & UNP_WANTCRED) { ==== //depot/projects/smpng/sys/net/bridgestp.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.14 2006/07/26 10:45:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.15 2006/07/31 20:24:46 thompsa Exp $"); #include #include @@ -112,6 +112,7 @@ static void bstp_make_blocking(struct bstp_state *, struct bstp_port *); static void bstp_set_port_state(struct bstp_port *, uint8_t); +static void bstp_update_forward_transitions(struct bstp_port *); #ifdef notused static void bstp_set_bridge_priority(struct bstp_state *, uint64_t); static void bstp_set_port_priority(struct bstp_state *, @@ -531,6 +532,12 @@ } static void +bstp_update_forward_transitions(struct bstp_port *bp) +{ + bp->bp_forward_transitions++; +} + +static void bstp_topology_change_detection(struct bstp_state *bs) { BSTP_LOCK_ASSERT(bs); @@ -543,6 +550,7 @@ bstp_timer_start(&bs->bs_tcn_timer, 0); } bs->bs_topology_change_detected = 1; + getmicrotime(&bs->bs_last_tc_time); } static void @@ -749,6 +757,7 @@ bstp_timer_start(&bp->bp_forward_delay_timer, 0); } else if (bp->bp_state == BSTP_IFSTATE_LEARNING) { bstp_set_port_state(bp, BSTP_IFSTATE_FORWARDING); + bstp_update_forward_transitions(bp); if (bstp_designated_for_some_port(bs) && bp->bp_change_detection_enabled) bstp_topology_change_detection(bs); @@ -865,6 +874,7 @@ LIST_FOREACH(bp, &bs->bs_bplist, bp_next) bstp_ifupdstatus(bs, bp); + getmicrotime(&bs->bs_last_tc_time); bstp_port_state_selection(bs); bstp_config_bpdu_generation(bs); bstp_timer_start(&bs->bs_hello_timer, 0); ==== //depot/projects/smpng/sys/net/bridgestp.h#2 (text+ko) ==== @@ -67,7 +67,7 @@ * * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp * - * $FreeBSD: src/sys/net/bridgestp.h,v 1.2 2006/07/26 10:45:38 thompsa Exp $ + * $FreeBSD: src/sys/net/bridgestp.h,v 1.3 2006/07/31 20:24:46 thompsa Exp $ */ /* @@ -201,6 +201,7 @@ uint8_t bp_config_pending; uint8_t bp_change_detection_enabled; uint8_t bp_priority; + uint32_t bp_forward_transitions; }; /* @@ -229,6 +230,7 @@ struct bstp_timer bs_tcn_timer; struct callout bs_bstpcallout; /* STP callout */ struct bstp_timer bs_link_timer; + struct timeval bs_last_tc_time; LIST_HEAD(, bstp_port) bs_bplist; }; ==== //depot/projects/smpng/sys/net/if_bridge.c#35 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.72 2006/07/27 21:01:47 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.73 2006/07/31 20:24:46 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -212,6 +212,7 @@ uint32_t sc_rthash_key; /* key for hash */ LIST_HEAD(, bridge_iflist) sc_spanlist; /* span ports list */ struct bstp_state sc_stp; /* STP state */ + uint32_t sc_brtexceeded; /* # of cache drops */ }; static struct mtx bridge_list_mtx; @@ -299,6 +300,9 @@ static int bridge_ioctl_sifcost(struct bridge_softc *, void *); static int bridge_ioctl_addspan(struct bridge_softc *, void *); static int bridge_ioctl_delspan(struct bridge_softc *, void *); +static int bridge_ioctl_gbparam(struct bridge_softc *, void *); +static int bridge_ioctl_grte(struct bridge_softc *, void *); +static int bridge_ioctl_gifsstp(struct bridge_softc *, void *); static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *, int); static int bridge_ip_checkbasic(struct mbuf **mp); @@ -397,6 +401,15 @@ BC_F_COPYIN|BC_F_SUSER }, { bridge_ioctl_delspan, sizeof(struct ifbreq), BC_F_COPYIN|BC_F_SUSER }, + + { bridge_ioctl_gbparam, sizeof(struct ifbropreq), + BC_F_COPYOUT }, + + { bridge_ioctl_grte, sizeof(struct ifbrparam), + BC_F_COPYOUT }, + + { bridge_ioctl_gifsstp, sizeof(struct ifbpstpconf), + BC_F_COPYOUT }, }; const int bridge_control_table_size = sizeof(bridge_control_table) / sizeof(bridge_control_table[0]); @@ -510,6 +523,7 @@ sc->sc_brtmax = BRIDGE_RTABLE_MAX; sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT; + getmicrotime(&(sc->sc_stp.bs_last_tc_time)); /* Initialize our routing table. */ bridge_rtable_init(sc); @@ -1425,6 +1439,95 @@ return (0); } +static int +bridge_ioctl_gbparam(struct bridge_softc *sc, void *arg) +{ + struct ifbropreq *req = arg; + struct bstp_port *root_port; + + BRIDGE_LOCK_ASSERT(sc); + + req->ifbop_maxage = sc->sc_stp.bs_max_age; + req->ifbop_hellotime = sc->sc_stp.bs_hello_time; + req->ifbop_fwddelay = sc->sc_stp.bs_forward_delay; + + root_port = sc->sc_stp.bs_root_port; + if (root_port == NULL) + req->ifbop_root_port = 0; + else + req->ifbop_root_port = root_port->bp_ifp->if_index; + + req->ifbop_root_path_cost = sc->sc_stp.bs_root_path_cost; + req->ifbop_designated_root = sc->sc_stp.bs_designated_root; + req->ifbop_last_tc_time.tv_sec = sc->sc_stp.bs_last_tc_time.tv_sec; + req->ifbop_last_tc_time.tv_usec = sc->sc_stp.bs_last_tc_time.tv_usec; + + return (0); +} + +static int +bridge_ioctl_grte(struct bridge_softc *sc, void *arg) +{ + struct ifbrparam *param = arg; + + BRIDGE_LOCK_ASSERT(sc); + + param->ifbrp_cexceeded = sc->sc_brtexceeded; + + return (0); +} + +static int +bridge_ioctl_gifsstp(struct bridge_softc *sc, void *arg) +{ + struct ifbpstpconf *bifstp = arg; + struct bridge_iflist *bif; + struct ifbpstpreq bpreq; + int count, len, error = 0; + + BRIDGE_LOCK_ASSERT(sc); + + count = 0; + LIST_FOREACH(bif, &sc->sc_iflist, bif_next) { + if ((bif->bif_flags & IFBIF_STP) != 0) + count++; + } + + if (bifstp->ifbpstp_len == 0) { + bifstp->ifbpstp_len = sizeof(bpreq) * count; + return (0); + } + + count = 0; + len = bifstp->ifbpstp_len; + bzero(&bpreq, sizeof(bpreq)); + LIST_FOREACH(bif, &sc->sc_iflist, bif_next) { + if (len < sizeof(bpreq)) + break; + + if ((bif->bif_flags & IFBIF_STP) == 0) + continue; + + bpreq.ifbp_portno = bif->bif_ifp->if_index & 0xff; + bpreq.ifbp_fwd_trans = bif->bif_stp.bp_forward_transitions; + bpreq.ifbp_design_cost = bif->bif_stp.bp_designated_cost; + bpreq.ifbp_design_port = bif->bif_stp.bp_designated_port; + bpreq.ifbp_design_bridge = bif->bif_stp.bp_designated_bridge; + bpreq.ifbp_design_root = bif->bif_stp.bp_designated_root; + + error = copyout(&bpreq, bifstp->ifbpstp_req + count, + sizeof(bpreq)); + if (error != 0) + break; + + count++; + len -= sizeof(bpreq); + } + + bifstp->ifbpstp_len = sizeof(bpreq) * count; + return (error); +} + /* * bridge_ifdetach: * @@ -2249,8 +2352,10 @@ * update it, otherwise create a new one. */ if ((brt = bridge_rtnode_lookup(sc, dst)) == NULL) { - if (sc->sc_brtcnt >= sc->sc_brtmax) + if (sc->sc_brtcnt >= sc->sc_brtmax) { + sc->sc_brtexceeded++; return (ENOSPC); + } /* * Allocate a new bridge forwarding node, and ==== //depot/projects/smpng/sys/net/if_bridgevar.h#12 (text+ko) ==== @@ -67,7 +67,7 @@ * * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp * - * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.14 2006/07/27 21:01:47 thompsa Exp $ + * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.15 2006/07/31 20:24:46 thompsa Exp $ */ /* @@ -108,6 +108,10 @@ #define BRDGSIFCOST 22 /* set if path cost (ifbreq) */ #define BRDGADDS 23 /* add bridge span member (ifbreq) */ #define BRDGDELS 24 /* delete bridge span member (ifbreq) */ +#define BRDGPARAM 25 /* get bridge STP params (ifbropreq) */ +#define BRDGGRTE 26 /* get cache drops (ifbrparam) */ +#define BRDGGIFSSTP 27 /* get member STP params list + * (ifbpstpconf) */ /* * Generic bridge control request. @@ -191,6 +195,45 @@ #define ifbrp_hellotime ifbrp_ifbrpu.ifbrpu_int8 /* hello time (sec) */ #define ifbrp_fwddelay ifbrp_ifbrpu.ifbrpu_int8 /* fwd time (sec) */ #define ifbrp_maxage ifbrp_ifbrpu.ifbrpu_int8 /* max age (sec) */ +#define ifbrp_cexceeded ifbrp_ifbrpu.ifbrpu_int32 /* # of cache dropped + * adresses */ +/* + * Bridge current operational parameters structure. + */ +struct ifbropreq { + uint8_t ifbop_maxage; + uint8_t ifbop_hellotime; + uint8_t ifbop_fwddelay; + uint16_t ifbop_root_port; + uint32_t ifbop_root_path_cost; + uint64_t ifbop_designated_root; + struct timeval ifbop_last_tc_time; +}; + +/* + * Bridge member operational STP params structure. + */ +struct ifbpstpreq { + uint8_t ifbp_portno; /* bp STP port number */ + uint32_t ifbp_fwd_trans; /* bp STP fwd transitions */ + uint32_t ifbp_design_cost; /* bp STP designated cost */ + uint32_t ifbp_design_port; /* bp STP designated port */ + uint64_t ifbp_design_bridge; /* bp STP designated bridge */ + uint64_t ifbp_design_root; /* bp STP designated root */ +}; + +/* + * Bridge STP ports list structure. + */ +struct ifbpstpconf { + uint32_t ifbpstp_len; /* buffer size */ + union { + caddr_t ifbpstpu_buf; + struct ifbpstpreq *ifbpstpu_req; + } ifbpstp_ifbpstpu; +#define ifbpstp_buf ifbpstp_ifbpstpu.ifbpstpu_buf +#define ifbpstp_req ifbpstp_ifbpstpu.ifbpstpu_req +}; #ifdef _KERNEL ==== //depot/projects/smpng/sys/nfsserver/nfs.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.79 2006/01/28 19:24:39 csjp Exp $ + * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.80 2006/08/01 16:27:14 jhb Exp $ */ #ifndef _NFSSERVER_NFS_H_ @@ -337,6 +337,7 @@ void nfsm_adj(struct mbuf *, int, int); int nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *); void nfsrv_initcache(void); +void nfsrv_destroycache(void); void nfsrv_timer(void *); int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *, struct nfsrv_descript **); ==== //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.41 2006/06/23 00:42:26 mohans Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.43 2006/08/01 16:27:14 jhb Exp $"); /* * Reference: Chet Juszczak, "Improving the Performance and Correctness @@ -65,6 +65,7 @@ static LIST_HEAD(nfsrvhash, nfsrvcache) *nfsrvhashtbl; static TAILQ_HEAD(nfsrvlru, nfsrvcache) nfsrvlruhead; static u_long nfsrvhash; +static eventhandler_tag nfsrv_nmbclusters_tag; #define TRUE 1 #define FALSE 0 @@ -147,8 +148,19 @@ nfsrvcache_size_change(NULL); nfsrvhashtbl = hashinit(desirednfsrvcache, M_NFSD, &nfsrvhash); TAILQ_INIT(&nfsrvlruhead); - EVENTHANDLER_REGISTER(nmbclusters_change, nfsrvcache_size_change, NULL, - EVENTHANDLER_PRI_FIRST); + nfsrv_nmbclusters_tag = EVENTHANDLER_REGISTER(nmbclusters_change, + nfsrvcache_size_change, NULL, EVENTHANDLER_PRI_FIRST); +} + +/* + * Teardown the server request cache list + */ +void +nfsrv_destroycache(void) +{ + KASSERT(TAILQ_EMPTY(&nfsrvlruhead), ("%s: pending requests", __func__)); + EVENTHANDLER_DEREGISTER(nmbclusters_change, nfsrv_nmbclusters_tag); + hashdestroy(nfsrvhashtbl, M_NFSD, nfsrvhash); } /* @@ -360,8 +372,7 @@ NFSD_LOCK_ASSERT(); - for (rp = TAILQ_FIRST(&nfsrvlruhead); rp != 0; rp = nextrp) { - nextrp = TAILQ_NEXT(rp, rc_lru); + TAILQ_FOREACH_SAFE(rp, &nfsrvlruhead, rc_lru, nextrp) { LIST_REMOVE(rp, rc_hash); TAILQ_REMOVE(&nfsrvlruhead, rp, rc_lru); if (rp->rc_flag & RC_REPMBUF) ==== //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#34 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.142 2006/07/28 19:05:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.143 2006/08/01 16:27:14 jhb Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -569,8 +569,9 @@ break; } - callout_stop(&nfsrv_callout); + callout_drain(&nfsrv_callout); syscall_deregister(&nfssvc_offset, &nfssvc_prev_sysent); + nfsrv_destroycache(); /* Free the server request cache */ mtx_destroy(&nfsd_mtx); break; default: ==== //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#28 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.105 2006/01/28 19:24:40 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.106 2006/08/01 15:32:25 jhb Exp $"); #include "opt_inet6.h" #include "opt_mac.h" @@ -720,9 +720,7 @@ panic("nfsd init"); nfssvc_sockhead_flag |= SLP_INIT; if (terminating) { - for (slp = TAILQ_FIRST(&nfssvc_sockhead); slp != NULL; - slp = nslp) { - nslp = TAILQ_NEXT(slp, ns_chain); + TAILQ_FOREACH_SAFE(slp, &nfssvc_sockhead, ns_chain, nslp) { if (slp->ns_flag & SLP_VALID) nfsrv_zapsock(slp); TAILQ_REMOVE(&nfssvc_sockhead, slp, ns_chain); ==== //depot/projects/smpng/sys/sys/kernel.h#34 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/kernel.h,v 1.130 2006/05/26 10:23:05 phk Exp $ + * $FreeBSD: src/sys/sys/kernel.h,v 1.131 2006/08/01 16:32:20 jhb Exp $ */ #ifndef _SYS_KERNEL_H_ @@ -157,6 +157,7 @@ SI_SUB_MOUNT_ROOT = 0xb400000, /* root mount*/ SI_SUB_SWAP = 0xc000000, /* swap */ SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup*/ + SI_SUB_SYSCALLS = 0xd800000, /* register system calls */ SI_SUB_KTHREAD_INIT = 0xe000000, /* init process*/ SI_SUB_KTHREAD_PAGE = 0xe400000, /* pageout daemon*/ SI_SUB_KTHREAD_VM = 0xe800000, /* vm daemon*/ ==== //depot/projects/smpng/sys/sys/socketvar.h#54 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.153 2006/07/24 15:20:08 rwatson Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.154 2006/08/01 10:30:26 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -477,6 +477,7 @@ void sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n); struct mbuf * sbcreatecontrol(caddr_t p, int size, int type, int level); +void sbdestroy(struct sockbuf *sb, struct socket *so); void sbdrop(struct sockbuf *sb, int len); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 1 17:34:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9318B16A4E6; Tue, 1 Aug 2006 17:34:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 637A716A4E2 for ; Tue, 1 Aug 2006 17:34:18 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2FDC43D55 for ; Tue, 1 Aug 2006 17:34:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71HYHNK019914 for ; Tue, 1 Aug 2006 17:34:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71HYHWr019911 for perforce@freebsd.org; Tue, 1 Aug 2006 17:34:17 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Aug 2006 17:34:17 GMT Message-Id: <200608011734.k71HYHWr019911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 102957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 17:34:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=102957 Change 102957 by jhb@jhb_mutex on 2006/08/01 17:33:57 IFC @102955. Affected files ... .. //depot/projects/smpng/sys/dev/re/if_re.c#43 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#51 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#33 integrate Differences ... ==== //depot/projects/smpng/sys/dev/re/if_re.c#43 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.70 2006/07/30 23:25:21 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.71 2006/08/01 17:18:25 wpaul Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -190,6 +190,8 @@ "Corega CG-LAPCIGT (RTL8169S) Gigabit Ethernet" }, { LINKSYS_VENDORID, LINKSYS_DEVICEID_EG1032, RL_HWREV_8169S, "Linksys EG1032 (RTL8169S) Gigabit Ethernet" }, + { USR_VENDORID, USR_DEVICEID_997902, RL_HWREV_8169S, + "US Robotics 997902 (RTL8169S) Gigabit Ethernet" }, { 0, 0, 0, NULL } }; @@ -984,26 +986,6 @@ RL_DESC_INC(idx); } - /* - * With some of the RealTek chips, using the checksum offload - * support in conjunction with the autopadding feature results - * in the transmission of corrupt frames. For example, if we - * need to send a really small IP fragment that's less than 60 - * bytes in size, and IP header checksumming is enabled, the - * resulting ethernet frame that appears on the wire will - * have garbled payload. To work around this, if TX checksum - * offload is enabled, we always manually pad short frames out - * to the minimum ethernet frame size. We do this by lying - * about the size of the final fragment in the DMA map. - */ - - if (ctx->rl_flags && totlen < (ETHER_MIN_LEN - ETHER_CRC_LEN)) { - i = cmdstat & 0xFFFF; - i += ETHER_MIN_LEN - ETHER_CRC_LEN - totlen; - cmdstat = (cmdstat & 0xFFFF) | i; - d->rl_cmdstat = htole32(cmdstat | ctx->rl_flags); - } - d->rl_cmdstat |= htole32(RL_TDESC_CMD_EOF); ctx->rl_maxsegs = nseg; ctx->rl_idx = idx; @@ -1386,6 +1368,9 @@ if (sc->rl_res) bus_release_resource(dev, RL_RES, RL_RID, sc->rl_res); + /* Yield the CPU long enough for any tasks to drain */ + + tsleep(sc, PPAUSE, "rewait", hz); /* Unload and free the RX DMA ring memory and map */ @@ -1812,6 +1797,17 @@ ifp->if_timer = 0; } + /* + * Some chips will ignore a second TX request issued while an + * existing transmission is in progress. If the transmitter goes + * idle but there are still packets waiting to be sent, we need + * to restart the channel here to flush them out. This only seems + * to be required with the PCIe devices. + */ + + if (sc->rl_ldata.rl_tx_free < RL_TX_DESC_CNT) + CSR_WRITE_1(sc, sc->rl_txstart, RL_TXSTART_START); + #ifdef RE_TX_MODERATION /* * If not all descriptors have been released reaped yet, @@ -1822,6 +1818,7 @@ if (sc->rl_ldata.rl_tx_free != RL_TX_DESC_CNT) CSR_WRITE_4(sc, RL_TIMERCNT, 1); #endif + } static void @@ -2031,8 +2028,27 @@ arg.rl_ring = sc->rl_ldata.rl_tx_list; map = sc->rl_ldata.rl_tx_dmamap[*idx]; - error = bus_dmamap_load_mbuf(sc->rl_ldata.rl_mtag, map, - *m_head, re_dma_map_desc, &arg, BUS_DMA_NOWAIT); + + /* + * With some of the RealTek chips, using the checksum offload + * support in conjunction with the autopadding feature results + * in the transmission of corrupt frames. For example, if we + * need to send a really small IP fragment that's less than 60 + * bytes in size, and IP header checksumming is enabled, the + * resulting ethernet frame that appears on the wire will + * have garbled payload. To work around this, if TX checksum + * offload is enabled, we always manually pad short frames out + * to the minimum ethernet frame size. We do this by pretending + * the mbuf chain has too many fragments so the coalescing code + * below can assemble the packet into a single buffer that's + * padded out to the mininum frame size. + */ + + if (arg.rl_flags && (*m_head)->m_pkthdr.len < RL_MIN_FRAMELEN) + error = EFBIG; + else + error = bus_dmamap_load_mbuf(sc->rl_ldata.rl_mtag, map, + *m_head, re_dma_map_desc, &arg, BUS_DMA_NOWAIT); if (error && error != EFBIG) { if_printf(sc->rl_ifp, "can't map mbuf (error %d)\n", error); @@ -2048,6 +2064,19 @@ else *m_head = m_new; + /* + * Manually pad short frames, and zero the pad space + * to avoid leaking data. + */ + + if (m_new->m_pkthdr.len < RL_MIN_FRAMELEN) { + bzero(mtod(m_new, char *) + m_new->m_pkthdr.len, + RL_MIN_FRAMELEN - m_new->m_pkthdr.len); + m_new->m_pkthdr.len += RL_MIN_FRAMELEN - + m_new->m_pkthdr.len; + m_new->m_len = m_new->m_pkthdr.len; + } + arg.sc = sc; arg.rl_idx = *idx; arg.rl_maxsegs = sc->rl_ldata.rl_tx_free; @@ -2176,7 +2205,7 @@ * location on the 8169 gigE chip. I don't know why. */ - CSR_WRITE_2(sc, sc->rl_txstart, RL_TXSTART_START); + CSR_WRITE_1(sc, sc->rl_txstart, RL_TXSTART_START); #ifdef RE_TX_MODERATION /* ==== //depot/projects/smpng/sys/net/if_vlan.c#51 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan.c,v 1.106 2006/07/09 06:04:00 sam Exp $ + * $FreeBSD: src/sys/net/if_vlan.c,v 1.107 2006/08/01 17:28:10 qingli Exp $ */ /* @@ -917,21 +917,15 @@ __func__, ntohs(evl->evl_encap_proto))); tag = EVL_VLANOFTAG(ntohs(evl->evl_tag)); - - /* - * Restore the original ethertype. We'll remove - * the encapsulation after we've found the vlan - * interface corresponding to the tag. - */ - evl->evl_encap_proto = evl->evl_proto; break; default: - tag = (uint16_t) -1; -#ifdef INVARIANTS - panic("%s: unsupported if_type (%u)", - __func__, ifp->if_type); +#ifdef DEBUG + /* XXX rate limit? */ + if_printf(ifp, "unsupported if_type %u", ifp->if_type); #endif - break; + m_freem(m); + ifp->if_noproto++; /* XXX? */ + return; } } @@ -952,12 +946,12 @@ if (mtag == NULL) { /* * Packet had an in-line encapsulation header; - * remove it. The original header has already - * been fixed up above. + * remove it. Note that we leave the type field + * unchanged; we only copy up the mac addresses. */ bcopy(mtod(m, caddr_t), mtod(m, caddr_t) + ETHER_VLAN_ENCAP_LEN, - ETHER_HDR_LEN); + ETHER_HDR_LEN - ETHER_TYPE_LEN); m_adj(m, ETHER_VLAN_ENCAP_LEN); } ==== //depot/projects/smpng/sys/pci/if_rlreg.h#33 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.59 2006/07/30 23:25:20 wpaul Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.60 2006/08/01 17:18:25 wpaul Exp $ */ /* @@ -938,6 +938,14 @@ */ #define EDIMAX_DEVICEID_EP4103DL 0xAB06 +/* US Robotics vendor ID */ + +#define USR_VENDORID 0x16EC + +/* US Robotics 997902 device ID */ + +#define USR_DEVICEID_997902 0x0116 + /* * PCI low memory base and low I/O base register, and * other PCI registers. From owner-p4-projects@FreeBSD.ORG Tue Aug 1 17:42:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CCC616A4E1; Tue, 1 Aug 2006 17:42:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2270A16A4DD; Tue, 1 Aug 2006 17:42:37 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEA4D43D45; Tue, 1 Aug 2006 17:42:36 +0000 (GMT) (envelope-from sam@errno.com) Received: from [10.0.0.248] (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id k71HgZ6B023579 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 1 Aug 2006 10:42:35 -0700 (PDT) (envelope-from sam@errno.com) Message-ID: <44CF928B.7020102@errno.com> Date: Tue, 01 Aug 2006 10:42:35 -0700 From: Sam Leffler User-Agent: Thunderbird 1.5.0.4 (X11/20060724) MIME-Version: 1.0 To: Paolo Pisati References: <200608011725.k71HP4ol019342@repoman.freebsd.org> In-Reply-To: <200608011725.k71HP4ol019342@repoman.freebsd.org> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 102954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 17:42:37 -0000 Paolo Pisati wrote: > http://perforce.freebsd.org/chv.cgi?CH=102954 > > Change 102954 by piso@piso_newluxor on 2006/08/01 17:24:16 > > Convert ath to use a filter+ithread handler: > > use a spinlock (inside softc) to guard against > races when accessing sc_status or the interrupt registers, > and axe all the taskqueue jobs from ath_intr(). I highly doubt this does the right thing and the spinlock is almost certain to be the wrong thing to do here. We should probably talk privately about how to restructure ath to use your stuff but I expected a very different approach. Sam From owner-p4-projects@FreeBSD.ORG Tue Aug 1 18:25:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7D1D16A567; Tue, 1 Aug 2006 18:25:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C6F616A563 for ; Tue, 1 Aug 2006 18:25:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C761F43D67 for ; Tue, 1 Aug 2006 18:25:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71IPQTr026271 for ; Tue, 1 Aug 2006 18:25:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71IPPFr026268 for perforce@freebsd.org; Tue, 1 Aug 2006 18:25:25 GMT (envelope-from jb@freebsd.org) Date: Tue, 1 Aug 2006 18:25:25 GMT Message-Id: <200608011825.k71IPPFr026268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 18:25:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=102961 Change 102961 by jb@jb_freebsd2 on 2006/08/01 18:25:10 As jkoshy's libelf nears completion, it's time to start doing trial builds with it. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_begin.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_begin.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_end.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_end.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_errno.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_fill.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_fill.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_getbase.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_getbase.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_getident.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_getident.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_kind.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_kind.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_memory.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_memory.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_next.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_next.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_rand.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_rand.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_rawfile.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_rawfile.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_types.m4#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_version.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_version.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf.h#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_fsize.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_fsize.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getclass.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getclass.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_xlate.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_xlatetof.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf.h#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf_fsize.m4#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 1 18:34:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 680D616A4DD; Tue, 1 Aug 2006 18:34:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4407116A4E6; Tue, 1 Aug 2006 18:34:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4BD643D83; Tue, 1 Aug 2006 18:34:34 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k71IYMKC081390; Tue, 1 Aug 2006 14:34:28 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Sam Leffler Date: Tue, 1 Aug 2006 14:34:06 -0400 User-Agent: KMail/1.9.1 References: <200608011725.k71HP4ol019342@repoman.freebsd.org> <44CF928B.7020102@errno.com> In-Reply-To: <44CF928B.7020102@errno.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608011434.07440.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 01 Aug 2006 14:34:29 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1630/Tue Aug 1 11:38:56 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 102954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 18:34:45 -0000 On Tuesday 01 August 2006 13:42, Sam Leffler wrote: > Paolo Pisati wrote: > > http://perforce.freebsd.org/chv.cgi?CH=102954 > > > > Change 102954 by piso@piso_newluxor on 2006/08/01 17:24:16 > > > > Convert ath to use a filter+ithread handler: > > > > use a spinlock (inside softc) to guard against > > races when accessing sc_status or the interrupt registers, > > and axe all the taskqueue jobs from ath_intr(). > > I highly doubt this does the right thing and the spinlock is almost > certain to be the wrong thing to do here. We should probably talk > privately about how to restructure ath to use your stuff but I expected > a very different approach. I think it shouldn't actually need a lot of restructuring at all. The existing ath_intr() function should be the filter, but instead of creating a task for the higher level handle, it just returns a flag to ask the interrupt code to schedule it. This only handles 1 handler though, so if you kick off multiple tasks you might need to do some tweaking there (either do the most common one as the handler and still use taskqueue for the others or perhaps have the handler be a little "fatter"). This does seem like a lot more code churn than is necessary. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 1 18:40:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5BE116A5D6; Tue, 1 Aug 2006 18:40:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78A7416A5E5 for ; Tue, 1 Aug 2006 18:40:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C553B43D78 for ; Tue, 1 Aug 2006 18:39:44 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71IdiVH027545 for ; Tue, 1 Aug 2006 18:39:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71IdiDp027542 for perforce@freebsd.org; Tue, 1 Aug 2006 18:39:44 GMT (envelope-from jb@freebsd.org) Date: Tue, 1 Aug 2006 18:39:44 GMT Message-Id: <200608011839.k71IdiDp027542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 18:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=102962 Change 102962 by jb@jb_freebsd2 on 2006/08/01 18:38:49 Treat MPI_EVENT_QUEUE_FULL as an expected event type so that it isn't reported as 'unhandled' all the time. Fix a stray endian conversion in a printf. This syncs the mpt driver with the one I'm using in the dtrace project. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_cam.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_cam.c#8 (text+ko) ==== @@ -2153,9 +2153,13 @@ mpt_prt(mpt, "mpt_cam_event: MPI_EVENT_SAS_DEVICE_STATUS_CHANGE\n"); break; + case MPI_EVENT_QUEUE_FULL: + mpt_lprt(mpt, MPT_PRT_DEBUG, + "mpt_cam_event: MPI_EVENT_QUEUE_FULL\n"); + break; default: mpt_lprt(mpt, MPT_PRT_WARN, "mpt_cam_event: 0x%x\n", - le32toh(msg->Event) & 0xFF); + msg->Event & 0xFF); return (0); } return (1); From owner-p4-projects@FreeBSD.ORG Tue Aug 1 18:56:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D60A16A4E8; Tue, 1 Aug 2006 18:56:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F01F16A4DE; Tue, 1 Aug 2006 18:56:37 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E5FD43D4C; Tue, 1 Aug 2006 18:56:29 +0000 (GMT) (envelope-from sam@errno.com) Received: from [10.0.0.248] (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id k71IuRQJ024111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 1 Aug 2006 11:56:28 -0700 (PDT) (envelope-from sam@errno.com) Message-ID: <44CFA3DB.2090801@errno.com> Date: Tue, 01 Aug 2006 11:56:27 -0700 From: Sam Leffler User-Agent: Thunderbird 1.5.0.4 (X11/20060724) MIME-Version: 1.0 To: John Baldwin References: <200608011725.k71HP4ol019342@repoman.freebsd.org> <44CF928B.7020102@errno.com> <200608011434.07440.jhb@freebsd.org> In-Reply-To: <200608011434.07440.jhb@freebsd.org> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 102954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 18:56:37 -0000 John Baldwin wrote: > On Tuesday 01 August 2006 13:42, Sam Leffler wrote: >> Paolo Pisati wrote: >>> http://perforce.freebsd.org/chv.cgi?CH=102954 >>> >>> Change 102954 by piso@piso_newluxor on 2006/08/01 17:24:16 >>> >>> Convert ath to use a filter+ithread handler: >>> >>> use a spinlock (inside softc) to guard against >>> races when accessing sc_status or the interrupt registers, >>> and axe all the taskqueue jobs from ath_intr(). >> I highly doubt this does the right thing and the spinlock is almost >> certain to be the wrong thing to do here. We should probably talk >> privately about how to restructure ath to use your stuff but I expected >> a very different approach. > > I think it shouldn't actually need a lot of restructuring at all. The > existing ath_intr() function should be the filter, but instead of creating a > task for the higher level handle, it just returns a flag to ask the interrupt > code to schedule it. This only handles 1 handler though, so if you kick off > multiple tasks you might need to do some tweaking there (either do the most > common one as the handler and still use taskqueue for the others or perhaps > have the handler be a little "fatter"). This does seem like a lot more code > churn than is necessary. > Basically yes, the stuff run in the private taskq thread should run in the deferred interrupt context. The only issue is how to handle beacon processing (and in the future UAPSD processing). I'm not familiar with what's allowed to run in a filter routine but deferring the beacon frame generation is likely not going to work and the work done to post a beacon frame may do calls that are not permitted. FWIW the model used by ath is to defer "slow processing" to taskq-like context and leverage the single-threaded-ness of the taskq thread to avoid contention. This has worked ok but adds overhead and I've considered doing a total rewrite. The existing scheme also means you cannot implement polling w/o major changes. Sam From owner-p4-projects@FreeBSD.ORG Tue Aug 1 19:31:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C85D16A4E5; Tue, 1 Aug 2006 19:31:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 725FC16A4DE; Tue, 1 Aug 2006 19:31:10 +0000 (UTC) (envelope-from flag@newluxor.wired.org) Received: from mail.oltrelinux.com (krisma.oltrelinux.com [194.242.226.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 036F743D69; Tue, 1 Aug 2006 19:31:09 +0000 (GMT) (envelope-from flag@newluxor.wired.org) Received: from newluxor.wired.org (ip-115-167.sn1.eutelia.it [62.94.115.167]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.oltrelinux.com (Postfix) with ESMTP id C453611B254; Tue, 1 Aug 2006 21:31:08 +0200 (CEST) Received: (from flag@localhost) by newluxor.wired.org (8.13.7/8.13.7/Submit) id k71JTYxu035085; Tue, 1 Aug 2006 21:29:34 +0200 (CEST) (envelope-from flag) Date: Tue, 1 Aug 2006 21:29:28 +0200 From: Paolo Pisati To: Sam Leffler Message-ID: <20060801192928.GA34484@tin.it> References: <200608011725.k71HP4ol019342@repoman.freebsd.org> <44CF928B.7020102@errno.com> <200608011434.07440.jhb@freebsd.org> <44CFA3DB.2090801@errno.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <44CFA3DB.2090801@errno.com> User-Agent: Mutt/1.4.2.1i X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at krisma.oltrelinux.com Cc: Sam Leffler , Perforce Change Reviews , John Baldwin Subject: Re: PERFORCE change 102954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 19:31:10 -0000 On Tue, Aug 01, 2006 at 11:56:27AM -0700, Sam Leffler wrote: > Basically yes, the stuff run in the private taskq thread should run in > the deferred interrupt context. The only issue is how to handle beacon > processing (and in the future UAPSD processing). I'm not familiar with > what's allowed to run in a filter routine but deferring the beacon frame > generation is likely not going to work and the work done to post a > beacon frame may do calls that are not permitted. a filter handler is just like a fast handler returning a value. BTW i see many calls from ath_intr() to the blob hal interface, are those functions blocking? bye -- Paolo Piso's first law: nothing works as expected! From owner-p4-projects@FreeBSD.ORG Tue Aug 1 20:26:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5983516A4E0; Tue, 1 Aug 2006 20:26:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03E9716A4DE for ; Tue, 1 Aug 2006 20:26:13 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61E6843D5E for ; Tue, 1 Aug 2006 20:26:05 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71KQ5xs038048 for ; Tue, 1 Aug 2006 20:26:05 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71KQ4Cl038045 for perforce@freebsd.org; Tue, 1 Aug 2006 20:26:04 GMT (envelope-from clem1@FreeBSD.org) Date: Tue, 1 Aug 2006 20:26:04 GMT Message-Id: <200608012026.k71KQ4Cl038045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 102969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 20:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=102969 Change 102969 by clem1@clem1_ipv6vulns on 2006/08/01 20:25:24 isicng improvements : - allow extension headers for icmpsicng - introduce new options for icmpsicng - fasticmpsicng, a "faster" version of icmpsicng - tunsicng, 6to4 random packets generator - bugs fix libnet: checksum is OK when there are some extension headers. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/ChangeLog#5 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/Makefile.in#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/fasticmpsicng.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/icmpsicng.c#5 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/isicng.c#5 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/tunsicng.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#8 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_checksum.c#3 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,24 @@ +ISICNG (v0.01.7) 06/07/31, by Clément Lecigne (clem1@FreeBSD.org) + + o icmpsicng.c improvements: + o support all extension header. + o speed improvements. + o more options (flowlabel, hoplimit). + o fasticmpsic.c generates very simple icmp packets but much + faster than icmpsicng. + o tunsicng.c generates random ipv6 packets encapsulated into + random ipv4 packets. + + +ISICNG (v0.01.6) 06/07/30, by Clément Lecigne (clem1@FreeBSD.org) + + o made icmpsicng much faster. + o -w option removed + +ISICNG (v0.01.5) 06/07/21, by Clément Lecigne (clem1@FreeBSD.org) + + o tunsicng generates IPv6-over-IPv4 packets. + ISICNG (v0.01.4) 06/07/16, by Clément Lecigne (clem1@FreeBSD.org) o ipcompsicng generates random ipcomp (IPCompression) packets. ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ VERSION = 0.01 DEFS += -DVERSION=\"$(VERSION)\" -BINS = isicng tcpsicng udpsicng icmpsicng ipcompsicng +BINS = isicng tcpsicng udpsicng icmpsicng ipcompsicng tunsicng fasticmpsicng all: $(BINS) @@ -34,6 +34,12 @@ ipcompsicng: ipcompsicng.c isicng.h gcc -o ipcompsicng ipcompsicng.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS) +tunsicng: tunsicng.c isicng.h + gcc -o tunsicng tunsicng.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS) + +fasticmpsicng: fasticmpsicng.c isicng.h + gcc -o fasticmpsicng fasticmpsicng.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS) + realclean: distclean distclean: clean rm -f config.cache config.log config.status ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/icmpsicng.c#5 (text+ko) ==== @@ -1,6 +1,8 @@ #include "isicng.h" -/* This is tuned for ethernet sized frames (1500 bytes) +/* $id: $ + * + * This is tuned for ethernet sized frames (1500 bytes) * For user over a modem or frame (or other) you will have to change the * 'rand() & 0x4ff' line below. The 0x4ff needs to be less than the size of * the frame size minus the length of the ip header (40 bytes IIRC) minus the @@ -29,10 +31,9 @@ u_int a; u_char *buf = NULL; u_short *payload = NULL; - u_int payload_s = 0; + u_int payload_s = 0, len; struct libnet_icmpv6_hdr *icmp = NULL; - struct icmp_option_base_header { u_int8_t type; u_int8_t length; @@ -46,10 +47,15 @@ /* Packet Variables */ struct libnet_ipv6_hdr *ip6; struct libnet_in6_addr ip_src, ip_dst; - u_int32_t flow; + u_int32_t flow = 0xdeadbeef; u_int8_t tc, hl = 0, ver, *nx, eo; u_int32_t maxsize, minsize, multiple; struct libnet_ipv6_frag_hdr *ip6f = NULL; + struct libnet_ipv6_routing_hdr *ip6r = NULL; + struct libnet_ipv6_destopts_hdr *ip6d = NULL; + struct libnet_ipv6_hbhopts_hdr *ip6h = NULL; + struct libnet_ah_hdr *ip6ah = NULL; + struct libnet_esp_hdr *ip6esp = NULL; #ifdef LIBNET_BSDISH_OS char *smac = NULL, *dmac = NULL; @@ -60,7 +66,6 @@ int src_ip_rand = 0, dst_ip_rand = 0, dst_ok = 0, what; struct timeval tv, tv2; float sec; - unsigned int wwait; unsigned int cx = 0; u_long max_pushed = 10240; /* 10MB/sec */ u_long num_to_send = 0xffffffff; /* Send 4billion packets */ @@ -71,6 +76,11 @@ /* Defaults */ float FragPct = 30; + float RthPct = 10; + float DopPct = 10; + float HbhPct = 10; + float EspPct = 0; + float AhPct = 0; float BadIPVer = 10; float ICMPCksm = 10; float TooBig = 5; @@ -84,25 +94,27 @@ float IcmpOpt = 0; float Llocal = 10; float Slocal = 5; - + int MaxEHdr = 2; + maxsize = 1279; minsize = 128; - multiple = 1; + multiple = 1; - wwait = 500; /* wait microseconds between each write() */ - /* Not crypto strong randomness but we don't really care. And this * * gives us a way to determine the seed while the program is running * * if we need to repeat the results */ seed = getpid(); - while((c = getopt(argc, argv, "hd:i:s:r:m:k:D:S:p:H:V:F:I:T:R:E:U:M:O:N:W:P:z:Z:K:vx:w:L:A:")) != EOF) + while((c = getopt(argc, argv, "hd:i:f:s:r:m:k:D:S:e:p:H:V:F:I:T:R:E:U:M:O:N:W:P:z:Z:K:vx:L:A:B:C:G:J:Q:")) != EOF) { switch (c) { case 'i': device = optarg; break; + case 'e': + MaxEHdr = atoi(optarg); + break; case 'L': Llocal = atof(optarg); break; @@ -136,6 +148,9 @@ case 'W': NI = atof(optarg); break; + case 'f': + flow = atoi(optarg); + break; case 'z': minsize = atoi(optarg); break; @@ -145,9 +160,6 @@ case 'K': multiple = atoi(optarg); break; - case 'w': - wwait = atoi(optarg); - break; case 'h': usage(argv[0]); exit(0); @@ -214,6 +226,21 @@ case 'F': FragPct = atof(optarg); break; + case 'B': + HbhPct = atof(optarg); + break; + case 'C': + DopPct = atof(optarg); + break; + case 'G': + RthPct = atof(optarg); + break; + case 'J': + EspPct = atof(optarg); + break; + case 'Q': + AhPct = atof(optarg); + break; case 'I': ICMPCksm = atof(optarg); break; @@ -295,7 +322,12 @@ printf("Maximum traffic rate = %.2f k/s\n", max_pushed/1024.0); printf("Bad IP Version\t= %.0f%%\t\t", BadIPVer); - printf("Frag header\t= %.0f%%\n", FragPct); + printf("Routing hdr\t=%.0f%%\t\t", RthPct); + printf("Destination opts hdr\t=%.0f%%\t\t", DopPct); + printf("Hop by hop hdr\t=%.0f%%\t\t", HbhPct); + printf("Esp hdr\t=%.0f%%\t\t", EspPct); + printf("Ah hdr\t=%.0f%%\t\t", AhPct); + printf("Frag hdr\t= %.0f%%\n", FragPct); printf("TooBig=%.0f%% Redirect=%.0f%% Echo=%.0f%% Router=%.0f%%\n", TooBig, Redir, Echo, RT); printf("Unreach=%.0f%% MLD=%.0f%% ND=%.0f%% NI=%.0f%%\n", Unreach, MLD, ND, NI); @@ -327,11 +359,11 @@ for(acx = 0; acx < num_to_send; acx++) { off = eo; - memset(buf + eo, 0x0, IP_MAXPACKET - eo); if (!hl) hl = rand() & 0xff; - flow = rand(); + if (flow == 0xdeadbeef) + flow = rand(); tc = rand() & 0xff; if (src_ip_rand == 1) @@ -363,19 +395,142 @@ off += 40; - /* fragmentation or not ? */ - if(rand() <= (RAND_MAX * FragPct) && payload_s >= 16) - { - ip6f = (struct libnet_ipv6_frag_hdr *)(buf + off); - *nx = 44; - ip6f->ip_nh = IPPROTO_ICMP6; - ip6f->ip_reserved = (rand() % 2) ? rand() & 0xff : 0; - ip6f->ip_frag = rand() & 0xffff; - ip6f->ip_id = (rand() % 10) ? rand() : getpid(); - off += 8; - payload_s -= 8; - } + for (c = 0; c < MaxEHdr; c++){ + switch (rand() % 6) + { + case 0: + /* Fragmentation header */ + if (rand() <= (RAND_MAX * FragPct)) + { + ip6f = (struct libnet_ipv6_frag_hdr *)(buf + off); + *nx = 44; + ip6f->ip_nh = IPPROTO_ICMP6; + nx = &ip6->ip_nh; + ip6f->ip_reserved = (rand() % 2) ? rand() & 0xff : 0; + ip6f->ip_frag = rand() & 0xffff; + ip6f->ip_id = (rand() % 10) ? rand() : getpid(); + off += 8; + payload_s -= 8; + } + break; + case 1: + /* Routing header */ + if (rand() <= (RAND_MAX * RthPct)) + { + ip6r = (struct libnet_ipv6_routing_hdr *)(buf + off); + *nx = 43; + ip6r->ip_nh = IPPROTO_ICMP6; + nx = &ip6r->ip_nh; + ip6r->ip_len = rand() & 0xff; + ip6r->ip_rtype = (rand() % 2) ? rand() & 0xff : 0; + ip6r->ip_segments = rand() & 0xff; + off += 4; + payload_s -= 4; + /* padding with addresses */ + len = ((ip6r->ip_len + 1) << 3) - 4; + if (payload_s >= len) + { + payload = (short int *)(buf + off); + for (a = 0; a < len; a++) + payload[a] = rand() & 0xff; + payload_s -= len; + off += len; + } + } + break; + case 2: + /* Destination opts */ + if (rand() <= (RAND_MAX * DopPct)) + { + ip6d = (struct libnet_ipv6_destopts_hdr *)(buf + off); + *nx = 60; + ip6d->ip_nh = IPPROTO_ICMP6; + nx = &ip6d->ip_nh; + ip6d->ip_len = rand() & 0xff; + off += 2; + payload_s -= 2; + /* padding with random option */ + len = ((ip6d->ip_len + 1) << 3) - 2; + if (payload_s >= len) + { + payload = (short int *)(buf + off); + for (a = 0; a < len; a++) + payload[a] = rand() & 0xff; + payload_s -= len; + off += len; + } + } + break; + case 3: + /* Hop by hop header */ + if (rand() <= (RAND_MAX * HbhPct)) + { + ip6h = (struct libnet_ipv6_hbhopts_hdr *)(buf + off); + *nx = 0; + ip6h->ip_nh = IPPROTO_ICMP6; + nx = &ip6h->ip_nh; + ip6h->ip_len = rand() & 0xff; + off += 2; + payload_s -= 2; + /* padding with addr */ + len = ((ip6h->ip_len + 1) << 3) - 2; + if (payload_s >= len) + { + payload = (short int *)(buf + off); + for (a = 0; a < len; a++) + payload[a] = rand() & 0xff; + payload_s -= len; + off += len; + } + + } + break; + case 4: + /* AH header */ + if (rand() <= (RAND_MAX * AhPct)) + { + ip6ah = (struct libnet_ah_hdr *)(buf + off); + *nx = 51; + ip6ah->ah_nh = IPPROTO_ICMP6; + nx = &ip6ah->ah_nh; + ip6ah->ah_len = rand() & 0xff; + ip6ah->ah_res = (rand() % 2) ? 0 : rand() % 0xffff; + ip6ah->ah_spi = rand(); + ip6ah->ah_seq = rand(); + ip6ah->ah_auth = rand(); + off += 16; + payload_s -= 16; + } + break; + case 5: + /* ESP header */ + if (rand() <= (RAND_MAX * EspPct)) + { + ip6esp = (struct libnet_esp_hdr *)(buf + off); + *nx = 50; + ip6esp->esp_spi = rand(); + ip6esp->esp_seq = rand(); + ip6esp->esp_iv = rand(); + off += 12; + payload_s -= 12; + } + break; + } + if (payload_s > maxsize) + break; + } + /* XXX: try to avoid this */ + if (payload_s > maxsize) + { + if (printout) + puts("you need to increase minsize or decrease max ehdr"); + payload_s = 0; + continue; + } + /* save payload_s size for checksum */ + len = payload_s; + icmp = (struct libnet_icmpv6_hdr *)(buf + off); what = rand(); @@ -530,7 +685,7 @@ payload = (short int *)(buf + off); for (a = 0; a < payload_s; a++) payload[a] = rand() & 0xff; - }else{ + }else if (payload_s <= maxsize){ payload = (short int *)(buf + off); for(cx = 0; cx <= (payload_s >> 1); cx+=1) (u_short) payload[cx] = rand() & 0xffff; @@ -539,12 +694,11 @@ if (rand() <= (RAND_MAX * ICMPCksm)) icmp->icmp_sum = rand() & 0xffff; else - libnet_do_checksum(l, buf + eo, IPPROTO_ICMP6, payload_s + (off - 40 - eo)); + libnet_do_checksum(l, buf + eo, IPPROTO_ICMP6, len); if (skip <= acx) { for (cx = 0; cx < repeat; cx++) { - usleep(wwait); #ifdef LIBNET_BSDISH_OS c = libnet_write_link(l, buf, off + payload_s); #else /* !BSD */ @@ -553,7 +707,7 @@ if (c != -1) datapushed += c; } - if ((u_int)c != (off + payload_s)) + if ((u_int)c != (off + payload_s) && printout) fprintf(stderr, "Failed to send packet: %s\n", libnet_geterror(l)); } @@ -672,7 +826,6 @@ } return (off); } - void usage(u_char *name) { @@ -685,10 +838,13 @@ #endif " [-r seed] [-m ]\n" " [-p ] [-k ] [-x ]\n" - " [-z ] [-Z ] [-K ] [-w ]\n" + " [-z ] [-Z ] [-K ]\n" "\n" - " Percentage Opts: [-F frags] [-V Bad IP Version]\n" + " Percentage Opts: [-e maxehdr] [-F frags] [-Q ipsecah]\n" + " [-J ipsecesp] [-G routing] [-C dstopts]\n" + " [-B hopbyhop] [-V Bad IP Version]\n" " [-H hop limit] [-I Bad checksum]\n" + " [-f flowlabel]\n" " [-L linklocal addr] [-A sitelocal addr]\n" " [-P IcmpOpt]\n" " [-T Toobig] [-R Redirect] [-E Echo]\n" ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/isicng.c#5 (text+ko) ==== ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#8 (text+ko) ==== @@ -2347,6 +2347,12 @@ libnet_do_checksum(libnet_t *l, u_int8_t *packet, int protocol, int len); /* + * [Internal] + */ +int +libnet_payload_off(u_int8_t *buf, int len); + +/* * [Internal] */ u_int32_t ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_checksum.c#3 (text+ko) ==== @@ -94,6 +94,58 @@ } } +int +libnet_payload_off(u_int8_t *buf, int len) +{ + int proto; + int off; + struct libnet_ipv6_hdr *ip6; + struct libnet_ipv6_frag_hdr *ip6f; + struct libnet_ipv6_routing_hdr *ip6e; + + off = 0; + ip6 = (struct libnet_ipv6_hdr *)buf; + proto = ip6->ip_nh; + off += LIBNET_IPV6_H; + + while (1) + { + if (off > len) return (0); + switch (proto) + { + case IPPROTO_IPV6: + ip6 = (struct libnet_ipv6_hdr *)(buf + off); + proto = ip6->ip_nh; + off += LIBNET_IPV6_H; + break; + case IPPROTO_FRAGMENT: + ip6f = (struct libnet_ipv6_frag_hdr *)(buf + off); + proto = ip6f->ip_nh; + off += LIBNET_IPV6_FRAG_H; + break; + case IPPROTO_AH: + ip6e = (struct libnet_ipv6_routing_hdr *)(buf + off); + proto = ip6e->ip_nh; + off += (ip6e->ip_len + 2) << 2; + break; + case IPPROTO_HOPOPTS: + case IPPROTO_ROUTING: + case IPPROTO_DSTOPTS: + ip6e = (struct libnet_ipv6_routing_hdr *)(buf + off); + proto = ip6e->ip_nh; + off += (ip6e->ip_len + 1) << 3; + break; + case IPPROTO_ESP: + /* no need to checksum if ESP */ + return (-1); + default: + return (off); + } + } + /* never reached */ + return (off); +} + int libnet_do_checksum(libnet_t *l, u_int8_t *buf, int protocol, int len) @@ -104,8 +156,10 @@ int is_ipv6; int ip_hl; int sum; + int off; /* points to the payload start in buf */ is_ipv6 = 0; /* default to not using IPv6 */ + off = 0; sum = 0; iph_p = NULL; ip6h_p = NULL; @@ -128,6 +182,9 @@ ip6h_p = (struct libnet_ipv6_hdr *)buf; is_ipv6 = 1; ip_hl = LIBNET_IPV6_H; + off = libnet_payload_off(buf, len) - LIBNET_IPV6_H; + if (off == -1) + return 1; /* ESP */ } else { @@ -148,7 +205,7 @@ case IPPROTO_TCP: { struct libnet_tcp_hdr *tcph_p = - (struct libnet_tcp_hdr *)(buf + ip_hl); + (struct libnet_tcp_hdr *)(buf + ip_hl + off); #if (STUPID_SOLARIS_CHECKSUM_BUG) tcph_p->th_sum = tcph_p->th_off << 2; @@ -183,7 +240,7 @@ case IPPROTO_UDP: { struct libnet_udp_hdr *udph_p = - (struct libnet_udp_hdr *)(buf + ip_hl); + (struct libnet_udp_hdr *)(buf + ip_hl + off); udph_p->uh_sum = 0; if (is_ipv6) { @@ -202,7 +259,7 @@ case IPPROTO_ICMP6: { struct libnet_icmpv4_hdr *icmph_p = - (struct libnet_icmpv4_hdr *)(buf + ip_hl); + (struct libnet_icmpv4_hdr *)(buf + ip_hl + off); icmph_p->icmp_sum = 0; if (is_ipv6) { @@ -216,7 +273,7 @@ case IPPROTO_IGMP: { struct libnet_igmp_hdr *igmph_p = - (struct libnet_igmp_hdr *)(buf + ip_hl); + (struct libnet_igmp_hdr *)(buf + ip_hl + off); igmph_p->igmp_sum = 0; sum = libnet_in_cksum((u_int16_t *)igmph_p, len); From owner-p4-projects@FreeBSD.ORG Tue Aug 1 20:42:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B60716A4E0; Tue, 1 Aug 2006 20:42:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D6E416A4DE for ; Tue, 1 Aug 2006 20:42:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C2D543D49 for ; Tue, 1 Aug 2006 20:42:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71KgPZb039143 for ; Tue, 1 Aug 2006 20:42:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71KgPDC039140 for perforce@freebsd.org; Tue, 1 Aug 2006 20:42:25 GMT (envelope-from jb@freebsd.org) Date: Tue, 1 Aug 2006 20:42:25 GMT Message-Id: <200608012042.k71KgPDC039140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 20:42:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102970 Change 102970 by jb@jb_freebsd2 on 2006/08/01 20:42:20 When heading for a panic due to an unacked IPI, we really only need the first CPU which decides to panic to print put the trace buffer. Also report the pad fields from the per-cpu structure which we'll try to poke stuff in when we're at tl2 to see what is going on. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#11 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#11 (text+ko) ==== @@ -1218,6 +1218,10 @@ m->md.pv_list_count++; } +#ifdef TRAP_TRACING +static int trap_trace_report_done; +#endif + #ifdef SMP static cpumask_t pmap_ipi(pmap_t pmap, char *func, uint64_t arg1, uint64_t arg2) @@ -1288,9 +1292,17 @@ curactive & ~ackmask); #ifdef TRAP_TRACING - for (j = 0; j < MAXCPU; j++) - if (((1 << j) & curactive & ~ackmask) != 0) - trap_trace_report(j); + if (!trap_trace_report_done) { + trap_trace_report_done = 1; + for (j = 0; j < MAXCPU; j++) + if (((1 << j) & curactive & ~ackmask) != 0) { + struct pcpu *pc = pcpu_find(j); + printf("pcpu pad 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx\n", + pc->pad[0], pc->pad[1], pc->pad[2], pc->pad[3], + pc->pad[4], pc->pad[5], pc->pad[6]); + trap_trace_report(j); + } + } #endif hv_cpu_state((uint64_t)ffs64(curactive & ~ackmask), &cpu_state); From owner-p4-projects@FreeBSD.ORG Tue Aug 1 21:29:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C085016A4E0; Tue, 1 Aug 2006 21:29:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D1EB16A4DE for ; Tue, 1 Aug 2006 21:29:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C3A643D55 for ; Tue, 1 Aug 2006 21:29:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71LTQbv050536 for ; Tue, 1 Aug 2006 21:29:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71LTQ0B050533 for perforce@freebsd.org; Tue, 1 Aug 2006 21:29:26 GMT (envelope-from jb@freebsd.org) Date: Tue, 1 Aug 2006 21:29:26 GMT Message-Id: <200608012129.k71LTQ0B050533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 21:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=102971 Change 102971 by jb@jb_freebsd2 on 2006/08/01 21:28:35 Generate an offset for the 'pad' field in pcpu that we can use for temporary debugging at tl2. Affected files ... .. //depot/projects/dtrace/src/sys/sparc64/sparc64/genassym.c#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/sparc64/genassym.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sparc64/sparc64/genassym.c#4 (text+ko) ==== @@ -224,6 +224,7 @@ ASSYM(PC_KWBUF_FULL, offsetof(struct pcpu, pc_kwbuf_full)); ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); +ASSYM(PC_PAD, offsetof(struct pcpu, pad)); ASSYM(PC_PMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSBWBUF, offsetof(struct pcpu, pc_tsbwbuf)); ==== //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/sparc64/genassym.c#4 (text+ko) ==== @@ -224,6 +224,7 @@ ASSYM(PC_KWBUF_FULL, offsetof(struct pcpu, pc_kwbuf_full)); ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); +ASSYM(PC_PAD, offsetof(struct pcpu, pad)); ASSYM(PC_PMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSBWBUF, offsetof(struct pcpu, pc_tsbwbuf)); From owner-p4-projects@FreeBSD.ORG Tue Aug 1 23:45:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A23DA16A4E1; Tue, 1 Aug 2006 23:45:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C4F916A4DE for ; Tue, 1 Aug 2006 23:45:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 318F143D6A for ; Tue, 1 Aug 2006 23:45:31 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71NjVgh062004 for ; Tue, 1 Aug 2006 23:45:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71NjU4t062001 for perforce@freebsd.org; Tue, 1 Aug 2006 23:45:30 GMT (envelope-from imp@freebsd.org) Date: Tue, 1 Aug 2006 23:45:30 GMT Message-Id: <200608012345.k71NjU4t062001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 102980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 23:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=102980 Change 102980 by imp@imp_harmony on 2006/08/01 23:45:07 IFC @102978 Affected files ... .. //depot/projects/arm/src/bin/sh/parser.c#2 integrate .. //depot/projects/arm/src/bin/test/test.1#3 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/arm/src/include/Makefile#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/arm/src/lib/libmp/mpasbn.c#3 integrate .. //depot/projects/arm/src/lib/libtelnet/Makefile#2 integrate .. //depot/projects/arm/src/libexec/telnetd/Makefile#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/share/examples/Makefile.relnotesng#2 integrate .. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/arm/src/share/man/man4/man4.powerpc/Makefile#1 branch .. //depot/projects/arm/src/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch .. //depot/projects/arm/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/arm/src/share/misc/bsd-family-tree#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#23 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#10 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/arm/src/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/arm/src/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/arm/src/sys/dev/re/if_re.c#14 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#15 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/arm/src/sys/modules/Makefile#27 integrate .. //depot/projects/arm/src/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/arm/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#19 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#8 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#13 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_if.m#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_oea.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/arm/src/sys/sys/kernel.h#4 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#11 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#4 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/arm/src/sys/vm/pmap.h#8 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#11 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#14 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_GNU#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_NS_CACHING#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_PAM#1 branch .. //depot/projects/arm/src/tools/build/options/makeman#2 integrate .. //depot/projects/arm/src/usr.bin/hexdump/conv.c#2 integrate .. //depot/projects/arm/src/usr.bin/tar/read.c#2 integrate .. //depot/projects/arm/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/arm/src/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/kldxref/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/nvram/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/nvram/nvram.8#1 branch .. //depot/projects/arm/src/usr.sbin/nvram/nvram.c#1 branch Differences ... ==== //depot/projects/arm/src/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.56 2005/08/15 17:49:38 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); #include #include @@ -952,6 +952,7 @@ USTPUTC('\\', out); pungetc(); } else if (c == '\n') { + plinno++; if (doprompt) setprompt(2); else ==== //depot/projects/arm/src/bin/test/test.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.24 2006/07/27 19:08:21 yar Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $ .\" -.Dd July 27, 2006 +.Dd July 31, 2006 .Dt TEST 1 .Os .Sh NAME @@ -339,3 +339,9 @@ .Fl o , unlike in the logical operators of .Xr sh 1 . +For instance, the writable status of +.Pa file +will be tested by the following command even though the former expression +indicated false, which results in a gratuitous access to the file system: +.Pp +.Dl "[ -z abc -a -w file ]" ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.106 2006/03/19 15:44:53 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -56,6 +56,8 @@ .. ppbus .. + powermac_nvram + .. smbus .. speaker ==== //depot/projects/arm/src/include/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.261 2006/03/30 20:15:53 ume Exp $ +# $FreeBSD: src/include/Makefile,v 1.262 2006/08/01 22:19:00 sobomax Exp $ # # Doing a "make install" builds /usr/include. @@ -41,7 +41,7 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ - dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ + dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ @@ -55,6 +55,10 @@ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +.if ${MACHINE_ARCH} == "powerpc" +_dev_powermac_nvram= dev/powermac_nvram +.endif + .if ${MK_GPIB} != "no" _dev_ieee488= dev/ieee488 .endif ==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_cpio.c#2 (text+ko) ==== @@ -25,9 +25,12 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.17 2006/03/21 16:55:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.18 2006/07/30 18:33:20 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#endif #include /* #include */ /* See archive_platform.h */ ==== //depot/projects/arm/src/lib/libarchive/archive_write.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.16 2005/09/24 21:15:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.17 2006/08/01 05:31:29 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -201,7 +201,9 @@ if (a->state & ARCHIVE_STATE_DATA) ((a->format_finish_entry)(a)); - if (archive_entry_dev(entry) == a->skip_file_dev && + if (a->skip_file_dev != 0 && + archive_entry_dev(entry) == a->skip_file_dev && + a->skip_file_ino != 0 && archive_entry_ino(entry) == a->skip_file_ino) { archive_set_error(a, 0, "Can't add archive to itself"); return (ARCHIVE_WARN); ==== //depot/projects/arm/src/lib/libmp/mpasbn.c#3 (text+ko) ==== @@ -70,7 +70,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.4 2006/07/28 23:00:16 simon Exp $"); +__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.5 2006/07/30 19:29:26 simon Exp $"); #include #include @@ -95,15 +95,16 @@ static MINT *_itom(const char *, short); static void _madd(const char *, const MINT *, const MINT *, MINT *); static int _mcmpa(const char *, const MINT *, const MINT *); -static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *); +static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *, + BN_CTX *); static void _mfree(const char *, MINT *); static void _moveb(const char *, const BIGNUM *, MINT *); static void _movem(const char *, const MINT *, MINT *); static void _msub(const char *, const MINT *, const MINT *, MINT *); static char *_mtod(const char *, const MINT *); static char *_mtox(const char *, const MINT *); -static void _mult(const char *, const MINT *, const MINT *, MINT *); -static void _sdiv(const char *, const MINT *, short, MINT *, short *); +static void _mult(const char *, const MINT *, const MINT *, MINT *, BN_CTX *); +static void _sdiv(const char *, const MINT *, short, MINT *, short *, BN_CTX *); static MINT *_xtom(const char *, const char *); /* @@ -223,14 +224,11 @@ * Compute qmp=nmp/dmp and rmp=nmp%dmp. */ static void -_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp) +_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp, + BN_CTX *c) { BIGNUM q, r; - BN_CTX *c; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&r); BN_init(&q); BN_ERRCHECK(msg, BN_div(&q, &r, nmp->bn, dmp->bn, c)); @@ -238,14 +236,18 @@ _moveb(msg, &r, rmp); BN_free(&q); BN_free(&r); - BN_CTX_free(c); } void mdiv(const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp) { + BN_CTX *c; - _mdiv("mdiv", nmp, dmp, qmp, rmp); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("mdiv"); + _mdiv("mdiv", nmp, dmp, qmp, rmp, c); + BN_CTX_free(c); } /* @@ -357,11 +359,15 @@ void msqrt(const MINT *nmp, MINT *xmp, MINT *rmp) { + BN_CTX *c; MINT *tolerance; MINT *ox, *x; MINT *z1, *z2, *z3; short i; + c = BN_CTX_new(); + if (c == NULL) + _bnerr("msqrt"); tolerance = _itom("msqrt", 1); x = _itom("msqrt", 1); ox = _itom("msqrt", 0); @@ -370,13 +376,13 @@ z3 = _itom("msqrt", 0); do { _movem("msqrt", x, ox); - _mdiv("msqrt", nmp, x, z1, z2); + _mdiv("msqrt", nmp, x, z1, z2, c); _madd("msqrt", x, z1, z2); - _sdiv("msqrt", z2, 2, x, &i); + _sdiv("msqrt", z2, 2, x, &i, c); _msub("msqrt", ox, x, z3); } while (_mcmpa("msqrt", z3, tolerance) == 1); _movem("msqrt", x, xmp); - _mult("msqrt", x, x, z1); + _mult("msqrt", x, x, z1, c); _msub("msqrt", nmp, z1, z2); _movem("msqrt", z2, rmp); _mfree("msqrt", tolerance); @@ -385,6 +391,7 @@ _mfree("msqrt", z1); _mfree("msqrt", z2); _mfree("msqrt", z3); + BN_CTX_free(c); } /* @@ -470,26 +477,26 @@ * Compute rmp=mp1*mp2. */ static void -_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp) +_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp, BN_CTX *c) { BIGNUM b; - BN_CTX *c; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&b); BN_ERRCHECK(msg, BN_mul(&b, mp1->bn, mp2->bn, c)); _moveb(msg, &b, rmp); BN_free(&b); - BN_CTX_free(c); } void mult(const MINT *mp1, const MINT *mp2, MINT *rmp) { + BN_CTX *c; - _mult("mult", mp1, mp2, rmp); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("mult"); + _mult("mult", mp1, mp2, rmp, c); + BN_CTX_free(c); } /* @@ -538,16 +545,13 @@ * Compute qmp=nmp/d and ro=nmp%d. */ static void -_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro) +_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro, + BN_CTX *c) { MINT *dmp, *rmp; BIGNUM q, r; - BN_CTX *c; char *s; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&q); BN_init(&r); dmp = _itom(msg, d); @@ -565,14 +569,18 @@ _mfree(msg, rmp); BN_free(&r); BN_free(&q); - BN_CTX_free(c); } void sdiv(const MINT *nmp, short d, MINT *qmp, short *ro) { + BN_CTX *c; - _sdiv("sdiv", nmp, d, qmp, ro); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("sdiv"); + _sdiv("sdiv", nmp, d, qmp, ro, c); + BN_CTX_free(c); } /* ==== //depot/projects/arm/src/lib/libtelnet/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: src/lib/libtelnet/Makefile,v 1.23 2006/03/17 18:54:28 ru Exp $ +# $FreeBSD: src/lib/libtelnet/Makefile,v 1.24 2006/07/31 13:29:35 yar Exp $ .include @@ -19,13 +19,14 @@ .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" SRCS+= kerberos5.c CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .endif -.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa ==== //depot/projects/arm/src/libexec/telnetd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.28 2006/07/27 12:15:37 yar Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.31 2006/07/31 19:15:09 yar Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -30,18 +30,20 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} +# XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} LDADD+= -lkrb5 -lasn1 -lroken -lcom_err .endif .endif -.endif .include ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../../.. @@ -11,7 +11,7 @@ # SGML content SRCS+= article.sgml -# SRCS+= proc-ia64.sgml +SRCS+= proc-ia64.sgml SRCS+= ../common/hw.ent SRCS+= ../common/artheader.sgml SRCS+= ../common/dev.sgml ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.958 2006/07/25 21:48:28 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.959 2006/07/31 16:49:25 brueffer Exp $ 2000 @@ -618,7 +618,7 @@ The &man.my.4; driver is now MPSAFE. &merged; - The &man.my.4; driver now supports &man.altq.4;. + The &man.my.4; driver now supports &man.altq.4;. &merged; The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet @@ -641,7 +641,7 @@ The &man.sk.4; driver is now MPSAFE. &merged; - The &man.ste.4; driver is now MPSAFE. + The &man.ste.4; driver is now MPSAFE. &merged; The &man.stge.4; driver has been added. It supports the Sundance/Tamarack TC9021 Gigabit Ethernet controller and was ==== //depot/projects/arm/src/release/doc/share/examples/Makefile.relnotesng#2 (text+ko) ==== @@ -1,12 +1,12 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # -ARCHS= amd64 ia64 i386 pc98 sparc64 +ARCHS= amd64 ia64 i386 pc98 powerpc sparc64 MULTITEXTS= installation relnotes hardware UNITEXTS= readme errata ==== //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.87 2006/07/25 05:13:53 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.88 2006/07/31 17:04:28 brueffer Exp $ # # @@ -46,14 +46,14 @@ arcmsr i386,amd64 asr i386 ath i386 -aue i386,pc98,ia64,amd64 +aue i386,pc98,ia64,amd64,powerpc awi i386,pc98,amd64 -axe i386,pc98,amd64 +axe i386,pc98,amd64,powerpc bce i386,amd64 bge i386,pc98,sparc64,ia64,amd64 bktr i386,pc98 bt i386,amd64 -cdce i386,pc98,ia64,amd64 +cdce i386,pc98,ia64,amd64,powerpc ciss i386,ia64,amd64 ce i386,pc98 cm i386 @@ -61,7 +61,7 @@ cp i386,pc98 ct pc98 ctau i386 -cue i386,pc98,ia64,amd64 +cue i386,pc98,ia64,amd64,powerpc cx i386 de i386,pc98,alpha,ia64,amd64 dpt i386,ia64,amd64 @@ -70,8 +70,8 @@ esp sparc64 ex i386,amd64 fe i386,pc98,amd64 -fwohci i386,sparc64,ia64,amd64 -gem sparc64 +fwohci i386,sparc64,ia64,amd64,powerpc +gem sparc64,powerpc hifn i386,pc98,amd64 hptmv i386,amd64 ida i386 @@ -79,7 +79,7 @@ iir i386,ia64,amd64 ips i386,amd64 ixgb i386,amd64 -kue i386,pc98,ia64,amd64 +kue i386,pc98,ia64,amd64,powerpc lge i386,pc98,amd64 mfi i386,alpha,ia64,amd64 mlx i386,alpha,ia64,amd64 @@ -93,7 +93,7 @@ nge i386,pc98,alpha,amd64 nsp i386,pc98 nve i386,amd64 -ohci i386,pc98,alpha,ia64,amd64 +ohci i386,pc98,alpha,ia64,amd64,powerpc oltr i386 pcn i386,pc98,alpha,ia64,amd64 pst i386 @@ -148,13 +148,13 @@ ucycom i386,pc98,amd64 udav i386,pc98,amd64 uftdi i386,pc98,amd64 -uhci i386,pc98,alpha,ia64,amd64 -ulpt i386,pc98,alpha,amd64 -umass i386,pc98,alpha,amd64 +uhci i386,pc98,alpha,ia64,amd64,powerpc +ulpt i386,pc98,alpha,amd64,powerpc +umass i386,pc98,alpha,amd64,powerpc umodem i386,pc98,amd64 uplcom i386,pc98,amd64 -urio i386,pc98,amd64 -uscanner i386,pc98,amd64 +urio i386,pc98,amd64,powerpc +uscanner i386,pc98,amd64,powerpc uvisor i386,pc98,amd64 uvscom i386,pc98,amd64 vge i386,pc98,amd64 ==== //depot/projects/arm/src/share/man/man5/src.conf.5#2 (text) ==== @@ -1,12 +1,12 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: src/tools/build/options/makeman,v 1.2 2006/03/21 09:08:45 ru Exp -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.4 2006/05/17 09:33:06 phk Exp $ -.Dd April 13, 2006 +.\" from FreeBSD: src/tools/build/options/makeman,v 1.5 2006/07/31 12:41:13 yar Exp +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.6 2006/07/31 14:13:25 yar Exp $ +.Dd July 31, 2006 .Dt SRC.CONF 5 .Os .Sh NAME .Nm src.conf -.Nd source build options +.Nd "source build options" .Sh DESCRIPTION The .Nm @@ -50,7 +50,7 @@ .Nm is to control the compilation of the .Fx -sources, which are usually found in +source code, which is usually located in .Pa /usr/src . As a rule, the system administrator creates .Nm @@ -65,12 +65,14 @@ or in environment; see .Xr environ 7 . .Pp -The values of variables are ignored; the variable being -set at all (even to +The values of variables are ignored regardless of their setting; +even if they would be set to .Dq Li FALSE or -.Dq Li NO ) -causes it to be treated as if it was set with no value. +.Dq Li NO . +Just the existence of an option will cause +it to be honoured by +.Xr make 1 . .Pp The following list provides a name and short description for variables that can be used for source builds. @@ -237,6 +239,12 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_GDB,v 1.1 2006/03/21 07:50:49 ru Exp Set to not build .Xr gdb 1 . +.It Va WITHOUT_GNU +.\" from FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.2 2006/07/31 13:53:27 yar Exp +Set to not build contributed GNU software as a part of the base system. +This option can be useful if the system built must not contain any code +covered by the GNU Public License due to legal reasons. +.Sy "The option has no effect yet." When set, it also enforces the following options: .Pp .Bl -item -compact @@ -388,6 +396,14 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_NLS_CATALOGS,v 1.1 2006/03/21 07:50:50 ru Exp Set to not build NLS catalog support for .Xr csh 1 . +.It Va WITHOUT_NS_CACHING +.\" from FreeBSD: src/tools/build/options/WITHOUT_NS_CACHING,v 1.1 2006/07/31 13:08:47 yar Exp +Set to disable name caching in the +.Pa nsswitch +subsystem. +The generic caching daemon, +.Xr cached 8 , +will not be built either if this option is set. .It Va WITHOUT_OBJC .\" from FreeBSD: src/tools/build/options/WITHOUT_OBJC,v 1.1 2006/03/21 07:50:50 ru Exp Set to not build Objective C support. @@ -407,6 +423,10 @@ .It .Va WITHOUT_OPENSSH .El +.It Va WITHOUT_PAM +.\" from FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.2 2006/07/31 13:53:27 yar Exp +Set to not build PAM library and modules. +.Sy "This option is deprecated and does nothing." When set, it also enforces the following options: .Pp .Bl -item -compact ==== //depot/projects/arm/src/share/misc/bsd-family-tree#3 (text+ko) ==== @@ -198,12 +198,12 @@ | | | | | NetBSD 2.1 | | | | | | | | | | | | | NetBSD 3.0 | | - | | | | | | | DragonFly 1.4.0 - | | | | | | OpenBSD 3.9 | - | FreeBSD | | | | | | - | 6.1 | | | | | | - | | FreeBSD 5.5 | | \ | | - | V | | NetBSD 3.0.1 | DragonFly 1.6.0 + | | | | | | | DragonFly 1.4.0 + | | | | | | OpenBSD 3.9 | + | FreeBSD | | | | | | + | 6.1 | | | | | | + | | FreeBSD 5.5 | | | | | + | V | | NetBSD 3.0.1 | DragonFly 1.6.0 | | | | | FreeBSD 7 -current | NetBSD -current OpenBSD -current | | | | | | @@ -449,7 +449,7 @@ OpenBSD 3.9 2006-05-01 [OBD] FreeBSD 6.1 2006-05-08 [FBD] FreeBSD 5.5 2006-05-25 [FBD] -NetBSD 3.0.1 2006-07-24 [NBD] +NetBSD 3.0.1 2006-07-24 [NBD] (security/critical release) DragonFly 1.6.0 2006-07-24 [DFB] Bibliography @@ -511,4 +511,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.106 2006/07/25 13:31:00 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.107 2006/08/01 15:26:09 maxim Exp $ ==== //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#21 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); /* * Manages physical address maps. @@ -2972,7 +2972,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#23 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.66 2006/07/20 23:26:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.67 2006/08/01 19:06:04 alc Exp $"); #include #include #include @@ -2759,32 +2759,6 @@ /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - switch(prot) { - case VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE: - case VM_PROT_READ|VM_PROT_WRITE: - return; - - case VM_PROT_READ: - case VM_PROT_READ|VM_PROT_EXECUTE: - pmap_clearbit(m, PVF_WRITE); - break; - - default: - pmap_remove_all(m); - break; - } - -} - - -/* * Remove all pages from specified address space * this aids process exit speeds. Also, this code * is special cased for current process only, but @@ -4470,7 +4444,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { if (m->md.pvh_attrs & PVF_WRITE) ==== //depot/projects/arm/src/sys/conf/files.powerpc#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.56 2006/07/26 19:44:42 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.57 2006/08/01 22:19:01 sobomax Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,3 +128,5 @@ powerpc/psim/uart_iobus.c optional uart psim dev/scc/scc_bfe_macio.c optional scc powermac + +dev/powermac_nvram/powermac_nvram.c optional powermac powermac_nvram ==== //depot/projects/arm/src/sys/ddb/db_ps.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.61 2006/07/12 21:22:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.63 2006/08/01 22:30:55 jhb Exp $"); #include #include @@ -57,10 +57,10 @@ * * 1 2 3 4 5 6 7 * 1234567890123456789012345678901234567890123456789012345678901234567890 - * pid uid ppid pgrp state wmesg wchan cmd - * < wmesg > < wchan > - * (threaded) - * < wmesg > < wchan > + * pid ppid pgrp uid state wmesg wchan cmd + * < wmesg > < wchan > + * (threaded) + * < wmesg > < wchan > * * For machines with 64-bit pointers, we expand the wchan field 8 more * characters. @@ -83,9 +83,9 @@ p = &proc0; #ifdef __LP64__ - db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #else - db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #endif while (--np >= 0 && !db_pager_quit) { if (p == NULL) { @@ -98,9 +98,9 @@ cred = p->p_ucred; pgrp = p->p_pgrp; - db_printf("%5d %4d %5d %5d ", p->p_pid, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 2 02:32:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09CBF16A4E0; Wed, 2 Aug 2006 02:32:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D81D816A4DE for ; Wed, 2 Aug 2006 02:32:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A962543D45 for ; Wed, 2 Aug 2006 02:32:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k722W0Bs081561 for ; Wed, 2 Aug 2006 02:32:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k722W0ps081556 for perforce@freebsd.org; Wed, 2 Aug 2006 02:32:00 GMT (envelope-from jb@freebsd.org) Date: Wed, 2 Aug 2006 02:32:00 GMT Message-Id: <200608020232.k722W0ps081556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 02:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=102985 Change 102985 by jb@jb_freebsd2 on 2006/08/02 02:31:16 Add some debugging statements to set aside the %pc and %tick in the per-cpu structure. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/interrupt.S#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/interrupt.S#2 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.8 2005/04/16 15:05:56 marius Exp $"); #include "opt_simulator.h" +#include "opt_trap_trace.h" #include #include #include @@ -437,6 +438,25 @@ membar #Sync GET_PCPU_PHYS_SCRATCH(%g6) wr %g0, ASI_REAL, %asi + +#ifdef TRAP_TRACING + /* pcpu->pad[0] = %pc */ + rd %pc, %g4 + stxa %g4, [PCPU(PAD)]%asi + + /* pcpu->pad[1] = %tick */ + rdpr %tick, %g4 + stxa %g4, [PCPU(PAD) + 8]%asi + + /* + * Increment a counter which might help us notice if we're + * stuck in a loop. pcpu->pad[2] = count + */ + ldxa [PCPU(PAD) + 16]%asi, %g4 + add %g4, 1, %g4 + stxa %g4, [PCPU(PAD) + 16]%asi +#endif + lda [PCPU(CPUMASK)]%asi, %g4 lda [%g3]%asi, %g1 1: or %g1, %g4, %g2 From owner-p4-projects@FreeBSD.ORG Wed Aug 2 06:44:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C95116A50C; Wed, 2 Aug 2006 06:44:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07E3416A501 for ; Wed, 2 Aug 2006 06:44:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0FCE43D45 for ; Wed, 2 Aug 2006 06:44:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k726iP40010390 for ; Wed, 2 Aug 2006 06:44:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k726iP5e010387 for perforce@freebsd.org; Wed, 2 Aug 2006 06:44:25 GMT (envelope-from jb@freebsd.org) Date: Wed, 2 Aug 2006 06:44:25 GMT Message-Id: <200608020644.k726iP5e010387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102997 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 06:44:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102997 Change 102997 by jb@jb_freebsd2 on 2006/08/02 06:44:00 Only print the trap trace data on the first CPU that decides to panic. We really don't need (potentially) 32 copies of the info. Also printf the pad fields in the per-cpu structure which we're using a temporary debug storage during traps. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#10 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#10 (text+ko) ==== @@ -1218,6 +1218,10 @@ m->md.pv_list_count++; } +#ifdef TRAP_TRACING +static int trap_trace_report_done; +#endif + #ifdef SMP static cpumask_t pmap_ipi(pmap_t pmap, char *func, uint64_t arg1, uint64_t arg2) @@ -1288,9 +1292,17 @@ curactive & ~ackmask); #ifdef TRAP_TRACING - for (j = 0; j < MAXCPU; j++) - if (((1 << j) & curactive & ~ackmask) != 0) - trap_trace_report(j); + if (!trap_trace_report_done) { + trap_trace_report_done = 1; + for (j = 0; j < MAXCPU; j++) + if (((1 << j) & curactive & ~ackmask) != 0) { + struct pcpu *pc = pcpu_find(j); + printf("pcpu pad 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx\n", + pc->pad[0], pc->pad[1], pc->pad[2], pc->pad[3], + pc->pad[4], pc->pad[5], pc->pad[6]); + trap_trace_report(j); + } + } #endif hv_cpu_state((uint64_t)ffs64(curactive & ~ackmask), &cpu_state); From owner-p4-projects@FreeBSD.ORG Wed Aug 2 06:47:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A680716A4E0; Wed, 2 Aug 2006 06:47:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A5F716A4DE for ; Wed, 2 Aug 2006 06:47:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 622E243D67 for ; Wed, 2 Aug 2006 06:47:30 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k726lU2t010584 for ; Wed, 2 Aug 2006 06:47:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k726lTfW010581 for perforce@freebsd.org; Wed, 2 Aug 2006 06:47:29 GMT (envelope-from jb@freebsd.org) Date: Wed, 2 Aug 2006 06:47:29 GMT Message-Id: <200608020647.k726lTfW010581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 06:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=102998 Change 102998 by jb@jb_freebsd2 on 2006/08/02 06:47:22 Save the %pc and %tick registers in the per-cpu structure for debug purposes while trying to track down the problem of the wandering CPU taking up gardening. In the sun4v_stable tree, this change actually stopped the panic from happening, but that can't be because anything is fixed here... just that something has changed. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#4 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.8 2005/04/16 15:05:56 marius Exp $"); #include "opt_simulator.h" +#include "opt_trap_trace.h" #include #include #include @@ -437,6 +438,25 @@ membar #Sync GET_PCPU_PHYS_SCRATCH(%g6) wr %g0, ASI_REAL, %asi + +#ifdef TRAP_TRACING + /* pcpu->pad[0] = %pc */ + rd %pc, %g4 + stxa %g4, [PCPU(PAD)]%asi + + /* pcpu->pad[1] = %tick */ + rdpr %tick, %g4 + stxa %g4, [PCPU(PAD) + 8]%asi + + /* + * Increment a counter which might help us notice if we're + * stuck in a loop. pcpu->pad[2] = count + */ + ldxa [PCPU(PAD) + 16]%asi, %g4 + add %g4, 1, %g4 + stxa %g4, [PCPU(PAD) + 16]%asi +#endif + lda [PCPU(CPUMASK)]%asi, %g4 lda [%g3]%asi, %g1 1: or %g1, %g4, %g2 From owner-p4-projects@FreeBSD.ORG Wed Aug 2 06:49:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E702116A4EA; Wed, 2 Aug 2006 06:49:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAE6F16A4E8 for ; Wed, 2 Aug 2006 06:49:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6875343D6E for ; Wed, 2 Aug 2006 06:49:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k726nXxL010698 for ; Wed, 2 Aug 2006 06:49:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k726nXqB010695 for perforce@freebsd.org; Wed, 2 Aug 2006 06:49:33 GMT (envelope-from jb@freebsd.org) Date: Wed, 2 Aug 2006 06:49:33 GMT Message-Id: <200608020649.k726nXqB010695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 06:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=102999 Change 102999 by jb@jb_freebsd2 on 2006/08/02 06:49:24 Pad the structure out a bit further to give us a few more places to stach debug info. The size of the pad field differs between this tree and the sun4v_stable tree because DTrace adds fields to struct pcpu and the requirement is that it is a multiple of 64 bytes. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#4 (text+ko) ==== @@ -78,7 +78,7 @@ struct rwindow pc_tsbwbuf[2]; \ uint64_t pc_caller; \ uint16_t pc_cpulist[MAXCPU]; \ - uint64_t pad[2]; + uint64_t pad[10]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned From owner-p4-projects@FreeBSD.ORG Wed Aug 2 06:51:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BECA16A4E8; Wed, 2 Aug 2006 06:51:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E8FC16A4E5 for ; Wed, 2 Aug 2006 06:51:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F85043D55 for ; Wed, 2 Aug 2006 06:51:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k726paWa010897 for ; Wed, 2 Aug 2006 06:51:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k726pacq010894 for perforce@freebsd.org; Wed, 2 Aug 2006 06:51:36 GMT (envelope-from jb@freebsd.org) Date: Wed, 2 Aug 2006 06:51:36 GMT Message-Id: <200608020651.k726pacq010894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 06:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=103000 Change 103000 by jb@jb_freebsd2 on 2006/08/02 06:51:30 Sync this file to the version in the dtrace tree. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/lib/libstand/ufs.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/lib/libstand/ufs.c#2 (text+ko) ==== @@ -92,6 +92,10 @@ #define COMPAT_UFS /* DUX has old format file systems */ #endif +/* +#define DEBUG 1 +*/ + static int ufs_open(const char *path, struct open_file *f); static int ufs_write(struct open_file *f, void *buf, size_t size, size_t *resid); static int ufs_close(struct open_file *f); @@ -111,6 +115,7 @@ ufs_readdir }; +#if defined(__sparc64__) && defined(T1_SIMULATOR) typedef int32_t daddr32_t; typedef int32_t time32_t; typedef unsigned char uchar_t; @@ -238,6 +243,7 @@ uchar_t fs_space[1]; /* list of blocks for each rotation */ /* actually longer */ }; +#endif /* * In-core open file. @@ -277,6 +283,7 @@ * i_number. */ +#if defined(DEBUG) && DEBUG > 1 static void hdump(uint8_t *bp, int size) { int i; @@ -311,6 +318,7 @@ printf(" : %s\n", tmp); } } +#endif /* @@ -330,10 +338,12 @@ if (fs == NULL) panic("fs == NULL"); +#ifdef DEBUG printf("read_inode : inumber=0x%llx fsba=0x%llx dba=0x%llx\n", (uint64_t)inumber, (uint64_t)ino_to_fsba(fs, inumber), (uint64_t)fsbtodb(fs, ino_to_fsba(fs, inumber)) ); +#endif /* * Read inode and save it. @@ -580,7 +590,7 @@ file_block = lblkno(fs, fp->f_seekp); file_size = DIP(fp, di_size); block_size = sblksize(fs, file_size, file_block); -#if 0 +#ifdef DEBUG printf("buf_read_file: fs->f_seekp=0x%llx : off=0x%lx : file_block=0x%lx : block_size=0x%llx\n", (uint64_t)fp->f_seekp, off, file_block, (uint64_t)block_size); printf("\tfile_size=0x%llx : fs_bsize=0x%llx\n", (uint64_t)file_size, (uint64_t)fs->fs_bsize); @@ -589,11 +599,13 @@ printf("fs->fs_qbmask=%llx fs->fs_qfmask=%llx fs->fs_fmask=%lx\n", fs->fs_qbmask, fs->fs_qfmask, fs->fs_fmask); #endif +#if defined(__sparc64__) && defined(T1_SIMULATOR) if (block_size > 8192) { block_size=8192; printf("FORCE ROUND block_size\n"); } -#if 0 +#endif +#ifdef DEBUG printf("\tfp->f_buf_blkno = 0x%lx\n", fp->f_buf_blkno); #endif if (file_block != fp->f_buf_blkno) { @@ -603,7 +615,7 @@ rc = block_map(f, file_block, &disk_block); if (rc) return (rc); -#if 0 +#ifdef DEBUG printf("\tblock_map : disk_block = 0x%lx\n", disk_block); #endif if (disk_block == 0) { @@ -611,7 +623,7 @@ fp->f_buf_size = block_size; } else { twiddle(); -#if 0 +#ifdef DEBUG printf("\tcalling dev_strategy for block read fsbtodb[0x%lx]=0x%lx\n", disk_block, fsbtodb(fs, disk_block)); #endif @@ -620,10 +632,12 @@ block_size, fp->f_buf, &fp->f_buf_size); if (rc) return (rc); -#if 0 +#ifdef DEBUG printf("\treturned from block read with 0x%lx bytes\n", fp->f_buf_size); +#if DEBUG > 1 hdump(fp->f_buf, fp->f_buf_size); #endif +#endif } fp->f_buf_blkno = file_block; @@ -646,6 +660,7 @@ return (0); } +#if defined(__sparc64__) && defined(T1_SIMULATOR) static void test_disk(struct open_file *f) { @@ -666,14 +681,15 @@ if (rc || read_size != 512) printf("strategy failed\n"); -#if 0 +#if defined(DEBUG) && DEBUG > 1 printf("%04d\n", i); hdump(buf, 512); -#endif - +#endif + } } +#endif static int search_directory(name, f, inumber_p) @@ -688,11 +704,11 @@ size_t buf_size; int namlen, length; int rc; -#if 0 +#if defined(__sparc64__) && defined(T1_SIMULATOR) test_disk(f); #endif length = strlen(name); -#if 0 +#ifdef DEBUG printf("search_directory: name=%s\n", name); #endif fp->f_seekp = 0; @@ -701,18 +717,18 @@ rc = buf_read_file(f, &buf, &buf_size); if (rc) return (rc); -#if 0 +#ifdef DEBUG printf("scan directory entries: @ 0x%llx (size=0x%llx)\n", (uint64_t)buf, (uint64_t)buf_size); #endif dp = (struct direct *)buf; edp = (struct direct *)(buf + buf_size); i = 0; -#if 0 +#if defined(DEBUG) && DEBUG > 1 hdump(buf, buf_size); #endif while (dp < edp) { -#if 0 +#ifdef DEBUG printf("\tdirent# %d (dp=0x%llx edp=0x%llx\n", i, (uint64_t)dp, (uint64_t)edp); #endif @@ -724,7 +740,7 @@ else #endif namlen = dp->d_namlen; -#if 0 +#ifdef DEBUG printf("namlen: %d dp->d_name: %s\n", namlen, dp->d_name); #endif if (namlen == length && @@ -743,11 +759,12 @@ } static int sblock_try[] = SBLOCKSEARCH; +#if defined(__sparc64__) && defined(T1_SIMULATOR) #define SOLARIS_SBLOCK_CONVERT 1 void map_sblock(struct fs *fsp) { struct solaris_fs sfs = *(struct solaris_fs *)fsp; -#if 0 +#ifdef DEBUG printf("fbsd fs_qfmask offset %lx solaris fs_qfmask offset %lx\n", offsetof(struct fs, fs_qfmask), offsetof(struct solaris_fs, fs_qfmask)); printf("fbsd fs_qbmask offset %lx solaris fs_qbmask offset %lx\n", @@ -763,7 +780,7 @@ fsp->fs_qfmask = ((uint64_t)sfs.fs_qfmask.val[0]) << 32 | sfs.fs_qfmask.val[1]; } - +#endif @@ -811,7 +828,7 @@ -#if 0 +#ifdef DEBUG printf("fs->fs_magic: %x fs->fs_bsize: %x fs->fs_sblockloc: %lx\n", fs->fs_magic, fs->fs_bsize, fs->fs_sblockloc); printf("sblock_try[i]: %x buf_size %lx\n", @@ -829,7 +846,7 @@ rc = EINVAL; goto out; } -#if 1 +#if defined(__sparc64__) && defined(T1_SIMULATOR) map_sblock(fs); #endif /* @@ -852,7 +869,7 @@ goto out; } -#if 0 +#ifdef DEBUG printf("read root inode \n"); #endif cp = path = strdup(upath); @@ -901,8 +918,10 @@ * symbolic link. */ parent_inumber = inumber; +#ifdef DEBUG printf("-- searching %s @ inode = 0x%x - found @ 0x%x\n", ncp, parent_inumber, inumber); +#endif rc = search_directory(ncp, f, &inumber); *cp = c; if (rc) From owner-p4-projects@FreeBSD.ORG Wed Aug 2 10:40:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FBA116A4E7; Wed, 2 Aug 2006 10:40:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 419E516A4DA for ; Wed, 2 Aug 2006 10:40:41 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4CB543D4C for ; Wed, 2 Aug 2006 10:40:40 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72AeeUH035778 for ; Wed, 2 Aug 2006 10:40:40 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72AeeX0035775 for perforce@freebsd.org; Wed, 2 Aug 2006 10:40:40 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 2 Aug 2006 10:40:40 GMT Message-Id: <200608021040.k72AeeX0035775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 10:40:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=103012 Change 103012 by rdivacky@rdivacky_witten on 2006/08/02 10:40:31 Add dummy arg to the linux_clone(). Linux uses some very strange calling convention here. linux_clone() takes 4 args but the 4th is addressed as 5th. Found by: kib Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#20 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#20 (text+ko) ==== @@ -214,8 +214,9 @@ 118 AUE_FSYNC NOPROTO { int fsync(int fd); } 119 AUE_SIGRETURN STD { int linux_sigreturn( \ struct l_sigframe *sfp); } +; linux uses some strange calling convention here so we have to use the dummy arg 120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack, \ - void *parent_tidptr, void * child_tidptr); } + void *parent_tidptr, int dummy, void * child_tidptr); } 121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \ int len); } 122 AUE_NULL STD { int linux_newuname( \ From owner-p4-projects@FreeBSD.ORG Wed Aug 2 10:41:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C40D216A4E5; Wed, 2 Aug 2006 10:41:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8633D16A4E1 for ; Wed, 2 Aug 2006 10:41:42 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C76743D46 for ; Wed, 2 Aug 2006 10:41:42 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72AfgJk035861 for ; Wed, 2 Aug 2006 10:41:42 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72AfgEX035858 for perforce@freebsd.org; Wed, 2 Aug 2006 10:41:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 2 Aug 2006 10:41:42 GMT Message-Id: <200608021041.k72AfgEX035858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 10:41:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=103013 Change 103013 by rdivacky@rdivacky_witten on 2006/08/02 10:41:03 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#20 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#20 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#20 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#20 (text+ko) ==== @@ -378,6 +378,7 @@ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char parent_tidptr_r_[PADR_(void *)]; + char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; struct linux_newuname_args { ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#20 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#20 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Aug 2 11:00:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65DA716A4E2; Wed, 2 Aug 2006 11:00:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2393216A4DA for ; Wed, 2 Aug 2006 11:00:06 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C029043D46 for ; Wed, 2 Aug 2006 11:00:05 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72B05eu036765 for ; Wed, 2 Aug 2006 11:00:05 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72B05lD036762 for perforce@freebsd.org; Wed, 2 Aug 2006 11:00:05 GMT (envelope-from piso@freebsd.org) Date: Wed, 2 Aug 2006 11:00:05 GMT Message-Id: <200608021100.k72B05lD036762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 11:00:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103014 Change 103014 by piso@piso_newluxor on 2006/08/02 10:59:20 Make the proto field unsigned. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#16 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#16 (text+ko) ==== @@ -67,7 +67,7 @@ struct proto_handler { u_int pri; /* Handler priority. */ int16_t dir; /* Flow direction. */ - int8_t proto; /* Working protocol. */ + uint8_t proto; /* Working protocol. */ int (*fingerprint)(struct libalias *la, /* Fingerprint * function. */ struct ip *pip, struct alias_data *ah); int (*protohandler)(struct libalias *la, /* Aliasing * function. */ From owner-p4-projects@FreeBSD.ORG Wed Aug 2 11:51:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0883A16A4DF; Wed, 2 Aug 2006 11:51:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D88A716A4DD for ; Wed, 2 Aug 2006 11:51:10 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E03843D45 for ; Wed, 2 Aug 2006 11:51:10 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72BpAgc041110 for ; Wed, 2 Aug 2006 11:51:10 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72BpAqO041107 for perforce@freebsd.org; Wed, 2 Aug 2006 11:51:10 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 2 Aug 2006 11:51:10 GMT Message-Id: <200608021151.k72BpAqO041107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 11:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103016 Change 103016 by gonzo@gonzo_hq on 2006/08/02 11:50:46 o nexus device added fo further pci stuff. Affected files ... .. //depot/projects/mips2/src/sys/conf/files.mips#13 edit .. //depot/projects/mips2/src/sys/mips/mips/nexus.c#1 add Differences ... ==== //depot/projects/mips2/src/sys/conf/files.mips#13 (text+ko) ==== @@ -5,23 +5,24 @@ mips/mips/copystr.S standard mips/mips/cpu.c standard mips/mips/db_disasm.c optional ddb -mips/mips/db_interface.c optional ddb +mips/mips/db_interface.c optional ddb mips/mips/db_trace.c optional ddb -mips/mips/dump_machdep.c standard +mips/mips/dump_machdep.c standard mips/mips/elf_machdep.c standard mips/mips/exception.S standard mips/mips/in_cksum.c optional inet -mips/mips/intr_machdep.c standard -mips/mips/locore.S standard no-obj +mips/mips/intr_machdep.c standard +mips/mips/locore.S standard no-obj mips/mips/machdep.c standard mips/mips/mem.c optional mem -mips/mips/pmap.c standard +mips/mips/nexus.c optional nexus +mips/mips/pmap.c standard mips/mips/support.S standard mips/mips/swtch.S standard mips/mips/sys_machdep.c standard -mips/mips/tick.c standard +mips/mips/tick.c standard mips/mips/tlb.c standard -mips/mips/trap.c standard +mips/mips/trap.c standard mips/mips/uio_machdep.c standard mips/mips/uio_machdep.c standard mips/mips/vm_machdep.c standard From owner-p4-projects@FreeBSD.ORG Wed Aug 2 11:55:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E81416A4E0; Wed, 2 Aug 2006 11:55:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5DFA16A4DF for ; Wed, 2 Aug 2006 11:55:16 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E3E043D46 for ; Wed, 2 Aug 2006 11:55:16 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72BtGjM041281 for ; Wed, 2 Aug 2006 11:55:16 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72BtFQ5041263 for perforce@freebsd.org; Wed, 2 Aug 2006 11:55:15 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 2 Aug 2006 11:55:15 GMT Message-Id: <200608021155.k72BtFQ5041263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 11:55:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=103017 Change 103017 by gonzo@gonzo_hq on 2006/08/02 11:54:44 o busdma functions added. Borrowed from NetBSD and FreeBSD/arm. Some calls are stubs, some - semiready (debug required). These functions are required for ATA stuff. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#2 (text+ko) ==== @@ -25,5 +25,649 @@ * */ +/*- + * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * 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. + * + * 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. + */ + +/* $NetBSD: bus_dma.c,v 1.17 2006/03/01 12:38:11 yamt Exp $ */ + #include __FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +struct bus_dma_tag { + bus_dma_tag_t parent; + bus_size_t alignment; + bus_size_t boundary; + bus_addr_t lowaddr; + bus_addr_t highaddr; + bus_dma_filter_t *filter; + void *filterarg; + bus_size_t maxsize; + u_int nsegments; + bus_size_t maxsegsz; + int flags; + int ref_count; + int map_count; + bus_dma_lock_t *lockfunc; + void *lockfuncarg; + /* XXX: machine-dependent fields */ + vm_offset_t _physbase; + vm_offset_t _wbase; + vm_offset_t _wsize; +}; + +#define DMAMAP_LINEAR 0x1 +#define DMAMAP_MBUF 0x2 +#define DMAMAP_UIO 0x4 +#define DMAMAP_ALLOCATED 0x10 +#define DMAMAP_TYPE_MASK (DMAMAP_LINEAR|DMAMAP_MBUF|DMAMAP_UIO) +#define DMAMAP_COHERENT 0x8 +struct bus_dmamap { + bus_dma_tag_t dmat; + int flags; + void *buffer; + void *origbuffer; + void *allocbuffer; + TAILQ_ENTRY(bus_dmamap) freelist; + int len; +}; + +static TAILQ_HEAD(,bus_dmamap) dmamap_freelist = + TAILQ_HEAD_INITIALIZER(dmamap_freelist); + +#define BUSDMA_STATIC_MAPS 500 +static struct bus_dmamap map_pool[BUSDMA_STATIC_MAPS]; + +static struct mtx busdma_mtx; + +MTX_SYSINIT(busdma_mtx, &busdma_mtx, "busdma lock", MTX_DEF); + +static void +mips_dmamap_freelist_init(void *dummy) +{ + int i; + + for (i = 0; i < BUSDMA_STATIC_MAPS; i++) + TAILQ_INSERT_HEAD(&dmamap_freelist, &map_pool[i], freelist); +} + +SYSINIT(busdma, SI_SUB_VM, SI_ORDER_ANY, mips_dmamap_freelist_init, NULL); + + + +/* + * Check to see if the specified page is in an allowed DMA range. + */ + +static __inline int +bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dma_segment_t *segs, + bus_dmamap_t map, void *buf, bus_size_t buflen, struct pmap *pmap, + int flags, vm_offset_t *lastaddrp, int *segp); + +/* + * Convenience function for manipulating driver locks from busdma (during + * busdma_swi, for example). Drivers that don't provide their own locks + * should specify &Giant to dmat->lockfuncarg. Drivers that use their own + * non-mutex locking scheme don't have to use this at all. + */ +void +busdma_lock_mutex(void *arg, bus_dma_lock_op_t op) +{ + struct mtx *dmtx; + + dmtx = (struct mtx *)arg; + switch (op) { + case BUS_DMA_LOCK: + mtx_lock(dmtx); + break; + case BUS_DMA_UNLOCK: + mtx_unlock(dmtx); + break; + default: + panic("Unknown operation 0x%x for busdma_lock_mutex!", op); + } +} + +/* + * dflt_lock should never get called. It gets put into the dma tag when + * lockfunc == NULL, which is only valid if the maps that are associated + * with the tag are meant to never be defered. + * XXX Should have a way to identify which driver is responsible here. + */ +static void +dflt_lock(void *arg, bus_dma_lock_op_t op) +{ +#ifdef INVARIANTS + panic("driver error: busdma dflt_lock called"); +#else + printf("DRIVER_ERROR: busdma dflt_lock called\n"); +#endif +} + +static __inline bus_dmamap_t +_busdma_alloc_dmamap(void) +{ + bus_dmamap_t map; + + mtx_lock(&busdma_mtx); + map = TAILQ_FIRST(&dmamap_freelist); + if (map) + TAILQ_REMOVE(&dmamap_freelist, map, freelist); + mtx_unlock(&busdma_mtx); + if (!map) { + map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT); + if (map) + map->flags = DMAMAP_ALLOCATED; + } else + map->flags = 0; + return (map); +} + +static __inline void +_busdma_free_dmamap(bus_dmamap_t map) +{ + if (map->flags & DMAMAP_ALLOCATED) + free(map, M_DEVBUF); + else { + mtx_lock(&busdma_mtx); + TAILQ_INSERT_HEAD(&dmamap_freelist, map, freelist); + mtx_unlock(&busdma_mtx); + } +} + +int +bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, + bus_size_t boundary, bus_addr_t lowaddr, + bus_addr_t highaddr, bus_dma_filter_t *filter, + void *filterarg, bus_size_t maxsize, int nsegments, + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat) +{ + bus_dma_tag_t newtag; + int error = 0; + + /* Basic sanity checking */ + if (boundary != 0 && boundary < maxsegsz) + maxsegsz = boundary; + + /* Return a NULL tag on failure */ + *dmat = NULL; + + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, + M_ZERO | M_NOWAIT); + if (newtag == NULL) { + CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d", + __func__, newtag, 0, error); + return (ENOMEM); + } + + newtag->parent = parent; + newtag->alignment = alignment; + newtag->boundary = boundary; + newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1); + newtag->highaddr = trunc_page((vm_paddr_t)highaddr) + + (PAGE_SIZE - 1); + newtag->filter = filter; + newtag->filterarg = filterarg; + newtag->maxsize = maxsize; + newtag->nsegments = nsegments; + newtag->maxsegsz = maxsegsz; + newtag->flags = flags; + newtag->ref_count = 1; /* Count ourself */ + newtag->map_count = 0; + newtag->_wbase = 0; + newtag->_physbase = 0; + newtag->_wsize = 64 * 1024 * 1024; + if (lockfunc != NULL) { + newtag->lockfunc = lockfunc; + newtag->lockfuncarg = lockfuncarg; + } else { + newtag->lockfunc = dflt_lock; + newtag->lockfuncarg = NULL; + } + + /* Take into account any restrictions imposed by our parent tag */ + if (parent != NULL) { + newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr); + newtag->highaddr = MAX(parent->highaddr, newtag->highaddr); + if (newtag->boundary == 0) + newtag->boundary = parent->boundary; + else if (parent->boundary != 0) + newtag->boundary = MIN(parent->boundary, + newtag->boundary); + if (newtag->filter == NULL) { + /* + * Short circuit looking at our parent directly + * since we have encapsulated all of its information + */ + newtag->filter = parent->filter; + newtag->filterarg = parent->filterarg; + newtag->parent = parent->parent; + } + if (newtag->parent != NULL) + atomic_add_int(&parent->ref_count, 1); + } + + if (error != 0) { + free(newtag, M_DEVBUF); + } else { + *dmat = newtag; + } + CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d", + __func__, newtag, (newtag != NULL ? newtag->flags : 0), error); + return (error); + +} + +int +bus_dma_tag_destroy(bus_dma_tag_t dmat) +{ +#ifdef KTR + bus_dma_tag_t dmat_copy = dmat; +#endif + + if (dmat != NULL) { + + if (dmat->map_count != 0) + return (EBUSY); + + while (dmat != NULL) { + bus_dma_tag_t parent; + + parent = dmat->parent; + atomic_subtract_int(&dmat->ref_count, 1); + if (dmat->ref_count == 0) { + free(dmat, M_DEVBUF); + /* + * Last reference count, so + * release our reference + * count on our parent. + */ + dmat = parent; + } else + dmat = NULL; + } + } + CTR2(KTR_BUSDMA, "%s tag %p", __func__, dmat_copy); + + return (0); +} + +/* + * Allocate a handle for mapping from kva/uva/physical + * address space into bus device space. + */ +int +bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) +{ + bus_dmamap_t newmap; +#ifdef KTR + int error = 0; +#endif + + newmap = _busdma_alloc_dmamap(); + if (newmap == NULL) { + CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM); + return (ENOMEM); + } + *mapp = newmap; + newmap->dmat = dmat; + dmat->map_count++; + + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, error); + + return (0); + +} + +/* + * Destroy a handle for mapping from kva/uva/physical + * address space into bus device space. + */ +int +bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) +{ + _busdma_free_dmamap(map); + dmat->map_count--; + CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat); + return (0); +} + +/* + * Allocate a piece of memory that can be efficiently mapped into + * bus device space based on the constraints lited in the dma tag. + * A dmamap to for use with dmamap_load is also allocated. + */ +int +bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, + bus_dmamap_t *mapp) +{ + bus_dmamap_t newmap = NULL; + + int mflags; + + if (flags & BUS_DMA_NOWAIT) + mflags = M_NOWAIT; + else + mflags = M_WAITOK; + if (flags & BUS_DMA_ZERO) + mflags |= M_ZERO; + + newmap = _busdma_alloc_dmamap(); + if (newmap == NULL) { + CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", + __func__, dmat, dmat->flags, ENOMEM); + return (ENOMEM); + } + dmat->map_count++; + *mapp = newmap; + newmap->dmat = dmat; + + if (dmat->maxsize <= PAGE_SIZE) { + *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); + } else { + /* + * XXX Use Contigmalloc until it is merged into this facility + * and handles multi-seg allocations. Nobody is doing + * multi-seg allocations yet though. + */ + *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, mflags, + 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, + dmat->boundary); + } + if (*vaddr == NULL) { + if (newmap != NULL) { + _busdma_free_dmamap(newmap); + dmat->map_count--; + } + *mapp = NULL; + return (ENOMEM); + } + if (flags & BUS_DMA_COHERENT) { + /* XXXMIPS: check this later + void *tmpaddr = arm_remap_nocache( + (void *)((vm_offset_t)*vaddr &~ PAGE_MASK), + dmat->maxsize + ((vm_offset_t)*vaddr & PAGE_MASK)); + */ + void *tmpaddr = (void *)*vaddr; + + if (tmpaddr) { + tmpaddr = (void *)((vm_offset_t)(tmpaddr) + + ((vm_offset_t)*vaddr & PAGE_MASK)); + newmap->origbuffer = *vaddr; + newmap->allocbuffer = tmpaddr; + mips_dcache_wbinv_range((vm_offset_t)*vaddr, + dmat->maxsize); + *vaddr = tmpaddr; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; + return (0); + +} + +/* + * Free a piece of memory and it's allocated dmamap, that was allocated + * via bus_dmamem_alloc. Make the same choice for free/contigfree. + */ +void +bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) +{ + if (map->allocbuffer) { + KASSERT(map->allocbuffer == vaddr, + ("Trying to freeing the wrong DMA buffer")); + vaddr = map->origbuffer; + /* XXXMIPS: arm_unmap_nocache(map->allocbuffer, dmat->maxsize); */ + } + if (dmat->maxsize <= PAGE_SIZE) + free(vaddr, M_DEVBUF); + else { + contigfree(vaddr, dmat->maxsize, M_DEVBUF); + } + dmat->map_count--; + _busdma_free_dmamap(map); + CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags); + +} + +/* + * Utility function to load a linear buffer. lastaddrp holds state + * between invocations (for multiple-buffer loads). segp contains + * the starting segment on entrance, and the ending segment on exit. + * first indicates if this is the first invocation of this function. + */ +static __inline int +bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dma_segment_t *segs, + bus_dmamap_t map, void *buf, bus_size_t buflen, struct pmap *pmap, + int flags, vm_offset_t *lastaddrp, int *segp) +{ + bus_size_t sgsize; + bus_size_t bmask; + vm_offset_t curaddr, lastaddr; + vm_offset_t vaddr = (vm_offset_t)buf; + int seg; + int error = 0; + + lastaddr = *lastaddrp; + bmask = ~(dmat->boundary - 1); + + for (seg = *segp; buflen > 0 ; ) { + /* + * Get the physical address for this segment. + */ + curaddr = pmap_extract(pmap, vaddr); + + /* + * If we're beyond the current DMA window, indicate + * that and try to fall back onto something else. + */ + /* XXXMIPS: check for range validity */ + if (curaddr < dmat->_physbase || + curaddr >= (dmat->_physbase + dmat->_wsize)) + return (EINVAL); +#if 0 + printf("dma: addr 0x%08lx -> 0x%08lx\n", curaddr, + (curaddr - t->_physbase) + t->_wbase); +#endif + /* + * In a valid DMA range. Translate the physical + * memory address to an address in the DMA window. + */ + curaddr = (curaddr - dmat->_physbase) + dmat->_wbase; + + + /* + * Compute the segment size, and adjust counts. + */ + sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (buflen < sgsize) + sgsize = buflen; + + /* + * Insert chunk into a segment, coalescing with + * the previous segment if possible. + */ + if (seg >= 0 && curaddr == lastaddr && + (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && + (dmat->boundary == 0 || + (segs[seg].ds_addr & bmask) == + (curaddr & bmask))) { + segs[seg].ds_len += sgsize; + goto segdone; + } else { + if (++seg >= dmat->nsegments) + break; + segs[seg].ds_addr = curaddr; + segs[seg].ds_len = sgsize; + } + if (error) + break; +segdone: + lastaddr = curaddr + sgsize; + vaddr += sgsize; + buflen -= sgsize; + } + + *segp = seg; + *lastaddrp = lastaddr; + + /* + * Did we fit? + */ + if (buflen != 0) + error = EFBIG; + + return error; +} + +/* + * Map the buffer buf into bus space using the dmamap map. + */ +int +bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, + bus_size_t buflen, bus_dmamap_callback_t *callback, + void *callback_arg, int flags) +{ + vm_offset_t lastaddr = 0; + int error, nsegs = -1; +#ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT + bus_dma_segment_t dm_segments[dmat->nsegments]; +#else + bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; +#endif + + KASSERT(dmat != NULL, ("dmatag is NULL")); + KASSERT(map != NULL, ("dmamap is NULL")); + map->flags &= ~DMAMAP_TYPE_MASK; + map->flags |= DMAMAP_LINEAR|DMAMAP_COHERENT; + map->buffer = buf; + map->len = buflen; + error = bus_dmamap_load_buffer(dmat, + dm_segments, map, buf, buflen, kernel_pmap, + flags, &lastaddr, &nsegs); + if (error) + (*callback)(callback_arg, NULL, 0, error); + else + (*callback)(callback_arg, dm_segments, nsegs + 1, error); + + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, nsegs + 1, error); + + return (0); + +} + +/* + * Like bus_dmamap_load(), but for mbufs. + */ +int +bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, struct mbuf *m0, + bus_dmamap_callback2_t *callback, void *callback_arg, + int flags) +{ + panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); + return (0); +} + +int +bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map, + struct mbuf *m0, bus_dma_segment_t *segs, int *nsegs, + int flags) +{ + int error = 0; + panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); + return (error); +} + +/* + * Like bus_dmamap_load(), but for uios. + */ +int +bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, struct uio *uio, + bus_dmamap_callback2_t *callback, void *callback_arg, + int flags) +{ + panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); + return (0); +} + +/* + * Release the mapping held by map. + */ +void +_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) +{ + panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); + return; +} + + + +static __inline void +bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) +{ + panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); +} + +void +_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) +{ + panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); +} From owner-p4-projects@FreeBSD.ORG Wed Aug 2 13:53:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55EEA16A4E1; Wed, 2 Aug 2006 13:53:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E08216A4DF for ; Wed, 2 Aug 2006 13:53:49 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5413A43D5D for ; Wed, 2 Aug 2006 13:53:45 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72DrjSD057454 for ; Wed, 2 Aug 2006 13:53:45 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72DrjFw057451 for perforce@freebsd.org; Wed, 2 Aug 2006 13:53:45 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 2 Aug 2006 13:53:45 GMT Message-Id: <200608021353.k72DrjFw057451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 13:53:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=103021 Change 103021 by gabor@gabor_spitfire on 2006/08/02 13:53:42 Eliminate make += variable assignments. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#15 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#15 (text+ko) ==== @@ -12,10 +12,12 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"` + _MASTER_SITES_${_group}= $${_MASTER_SITES_${_group}} ${__SUFFIX_TMP} done else - _MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + _MASTER_SITES_DEFAULT= ${_MASTER_SITES_DEFAULT} ${__SUFFIX_TMP} fi done for _S in ${MASTER_SITE_SUBDIR}; do @@ -30,12 +32,14 @@ exit 1 fi if [ -n "${_MASTER_SITES_${_group}}" ] ; then - _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + _MASTER_SITE_SUBDIR_${_group}= $${_MASTER_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi done else if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then - _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"` + _MASTER_SITE_SUBDIR_DEFAULT= ${_MASTER_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP} fi fi done @@ -55,10 +59,11 @@ for site in $${_MASTER_SITES_${_group}}; do _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then - MASTER_SITES_TMP+= ${site} + MASTER_SITES_TMP= ${MASTER_SITES_TMP} ${site} else for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do - MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^" + MASTER_SITES_TMP= ${MASTER_SITES_TM} ${__SUFFIX_TMP} done fi done @@ -77,10 +82,11 @@ for site in ${_MASTER_SITES_DEFAULT}; do _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then - MASTER_SITES_TMP+= ${site} + MASTER_SITES_TMP= ${MASTER_SITES_TMP} ${site} else for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do - MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^" + __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + MASTER_SITES_TMP= ${MASTER_SITES_TMP} ${__SUFFIX_TMP} done fi done @@ -113,7 +119,7 @@ if [ -d ${MOUNTPT}/ports/distfiles ] ; then _MASTER_SITE_OVERRIDE:= file:${MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE} if [ -n "${FETCH_SYMLINK_DISTFILES}" ]; then - FETCH_BEFORE_ARGS+= -l + FETCH_BEFORE_ARGS= ${FETCH_BEFORE_ARGS} -l fi fi done @@ -137,14 +143,15 @@ if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then _G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/` if [ -z "${_G_TEMP_TEMP}" ; then - _G_TEMP+= ${_group} - _MASTER_SITES_ALL+= $${_MASTER_SITES_${_group}} + _G_TEMP= ${_G_TEMP} ${_group} + _MASTER_SITES_ALL= ${_MASTER_SITES_ALL} $${_MASTER_SITES_${_group}} fi fi done - _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"` + __SUFFIX_TMP= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"` + _DISTFILES= ${_DISTFILE} ${__SUFFIX_TMP} else - _DISTFILES+= ${_D} + _DISTFILES= ${_DISTFILES} ${_D} fi done _G_TEMP= @@ -260,10 +267,12 @@ ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" exit 1 fi - _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + _PATCH_SITES_${_group}= $${_PATCH_SITES_${_group}} ${__SUFFIX_TMP} done else - _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + _PATCH_SITES_DEFAULT= ${_PATCH_SITES_DEFAULT} ${__SUFFIX_TMP} fi done for _S in ${PATCH_SITE_SUBDIR}; do @@ -278,12 +287,14 @@ exit 1 fi if [ -n "${_PATCH_SITES_${_group}}" ] ; then - _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + _PATCH_SITE_SUBDIR_${_group}= $${_PATCH_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi done else if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then - _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + _PATCH_SITE_SUBDIR_DEFAULT= ${_PATCH_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP} fi fi done @@ -301,11 +312,12 @@ for site in $${_PATCH_SITES_${_group}}; do _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then - PATCH_SITES_TMP+= ${site} + PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${site} else for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do - PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` - dine + __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${__SUFFIX_TMP} + done fi done fi @@ -323,10 +335,11 @@ for site in ${_PATCH_SITES_DEFAULT}; do _S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then - PATCH_SITES_TMP+= ${site} + PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${site} else for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do - PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${__SUFFIX_TMP} done fi done @@ -346,14 +359,15 @@ if [ -z "$${_PATCH_SITES_${_group}}" ] ; then _G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/` if [ -z "${_G_TEMP_TEMP}" ] ; then - _G_TEMP+= ${_group} - _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} + _G_TEMP= ${_G_TEMP} ${_group} + _PATCH_SITES_ALL= ${_PATCH_SITES_ALL} $${_PATCH_SITES_${_group}} fi fi done - _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + __SUFFIX_TMP= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + _PATCHFILES= ${_PATCHFILES} ${__SUFFIX_TMP} else - _PATCHFILES+= ${_P} + _PATCHFILES= ${_PATCHFILES} ${_P} fi done for _S in ${PATCH_SITES}; do From owner-p4-projects@FreeBSD.ORG Wed Aug 2 15:03:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F23BE16A4DD; Wed, 2 Aug 2006 15:03:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0A6816A4E1 for ; Wed, 2 Aug 2006 15:03:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1713343D6B for ; Wed, 2 Aug 2006 15:03:14 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72F3Dg0063864 for ; Wed, 2 Aug 2006 15:03:13 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72F3D6d063861 for perforce@freebsd.org; Wed, 2 Aug 2006 15:03:13 GMT (envelope-from piso@freebsd.org) Date: Wed, 2 Aug 2006 15:03:13 GMT Message-Id: <200608021503.k72F3D6d063861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 15:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=103026 Change 103026 by piso@piso_newluxor on 2006/08/02 15:02:52 After a brief talk with scottl about aac, he convinced me that the mask/unmask isn't the ideal approach here. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#7 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#7 (text+ko) ==== @@ -814,8 +814,6 @@ */ wakeup(sc->aifthread); } - if (ret & FILTER_SCHEDULE_THREAD) - AAC_MASK_INTERRUPTS(sc); return((ret)?ret:FILTER_STRAY); } @@ -1079,7 +1077,6 @@ aac_startio(sc); mtx_unlock(&sc->aac_io_lock); - AAC_UNMASK_INTERRUPTS(sc); } /* From owner-p4-projects@FreeBSD.ORG Wed Aug 2 15:50:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6DC816A4E5; Wed, 2 Aug 2006 15:50:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8588616A4DD for ; Wed, 2 Aug 2006 15:50:44 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D257D43D76 for ; Wed, 2 Aug 2006 15:50:37 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72FobwV066495 for ; Wed, 2 Aug 2006 15:50:37 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72Fob30066492 for perforce@freebsd.org; Wed, 2 Aug 2006 15:50:37 GMT (envelope-from csjp@freebsd.org) Date: Wed, 2 Aug 2006 15:50:37 GMT Message-Id: <200608021550.k72Fob30066492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 103037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 15:50:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=103037 Change 103037 by csjp@csjp_xor on 2006/08/02 15:49:52 Do some cosmetic changes to make merging into HEAD a bit easier. Should be no functional change here Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#17 (text+ko) ==== @@ -217,9 +217,8 @@ * Try to provide more helpful debugging output if su(1) is running * non-setuid, or was run from a file system not mounted setuid. */ - if (geteuid() != 0) { + if (geteuid() != 0) errx(1, "not running setuid"); - } if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT @@ -231,9 +230,8 @@ } nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); - if (nargv == NULL) { + if (nargv == NULL) errx(1, "malloc failure"); - } nargv[argc + 3] = NULL; for (i = argc; i >= optind; i--) @@ -266,9 +264,8 @@ } username = strdup(pwd->pw_name); - if (username == NULL) { + if (username == NULL) err(1, "strdup failure"); - } if (asme) { if (pwd->pw_shell != NULL && *pwd->pw_shell != '\0') { @@ -370,16 +367,14 @@ errx(1, "only root may use -c"); } lc = login_getclass(class); - if (lc == NULL) { + if (lc == NULL) errx(1, "unknown class: %s", class); - } } /* if asme and non-standard target shell, must be root */ if (asme) { - if (ruid != 0 && !chshell(pwd->pw_shell)) { + if (ruid != 0 && !chshell(pwd->pw_shell)) errx(1, "permission denied (shell)"); - } } else if (pwd->pw_shell && *pwd->pw_shell) { shell = pwd->pw_shell; @@ -403,18 +398,16 @@ /* Switch to home directory */ if (asthem) { - if (chdir(pwd->pw_dir) < 0) { + if (chdir(pwd->pw_dir) < 0) errx(1, "no directory"); - } } /* * PAM modules might add supplementary groups in pam_setcred(), so * initialize them first. */ - if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) { + if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) err(1, "setusercontext"); - } retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); if (retcode != PAM_SUCCESS) { @@ -478,9 +471,8 @@ child_pgrp = getpgid(child_pid); if (tcgetpgrp(STDERR_FILENO) == child_pgrp) tcsetpgrp(STDERR_FILENO, getpgrp()); - if (pid == -1) { + if (pid == -1) err(1, "waitpid"); - } PAM_END(); exit(WEXITSTATUS(statusp)); case -1: @@ -512,9 +504,8 @@ */ if ((asme || (!asthem && class == NULL)) && pwd->pw_uid) setwhat &= ~(LOGIN_SETPRIORITY | LOGIN_SETRESOURCES); - if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) { + if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) err(1, "setusercontext"); - } if (!asme) { if (asthem) { @@ -555,7 +546,7 @@ /* csh strips the first character... */ *np.a = asthem ? "-su" : iscsh == YES ? "_su" : "su"; - if (ruid != 0) + if (ruid != 0) syslog(LOG_NOTICE, "%s to %s%s", username, user, ontty()); From owner-p4-projects@FreeBSD.ORG Wed Aug 2 16:16:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEDB716A4E2; Wed, 2 Aug 2006 16:16:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F11416A4DE for ; Wed, 2 Aug 2006 16:16:11 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDEF643D46 for ; Wed, 2 Aug 2006 16:16:09 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72GG9MP068896 for ; Wed, 2 Aug 2006 16:16:09 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72GG9U1068893 for perforce@freebsd.org; Wed, 2 Aug 2006 16:16:09 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 2 Aug 2006 16:16:09 GMT Message-Id: <200608021616.k72GG9U1068893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 16:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=103039 Change 103039 by gonzo@gonzo_hq on 2006/08/02 16:15:49 o Initial support for GT64120 chip. o Enable pci/ata/atadisk in malta config. Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/MALTA#7 edit .. //depot/projects/mips2/src/sys/mips/mips4k/malta/files.malta#5 edit .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt.c#1 add .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#1 add .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gtreg.h#1 add .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gtvar.h#1 add .. //depot/projects/mips2/src/sys/mips/mips4k/malta/std.malta#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#7 (text+ko) ==== @@ -53,7 +53,8 @@ device genclock device loop device ether +device md device mem -device md +device nexus device uart device uart_ns8250 ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/files.malta#5 (text+ko) ==== @@ -1,4 +1,6 @@ # $FreeBSD$ +mips/mips4k/malta/gt.c standard +mips/mips4k/malta/gt_pci.c standard mips/mips4k/malta/uart_cpu_maltausart.c optional uart mips/mips4k/malta/uart_dev_maltausart.c optional uart mips/mips4k/malta/uart_bus_maltausart.c optional uart ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/std.malta#2 (text+ko) ==== @@ -7,3 +7,6 @@ # XXXMIPS: It's a stub, isn't it? # cpu CPU_MIPS4KC +device pci +device ata +device atadisk From owner-p4-projects@FreeBSD.ORG Wed Aug 2 16:22:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 162F116A4E6; Wed, 2 Aug 2006 16:22:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E476916A4DE for ; Wed, 2 Aug 2006 16:22:18 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40BB243D62 for ; Wed, 2 Aug 2006 16:22:18 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72GMIRv069335 for ; Wed, 2 Aug 2006 16:22:18 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72GMHaf069332 for perforce@freebsd.org; Wed, 2 Aug 2006 16:22:17 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 2 Aug 2006 16:22:17 GMT Message-Id: <200608021622.k72GMHaf069332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 16:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103041 Change 103041 by gonzo@gonzo_hq on 2006/08/02 16:21:44 o Make nexus device standard, not optional. Pointed by: Olivier Houchard. Affected files ... .. //depot/projects/mips2/src/sys/conf/files.mips#14 edit .. //depot/projects/mips2/src/sys/mips/conf/MALTA#8 edit Differences ... ==== //depot/projects/mips2/src/sys/conf/files.mips#14 (text+ko) ==== @@ -15,7 +15,7 @@ mips/mips/locore.S standard no-obj mips/mips/machdep.c standard mips/mips/mem.c optional mem -mips/mips/nexus.c optional nexus +mips/mips/nexus.c standard mips/mips/pmap.c standard mips/mips/support.S standard mips/mips/swtch.S standard ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#8 (text+ko) ==== @@ -55,6 +55,5 @@ device ether device md device mem -device nexus device uart device uart_ns8250 From owner-p4-projects@FreeBSD.ORG Wed Aug 2 17:56:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9389816A4E2; Wed, 2 Aug 2006 17:56:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EDFF16A4DF for ; Wed, 2 Aug 2006 17:56:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E133643D72 for ; Wed, 2 Aug 2006 17:56:19 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72HuJ36083707 for ; Wed, 2 Aug 2006 17:56:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72HuJNA083704 for perforce@freebsd.org; Wed, 2 Aug 2006 17:56:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 2 Aug 2006 17:56:19 GMT Message-Id: <200608021756.k72HuJNA083704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 17:56:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=103047 Change 103047 by hselasky@hselasky_mini_itx on 2006/08/02 17:55:20 Improve support for polling USB transfers: 1) Make sure that the polling thread does not read USB host controller status registers, blocking host controller interrupts. 2) Make sure that the polling thread handles poll transfers only, and the interrupt thread interrupt transfers only, and simplify the check. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#8 (text+ko) ==== @@ -1059,19 +1059,16 @@ * and callback must be called else zero */ static u_int8_t -ehci_check_transfer(struct usbd_xfer *xfer) +ehci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd) { DPRINTFN(15, ("xfer=%p\n", xfer)); - if(xfer->usb_thread) + if(xfer->usb_thread != ctd) { - if(xfer->usb_thread != curthread) - { - /* cannot call this transfer - * back due to locking ! - */ - goto done; - } + /* cannot call this transfer + * back due to locking ! + */ + goto done; } if(xfer->pipe->methods == &ehci_device_isoc_fs_methods) @@ -1205,8 +1202,8 @@ return; } -void -ehci_interrupt(ehci_softc_t *sc) +static void +ehci_interrupt_td(ehci_softc_t *sc, struct thread *ctd) { enum { FINISH_LIST_MAX = 16 }; @@ -1232,6 +1229,15 @@ goto done; } + if(ctd) + { + /* the poll thread should not read + * any status registers that will + * clear interrupts! + */ + goto repeat; + } + sc->sc_bus.no_intrs++; DPRINTFN(15,("%s: real interrupt\n", @@ -1322,7 +1328,7 @@ /* check if transfer is * transferred */ - if(ehci_check_transfer(xfer)) + if(ehci_check_transfer(xfer, ctd)) { /* queue callback */ ptr->xfer = xfer; @@ -1358,6 +1364,13 @@ return; } +void +ehci_interrupt(ehci_softc_t *sc) +{ + ehci_interrupt_td(sc, NULL); + return; +} + /* * called when a request does not complete */ @@ -1390,7 +1403,7 @@ static void ehci_do_poll(struct usbd_bus *bus) { - ehci_interrupt(EHCI_BUS2SC(bus)); + ehci_interrupt_td(EHCI_BUS2SC(bus), curthread); return; } ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#8 (text+ko) ==== @@ -839,21 +839,18 @@ * and callback must be called; else zero */ static u_int8_t -ohci_check_transfer(struct usbd_xfer *xfer) +ohci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd) { ohci_ed_t *ed = xfer->qh_start; DPRINTFN(15, ("xfer=%p\n", xfer)); - if(xfer->usb_thread) + if(xfer->usb_thread != ctd) { - if(xfer->usb_thread != curthread) - { - /* cannot call this transfer - * back due to locking ! - */ - return 0; - } + /* cannot call this transfer + * back due to locking ! + */ + return 0; } if((ed->ed_flags & htole32(OHCI_ED_SKIP)) || @@ -928,8 +925,8 @@ return; } -void -ohci_interrupt(ohci_softc_t *sc) +static void +ohci_interrupt_td(ohci_softc_t *sc, struct thread *ctd) { enum { FINISH_LIST_MAX = 16 }; @@ -948,6 +945,15 @@ goto done; } + if(ctd) + { + /* the poll thread should not read + * any status registers that will + * clear interrupts! + */ + goto repeat; + } + sc->sc_bus.no_intrs++; DPRINTFN(15,("%s: real interrupt\n", @@ -1074,7 +1080,7 @@ /* check if transfer is * transferred */ - if(ohci_check_transfer(xfer)) + if(ohci_check_transfer(xfer, ctd)) { /* queue callback */ ptr->xfer = xfer; @@ -1110,6 +1116,13 @@ return; } +void +ohci_interrupt(ohci_softc_t *sc) +{ + ohci_interrupt_td(sc, NULL); + return; +} + /* * called when a request does not complete */ @@ -1142,7 +1155,7 @@ static void ohci_do_poll(struct usbd_bus *bus) { - ohci_interrupt(OHCI_BUS2SC(bus)); + ohci_interrupt_td(OHCI_BUS2SC(bus), curthread); return; } ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#8 (text+ko) ==== @@ -927,21 +927,18 @@ * and callback must be called; else zero */ static u_int8_t -uhci_check_transfer(struct usbd_xfer *xfer) +uhci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd) { uhci_td_t *td; DPRINTFN(15, ("xfer=%p\n", xfer)); - if(xfer->usb_thread) + if(xfer->usb_thread != ctd) { - if(xfer->usb_thread != curthread) - { - /* cannot call this transfer - * back due to locking ! - */ - return 0; - } + /* cannot call this transfer + * back due to locking ! + */ + goto done; } td = xfer->td_transfer_last; @@ -1021,8 +1018,8 @@ return 1; } -void -uhci_interrupt(uhci_softc_t *sc) +static void +uhci_interrupt_td(uhci_softc_t *sc, struct thread *ctd) { enum { FINISH_LIST_MAX = 16 }; @@ -1053,6 +1050,15 @@ goto done; } + if(ctd) + { + /* the poll thread should not read + * any status registers that will + * clear interrupts! + */ + goto repeat; + } + sc->sc_bus.no_intrs++; DPRINTFN(15,("%s: real interrupt\n", @@ -1128,7 +1134,7 @@ /* check if transfer is * transferred */ - if(uhci_check_transfer(xfer)) + if(uhci_check_transfer(xfer, ctd)) { /* queue callback */ ptr->xfer = xfer; @@ -1164,6 +1170,13 @@ return; } +void +uhci_interrupt(uhci_softc_t *sc) +{ + uhci_interrupt_td(sc, NULL); + return; +} + /* * called when a request does not complete */ @@ -1196,7 +1209,7 @@ static void uhci_do_poll(struct usbd_bus *bus) { - uhci_interrupt(UHCI_BUS2SC(bus)); + uhci_interrupt_td(UHCI_BUS2SC(bus), curthread); return; } From owner-p4-projects@FreeBSD.ORG Wed Aug 2 18:10:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276BC16A4E0; Wed, 2 Aug 2006 18:10:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E395B16A4DD for ; Wed, 2 Aug 2006 18:10:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86E9A43D46 for ; Wed, 2 Aug 2006 18:10:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72IAe64086019 for ; Wed, 2 Aug 2006 18:10:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72IAd5e086012 for perforce@freebsd.org; Wed, 2 Aug 2006 18:10:39 GMT (envelope-from jhb@freebsd.org) Date: Wed, 2 Aug 2006 18:10:39 GMT Message-Id: <200608021810.k72IAd5e086012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 18:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=103050 Change 103050 by jhb@jhb_mutex on 2006/08/02 18:10:24 IFC @103046. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#65 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#23 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#32 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#31 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#36 integrate .. //depot/projects/smpng/sys/dev/dc/dcphy.c#4 integrate .. //depot/projects/smpng/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#18 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#32 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#105 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#80 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#43 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#20 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#73 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#90 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#57 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#115 integrate .. //depot/projects/smpng/sys/modules/Makefile#127 integrate .. //depot/projects/smpng/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/smpng/sys/net/bridgestp.c#10 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#3 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#36 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#75 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#81 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#37 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#66 integrate .. //depot/projects/smpng/sys/sys/syscall.h#72 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#72 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#75 integrate .. //depot/projects/smpng/sys/vm/pmap.h#33 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#83 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#80 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#58 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#65 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); /* * Manages physical address maps. @@ -2972,7 +2972,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. ==== //depot/projects/smpng/sys/amd64/include/pmap.h#23 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.132 2006/05/01 22:07:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.133 2006/08/02 16:24:23 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -81,6 +81,8 @@ #define PGEX_P 0x01 /* Protection violation vs. not present */ #define PGEX_W 0x02 /* during a Write cycle */ #define PGEX_U 0x04 /* access from User mode (UPL) */ +#define PGEX_RSV 0x08 /* reserved PTE field is non-zero */ +#define PGEX_I 0x10 /* during an instruction fetch */ /* * Pte related macros. This is complicated by having to deal with ==== //depot/projects/smpng/sys/arm/arm/pmap.c#32 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.66 2006/07/20 23:26:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.67 2006/08/01 19:06:04 alc Exp $"); #include #include #include @@ -2759,32 +2759,6 @@ /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - switch(prot) { - case VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE: - case VM_PROT_READ|VM_PROT_WRITE: - return; - - case VM_PROT_READ: - case VM_PROT_READ|VM_PROT_EXECUTE: - pmap_clearbit(m, PVF_WRITE); - break; - - default: - pmap_remove_all(m); - break; - } - -} - - -/* * Remove all pages from specified address space * this aids process exit speeds. Also, this code * is special cased for current process only, but @@ -4464,7 +4438,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { if (m->md.pvh_attrs & PVF_WRITE) ==== //depot/projects/smpng/sys/conf/files.powerpc#31 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.56 2006/07/26 19:44:42 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.57 2006/08/01 22:19:01 sobomax Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,3 +128,5 @@ powerpc/psim/uart_iobus.c optional uart psim dev/scc/scc_bfe_macio.c optional scc powermac + +dev/powermac_nvram/powermac_nvram.c optional powermac powermac_nvram ==== //depot/projects/smpng/sys/ddb/db_ps.c#36 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.62 2006/08/01 15:29:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.63 2006/08/01 22:30:55 jhb Exp $"); #include #include @@ -57,10 +57,10 @@ * * 1 2 3 4 5 6 7 * 1234567890123456789012345678901234567890123456789012345678901234567890 - * pid ppid pgrp uid state wmesg wchan cmd - * < wmesg > < wchan > - * (threaded) - * < wmesg > < wchan > + * pid ppid pgrp uid state wmesg wchan cmd + * < wmesg > < wchan > + * (threaded) + * < wmesg > < wchan > * * For machines with 64-bit pointers, we expand the wchan field 8 more * characters. @@ -83,9 +83,9 @@ p = &proc0; #ifdef __LP64__ - db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #else - db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #endif while (--np >= 0 && !db_pager_quit) { if (p == NULL) { ==== //depot/projects/smpng/sys/dev/dc/dcphy.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/dcphy.c,v 1.31 2006/06/03 20:37:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/dcphy.c,v 1.32 2006/08/02 05:28:52 yongari Exp $"); /* * Pseudo-driver for internal NWAY support on DEC 21143 and workalike @@ -131,7 +131,7 @@ device_set_desc(dev, "Intel 21143 NWAY media interface"); - return (0); + return (BUS_PROBE_DEFAULT); } static int ==== //depot/projects/smpng/sys/dev/dc/pnphy.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/pnphy.c,v 1.20 2005/10/18 06:09:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/pnphy.c,v 1.21 2006/08/02 05:28:52 yongari Exp $"); /* * Pseudo-driver for media selection on the Lite-On PNIC 82c168 @@ -116,7 +116,7 @@ device_set_desc(dev, "PNIC 82c168 media interface"); - return (0); + return (BUS_PROBE_DEFAULT); } static int ==== //depot/projects/smpng/sys/dev/ral/rt2560.c#5 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.6 2006/07/26 03:30:22 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.7 2006/08/02 04:54:14 sam Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.6 2006/07/26 03:30:22 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.7 2006/08/02 04:54:14 sam Exp $"); /*- * Ralink Technology RT2560 chipset driver @@ -2842,8 +2842,7 @@ return 0; bad: ifp->if_oerrors++; - if (ni != NULL) - ieee80211_free_node(ni); + ieee80211_free_node(ni); RAL_UNLOCK(sc); return EIO; /* XXX */ } ==== //depot/projects/smpng/sys/dev/sk/if_sk.c#6 (text) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.128 2006/07/27 05:06:43 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.129 2006/08/02 02:36:59 yongari Exp $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports @@ -140,7 +140,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.128 2006/07/27 05:06:43 yongari Exp $"; + "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.129 2006/08/02 02:36:59 yongari Exp $"; #endif static struct sk_type sk_devs[] = { @@ -793,13 +793,11 @@ for (i = 0; i < SK_TIMEOUT; i++) { DELAY(1); - if (SK_YU_READ_2(sc_if, YUKON_SMICR) & YU_SMICR_BUSY) + if ((SK_YU_READ_2(sc_if, YUKON_SMICR) & YU_SMICR_BUSY) == 0) break; } - if (i == SK_TIMEOUT) { + if (i == SK_TIMEOUT) if_printf(sc_if->sk_ifp, "phy write timeout\n"); - return (0); - } return(0); } ==== //depot/projects/smpng/sys/dev/ubsec/ubsec.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.44 2006/06/06 13:58:12 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.45 2006/08/02 17:41:58 jhb Exp $"); /* * uBsec 5[56]01, 58xx hardware crypto accelerator @@ -1369,57 +1369,46 @@ ubsecstats.hst_unaligned++; totlen = q->q_src_mapsize; - if (q->q_src_m->m_flags & M_PKTHDR) { + if (totlen >= MINCLSIZE) { + m = m_getcl(M_DONTWAIT, MT_DATA, + q->q_src_m->m_flags & M_PKTHDR); + len = MCLBYTES; + } else if (q->q_src_m->m_flags & M_PKTHDR) { + m = m_gethdr(M_DONTWAIT, MT_DATA); len = MHLEN; - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) { - m_free(m); - m = NULL; - } } else { + m = m_get(M_DONTWAIT, MT_DATA); len = MLEN; - MGET(m, M_DONTWAIT, MT_DATA); + } + if (m && q->q_src_m->m_flags & M_PKTHDR && + !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) { + m_free(m); + m = NULL; } if (m == NULL) { ubsecstats.hst_nombuf++; err = sc->sc_nqueue ? ERESTART : ENOMEM; goto errout; } - if (totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); - if ((m->m_flags & M_EXT) == 0) { - m_free(m); - ubsecstats.hst_nomcl++; - err = sc->sc_nqueue ? ERESTART : ENOMEM; - goto errout; - } - len = MCLBYTES; - } - m->m_len = len; - top = NULL; + m->m_len = len = min(totlen, len); + totlen -= len; + top = m; mp = ⊤ while (totlen > 0) { - if (top) { - MGET(m, M_DONTWAIT, MT_DATA); - if (m == NULL) { - m_freem(top); - ubsecstats.hst_nombuf++; - err = sc->sc_nqueue ? ERESTART : ENOMEM; - goto errout; - } + if (totlen >= MINCLSIZE) { + m = m_getcl(M_DONTWAIT, + MT_DATA, 0); + len = MCLBYTES; + } else { + m = m_get(M_DONTWAIT, MT_DATA); len = MLEN; } - if (top && totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); - if ((m->m_flags & M_EXT) == 0) { - *mp = m; - m_freem(top); - ubsecstats.hst_nomcl++; - err = sc->sc_nqueue ? ERESTART : ENOMEM; - goto errout; - } - len = MCLBYTES; + if (m == NULL) { + m_freem(top); + ubsecstats.hst_nombuf++; + err = sc->sc_nqueue ? ERESTART : ENOMEM; + goto errout; } m->m_len = len = min(totlen, len); totlen -= len; ==== //depot/projects/smpng/sys/dev/usb/if_ural.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.42 2006/07/26 03:30:50 sam Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.43 2006/08/02 04:55:04 sam Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.42 2006/07/26 03:30:50 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.43 2006/08/02 04:55:04 sam Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -2361,8 +2361,7 @@ return 0; bad: ifp->if_oerrors++; - if (ni != NULL) - ieee80211_free_node(ni); + ieee80211_free_node(ni); return EIO; /* XXX */ } ==== //depot/projects/smpng/sys/geom/mirror/g_mirror.c#32 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.85 2006/07/10 21:18:00 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.86 2006/08/01 23:17:33 pjd Exp $"); #include #include @@ -2077,7 +2077,7 @@ * Not good, NOT GOOD! * It means that mirror was started on stale disks * and more fresh disk just arrive. - * If there were writes, mirror is fucked up, sorry. + * If there were writes, mirror is broken, sorry. * I think the best choice here is don't touch * this disk and inform the user laudly. */ ==== //depot/projects/smpng/sys/geom/raid3/g_raid3.c#33 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.69 2006/07/10 21:18:00 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.70 2006/08/01 23:17:33 pjd Exp $"); #include #include @@ -2351,7 +2351,7 @@ * Not good, NOT GOOD! * It means that device was started on stale disks * and more fresh disk just arrive. - * If there were writes, device is fucked up, sorry. + * If there were writes, device is broken, sorry. * I think the best choice here is don't touch * this disk and inform the user laudly. */ ==== //depot/projects/smpng/sys/i386/i386/pmap.c#105 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.571 2006/07/20 17:48:40 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.572 2006/08/01 19:06:05 alc Exp $"); /* * Manages physical address maps. @@ -3066,7 +3066,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3103,23 +3103,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. ==== //depot/projects/smpng/sys/ia64/ia64/pmap.c#80 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.177 2006/06/27 05:05:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.178 2006/08/01 19:06:05 alc Exp $"); #include #include @@ -1939,40 +1939,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - struct ia64_lpte *pte; - pmap_t oldpmap, pmap; - pv_entry_t pv; - - if ((prot & VM_PROT_WRITE) != 0) - return; - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - if ((m->flags & PG_WRITEABLE) == 0) - return; - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - pmap = pv->pv_pmap; - PMAP_LOCK(pmap); - oldpmap = pmap_install(pmap); - pte = pmap_find_vhpt(pv->pv_va); - KASSERT(pte != NULL, ("pte")); - pmap_pte_prot(pmap, pte, prot); - pmap_invalidate_page(pmap, pv->pv_va); - pmap_install(oldpmap); - PMAP_UNLOCK(pmap); - } - vm_page_flag_clear(m, PG_WRITEABLE); - } else { - pmap_remove_all(m); - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. @@ -2119,6 +2085,43 @@ } /* + * Clear the write and modified bits in each of the given page's mappings. + */ +void +pmap_remove_write(vm_page_t m) +{ + struct ia64_lpte *pte; + pmap_t oldpmap, pmap; + pv_entry_t pv; + vm_prot_t prot; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if ((m->flags & PG_FICTITIOUS) != 0 || + (m->flags & PG_WRITEABLE) == 0) + return; + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = pv->pv_pmap; + PMAP_LOCK(pmap); + oldpmap = pmap_install(pmap); + pte = pmap_find_vhpt(pv->pv_va); + KASSERT(pte != NULL, ("pte")); + prot = pmap_prot(pte); + if ((prot & VM_PROT_WRITE) != 0) { + if (pmap_dirty(pte)) { + vm_page_dirty(m); + pmap_clear_dirty(pte); + } + prot &= ~VM_PROT_WRITE; + pmap_pte_prot(pmap, pte, prot); + pmap_invalidate_page(pmap, pv->pv_va); + } + pmap_install(oldpmap); + PMAP_UNLOCK(pmap); + } + vm_page_flag_clear(m, PG_WRITEABLE); +} + +/* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This * routine is intended to be used for mapping device memory, ==== //depot/projects/smpng/sys/kern/init_sysent.c#73 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.215 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.216 2006/08/02 08:14:01 davidxu Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ ==== //depot/projects/smpng/sys/kern/kern_time.c#43 (text+ko) ==== @@ -30,12 +30,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.129 2006/03/01 06:29:34 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.130 2006/08/02 07:34:51 davidxu Exp $"); #include "opt_mac.h" #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/kern/makesyscalls.sh#20 (text+ko) ==== @@ -1,6 +1,6 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.63 2006/07/28 19:05:28 jhb Exp $ +# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.64 2006/08/02 08:09:24 davidxu Exp $ set -e @@ -119,9 +119,7 @@ printf "#define\t%s\n\n", sysproto_h > sysarg printf "#include \n" > sysarg printf "#include \n" > sysarg - printf "#include \n" > sysarg - printf "#include \n" > sysarg - printf "#include \n\n" > sysarg + printf "#include \n" > sysarg printf "#include \n\n" > sysarg printf "#include \n\n" > sysarg printf "struct proc;\n\n" > sysarg ==== //depot/projects/smpng/sys/kern/syscalls.c#73 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.199 2006/07/28 19:08:37 jhb Exp $ + * $FreeBSD: src/sys/kern/syscalls.c,v 1.200 2006/08/02 08:14:01 davidxu Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ ==== //depot/projects/smpng/sys/kern/uipc_sockbuf.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.163 2006/08/01 10:30:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.164 2006/08/02 13:01:58 rwatson Exp $"); #include "opt_param.h" @@ -64,22 +64,21 @@ static u_long sb_efficiency = 8; /* parameter for sbreserve() */ -static void sbdrop_internal(register struct sockbuf *sb, register int len); -static void sbflush_internal(register struct sockbuf *sb); +static void sbdrop_internal(struct sockbuf *sb, int len); +static void sbflush_internal(struct sockbuf *sb); static void sbrelease_internal(struct sockbuf *sb, struct socket *so); /* - * Socantsendmore indicates that no more data will be sent on the - * socket; it would normally be applied to a socket when the user - * informs the system that no more data is to be sent, by the protocol - * code (in case PRU_SHUTDOWN). Socantrcvmore indicates that no more data - * will be received, and will normally be applied to the socket by a - * protocol when it detects that the peer will send no more data. - * Data queued for reading in the socket may yet be read. + * Socantsendmore indicates that no more data will be sent on the socket; it + * would normally be applied to a socket when the user informs the system + * that no more data is to be sent, by the protocol code (in case + * PRU_SHUTDOWN). Socantrcvmore indicates that no more data will be + * received, and will normally be applied to the socket by a protocol when it + * detects that the peer will send no more data. Data queued for reading in + * the socket may yet be read. */ void -socantsendmore_locked(so) - struct socket *so; +socantsendmore_locked(struct socket *so) { SOCKBUF_LOCK_ASSERT(&so->so_snd); @@ -90,8 +89,7 @@ } void -socantsendmore(so) - struct socket *so; +socantsendmore(struct socket *so) { SOCKBUF_LOCK(&so->so_snd); @@ -100,8 +98,7 @@ } void -socantrcvmore_locked(so) - struct socket *so; +socantrcvmore_locked(struct socket *so) { SOCKBUF_LOCK_ASSERT(&so->so_rcv); @@ -112,8 +109,7 @@ } void -socantrcvmore(so) - struct socket *so; +socantrcvmore(struct socket *so) { SOCKBUF_LOCK(&so->so_rcv); @@ -125,8 +121,7 @@ * Wait for data to arrive at/drain from a socket buffer. */ int -sbwait(sb) - struct sockbuf *sb; +sbwait(struct sockbuf *sb) { SOCKBUF_LOCK_ASSERT(sb); @@ -138,12 +133,11 @@ } /* - * Lock a sockbuf already known to be locked; - * return any error returned from sleep (EINTR). + * Lock a sockbuf already known to be locked; return any error returned from + * sleep (EINTR). */ int -sb_lock(sb) - register struct sockbuf *sb; +sb_lock(struct sockbuf *sb) { int error; @@ -162,8 +156,8 @@ } /* - * Wakeup processes waiting on a socket buffer. Do asynchronous - * notification via SIGIO if the socket has the SS_ASYNC flag set. + * Wakeup processes waiting on a socket buffer. Do asynchronous notification + * via SIGIO if the socket has the SS_ASYNC flag set. * * Called with the socket buffer lock held; will release the lock by the end * of the function. This allows the caller to acquire the socket buffer lock @@ -174,9 +168,7 @@ * correct. */ void -sowakeup(so, sb) - register struct socket *so; - register struct sockbuf *sb; +sowakeup(struct socket *so, struct sockbuf *sb) { SOCKBUF_LOCK_ASSERT(sb); @@ -201,39 +193,36 @@ /* * Socket buffer (struct sockbuf) utility routines. * - * Each socket contains two socket buffers: one for sending data and - * one for receiving data. Each buffer contains a queue of mbufs, - * information about the number of mbufs and amount of data in the - * queue, and other fields allowing select() statements and notification - * on data availability to be implemented. + * Each socket contains two socket buffers: one for sending data and one for + * receiving data. Each buffer contains a queue of mbufs, information about + * the number of mbufs and amount of data in the queue, and other fields + * allowing select() statements and notification on data availability to be + * implemented. * - * Data stored in a socket buffer is maintained as a list of records. - * Each record is a list of mbufs chained together with the m_next - * field. Records are chained together with the m_nextpkt field. The upper - * level routine soreceive() expects the following conventions to be - * observed when placing information in the receive buffer: + * Data stored in a socket buffer is maintained as a list of records. Each + * record is a list of mbufs chained together with the m_next field. Records + * are chained together with the m_nextpkt field. The upper level routine + * soreceive() expects the following conventions to be observed when placing + * information in the receive buffer: * - * 1. If the protocol requires each message be preceded by the sender's - * name, then a record containing that name must be present before - * any associated data (mbuf's must be of type MT_SONAME). - * 2. If the protocol supports the exchange of ``access rights'' (really - * just additional data associated with the message), and there are - * ``rights'' to be received, then a record containing this data - * should be present (mbuf's must be of type MT_RIGHTS). - * 3. If a name or rights record exists, then it must be followed by - * a data record, perhaps of zero length. + * 1. If the protocol requires each message be preceded by the sender's name, + * then a record containing that name must be present before any + * associated data (mbuf's must be of type MT_SONAME). + * 2. If the protocol supports the exchange of ``access rights'' (really just + * additional data associated with the message), and there are ``rights'' + * to be received, then a record containing this data should be present + * (mbuf's must be of type MT_RIGHTS). + * 3. If a name or rights record exists, then it must be followed by a data + * record, perhaps of zero length. * * Before using a new socket structure it is first necessary to reserve * buffer space to the socket, by calling sbreserve(). This should commit * some of the available buffer space in the system buffer pool for the - * socket (currently, it does nothing but enforce limits). The space - * should be released by calling sbrelease() when the socket is destroyed. + * socket (currently, it does nothing but enforce limits). The space should + * be released by calling sbrelease() when the socket is destroyed. */ - int -soreserve(so, sndcc, rcvcc) - register struct socket *so; - u_long sndcc, rcvcc; +soreserve(struct socket *so, u_long sndcc, u_long rcvcc) { struct thread *td = curthread; @@ -281,24 +270,22 @@ } /* - * Allot mbufs to a sockbuf. - * Attempt to scale mbmax so that mbcnt doesn't become limiting - * if buffering efficiency is near the normal case. + * Allot mbufs to a sockbuf. Attempt to scale mbmax so that mbcnt doesn't + * become limiting if buffering efficiency is near the normal case. */ int -sbreserve_locked(sb, cc, so, td) - struct sockbuf *sb; - u_long cc; - struct socket *so; - struct thread *td; +sbreserve_locked(struct sockbuf *sb, u_long cc, struct socket *so, + struct thread *td) { rlim_t sbsize_limit; SOCKBUF_LOCK_ASSERT(sb); /* - * td will only be NULL when we're in an interrupt - * (e.g. in tcp_input()) + * td will only be NULL when we're in an interrupt (e.g. in + * tcp_input()). + * + * XXXRW: This comment needs updating, as might the code. */ if (cc > sb_max_adj) return (0); @@ -318,11 +305,8 @@ } int -sbreserve(sb, cc, so, td) - struct sockbuf *sb; - u_long cc; - struct socket *so; - struct thread *td; +sbreserve(struct sockbuf *sb, u_long cc, struct socket *so, + struct thread *td) { int error; @@ -336,9 +320,7 @@ * Free mbufs held by a socket, and reserved mbuf space. */ static void -sbrelease_internal(sb, so) - struct sockbuf *sb; - struct socket *so; +sbrelease_internal(struct sockbuf *sb, struct socket *so) { sbflush_internal(sb); @@ -348,9 +330,7 @@ } void -sbrelease_locked(sb, so) - struct sockbuf *sb; - struct socket *so; +sbrelease_locked(struct sockbuf *sb, struct socket *so) { SOCKBUF_LOCK_ASSERT(sb); @@ -359,9 +339,7 @@ } void -sbrelease(sb, so) - struct sockbuf *sb; - struct socket *so; +sbrelease(struct sockbuf *sb, struct socket *so) { SOCKBUF_LOCK(sb); @@ -370,9 +348,7 @@ } void -sbdestroy(sb, so) - struct sockbuf *sb; - struct socket *so; +sbdestroy(struct sockbuf *sb, struct socket *so) { sbrelease_internal(sb, so); @@ -380,30 +356,27 @@ /* - * Routines to add and remove - * data from an mbuf queue. + * Routines to add and remove data from an mbuf queue. * - * The routines sbappend() or sbappendrecord() are normally called to - * append new mbufs to a socket buffer, after checking that adequate - * space is available, comparing the function sbspace() with the amount - * of data to be added. sbappendrecord() differs from sbappend() in - * that data supplied is treated as the beginning of a new record. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 2 21:08:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D65E16A4E2; Wed, 2 Aug 2006 21:08:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46D4E16A4DA for ; Wed, 2 Aug 2006 21:08:41 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9345E43D6B for ; Wed, 2 Aug 2006 21:08:38 +0000 (GMT) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72L8c58007917 for ; Wed, 2 Aug 2006 21:08:38 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72L8cnX007914 for perforce@freebsd.org; Wed, 2 Aug 2006 21:08:38 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 2 Aug 2006 21:08:38 GMT Message-Id: <200608022108.k72L8cnX007914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 21:08:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=103067 Change 103067 by adamartin@adamartin_hobbes on 2006/08/02 21:08:09 Import of work from subversion. I have nearly finished vfsops, and I will start vnops next (things like stat, and open, and lookup). Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/README#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_vfsops.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_vnops.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/cleanup.h#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#1 add .. //depot/projects/soc2006/adamartin_autofs/mount_autofs/Makefile#1 add .. //depot/projects/soc2006/adamartin_autofs/mount_autofs/mount_autofs.8#1 add .. //depot/projects/soc2006/adamartin_autofs/mount_autofs/mount_autofs.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 2 21:22:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD9A216A4E0; Wed, 2 Aug 2006 21:22:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9614C16A4DE for ; Wed, 2 Aug 2006 21:22:57 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 312CA43D53 for ; Wed, 2 Aug 2006 21:22:57 +0000 (GMT) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72LMvoN008675 for ; Wed, 2 Aug 2006 21:22:57 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72LMv7g008672 for perforce@freebsd.org; Wed, 2 Aug 2006 21:22:57 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 2 Aug 2006 21:22:57 GMT Message-Id: <200608022122.k72LMv7g008672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 21:22:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103068 Change 103068 by adamartin@adamartin_hobbes on 2006/08/02 21:22:23 Cleaning up the old branch Affected files ... .. //depot/projects/soc2006/adamartin_autofs/bin/cp/cp.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/dd/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/setfacl.1#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/setfacl/setfacl.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/sh/cd.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/sh/eval.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/sh/sh.1#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/sh/var.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/bin/sh/var.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/binutils/bfd/elf64-sparc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/ChangeLog#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/FREEBSD-upgrade#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/adventure#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/amigaos#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/animation#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/apple#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/archive#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/audio#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/basis#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/bflt#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/bout#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/btsnoop#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/c64#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/cad#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/commands#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/compress#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/console#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/cracklib#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/ctags#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/database#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/diff#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/digital#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/dump#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/elf#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/filesystems#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/flash#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/fsav#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/gnu#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/iff#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/images#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/java#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/linux#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/lisp#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/mach#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/macintosh#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/mail.news#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/maple#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/misctools#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/msdos#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/mup#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/ncr#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/perl#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/printer#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/psion#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/python#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/riff#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/scientific#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/sgi#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/sharc#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/sql#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/varied.out#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Magdir/wordprocessors#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Makefile.am#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/Makefile.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/aclocal.m4#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/apprentice.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/ascmagic.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/compress.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/config.h.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/configure#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/configure.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/file.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/file.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/file.man#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/fsmagic.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/funcs.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/libmagic.man#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/magic.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/magic.man#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/magic.mime#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/magic2mime#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/patchlevel.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/print.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/readelf.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/readelf.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/file/softmagic.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/FREEBSD-upgrade#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/HISTORY#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/Makefile.am#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/Makefile.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/README#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/TODO#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/VERSION#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/Makefile.am#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/Makefile.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditd/auditd.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditfilterd/Makefile.am#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditfilterd/Makefile.in#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bin/auditreduce/auditreduce.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/Makefile.am#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/Makefile.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/audit.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/audit_filter.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/audit_kevents.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/audit_record.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/bsm/libbsm.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/config/config.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/config/config.h.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/config/ltmain.sh#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/configure#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/configure.ac#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/etc/audit_event#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/etc/audit_filter#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/Makefile.am#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/Makefile.in#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/au_open.3#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/au_token.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/audit_submit.3#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/bsm_audit.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/bsm_io.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/bsm_notify.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/bsm_token.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/bsm_wrappers.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/libbsm/libbsm.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/man/audit.log.5#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/man/auditctl.2#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/modules/Makefile.am#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/modules/Makefile.in#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/test/Makefile.am#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/test/Makefile.in#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/test/bsm/Makefile.am#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/test/bsm/Makefile.in#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/openbsm/test/bsm/generate.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/pf/man/pfsync.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/FREEBSD-upgrade#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/PGPKEYS#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/RELEASE_NOTES#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/README#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/cf/submit.cf#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/cf/submit.mc#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/feature/dnsbl.m4#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/feature/enhdnsbl.m4#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/m4/proto.m4#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/cf/m4/version.m4#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/include/libmilter/mfapi.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/libmilter/docs/xxfi_header.html#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/libmilter/engine.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/libsm/t-memstat.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/README#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/bf.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/collect.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/conf.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/daemon.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/deliver.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/domain.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/envelope.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/headers.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/helpfile#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/main.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/map.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/mci.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/mime.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/parseaddr.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/queue.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/savemail.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/sendmail.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/sfsasl.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/sfsasl.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/srvrsmtp.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/tls.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/util.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/sendmail/src/version.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/tcpdump/tcpdump.1#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/texinfo/FREEBSD-upgrade#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/traceroute/traceroute.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/contrib/traceroute/traceroute.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/crypto/openssh/config.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/crypto/openssh/loginrec.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/defaults/rc.conf#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/devd.conf#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/hosts.allow#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/periodic/daily/470.status-named#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/abi#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/auditd#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/bridge#2 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/cached#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/devd#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/dhclient#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/jail#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/ldconfig#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/mountcritlocal#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/mountlate#2 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/netif#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.d/pf#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/rc.subr#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/sendmail/freebsd.mc#3 delete .. //depot/projects/soc2006/adamartin_autofs/etc/sendmail/freebsd.submit.mc#3 delete .. //depot/projects/soc2006/adamartin_autofs/games/fortune/datfiles/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/games/fortune/datfiles/fortunes#3 delete .. //depot/projects/soc2006/adamartin_autofs/gnu/usr.bin/send-pr/categories#3 delete .. //depot/projects/soc2006/adamartin_autofs/include/malloc_np.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libbsm/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/gen/getgrent.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/gen/glob.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/i386/gen/_ctx_start.S#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/net/resolver.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/posix1e/Makefile.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/posix1e/mac_is_present.3#2 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/posix1e/mac_prepare.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/posix1e/mac_set.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/posix1e/mac_text.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/stdlib/malloc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/stdlib/tsearch.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/string/strlcpy.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/sys/mincore.2#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/sys/stat.2#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libc/sys/truncate.2#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libdevinfo/devinfo.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libfetch/ftp.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libkvm/kvm_minidump_amd64.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libkvm/kvm_minidump_i386.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libmagic/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libmagic/config.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libpam/libpam/security/pam_mod_misc.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libpthread/thread/thr_private.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libpthread/thread/thr_sig.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libpthread/thread/thr_sigaction.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libsdp/sdp.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libsdp/util.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/sys/thr_error.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_attr.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_create.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_getschedparam.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_init.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_list.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_mutex.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_private.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_setprio.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_setschedparam.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libthr/thread/thr_spec.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libutil/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libutil/humanize_number.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libutil/kld.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libutil/login_class.3#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/libutil/pidfile.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/msun/i387/Makefile.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/msun/src/e_log.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/msun/src/e_logf.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/msun/src/e_scalbf.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/lib/msun/src/s_tanh.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/libexec/ftpd/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/libexec/ftpd/ftpcmd.y#3 delete .. //depot/projects/soc2006/adamartin_autofs/release/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 delete .. //depot/projects/soc2006/adamartin_autofs/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 delete .. //depot/projects/soc2006/adamartin_autofs/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 delete .. //depot/projects/soc2006/adamartin_autofs/release/doc/share/misc/dev.archlist.txt#3 delete .. //depot/projects/soc2006/adamartin_autofs/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/devfs/devfs.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/dhclient/dhclient.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/fdisk/fdisk.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ffsinfo/ffsinfo.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/fsdb/fsdb.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/fsdb/fsdb.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/geom/class/eli/geli.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/geom/class/eli/geom_eli.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ggate/ggatec/ggatec.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/add.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/gpt.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/gpt.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/gpt.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/label.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/remove.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/gpt/show.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifclone.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifconfig.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifconfig.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifconfig.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifgroup.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifieee80211.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifpfsync.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ifconfig/ifvlan.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/init/init.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ipfw/ipfw.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/ipfw/ipfw2.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/mount/mount.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/mount/mount.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sbin/mount_msdosfs/mount_msdosfs.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/secure/lib/libcrypto/Makefile.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/examples/diskless/clone_root#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/aac.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/acpi.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/adv.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/adw.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/altq.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/amd.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/amr.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ata.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/audit.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/auditpipe.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/bge.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/bt.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/carp.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/cpufreq.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/dpt.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/enc.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/esp.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/fast_ipsec.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/geom_fox.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/if_bridge.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/iir.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ips.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ipw.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/iwi.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ktr.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/man4.i386/linux.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/man4.i386/padlock.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/mpt.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/mxge.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ncr.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ncv.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/nfe.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ng_netflow.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/ng_tag.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/nsp.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/re.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/sched_4bsd.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/sched_core.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/sched_ule.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/snd_csa.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/snd_emu10kx.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/snd_envy24.4#2 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/snd_gusc.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/snd_ich.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/snd_sbc.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/stg.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/sym.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/umodem.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/uplcom.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/uscanner.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/uvisor.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man4/vinum.4#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man5/mailer.conf.5#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man5/rc.conf.5#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man7/build.7#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man7/ports.7#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man7/security.7#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man8/rc.subr.8#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/crypto.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/lock.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/mac.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/mutex.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/rwlock.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/sx.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/vflush.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/man/man9/vgone.9#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/mk/bsd.README#3 delete .. //depot/projects/soc2006/adamartin_autofs/share/monetdef/pt_PT.ISO8859-1.src#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/busdma_machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/db_trace.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/fpu.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/identcpu.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/initcpu.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/intr_machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/local_apic.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/pmap.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/amd64/trap.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/conf/DEFAULTS#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/conf/GENERIC#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/conf/NOTES#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/include/md_var.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/include/specialreg.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/linux32/linux32_dummy.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/linux32/linux32_proto.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/linux32/linux32_syscall.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/linux32/linux32_sysent.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/amd64/linux32/syscalls.master#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/busdma_machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/db_trace.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/elf_trampoline.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/gdb_machdep.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/inckern.S#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/locore.S#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/pmap.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/arm/vm_machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_pio.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_pio_rm9200.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_piovar.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_pmc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_rtc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_rtcreg.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_spi.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_spireg.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_ssc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_st.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91_twi.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/at91rm92reg.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/files.at91#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/if_ate.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/std.at91#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/std.kb920x#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/at91/uart_dev_at91usart.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/conf/IQ31244#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/conf/SIMICS#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/conf/SKYEYE#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/include/cpuconf.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/include/cpufunc.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/include/gdb_machdep.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/include/pmap.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/sa11x0/assabet_machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/sa11x0/uart_cpu_sa1110.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/sa11x0/uart_dev_sa1110.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/xscale/i80321/i80321_timer.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/arm/xscale/i80321/iq31244_machdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/boot/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/boot/i386/libi386/biosdisk.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/bsm/audit.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/bsm/audit_kevents.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/bsm/audit_record.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/cam/cam_ccb.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/cam/cam_xpt.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/cam/scsi/scsi_all.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/cam/scsi/scsi_cd.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/cam/scsi/scsi_da.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/freebsd32/freebsd32_misc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/freebsd32/freebsd32_proto.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/freebsd32/freebsd32_syscall.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/freebsd32/freebsd32_syscalls.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/freebsd32/freebsd32_sysent.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/freebsd32/syscalls.master#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linprocfs/linprocfs.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linux/linux_file.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linux/linux_ioctl.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linux/linux_ipc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linux/linux_misc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linux/linux_socket.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/linux/linux_util.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/ndis/kern_ndis.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/ndis/subr_ndis.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/ndis/winx32_wrap.S#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_ipc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_misc.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_proto.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_stream.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_syscall.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_syscallnames.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_sysent.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/svr4_util.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/compat/svr4/syscalls.master#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/Makefile.arm#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/NOTES#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/files#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/files.amd64#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/files.arm#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/files.i386#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/files.ia64#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/files.powerpc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/kern.mk#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/kern.post.mk#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/kern.pre.mk#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/kmod.mk#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/options#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/conf/options.arm#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/README#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/ah_soc.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/freebsd/ah_if.m#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap30.inc#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap43.inc#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap51.inc#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap61.inc#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/Makefile#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_bstream.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_bstream.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_context.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_context.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_env.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_env.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_self.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_self.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_self_context.s#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_self_info.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_step.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_step.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_str.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_str.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_swap.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_swap.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_symbols.c#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_symbols.h#2 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_trace.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_trace.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 delete .. //depot/projects/soc2006/adamartin_autofs/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 2 22:38:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C13C216A4E7; Wed, 2 Aug 2006 22:38:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A2B116A4DA for ; Wed, 2 Aug 2006 22:38:37 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ED4B43D70 for ; Wed, 2 Aug 2006 22:38:32 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72McVnk018978 for ; Wed, 2 Aug 2006 22:38:31 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72McV8C018975 for perforce@freebsd.org; Wed, 2 Aug 2006 22:38:31 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 2 Aug 2006 22:38:31 GMT Message-Id: <200608022238.k72McV8C018975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 22:38:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=103069 Change 103069 by gabor@gabor_spitfire on 2006/08/02 22:38:17 - Fix some syntactical errors in do-fetch.sh - Clean up FETCH_SCRIPT_ENV in bsd.port.mk Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#66 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#16 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#66 (text+ko) ==== @@ -2138,19 +2138,13 @@ FETCH_SCRIPT=${PORTSDIR}/Tools/scripts/do-fetch.sh FETCH_SCRIPT_ENV= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ - GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" \ + GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR} \ FETCH_CMD="${FETCH_CMD}" \ FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ FORCE_FETCH="${FORCE_FETCH}" NO_CHECKSUM="${NO_CHECKSUM}" MD5_FILE="${MD5_FILE}" \ - _MASTER_SITES="${_MASTER_SITES}" \ - _MASTER_SITE_OVERRIDE="${MASTER_SITE_OVERRIDE}" \ - _MASTER_SITE_BACKUP="${_MASTER_SITE_BACKUP}" MASTER_SORT_AWK="${MASTER_SORT_AWK}" \ - SORTED_MASTER_SITES_DEFAULT_CMD="${SORTED_MASTER_SITES_DEFAULT_CMD}" \ _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" \ - PATCHFILES="${PATCHFILES}" \ - SORTED_PATCH_SITES_DEFAULT_CMD="${SORTED_PATCH_SITES_DEFAULT_CMD}" - + PATCHFILES="${PATCHFILES}" .if exists(/usr/bin/fetch) FETCH_CMD?= /usr/bin/fetch -ARr ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#16 (text+ko) ==== @@ -4,10 +4,10 @@ for _S in ${MASTER_SITES}; do __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@}"` _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "/^://"` - if [ -n "${_S_TEMP}" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} - if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default + if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 @@ -31,7 +31,7 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - if [ -n "${_MASTER_SITES_${_group}}" ] ; then + if [ -n "$${_MASTER_SITES_${_group}}" ] ; then __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` _MASTER_SITE_SUBDIR_${_group}= $${_MASTER_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi From owner-p4-projects@FreeBSD.ORG Wed Aug 2 22:42:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF88D16A4E9; Wed, 2 Aug 2006 22:42:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8294B16A4DA for ; Wed, 2 Aug 2006 22:42:38 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97BA043D72 for ; Wed, 2 Aug 2006 22:42:37 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72MgbtQ019231 for ; Wed, 2 Aug 2006 22:42:37 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72MgbSw019228 for perforce@freebsd.org; Wed, 2 Aug 2006 22:42:37 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 2 Aug 2006 22:42:37 GMT Message-Id: <200608022242.k72MgbSw019228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 22:42:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103070 Change 103070 by gabor@gabor_spitfire on 2006/08/02 22:41:42 Make FETCH_SCRIPT and FETCH_SCRIPT_ENV overrideable. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#67 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#67 (text+ko) ==== @@ -2136,8 +2136,8 @@ PTHREAD_LIBS?= -pthread .endif -FETCH_SCRIPT=${PORTSDIR}/Tools/scripts/do-fetch.sh -FETCH_SCRIPT_ENV= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ +FETCH_SCRIPT?=${PORTSDIR}/Tools/scripts/do-fetch.sh +FETCH_SCRIPT_ENV?= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR} \ FETCH_CMD="${FETCH_CMD}" \ FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ From owner-p4-projects@FreeBSD.ORG Wed Aug 2 22:43:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8400316A4DE; Wed, 2 Aug 2006 22:43:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AA0616A4DD for ; Wed, 2 Aug 2006 22:43:40 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F8A143D58 for ; Wed, 2 Aug 2006 22:43:39 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72Mhd5g019298 for ; Wed, 2 Aug 2006 22:43:39 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72MhdFe019295 for perforce@freebsd.org; Wed, 2 Aug 2006 22:43:39 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 2 Aug 2006 22:43:39 GMT Message-Id: <200608022243.k72MhdFe019295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 22:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=103071 Change 103071 by gabor@gabor_spitfire on 2006/08/02 22:43:01 Whitespace cleanup. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#68 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#68 (text+ko) ==== @@ -2136,15 +2136,15 @@ PTHREAD_LIBS?= -pthread .endif -FETCH_SCRIPT?=${PORTSDIR}/Tools/scripts/do-fetch.sh -FETCH_SCRIPT_ENV?= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ - GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR} \ - FETCH_CMD="${FETCH_CMD}" \ - FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ - _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ - FORCE_FETCH="${FORCE_FETCH}" NO_CHECKSUM="${NO_CHECKSUM}" MD5_FILE="${MD5_FILE}" \ - _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" \ - PATCHFILES="${PATCHFILES}" +FETCH_SCRIPT?= ${PORTSDIR}/Tools/scripts/do-fetch.sh +FETCH_SCRIPT_ENV?= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ + GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR} \ + FETCH_CMD="${FETCH_CMD}" \ + FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ + _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ + FORCE_FETCH="${FORCE_FETCH}" NO_CHECKSUM="${NO_CHECKSUM}" MD5_FILE="${MD5_FILE}" \ + _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" \ + PATCHFILES="${PATCHFILES}" .if exists(/usr/bin/fetch) FETCH_CMD?= /usr/bin/fetch -ARr From owner-p4-projects@FreeBSD.ORG Wed Aug 2 23:00:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2335D16A4DD; Wed, 2 Aug 2006 23:00:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0FC916A4E0 for ; Wed, 2 Aug 2006 23:00:01 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B52843D46 for ; Wed, 2 Aug 2006 23:00:01 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72N01gR020058 for ; Wed, 2 Aug 2006 23:00:01 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72N01hE020041 for perforce@freebsd.org; Wed, 2 Aug 2006 23:00:01 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 2 Aug 2006 23:00:01 GMT Message-Id: <200608022300.k72N01hE020041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 23:00:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=103072 Change 103072 by gabor@gabor_spitfire on 2006/08/02 22:59:52 Fix an unterminated quoted string from @103069. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#69 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#69 (text+ko) ==== @@ -2138,7 +2138,7 @@ FETCH_SCRIPT?= ${PORTSDIR}/Tools/scripts/do-fetch.sh FETCH_SCRIPT_ENV?= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ - GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR} \ + GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR}" \ FETCH_CMD="${FETCH_CMD}" \ FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ From owner-p4-projects@FreeBSD.ORG Wed Aug 2 23:27:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA8E416A4DF; Wed, 2 Aug 2006 23:27:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7D6616A4DA for ; Wed, 2 Aug 2006 23:27:35 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F5CA43D46 for ; Wed, 2 Aug 2006 23:27:35 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72NRZK0026945 for ; Wed, 2 Aug 2006 23:27:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72NRZrs026942 for perforce@freebsd.org; Wed, 2 Aug 2006 23:27:35 GMT (envelope-from marcel@freebsd.org) Date: Wed, 2 Aug 2006 23:27:35 GMT Message-Id: <200608022327.k72NRZrs026942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 23:27:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=103073 Change 103073 by marcel@marcel_nfs on 2006/08/02 23:27:20 o Eliminate use of prfpregset_t and prgregset_t. They are obfuscating and inconsistent. o Eliminate ps_lgetxmmregs and ps_lsetxmmregs for i386, the generic ps_lgetxregs and ps_lsetxregs serve that purpose. Affected files ... .. //depot/projects/gdb/include/proc_service.h#8 edit Differences ... ==== //depot/projects/gdb/include/proc_service.h#8 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 2004 David Xu - * Copyright (c) 2004 Marcel Moolenaar + * Copyright (c) 2004-2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,19 +47,15 @@ __BEGIN_DECLS ps_err_e ps_lcontinue(struct ps_prochandle *, lwpid_t); -ps_err_e ps_lgetfpregs(struct ps_prochandle *, lwpid_t, prfpregset_t *); -ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, prgregset_t); +ps_err_e ps_lgetfpregs(struct ps_prochandle *, lwpid_t, fpregset_t *); +ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, gregset_t *); ps_err_e ps_lgetxregs(struct ps_prochandle *, lwpid_t, void *); ps_err_e ps_lgetxregsize(struct ps_prochandle *, lwpid_t, int *); -ps_err_e ps_lsetfpregs(struct ps_prochandle *, lwpid_t, const prfpregset_t *); -ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const prgregset_t); +ps_err_e ps_linfo(struct ps_prochandle *, lwpid_t, void *); +ps_err_e ps_lsetfpregs(struct ps_prochandle *, lwpid_t, const fpregset_t *); +ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const gregset_t *); ps_err_e ps_lsetxregs(struct ps_prochandle *, lwpid_t, const void *); -#ifdef __i386__ -ps_err_e ps_lgetxmmregs (struct ps_prochandle *, lwpid_t, char *); -ps_err_e ps_lsetxmmregs (struct ps_prochandle *, lwpid_t, const char *); -#endif ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t); -ps_err_e ps_linfo(struct ps_prochandle *, lwpid_t, void *); ps_err_e ps_pcontinue(struct ps_prochandle *); ps_err_e ps_pdmodel(struct ps_prochandle *, int *); ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *, From owner-p4-projects@FreeBSD.ORG Wed Aug 2 23:28:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 995A416A4E7; Wed, 2 Aug 2006 23:28:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 785A516A4E5 for ; Wed, 2 Aug 2006 23:28:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F9FF43D53 for ; Wed, 2 Aug 2006 23:28:37 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72NSb3g026987 for ; Wed, 2 Aug 2006 23:28:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72NSa6Q026984 for perforce@freebsd.org; Wed, 2 Aug 2006 23:28:36 GMT (envelope-from marcel@freebsd.org) Date: Wed, 2 Aug 2006 23:28:36 GMT Message-Id: <200608022328.k72NSa6Q026984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 23:28:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=103074 Change 103074 by marcel@marcel_nfs on 2006/08/02 23:28:31 Eliminate prfpregset_t and prgregset_t. Affected files ... .. //depot/projects/gdb/sys/sys/procfs.h#6 edit Differences ... ==== //depot/projects/gdb/sys/sys/procfs.h#6 (text+ko) ==== @@ -65,9 +65,6 @@ gregset_t pr_reg; /* General purpose registers (1) */ } prstatus_t; -typedef gregset_t prgregset_t[1]; -typedef fpregset_t prfpregset_t; - #define PRFNAMESZ 16 /* Maximum command length saved */ #define PRARGSZ 80 /* Maximum argument bytes saved */ From owner-p4-projects@FreeBSD.ORG Wed Aug 2 23:39:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC33816A4E2; Wed, 2 Aug 2006 23:39:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C50916A4E0 for ; Wed, 2 Aug 2006 23:39:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3243D43D79 for ; Wed, 2 Aug 2006 23:38:50 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72Nco51027733 for ; Wed, 2 Aug 2006 23:38:50 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72Ncn4f027730 for perforce@freebsd.org; Wed, 2 Aug 2006 23:38:49 GMT (envelope-from marcel@freebsd.org) Date: Wed, 2 Aug 2006 23:38:49 GMT Message-Id: <200608022338.k72Ncn4f027730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 23:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=103075 Change 103075 by marcel@marcel_nfs on 2006/08/02 23:37:52 o Eliminate prfpregset_t and prgregset_t. o Remove prototypes for ps_lgetxmmregs and ps_lsetxmmregs. Affected files ... .. //depot/projects/gdb/lib/libthread_db/libc_r_db.c#7 edit .. //depot/projects/gdb/lib/libthread_db/libpthread_db.c#6 edit .. //depot/projects/gdb/lib/libthread_db/libthr_db.c#7 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.c#6 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.h#10 edit .. //depot/projects/gdb/lib/libthread_db/thread_db_int.h#8 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/libc_r_db.c#7 (text+ko) ==== @@ -35,8 +35,8 @@ #include "thread_db_int.h" -void libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *); -void libc_r_md_getgregs(jmp_buf jb, prgregset_t); +void libc_r_md_getfpregs(jmp_buf jb, fpregset_t *); +void libc_r_md_getgregs(jmp_buf jb, gregset_t *); struct td_thragent { TD_THRAGENT_FIELDS; @@ -237,7 +237,7 @@ #endif static td_err_e -libc_r_db_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *r) +libc_r_db_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *r) { jmp_buf jb; const td_thragent_t *ta; @@ -262,7 +262,7 @@ } static td_err_e -libc_r_db_thr_getgregs(const td_thrhandle_t *th, prgregset_t r) +libc_r_db_thr_getgregs(const td_thrhandle_t *th, gregset_t *r) { jmp_buf jb; const td_thragent_t *ta; @@ -301,13 +301,13 @@ #endif static td_err_e -libc_r_db_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *r) +libc_r_db_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *r) { return (TD_ERR); } static td_err_e -libc_r_db_thr_setgregs(const td_thrhandle_t *th, const prgregset_t r) +libc_r_db_thr_setgregs(const td_thrhandle_t *th, const gregset_t *r) { return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/libpthread_db.c#6 (text+ko) ==== @@ -218,7 +218,7 @@ static td_err_e pt_ta_map_id2thr(const td_thragent_t *ta, thread_t id, td_thrhandle_t *th) { - prgregset_t gregs; + gregset_t gregs; TAILQ_HEAD(, pthread) thread_list; psaddr_t pt, tcb_addr; lwpid_t lwp; @@ -266,7 +266,7 @@ return (P2T(ret)); } /* check lwp */ - ret = ps_lgetregs(ta->ph, ta->map[id].lwp, gregs); + ret = ps_lgetregs(ta->ph, ta->map[id].lwp, &gregs); if (ret != PS_OK) { /* no longer exists */ ta->map[id].type = PT_NONE; @@ -724,7 +724,7 @@ #endif static td_err_e -pt_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *fpregs) +pt_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *fpregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -765,7 +765,7 @@ } static td_err_e -pt_thr_getgregs(const td_thrhandle_t *th, prgregset_t gregs) +pt_thr_getgregs(const td_thrhandle_t *th, gregset_t *gregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -857,7 +857,7 @@ #endif static td_err_e -pt_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *fpregs) +pt_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *fpregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -904,7 +904,7 @@ } static td_err_e -pt_thr_setgregs(const td_thrhandle_t *th, const prgregset_t gregs) +pt_thr_setgregs(const td_thrhandle_t *th, const gregset_t *gregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; ==== //depot/projects/gdb/lib/libthread_db/libthr_db.c#7 (text+ko) ==== @@ -532,7 +532,7 @@ #endif static td_err_e -pt_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *fpregs) +pt_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *fpregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -548,7 +548,7 @@ } static td_err_e -pt_thr_getgregs(const td_thrhandle_t *th, prgregset_t gregs) +pt_thr_getgregs(const td_thrhandle_t *th, gregset_t *gregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -582,7 +582,7 @@ #endif static td_err_e -pt_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *fpregs) +pt_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *fpregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -598,7 +598,7 @@ } static td_err_e -pt_thr_setgregs(const td_thrhandle_t *th, const prgregset_t gregs) +pt_thr_setgregs(const td_thrhandle_t *th, const gregset_t *gregs) { const td_thragent_t *ta = th->th_ta; int ret; ==== //depot/projects/gdb/lib/libthread_db/thread_db.c#6 (text+ko) ==== @@ -195,14 +195,14 @@ td_err_e -td_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *fpregset) +td_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *fpregset) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_getfpregs(th, fpregset)); } td_err_e -td_thr_getgregs(const td_thrhandle_t *th, prgregset_t gregs) +td_thr_getgregs(const td_thrhandle_t *th, gregset_t *gregs) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_getgregs(th, gregs)); @@ -225,14 +225,14 @@ #endif td_err_e -td_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *fpregs) +td_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *fpregs) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_setfpregs(th, fpregs)); } td_err_e -td_thr_setgregs(const td_thrhandle_t *th, const prgregset_t gregs) +td_thr_setgregs(const td_thrhandle_t *th, const gregset_t *gregs) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_setgregs(th, gregs)); ==== //depot/projects/gdb/lib/libthread_db/thread_db.h#10 (text+ko) ==== @@ -227,19 +227,13 @@ td_err_e td_thr_event_enable(const td_thrhandle_t *, int); td_err_e td_thr_event_getmsg(const td_thrhandle_t *, td_event_msg_t *); td_err_e td_thr_get_info(const td_thrhandle_t *, td_thrinfo_t *); -#ifdef __i386__ -td_err_e td_thr_getxmmregs(const td_thrhandle_t *, char *); -#endif -td_err_e td_thr_getfpregs(const td_thrhandle_t *, prfpregset_t *); -td_err_e td_thr_getgregs(const td_thrhandle_t *, prgregset_t); +td_err_e td_thr_getfpregs(const td_thrhandle_t *, fpregset_t *); +td_err_e td_thr_getgregs(const td_thrhandle_t *, gregset_t *); td_err_e td_thr_getxregs(const td_thrhandle_t *, void *); td_err_e td_thr_getxregsize(const td_thrhandle_t *, int *); td_err_e td_thr_set_event(const td_thrhandle_t *, td_thr_events_t *); -#ifdef __i386__ -td_err_e td_thr_setxmmregs(const td_thrhandle_t *, const char *); -#endif -td_err_e td_thr_setfpregs(const td_thrhandle_t *, const prfpregset_t *); -td_err_e td_thr_setgregs(const td_thrhandle_t *, const prgregset_t); +td_err_e td_thr_setfpregs(const td_thrhandle_t *, const fpregset_t *); +td_err_e td_thr_setgregs(const td_thrhandle_t *, const gregset_t *); td_err_e td_thr_setxregs(const td_thrhandle_t *, const void *); td_err_e td_thr_validate(const td_thrhandle_t *); td_err_e td_thr_tls_get_addr(const td_thrhandle_t *, void *, size_t, void **); ==== //depot/projects/gdb/lib/libthread_db/thread_db_int.h#8 (text+ko) ==== @@ -66,13 +66,13 @@ td_err_e (*to_thr_event_getmsg)(const td_thrhandle_t *, td_event_msg_t *); td_err_e (*to_thr_get_info)(const td_thrhandle_t *, td_thrinfo_t *); - td_err_e (*to_thr_getfpregs)(const td_thrhandle_t *, prfpregset_t *); - td_err_e (*to_thr_getgregs)(const td_thrhandle_t *, prgregset_t); + td_err_e (*to_thr_getfpregs)(const td_thrhandle_t *, fpregset_t *); + td_err_e (*to_thr_getgregs)(const td_thrhandle_t *, gregset_t *); td_err_e (*to_thr_set_event)(const td_thrhandle_t *, td_thr_events_t *); td_err_e (*to_thr_setfpregs)(const td_thrhandle_t *, - const prfpregset_t *); - td_err_e (*to_thr_setgregs)(const td_thrhandle_t *, const prgregset_t); + const fpregset_t *); + td_err_e (*to_thr_setgregs)(const td_thrhandle_t *, const gregset_t *); td_err_e (*to_thr_validate)(const td_thrhandle_t *); td_err_e (*to_thr_tls_get_addr)(const td_thrhandle_t *, void *, size_t, void **); From owner-p4-projects@FreeBSD.ORG Thu Aug 3 02:24:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F6FC16A4FC; Thu, 3 Aug 2006 02:24:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1594216A4FA for ; Thu, 3 Aug 2006 02:24:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E127743D45 for ; Thu, 3 Aug 2006 02:24:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k732OLTt047289 for ; Thu, 3 Aug 2006 02:24:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k732OLVl047286 for perforce@freebsd.org; Thu, 3 Aug 2006 02:24:21 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 02:24:21 GMT Message-Id: <200608030224.k732OLVl047286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103082 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 02:24:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=103082 Change 103082 by jb@jb_freebsd2 on 2006/08/03 02:24:04 Comment out some debug code. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#5 (text+ko) ==== @@ -44,6 +44,7 @@ #include "opt_ktr.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" +#include "opt_trap_trace.h" #include #include @@ -290,6 +291,9 @@ td = PCPU_GET(curthread); +#ifdef TRAP_TRACING +hv_ttrace_addentry(0, (uint64_t) trap, (uint64_t) td, type, data); +#endif CTR4(KTR_TRAP, "trap: %p type=%s (%s) pil=%#lx", td, trap_msg[trap_conversion[trapno]], (TRAPF_USERMODE(tf) ? "user" : "kernel"), rdpr(pil)); @@ -464,7 +468,7 @@ type = type & ~T_KERNEL; va = TLB_TAR_VA(data); -#if 1 +#if 0 if (ctx == 0 && (tf->tf_tpc < (uint64_t)copy_nofault_begin || tf->tf_tpc > (uint64_t)fs_nofault_end)) { spinlock_enter(); DELAY(10000*curcpu); From owner-p4-projects@FreeBSD.ORG Thu Aug 3 02:25:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E318716A4E0; Thu, 3 Aug 2006 02:25:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF29616A4DE for ; Thu, 3 Aug 2006 02:25:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6407243D6E for ; Thu, 3 Aug 2006 02:25:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k732PNSB047363 for ; Thu, 3 Aug 2006 02:25:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k732PN4v047359 for perforce@freebsd.org; Thu, 3 Aug 2006 02:25:23 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 02:25:23 GMT Message-Id: <200608030225.k732PN4v047359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 02:25:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=103084 Change 103084 by jb@jb_freebsd2 on 2006/08/03 02:25:06 Start using INVARIANTS. We're missing out on important checks without using that option. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#8 (text+ko) ==== @@ -70,8 +70,8 @@ options TRAP_TRACE_ENTRIES=256 # Trap trace buffer entries. options DIAGNOSTIC #options GDB # Support remote GDB. -#options INVARIANTS # Enable calls of extra sanity checking -#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DEBUG_LOCKS From owner-p4-projects@FreeBSD.ORG Thu Aug 3 03:03:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15F9A16A4F6; Thu, 3 Aug 2006 03:03:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C721E16A4F4 for ; Thu, 3 Aug 2006 03:03:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E45F43D45 for ; Thu, 3 Aug 2006 03:03:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7333TVO051042 for ; Thu, 3 Aug 2006 03:03:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7333AXG050981 for perforce@freebsd.org; Thu, 3 Aug 2006 03:03:10 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 03:03:10 GMT Message-Id: <200608030303.k7333AXG050981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 03:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=103086 Change 103086 by jb@jb_freebsd2 on 2006/08/03 03:02:15 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#18 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#16 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-core.sgml#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#11 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/wilko.key#2 integrate .. //depot/projects/dtrace/doc/share/sgml/trademarks.ent#4 integrate .. //depot/projects/dtrace/ports/GIDs#3 integrate .. //depot/projects/dtrace/ports/LEGAL#3 integrate .. //depot/projects/dtrace/ports/MOVED#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#5 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages.wrapper#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#4 integrate .. //depot/projects/dtrace/ports/UIDs#3 integrate .. //depot/projects/dtrace/ports/UPDATING#8 integrate .. //depot/projects/dtrace/src/Makefile.inc1#13 integrate .. //depot/projects/dtrace/src/bin/sh/parser.c#3 integrate .. //depot/projects/dtrace/src/bin/sh/sh.1#4 integrate .. //depot/projects/dtrace/src/bin/test/test.1#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/CHANGES#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/dtrace/src/crypto/openssl/Configure#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/FAQ#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/dtrace/src/crypto/openssl/INSTALL#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/LICENSE#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/dtrace/src/crypto/openssl/NEWS#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/README#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/CA.sh#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/ciphers.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/crl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/der_chop#3 delete .. //depot/projects/dtrace/src/crypto/openssl/apps/der_chop.in#3 delete .. //depot/projects/dtrace/src/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/dh.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/dhparam.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/dsaparam.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/gendh.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/openssl.cnf#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/passwd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/prime.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/rand.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/rsautl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/s_apps.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/s_cb.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/s_socket.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/s_time.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/sess_id.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/version.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/bugs/VC16.bug#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/ICE-CA.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/ICE-root.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/ICE-user.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/ICE.crl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/RegTP-4R.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/ca-cert.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/dsa-ca.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/dsa-pca.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/certs/factory.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/nortelCA.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/pca-cert.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/rsa-cca.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/timCA.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/tjhCA.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/vsign2.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/vsigntca.pem#3 delete .. //depot/projects/dtrace/src/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/dtrace/src/crypto/openssl/comm.txt#3 delete .. //depot/projects/dtrace/src/crypto/openssl/comms.txt#3 delete .. //depot/projects/dtrace/src/crypto/openssl/config#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes_cfb.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_bitstr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_bool.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_bytes.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_d2i_fp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_digest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_dup.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_enum.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_hdr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_i2d_fp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_meth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_object.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_octet.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_print.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_set.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_sign.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_type.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/a_verify.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1_mac.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn1t.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn_moid.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/asn_pack.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/d2i_pr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/d2i_pu.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/evp_asn1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/i2d_pr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/i2d_pu.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/n_pkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/p5_pbe.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/t_bitst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/t_crl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/t_req.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/t_spki.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/t_x509.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_fre.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_new.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_typ.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_utl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_bignum.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_long.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_name.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_pkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_pubkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_x509.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_x509a.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bf/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bf/bf_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bf/bf_opts.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bf/bfspeed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bf/bftest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/b_dump.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bf_nbio.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bio_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_acpt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_conn.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_fd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_log.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bio/bss_sock.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.s#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.s.works#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/add.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/div.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/mul.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/alpha/sub.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/bn-alpha.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/ca.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/co-alpha.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/mips1.s#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/pa-risc.s#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/r3000.s#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/sparcv8plus.S#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_add.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_asm.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_blind.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_ctx.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_div.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_exp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_exp2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_gcd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_kron.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_mod.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_mpi.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_mul.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_prime.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_rand.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_recp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_shift.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_sqr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_sqrt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_word.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/expspeed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/exptest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/buffer/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/buffer/buf_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/buffer/buffer.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/buffer/buffer.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cast/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cast/cast.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cast/cast_lcl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cast/cast_spd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cast/castopts.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cast/casttest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/comp/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/comp/comp.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/comp/comp_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/comp/comp_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/conf/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/conf/conf.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/conf/conf_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/conf/conf_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/conf/conf_mod.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cpt_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cryptlib.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/cversion.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/FILES0#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/cfb_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/des_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/des_old.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/des_old.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/des_opts.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/ede_cbcm_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/fcrypt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/read2pwd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/speed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/des/str2key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_gen.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dhtest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsatest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/dso.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/dso_dl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/dso_dlfcn.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/dso_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/dso_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dso/dso_null.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ebcdic.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_cvt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_lcl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ecp_mont.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ecp_nist.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ecp_recp.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ecp_smpl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ectest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_cnf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_ctrl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_dyn.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_fat.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_init.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_int.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_list.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_openssl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_padlock.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_pkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/eng_table.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/enginetest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw.ec#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_4758_cca.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_4758_cca_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_4758_cca_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_aep.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_aep_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_aep_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_atalla.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_atalla_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_atalla_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_cryptodev.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_cswift.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_cswift_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_cswift_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_ncipher.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_ncipher_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_ncipher_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_nuron.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_nuron_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_nuron_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_sureware.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_sureware_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_sureware_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_ubsec.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_ubsec_err.c#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/hw_ubsec_err.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_cipher.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_dh.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_digest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_dsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_rand.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_rsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/aep.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/atalla.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/cswift.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/engine/vendor_defns/sureware.h#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/err.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/err_prn.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/bio_b64.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/bio_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/bio_ok.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/c_all.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/c_alld.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/digest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_aes.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_bf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_cast.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_idea.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_null.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_old.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_rc2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_rc4.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_rc5.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_xcbc_d.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/encode.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_dss.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_dss1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_md2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_md4.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_md5.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_mdc2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_null.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_ripemd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_sha.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/m_sha1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/names.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p5_crpt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p5_crpt2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p_dec.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p_open.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p_seal.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/p_verify.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ex_data.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/hmac/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/hmac/hmac.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/hmac/hmac.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/idea/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/idea/i_skey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/idea/idea.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/idea/idea_spd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/idea/ideatest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/krb5/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/krb5/krb5_asn.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/lhash/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/lhash/lhash.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/lhash/lhash.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md2/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md2/md2.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md2/md2_dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md2/md2_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md2/md2test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md4/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md4/md4.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md4/md4_dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md4/md4_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md4/md4_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md4/md4test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/md5_dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/md5_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/md5_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/md5/md5test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mdc2/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mdc2/mdc2.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mdc2/mdc2_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mdc2/mdc2dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mdc2/mdc2test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mem.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mem_clr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/mem_dbg.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/o_str.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/o_str.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/o_names.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_dat.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_dat.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/objects.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/ocsp.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/ocsp_cl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/ocsp_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/ocsp_ext.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/ocsp_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/opensslconf.h.in#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ossl_typ.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_info.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_oth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_pk8.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_seal.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pem/pem_xaux.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/alpha.pl#3 delete .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/cbc.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/x86asm.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/x86ms.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/x86nasm.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/perlasm/x86unix.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_add.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_crpt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_crt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_decr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_init.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_kiss.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/pk12err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/pkcs12.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/bio_ber.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/example.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_asn1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_attr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_mime.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pkcs7.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pkcs7err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_egd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_vms.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_win.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/randtest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc2/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc2/rc2.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc2/rc2_skey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc2/rc2speed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc2/rc2test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/asm/rc4-586.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4_skey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4speed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc4/rc4test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc5/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc5/rc5.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc5/rc5_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rc5/rc5speed.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ripemd/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ripemd/ripemd.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ripemd/rmd_dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ripemd/rmd_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ripemd/rmd_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ripemd/rmdtest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_asn1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_chk.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_gen.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_null.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_oaep.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_saos.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/asm/sha1-586.pl#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha1_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha1test.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha_dgst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/sha_one.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sha/shatest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/stack/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/stack/stack.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/symhacks.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/threads/mttest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/threads/th-lock.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/tmdiff.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/tmdiff.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/txt_db/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/txt_db/txt_db.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/txt_db/txt_db.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/ui.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/ui_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/ui_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/ui_locl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/ui_openssl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ui/ui_util.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/uid.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/by_dir.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/by_file.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_att.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_cmp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_lu.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_r2x.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_trs.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_txt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_v3.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_vfy.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_vfy.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509cset.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509name.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509spki.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509/x_all.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_akey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_bitst.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_extku.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_ocsp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_skey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_sxnet.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3_utl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/v3err.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x509v3/x509v3.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/easy_tls/easy-tls.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/demos/engines/zencod/hw_zencod.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/tunala/autoungunk.sh#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/demos/tunala/cb.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/demos/tunala/configure.in#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssl/demos/tunala/tunala.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/demos/tunala/tunala.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/HOWTO/keys.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/CA.pl.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/asn1parse.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/ca.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/config.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/dgst.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/req.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/s_server.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/BIO_f_base64.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/BN_add_word.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/BN_new.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/ERR_error_string.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/EVP_DigestInit.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/EVP_SealInit.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/EVP_SignInit.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/OPENSSL_config.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/PKCS12_create.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/PKCS7_sign.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/PKCS7_verify.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/RSA_sign.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/blowfish.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/bn.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/bn_internal.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/d2i_X509.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/des_modes.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/engine.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/hmac.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/threads.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/dtrace/src/crypto/openssl/doc/openssl.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_error.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_fd.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_session.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_get_version.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_pending.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_shutdown.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_state_string.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/SSL_want.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssl/ssl.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/ssleay.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/e_os.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/e_os2.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/bio_ssl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/kssl.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s23_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s23_meth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s23_srvr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_meth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_both.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_meth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 3 03:41:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F92B16A4DF; Thu, 3 Aug 2006 03:41:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E61816A4DA for ; Thu, 3 Aug 2006 03:41:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1D6743D64 for ; Thu, 3 Aug 2006 03:41:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k733fWqj053410 for ; Thu, 3 Aug 2006 03:41:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k733fWhk053407 for perforce@freebsd.org; Thu, 3 Aug 2006 03:41:32 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 03:41:32 GMT Message-Id: <200608030341.k733fWhk053407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 03:41:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=103089 Change 103089 by jb@jb_freebsd2 on 2006/08/03 03:40:45 Remove a few non-portable prototypes that we can do without. They just cause upgrade problems if we implement them. Affected files ... .. //depot/projects/dtrace/src/include/pthread_np.h#4 edit Differences ... ==== //depot/projects/dtrace/src/include/pthread_np.h#4 (text+ko) ==== @@ -49,11 +49,8 @@ int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); -int pthread_mutex_held_np(pthread_mutex_t *); void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); -int pthread_rwlock_rdheld_np(pthread_rwlock_t *); -int pthread_rwlock_wrheld_np(pthread_rwlock_t *); void pthread_set_name_np(pthread_t, const char *); int pthread_single_np(void); void pthread_suspend_all_np(void); From owner-p4-projects@FreeBSD.ORG Thu Aug 3 04:28:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65A4B16A4E2; Thu, 3 Aug 2006 04:28:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40FEE16A4DA for ; Thu, 3 Aug 2006 04:28:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E640643D6B for ; Thu, 3 Aug 2006 04:28:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k734SWMg056690 for ; Thu, 3 Aug 2006 04:28:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k734SWbU056687 for perforce@freebsd.org; Thu, 3 Aug 2006 04:28:32 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 04:28:32 GMT Message-Id: <200608030428.k734SWbU056687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 04:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103091 Change 103091 by jb@jb_freebsd2 on 2006/08/03 04:28:22 Add an option for KSE. 8-) Affected files ... .. //depot/projects/dtrace/src/sys/conf/options#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/options#15 (text+ko) ==== @@ -94,6 +94,7 @@ GEOM_UZIP opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h +KSE opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE From owner-p4-projects@FreeBSD.ORG Thu Aug 3 04:31:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A44116A4E0; Thu, 3 Aug 2006 04:31:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F22A16A4DE for ; Thu, 3 Aug 2006 04:31:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18E5043D45 for ; Thu, 3 Aug 2006 04:31:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k734Va2S056973 for ; Thu, 3 Aug 2006 04:31:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k734Va13056970 for perforce@freebsd.org; Thu, 3 Aug 2006 04:31:36 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 04:31:36 GMT Message-Id: <200608030431.k734Va13056970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 04:31:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=103092 Change 103092 by jb@jb_freebsd2 on 2006/08/03 04:31:05 Save a few more registers as part of the debug information. These (finally) give us enough information to understand what is going on when a CPU goes of into the weeds. It is doing it because of a double trap caused by the curthread pointer in the per-cpu structure going bad (for a reason which hasn't been determined yet). Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#5 (text+ko) ==== @@ -448,6 +448,18 @@ rdpr %tick, %g4 stxa %g4, [PCPU(PAD) + 8]%asi + /* pcpu->pad[3] = %tl */ + rdpr %tl, %g4 + stxa %g4, [PCPU(PAD) + 24]%asi + + /* pcpu->pad[4] = %tpc */ + rdpr %tpc, %g4 + stxa %g4, [PCPU(PAD) + 32]%asi + + /* pcpu->pad[5] = %tnpc */ + rdpr %tnpc, %g4 + stxa %g4, [PCPU(PAD) + 40]%asi + /* * Increment a counter which might help us notice if we're * stuck in a loop. pcpu->pad[2] = count From owner-p4-projects@FreeBSD.ORG Thu Aug 3 04:45:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 183B316A4E0; Thu, 3 Aug 2006 04:45:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E577616A4DD for ; Thu, 3 Aug 2006 04:45:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F82043D4C for ; Thu, 3 Aug 2006 04:45:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k734jtJi057611 for ; Thu, 3 Aug 2006 04:45:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k734jtrC057608 for perforce@freebsd.org; Thu, 3 Aug 2006 04:45:55 GMT (envelope-from marcel@freebsd.org) Date: Thu, 3 Aug 2006 04:45:55 GMT Message-Id: <200608030445.k734jtrC057608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 04:45:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=103093 Change 103093 by marcel@marcel_nfs on 2006/08/03 04:45:22 Eliminate prfpregset_t and prgregset_t. This actually is a fix in most cases. Most functions aren't implemented :-( Affected files ... .. //depot/projects/gdb/lib/libthread_db/arch/alpha/libc_r_md.c#3 edit .. //depot/projects/gdb/lib/libthread_db/arch/amd64/libc_r_md.c#2 edit .. //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#4 edit .. //depot/projects/gdb/lib/libthread_db/arch/ia64/libc_r_md.c#2 edit .. //depot/projects/gdb/lib/libthread_db/arch/sparc64/libc_r_md.c#2 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/arch/alpha/libc_r_md.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include void -libc_r_md_getgregs(jmp_buf jb, prgregset_t r) +libc_r_md_getgregs(jmp_buf jb, gregset_t *r) { r->r_regs[R_V0] = jb->_jb[4]; r->r_regs[R_T0] = jb->_jb[5]; @@ -68,6 +68,6 @@ } void -libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/amd64/libc_r_md.c#2 (text+ko) ==== @@ -31,11 +31,11 @@ #include void -libc_r_md_getgregs(jmp_buf jb, prgregset_t *r) +libc_r_md_getgregs(jmp_buf jb, gregset_t *r) { } void -libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ #include void -libc_r_md_getgregs(jmp_buf jb, prgregset_t r) +libc_r_md_getgregs(jmp_buf jb, gregset_t *r) { r->r_eip = jb->_jb[0]; r->r_ebx = jb->_jb[1]; @@ -43,6 +43,6 @@ } void -libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/ia64/libc_r_md.c#2 (text+ko) ==== @@ -31,11 +31,11 @@ #include void -libc_r_md_getgregs(jmp_buf jb, prgregset_t *r) +libc_r_md_getgregs(jmp_buf jb, gregset_t *r) { } void -libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/sparc64/libc_r_md.c#2 (text+ko) ==== @@ -31,11 +31,11 @@ #include void -libc_r_md_getgregs(jmp_buf jb, prgregset_t *r) +libc_r_md_getgregs(jmp_buf jb, gregset_t *r) { } void -libc_r_md_getfpregs(jmp_buf jb, prfpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) { } From owner-p4-projects@FreeBSD.ORG Thu Aug 3 04:55:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9627D16A4E1; Thu, 3 Aug 2006 04:55:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5940B16A4DA for ; Thu, 3 Aug 2006 04:55:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FA9943D5A for ; Thu, 3 Aug 2006 04:55:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k734t7cc065798 for ; Thu, 3 Aug 2006 04:55:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k734t7qN065795 for perforce@freebsd.org; Thu, 3 Aug 2006 04:55:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 04:55:07 GMT Message-Id: <200608030455.k734t7qN065795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 04:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=103094 Change 103094 by jb@jb_freebsd2 on 2006/08/03 04:54:10 IFC Affected files ... .. //depot/projects/dtrace/src/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libc/uuid/uuid_compare.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.4 2005/01/03 02:56:15 marcel Exp $ + * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.5 2006/08/03 03:34:36 delphij Exp $ */ #include @@ -41,7 +41,8 @@ int32_t uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status) { - int res; + int res; + int64_t res64; if (status != NULL) *status = uuid_s_ok; @@ -54,10 +55,19 @@ if (b == NULL) return ((uuid_is_nil(a, NULL)) ? 0 : 1); - /* We have to compare the hard way. */ - res = (int)((int64_t)a->time_low - (int64_t)b->time_low); - if (res) - return ((res < 0) ? -1 : 1); + /* + * We have to compare the hard way. + * + * Note that time_low is defined as unsigned 32-bit + * integer, therefore, with a significantly large + * a->time_low and a small b->time_low, we will end + * up with a value which is larger than 0x7fffffff + * which is negative if casted to signed 32-bit + * integer. + */ + res64 = (int64_t)a->time_low - (int64_t)b->time_low; + if (res64) + return ((res64 < 0) ? -1 : 1); res = (int)a->time_mid - (int)b->time_mid; if (res) return ((res < 0) ? -1 : 1); ==== //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.151 2006/06/01 02:25:00 rodrigc Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.152 2006/08/03 03:55:52 delphij Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -283,6 +283,10 @@ g_access(pmp->pm_cp, 0, -1, 0); g_topology_unlock(); PICKUP_GIANT(); + /* Now the volume is clean. Mark it. */ + error = markvoldirty(pmp, 0); + if (error && (flags & FORCECLOSE) == 0) + return (error); } else if ((pmp->pm_flags & MSDOSFSMNT_RONLY) && !vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0)) { /* From owner-p4-projects@FreeBSD.ORG Thu Aug 3 04:55:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E754C16A556; Thu, 3 Aug 2006 04:55:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78F7816A4DD for ; Thu, 3 Aug 2006 04:55:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F376243D5C for ; Thu, 3 Aug 2006 04:55:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k734t7WN065804 for ; Thu, 3 Aug 2006 04:55:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k734t7lj065801 for perforce@freebsd.org; Thu, 3 Aug 2006 04:55:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 04:55:07 GMT Message-Id: <200608030455.k734t7lj065801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 04:55:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=103095 Change 103095 by jb@jb_freebsd2 on 2006/08/03 04:54:32 Loopback from current. Affected files ... .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#6 integrate Differences ... ==== //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.316 2006/08/02 17:22:30 marcel Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.318 2006/08/03 03:30:53 jb Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -18,9 +18,9 @@ aout .. .. + dtrace + .. engines - .. - dtrace .. .. libdata From owner-p4-projects@FreeBSD.ORG Thu Aug 3 04:56:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42DB316A4DF; Thu, 3 Aug 2006 04:56:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 218AA16A4DA for ; Thu, 3 Aug 2006 04:56:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D83D643D46 for ; Thu, 3 Aug 2006 04:56:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k734u9hk065949 for ; Thu, 3 Aug 2006 04:56:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k734u92k065946 for perforce@freebsd.org; Thu, 3 Aug 2006 04:56:09 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 04:56:09 GMT Message-Id: <200608030456.k734u92k065946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 04:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103096 Change 103096 by jb@jb_freebsd2 on 2006/08/03 04:55:47 Work-in-progress pending the availability of libbsdelf. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#5 edit Differences ... ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#3 (text+ko) ==== @@ -20,12 +20,18 @@ OPENSOLARIS_SYS_DISTDIR=${.CURDIR}/../../../sys/contrib/opensolaris CFLAGS+= -I${.CURDIR} \ - -I${DWARF_DISTDIR} \ - -I${.CURDIR}/../../../sys \ + -I${DWARF_DISTDIR} + +.if ${MACHINE_ARCH} != "i386" +CFLAGS+= -I/usr/local/include +.else +CFLAGS+= -I${.CURDIR}/../../../sys \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common + CFLAGS+= -D_SOLARIS_C_SOURCE +.endif .PATH: ${DWARF_DISTDIR} ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#5 (text+ko) ==== @@ -1,83 +1,19 @@ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* - Copyright (C) 2000,2003,2004 Silicon Graphics, Inc. All Rights Reserved. +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ALLOCA_H */ - This program is free software; you can redistribute it and/or modify it - under the terms of version 2.1 of the GNU Lesser General Public License - as published by the Free Software Foundation. +/* Define 1 if want producer to build with 32/64bit section offsets per dwarf3 + */ +#define HAVE_DWARF2_99_EXTENSION 1 - This program is distributed in the hope that it would be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +/* Define to 1 if the elf64_getehdr function is in libelf.a. */ +#define HAVE_ELF64_GETEHDR 1 - Further, this software is distributed without any warranty that it is - free of the rightful claim of any third person regarding infringement - or the like. Any license provided herein, whether implied or - otherwise, applies only to this software file. Patent licenses, if - any, provided herein do not apply to combinations of this program with - other software, or any other product whatsoever. - - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, - USA. - - Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pky, - Mountain View, CA 94043, or: - - http://www.sgi.com - - For further information regarding this notice, see: - - http://oss.sgi.com/projects/GenInfo/NoticeExplan - -*/ - - - -/* Define to 1 if the elf64_getshdr function is in libelf.a */ -/* #undef HAVE_ELF64_GETSHDR */ - -/* Define to 1 if the elf64_getehdr function is in libelf.a */ -/* #undef HAVE_ELF64_GETEHDR */ -#if defined(__sparc64__) +/* Define to 1 if the elf64_getshdr function is in libelf.a. */ #define HAVE_ELF64_GETSHDR 1 -#define HAVE_ELF64_GETEHDR 1 -#endif - -/* see if __uint32_t is predefined in the compiler */ -/* #undef HAVE___UINT32_T */ -/* see if __uint64_t is predefined in the compiler */ -/* #undef HAVE___UINT64_T */ - -/* Define 1 if sys/types.h defines __uint32_t */ -#define HAVE___UINT32_T_IN_SYS_TYPES_H 1 - -/* Define 1 if sys/types.h defines __uint64_t */ -#define HAVE___UINT64_T_IN_SYS_TYPES_H 1 - -/* Define 1 if R_IA_64_DIR32LSB is defined (might be enum value) */ -/* #undef HAVE_R_IA_64_DIR32LSB */ - -/* Define 1 if sys/ia64/elf.h exists*/ -/* #undef HAVE_SYS_IA64_ELF_H */ - -/* Define 1 if want to build with 32/64bit section offsets for ia64 */ -/* per the dwarf2 committee proposal adopted Dec 1999 */ -/* #undef HAVE_DWARF2_99_EXTENSION */ - -/* Define 1 if want only 32bit section offsets per pure dwarf2.0.0 spec */ -/* Only one of HAVE_OLD_DWARF2_32BIT_OFFSET or HAVE_DWARF2_99_EXTENSION */ -/* may be defined */ -/* #undef HAVE_OLD_DWARF2_32BIT_OFFSET */ - - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ALLOCA_H */ - /* Define to 1 if you have the header file. */ /* #undef HAVE_ELFACCESS_H */ @@ -88,16 +24,24 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ +#ifdef __i386__ #define HAVE_LIBELF_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBELF_LIBELF_H */ +#ifdef __sparc64__ +#define HAVE_LIBELF_LIBELF_H 1 +#endif /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SGIDEFS_H */ +/* Define 1 if want producer to build with only 32bit section offsets per + strict dwarf2 */ +/* #undef HAVE_OLD_DWARF2_32BIT_OFFSET */ + +/* Define 1 if R_IA_64_DIR32LSB is defined (might be enum value). */ +/* #undef HAVE_R_IA_64_DIR32LSB */ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -123,6 +67,24 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 +/* See if __uint32_t is predefined in the compiler. */ +/* #undef HAVE___UINT32_T */ + +/* Define 1 if __uint32_t is in sgidefs.h. */ +/* #undef HAVE___UINT32_T_IN_SGIDEFS_H */ + +/* Define 1 if sys/types.h defines __uint32_t. */ +#define HAVE___UINT32_T_IN_SYS_TYPES_H 1 + +/* See if __uint64_t is predefined in the compiler. */ +/* #undef HAVE___UINT64_T */ + +/* Define 1 if __uint64_t is in sgidefs.h. */ +/* #undef HAVE___UINT64_T_IN_SGIDEFS_H */ + +/* Define 1 if sys/types.h defines __uint64_t. */ +#define HAVE___UINT64_T_IN_SYS_TYPES_H 1 + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -143,7 +105,6 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ -#if defined(__sparc64__) -#define WORDS_BIGENDIAN +#ifdef __sparc64__ +#define WORDS_BIGENDIAN 1 #endif From owner-p4-projects@FreeBSD.ORG Thu Aug 3 06:08:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93E9416A4E0; Thu, 3 Aug 2006 06:08:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F51C16A4DD for ; Thu, 3 Aug 2006 06:08:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D6D743D45 for ; Thu, 3 Aug 2006 06:08:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7368hGe072004 for ; Thu, 3 Aug 2006 06:08:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7368g2i072001 for perforce@freebsd.org; Thu, 3 Aug 2006 06:08:42 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 06:08:42 GMT Message-Id: <200608030608.k7368g2i072001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 06:08:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=103100 Change 103100 by jb@jb_freebsd2 on 2006/08/03 06:07:44 IFC Affected files ... .. //depot/projects/dtrace/src/sys/conf/options#16 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/dtrace/src/sys/sys/sysent.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#8 integrate Differences ... ==== //depot/projects/dtrace/src/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.555 2006/07/29 18:38:53 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.556 2006/08/03 05:19:33 jb Exp $ # # On the handling of kernel options # ==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.216 2006/08/02 08:14:01 davidxu Exp $ + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.217 2006/08/03 05:32:43 jb Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ ==== //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#5 (text+ko) ==== @@ -1,6 +1,6 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.64 2006/08/02 08:09:24 davidxu Exp $ +# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.65 2006/08/03 05:29:09 jb Exp $ set -e ==== //depot/projects/dtrace/src/sys/kern/syscalls.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/kern/syscalls.c,v 1.201 2006/08/03 05:32:43 jb Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ ==== //depot/projects/dtrace/src/sys/kern/systrace_args.c#4 (text+ko) ==== @@ -2067,6 +2067,42 @@ *n_args = 3; break; } + /* kse_exit */ + case 379: { + *n_args = 0; + break; + } + /* kse_wakeup */ + case 380: { + struct kse_wakeup_args *p = params; + uarg[0] = (intptr_t) p->mbx; /* struct kse_mailbox * */ + *n_args = 1; + break; + } + /* kse_create */ + case 381: { + struct kse_create_args *p = params; + uarg[0] = (intptr_t) p->mbx; /* struct kse_mailbox * */ + iarg[1] = p->newgroup; /* int */ + *n_args = 2; + break; + } + /* kse_thr_interrupt */ + case 382: { + struct kse_thr_interrupt_args *p = params; + uarg[0] = (intptr_t) p->tmbx; /* struct kse_thr_mailbox * */ + iarg[1] = p->cmd; /* int */ + iarg[2] = p->data; /* long */ + *n_args = 3; + break; + } + /* kse_release */ + case 383: { + struct kse_release_args *p = params; + uarg[0] = (intptr_t) p->timeout; /* struct timespec * */ + *n_args = 1; + break; + } /* __mac_get_proc */ case 384: { struct __mac_get_proc_args *p = params; @@ -2498,6 +2534,14 @@ *n_args = 4; break; } + /* kse_switchin */ + case 440: { + struct kse_switchin_args *p = params; + uarg[0] = (intptr_t) p->tmbx; /* struct kse_thr_mailbox * */ + iarg[1] = p->flags; /* int */ + *n_args = 2; + break; + } /* ksem_timedwait */ case 441: { struct ksem_timedwait_args *p = params; ==== //depot/projects/dtrace/src/sys/sys/syscall.h#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/sys/syscall.h,v 1.198 2006/08/03 05:31:28 jb Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ ==== //depot/projects/dtrace/src/sys/sys/syscall.mk#8 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD$ +# $FreeBSD: src/sys/sys/syscall.mk,v 1.153 2006/08/03 05:31:28 jb Exp $ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp MIASM = \ syscall.o \ ==== //depot/projects/dtrace/src/sys/sys/sysent.h#6 (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/sys/sysent.h,v 1.49 2006/08/01 16:32:20 jhb Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.50 2006/08/03 05:26:51 jb Exp $ */ #ifndef _SYS_SYSENT_H_ ==== //depot/projects/dtrace/src/sys/sys/sysproto.h#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/sys/sysproto.h,v 1.201 2006/08/03 05:31:28 jb Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ From owner-p4-projects@FreeBSD.ORG Thu Aug 3 08:23:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 911B216A4E1; Thu, 3 Aug 2006 08:23:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5242116A4DA for ; Thu, 3 Aug 2006 08:23:32 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17C3D43D58 for ; Thu, 3 Aug 2006 08:23:32 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k738NVUf088795 for ; Thu, 3 Aug 2006 08:23:31 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k738NVt9088792 for perforce@freebsd.org; Thu, 3 Aug 2006 08:23:31 GMT (envelope-from gabor@FreeBSD.org) Date: Thu, 3 Aug 2006 08:23:31 GMT Message-Id: <200608030823.k738NVt9088792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 08:23:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103102 Change 103102 by gabor@gabor_spitfire on 2006/08/03 08:23:28 Document FETCH_SCRIPT and FETCH_SCRIPT_ENV in the header. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#70 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#70 (text+ko) ==== @@ -755,6 +755,12 @@ # FETCH_REGET - Times to retry fetching of files on checksum errors. # Default: 1 # +# FETCH_SCRIPT - The command that is called in the do-fetch target. +# Default: ${PORTSDIR}/Tools/scripts/do-fetch.sh +# +# FETCH_SCRIPT_ENV - The environment that is passed when invoking FETCH_SCRIPT. +# Default: see below +# # For extract: # # EXTRACT_CMD - Command for extracting archive: "bzip2" if USE_BZIP2 From owner-p4-projects@FreeBSD.ORG Thu Aug 3 09:12:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1614D16A4DF; Thu, 3 Aug 2006 09:12:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDD1316A4DE for ; Thu, 3 Aug 2006 09:12:35 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E67843D4C for ; Thu, 3 Aug 2006 09:12:35 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k739CZTG001707 for ; Thu, 3 Aug 2006 09:12:35 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k739CZB3001704 for perforce@freebsd.org; Thu, 3 Aug 2006 09:12:35 GMT (envelope-from gabor@FreeBSD.org) Date: Thu, 3 Aug 2006 09:12:35 GMT Message-Id: <200608030912.k739CZB3001704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 09:12:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=103104 Change 103104 by gabor@gabor_spitfire on 2006/08/03 09:11:57 - Pass MASTER_SITES and MASTER_SITE_SUBDIR to the script via FETCH_SCRIPT_ENV - Fix typo in do-fetch.sh Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#71 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#17 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#71 (text+ko) ==== @@ -2146,6 +2146,7 @@ FETCH_SCRIPT_ENV?= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR}" \ FETCH_CMD="${FETCH_CMD}" \ + MASTER_SITES="${MASTER_SITES}" MASTER_SITE_SUBDIR="${MASTER_SITE_SUBDIR}" \ FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ FORCE_FETCH="${FORCE_FETCH}" NO_CHECKSUM="${NO_CHECKSUM}" MD5_FILE="${MD5_FILE}" \ ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#17 (text+ko) ==== @@ -2,7 +2,7 @@ cd ${_DISTDIR} for _S in ${MASTER_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@}"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do From owner-p4-projects@FreeBSD.ORG Thu Aug 3 09:28:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAD6E16A4E1; Thu, 3 Aug 2006 09:28:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE78D16A4DA for ; Thu, 3 Aug 2006 09:28:57 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E70B43D45 for ; Thu, 3 Aug 2006 09:28:57 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k739SvxE002549 for ; Thu, 3 Aug 2006 09:28:57 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k739Su4G002546 for perforce@freebsd.org; Thu, 3 Aug 2006 09:28:56 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 3 Aug 2006 09:28:56 GMT Message-Id: <200608030928.k739Su4G002546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 103106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 09:28:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103106 Change 103106 by cdjones@cdjones-impulse on 2006/08/03 09:28:12 Address concerns on hackers@ about reading from memory that doesn't exist anymore. NOTE: this is known-buggy code that causes kernel panics, but I'm checking it in as a way point towards working code. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#19 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#15 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#19 (text+ko) ==== @@ -102,23 +102,26 @@ static void jsched_td(void *arg) { - struct prison *pr; - pr = arg; + struct prison *pr = arg; + /* int pr_id = pr->pr_id; */ + int flags = J_SCHED_TD_ACTIVE; + pr->pr_scheduler_flags_ptr = &flags; /* printf("Starting jsched_td\n"); */ for (;;) { - if (pr->pr_scheduler_flags & J_SCHED_TD_DIE) + if (flags & J_SCHED_TD_DIE) break; - + + mtx_lock(&pr->pr_mtx); /* Scheduling stuff goes here. */ /* printf("jsched_td running\n"); */ + mtx_unlock(&pr->pr_mtx); + tsleep(pr, 0, "-", hz); } -/* printf("Exiting jsched_td\n"); */ - - pr->pr_scheduler_flags = J_SCHED_TD_DEAD; + printf("Exiting jsched_td\n"); kthread_exit(0); } @@ -126,20 +129,23 @@ jpager_td(void *arg) { struct proc *p; - struct prison *pr; + struct prison *pr = arg; struct thread *td; long limit, cursize, newsize, usage; int breakout; - - pr = arg; - + int pr_id = pr->pr_id; + int flags = J_SCHED_TD_ACTIVE; + pr->pr_scheduler_flags_ptr = &flags; + printf("Starting jpager/%d with memory limit %ld bytes\n", - pr->pr_id, (long) prison_memory_limit(pr)); + pr_id, (long) prison_memory_limit(pr)); for (;;) { - if (pr->pr_pager_flags & J_PAGER_TD_DIE) + if (flags & J_PAGER_TD_DIE) break; - + + mtx_lock(&pr->pr_mtx); + /* TODO: consider whether it might be better to start * pushing back when we approach the limit, rather than * when we hit it. @@ -154,11 +160,11 @@ */ printf("jpager/%d: memory %ld / %ld bytes\n", - pr->pr_id, usage, limit); + pr_id, usage, limit); if ((usage - limit) > 0) { - printf("jpager/%d: overcommitted by %ld bytes (%lf percent)\n", - pr->pr_id, usage - limit, + printf("jpager/%d: overcommitted by %ld bytes (%f percent)\n", + pr_id, usage - limit, (double) 100 * ((double) (usage - limit) / (double) limit)); sx_slock(&allproc_lock); LIST_FOREACH(p, &allproc, p_list) { @@ -209,11 +215,12 @@ newsize = 0; PROC_UNLOCK(p); printf("jpager/%d: squeezing process %d from %ld to %ld\n", - pr->pr_id, p->p_pid, cursize, newsize); + pr_id, p->p_pid, cursize, newsize); vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, newsize); } /* end LIST_FOREACH procs */ sx_sunlock(&allproc_lock); } + mtx_unlock(&pr->pr_mtx); /* TODO --- make interval into a sysctl. */ /* 6 seconds because VM recomputes totals every 5. */ @@ -222,8 +229,6 @@ } printf("Exiting jpager_td\n"); - - pr->pr_pager_flags = J_PAGER_TD_DEAD; kthread_exit(0); } @@ -299,12 +304,10 @@ mtx_unlock(&allprison_mtx); /* TODO #ifdef SCHED_HIER */ - pr->pr_scheduler_flags = J_SCHED_TD_ACTIVE; if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched %d", pr->pr_id)) goto e_dropprref; KASSERT(j_sched_proc != NULL, ("NULL j_sched_proc")); pr->pr_scheduler = j_sched_proc; - pr->pr_pager_flags = J_PAGER_TD_ACTIVE; if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) goto e_dropprref; KASSERT(j_pager_proc != NULL, ("NULL j_pager_proc")); @@ -320,6 +323,7 @@ td->td_retval[0] = jaa.jid; return (0); e_dropprref: + /* TODO: kill pager, scheduler if they've started. */ mtx_lock(&allprison_mtx); LIST_REMOVE(pr, pr_list); prisoncount--; @@ -424,19 +428,20 @@ void prison_free(struct prison *pr) { - mtx_lock(&allprison_mtx); mtx_lock(&pr->pr_mtx); pr->pr_ref--; if (pr->pr_ref == 0) { + *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE; + kthread_resume(pr->pr_scheduler); + *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; + kthread_resume(pr->pr_pager); + LIST_REMOVE(pr, pr_list); mtx_unlock(&pr->pr_mtx); prisoncount--; mtx_unlock(&allprison_mtx); - /* Tell scheduler to die. No need to wait for it. */ - pr->pr_scheduler_flags |= J_SCHED_TD_DIE; - pr->pr_pager_flags |= J_PAGER_TD_DIE; wakeup(pr); TASK_INIT(&pr->pr_task, 0, prison_complete, pr); @@ -583,7 +588,11 @@ vm_pindex_t prison_memory_limit(struct prison *pr) { - return pr->pr_mem_limit; + vm_pindex_t memlimit; + mtx_lock(&pr->pr_mtx); + memlimit = (vm_pindex_t) pr->pr_mem_limit; + mtx_unlock(&pr->pr_mtx); + return memlimit; } /* ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#15 (text+ko) ==== @@ -101,9 +101,9 @@ struct mtx pr_mtx; unsigned int pr_priority; /* (p) jail priority */ struct proc *pr_scheduler; /* (c) scheduler pid */ - int pr_scheduler_flags; /* (p) communication to scheduler */ + int *pr_scheduler_flags_ptr; /* (p) communication to scheduler */ struct proc *pr_pager; /* (c) pager pid */ - int pr_pager_flags; /* (p) communication to pager */ + int *pr_pager_flags_ptr; /* (p) communication to pager */ size_t pr_mem_limit; /* (p) memory allocation limit */ size_t pr_mem_usage; /* (p) memory in use */ }; From owner-p4-projects@FreeBSD.ORG Thu Aug 3 09:39:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 516BA16A4E1; Thu, 3 Aug 2006 09:39:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8D5616A4DF for ; Thu, 3 Aug 2006 09:39:10 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78F1843D46 for ; Thu, 3 Aug 2006 09:39:10 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k739dAFl006080 for ; Thu, 3 Aug 2006 09:39:10 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k739dAcV006077 for perforce@freebsd.org; Thu, 3 Aug 2006 09:39:10 GMT (envelope-from gabor@FreeBSD.org) Date: Thu, 3 Aug 2006 09:39:10 GMT Message-Id: <200608030939.k739dAcV006077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 09:39:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103107 Change 103107 by gabor@gabor_spitfire on 2006/08/03 09:38:57 - Use single quotes around sed patterns where no shell substitution should be done - Add some missing ` Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#18 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#18 (text+ko) ==== @@ -2,29 +2,29 @@ cd ${_DISTDIR} for _S in ${MASTER_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "/^://"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s|^${__TMP}||" -e '/^://'` if [ -n "${_S_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} 's/,/ /g'`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's/@^(.*/):[^/:]+$@\1@'` _MASTER_SITES_${_group}= $${_MASTER_SITES_${_group}} ${__SUFFIX_TMP} done else - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*/):[^/:]+$@\1@'` _MASTER_SITES_DEFAULT= ${_MASTER_SITES_DEFAULT} ${__SUFFIX_TMP} fi done for _S in ${MASTER_SITE_SUBDIR}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e 's/^://'` if [ -n "${_S_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} 's/,/ /g'`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" @@ -32,24 +32,24 @@ exit 1 fi if [ -n "$${_MASTER_SITES_${_group}}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*)/:[^/:]+$@\1@'` _MASTER_SITE_SUBDIR_${_group}= $${_MASTER_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi done else if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} '@^(.*)/:[^/:]+$@\1@'` _MASTER_SITE_SUBDIR_DEFAULT= ${_MASTER_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP} fi fi done for _S in ${MASTER_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" "s/^://"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" 's/^://'` if [ -n "${_S_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} 's/,/ /g'`; do if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then - MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"` + MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} 's^%SUBDIR%/^^'` else _S_TEMP_TEMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then @@ -92,7 +92,7 @@ done fi else - MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` + MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} 's^%SUBDIR%/^^'` fi _MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} MASTER_SITES_TMP= @@ -136,11 +136,11 @@ _MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} _G_TEMP= DEFAULT for _D in ${DISTFILES}; do - __TMP= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//" - _D_TEMP= `${ECHO_CMD} ${_D} | ${SED} "s/^${__TMP}//" + __TMP= `${ECHO_CMD} ${_D} | ${SED} 's/:[^:]+$//'` + _D_TEMP= `${ECHO_CMD} ${_D} | ${SED} "s/^${__TMP}//"` if [ -n "${_D_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do - if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e 's/^://' -e 's/,/ /g'`; do + if [ -z "$${_MASTER_SITES_${_group}}" ] ; then _G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/` if [ -z "${_G_TEMP_TEMP}" ; then _G_TEMP= ${_G_TEMP} ${_group} @@ -148,7 +148,7 @@ fi fi done - __SUFFIX_TMP= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"` + __SUFFIX_TMP= `${ECHO_CMD} ${_D} | ${SED} 's/:[^:]+$//'` _DISTFILES= ${_DISTFILE} ${__SUFFIX_TMP} else _DISTFILES= ${_DISTFILES} ${_D} @@ -161,7 +161,7 @@ # # Sort the master site list according to the patterns in MASTER_SORT # -MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e "s|.|\\.|g" -e "s|^|://[^/]*|" -e "s|$|/|"` +MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e 's|.|\\.|g" -e "s|^|://[^/]*|' -e 's|$|/|'` MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; } .for srt in ${MASTER_SORT_REGEX} MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; } @@ -178,12 +178,12 @@ # # for use in the fetch targets for _S in ${MASTER_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@" - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//" + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//"` if [ -n "${_S_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e 's/^://' -e 's/,/ /g'`; do SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites--${_group} - ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} + ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} done fi done @@ -257,29 +257,29 @@ if [ -z "${PATCHFILES}" ] ; then for _S in ${PATCH_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e 's/^://'` if [ -n "${_S_TEMP}" ; then \ - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} 's/,/ /g'`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" exit 1 fi - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*/):[^/:]+$@\1@'` _PATCH_SITES_${_group}= $${_PATCH_SITES_${_group}} ${__SUFFIX_TMP} done else - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*/):[^/:]+$@\1@'` _PATCH_SITES_DEFAULT= ${_PATCH_SITES_DEFAULT} ${__SUFFIX_TMP} fi done for _S in ${PATCH_SITE_SUBDIR}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e 's/^://'` if [ -n "${_S_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} 's/,/ /g'`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" @@ -287,22 +287,22 @@ exit 1 fi if [ -n "${_PATCH_SITES_${_group}}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*)/:[^/:]+$@\1@'` _PATCH_SITE_SUBDIR_${_group}= $${_PATCH_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi done else if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*)/:[^/:]+$@\1@'` _PATCH_SITE_SUBDIR_DEFAULT= ${_PATCH_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP} fi fi done for _S in ${PATCH_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e 's/^://'` if [ -n "${_S_TEMP}" } ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} 's/,/ /g'`; do if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then _S_TEMP_TEMP= `${ECHO_CMD} ${_PATCH_SITES_${_group}} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*` if [ -z "${_S_TEMP_TEMP}" ] ; then @@ -345,17 +345,17 @@ done fi else - PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` + PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} 's^%SUBDIR%/^^'` fi _PATCH_SITES_DEFAULT:= ${PATCH_SITES_TMP} PATCH_SITES_TMP= _PATCH_SITES_ALL= ${_PATCH_SITES_DEFAULT} _G_TEMP= DEFAULT for _P in ${PATCHFILES}; do - __TMP= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + __TMP= `${ECHO_CMD} ${_P} | ${SED} 's/:[^:]+$//'` _P_TEMP= `${ECHO_CMD} ${_P} | ${SED} "s/^${__TMP}//" if [ -n "${_P_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_P_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_P_TEMP} | ${SED} -e 's/^://' -e 's/,/ /g'`; do if [ -z "$${_PATCH_SITES_${_group}}" ] ; then _G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/` if [ -z "${_G_TEMP_TEMP}" ] ; then @@ -364,17 +364,17 @@ fi fi done - __SUFFIX_TMP= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + __SUFFIX_TMP= `${ECHO_CMD} ${_P} | ${SED} 's/:[^:]+$//'` _PATCHFILES= ${_PATCHFILES} ${__SUFFIX_TMP} else _PATCHFILES= ${_PATCHFILES} ${_P} fi done for _S in ${PATCH_SITES}; do - __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//"` if [ -n "${_S_TEMP}" ] ; then - for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" "s/,/ /g"`; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e 's/^://' 's/,/ /g'`; do SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group} ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} done From owner-p4-projects@FreeBSD.ORG Thu Aug 3 09:55:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 206FC16A4DF; Thu, 3 Aug 2006 09:55:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D24FA16A4DD for ; Thu, 3 Aug 2006 09:55:32 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 913B343D46 for ; Thu, 3 Aug 2006 09:55:32 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k739tWj4007057 for ; Thu, 3 Aug 2006 09:55:32 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k739tWgQ007054 for perforce@freebsd.org; Thu, 3 Aug 2006 09:55:32 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 3 Aug 2006 09:55:32 GMT Message-Id: <200608030955.k739tWgQ007054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 103110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 09:55:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103110 Change 103110 by cdjones@cdjones-impulse on 2006/08/03 09:55:12 Same as before; panics with WITNESS. Whee. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#20 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#20 (text+ko) ==== @@ -144,8 +144,6 @@ if (flags & J_PAGER_TD_DIE) break; - mtx_lock(&pr->pr_mtx); - /* TODO: consider whether it might be better to start * pushing back when we approach the limit, rather than * when we hit it. @@ -220,7 +218,6 @@ } /* end LIST_FOREACH procs */ sx_sunlock(&allproc_lock); } - mtx_unlock(&pr->pr_mtx); /* TODO --- make interval into a sysctl. */ /* 6 seconds because VM recomputes totals every 5. */ @@ -432,16 +429,14 @@ mtx_lock(&pr->pr_mtx); pr->pr_ref--; if (pr->pr_ref == 0) { - *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE; - kthread_resume(pr->pr_scheduler); - *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; - kthread_resume(pr->pr_pager); - LIST_REMOVE(pr, pr_list); mtx_unlock(&pr->pr_mtx); prisoncount--; mtx_unlock(&allprison_mtx); + /* Tell scheduler, pager to die. No need to wait. */ + *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE; + *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; wakeup(pr); TASK_INIT(&pr->pr_task, 0, prison_complete, pr); From owner-p4-projects@FreeBSD.ORG Thu Aug 3 13:22:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EE9216A4E6; Thu, 3 Aug 2006 13:22:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2014C16A4E0 for ; Thu, 3 Aug 2006 13:22:51 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B17C143D49 for ; Thu, 3 Aug 2006 13:22:50 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73DMobn029700 for ; Thu, 3 Aug 2006 13:22:50 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73DModt029697 for perforce@freebsd.org; Thu, 3 Aug 2006 13:22:50 GMT (envelope-from piso@freebsd.org) Date: Thu, 3 Aug 2006 13:22:50 GMT Message-Id: <200608031322.k73DModt029697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 13:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=103113 Change 103113 by piso@piso_newluxor on 2006/08/03 13:22:23 First implementation of interrupt storm logic for filters: in case an interrupt come, and no filters claim it (and we don't have any ithread_only handler on that line), throttle the line (mask the interrupt and mark the source) and kick off a timeout once per second. Timeout function (when called) will check all the interrupts: if any of these interrupt is marked, check if it is still pending else unmask/unmark the source. If the interrupt is still pending, call filters and if any of them claim the interrupt, unmask/unmark it. Else, if no filter claims the interrupt, increase the timeout threshold for next check. TODO: -The code is still MD, but i would like to make it MI. -we need tunable timeout tresholds (upper & lower). -filters are called with a NULL frame parameter, while some of them expect to receive a valid trapframe... -i should call callout_drain() but i can't find a place where to do that: i guess we don't do cleanup in this case, case if we need to drain the callout, it means we are shutting down the box, right? Affected files ... .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#8 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +64,9 @@ static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +static struct callout callout_handle; +static int backoff = 1; + #ifdef SMP static int assign_cpu; @@ -165,6 +169,57 @@ return (isrc->is_pic->pic_config_intr(isrc, trig, pol)); } +static struct intsrc * +walk_intr_src(void) { + static int i = 0; + + for (; iis_event; + /* is this interrupt marked as being throttled? */ + if (ie != NULL && ie->ie_count == INT_MAX) { + /* and is the interrupt still pending? */ + if (isrc->is_pic->pic_source_pending(isrc)) { + /* + * yes, it's still pending: call filters... + */ + thread = intr_filter_loop(ie, NULL /* XXX frame */ ); + if (thread & FILTER_STRAY) { + /* + * no filter claimed the intr, + * backoff with a longer timeout + */ + backoff++; // XXX we need thresholds... + callout_reset(&callout_handle, hz*backoff, + &stray_detection, NULL); + continue; + } + } + /* + * a filter claimed the intr, or the intr was not + * pending anymore: unmask it + */ + ie->ie_count = 0; + isrc->is_pic->pic_enable_source(isrc); + } + } +} + void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { @@ -225,6 +280,15 @@ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); critical_exit(); + + /* Interrupt storm logic */ + if (thread & FILTER_STRAY) { + ie->ie_count = INT_MAX; + mtx_lock_spin(&intr_table_lock); + callout_reset(&callout_handle, hz, &stray_detection, NULL); + mtx_unlock_spin(&intr_table_lock); + } + /* Schedule the ithread if needed. */ if (thread & FILTER_SCHEDULE_THREAD) { error = intr_event_schedule_thread(ie); @@ -309,6 +373,8 @@ intrcnt_setname("???", 0); intrcnt_index = 1; mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + callout_init_mtx(&callout_handle, &intr_table_lock, 0); + // XXX - we don't drain the callout... } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) From owner-p4-projects@FreeBSD.ORG Thu Aug 3 13:24:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1638516A4DE; Thu, 3 Aug 2006 13:24:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D959A16A4DA for ; Thu, 3 Aug 2006 13:24:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90EB343D45 for ; Thu, 3 Aug 2006 13:24:58 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73DOw1P029769 for ; Thu, 3 Aug 2006 13:24:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73DOwmO029766 for perforce@freebsd.org; Thu, 3 Aug 2006 13:24:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 3 Aug 2006 13:24:58 GMT Message-Id: <200608031324.k73DOwmO029766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 13:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=103114 Change 103114 by hselasky@hselasky_mini_itx on 2006/08/03 13:24:52 Correct wrong size of hub descriptor. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#5 (text+ko) ==== @@ -412,7 +412,8 @@ if(!err && (nports >= 8)) { - USETW(req.wLength, USB_HUB_DESCRIPTOR_SIZE + (nports / 8)); + u_int16_t len = (USB_HUB_DESCRIPTOR_SIZE-1) + ((nports+7) / 8); + USETW(req.wLength, len); err = usbd_do_request(udev, &req, &hubdesc); } From owner-p4-projects@FreeBSD.ORG Thu Aug 3 14:58:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7254116A4E1; Thu, 3 Aug 2006 14:58:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D27316A4DD for ; Thu, 3 Aug 2006 14:58:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 291CA43D46 for ; Thu, 3 Aug 2006 14:58:57 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73Ewv6o035584 for ; Thu, 3 Aug 2006 14:58:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73Ewunx035581 for perforce@freebsd.org; Thu, 3 Aug 2006 14:58:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 3 Aug 2006 14:58:56 GMT Message-Id: <200608031458.k73Ewunx035581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 14:58:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103117 Change 103117 by hselasky@hselasky_mini_itx on 2006/08/03 14:58:03 Add some more debugging statements. Cleanup some include lines. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#7 (text+ko) ==== @@ -63,8 +63,8 @@ #include "usbdevs.h" -#include -#include +#include +#include __FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.38 2006/05/16 14:36:32 phk Exp $"); @@ -1544,7 +1544,7 @@ xfer->timeout = RAL_TX_TIMEOUT; - DPRINTF(sc, 10, "sending mgt frame len=%u rate=%u xfer len=%u\n", + DPRINTF(sc, 10, "sending frame len=%u rate=%u xfer len=%u\n", m0->m_pkthdr.len, rate, xfer->length); m_freem(m0); @@ -2443,6 +2443,8 @@ sc->sc_tx_ant = (val >> 2) & 0x3; sc->sc_nb_ant = (val & 0x3); + DPRINTF(sc, 0, "val = 0x%04x\n", val); + /* read MAC address */ ural_cfg_eeprom_read(sc, RAL_EEPROM_ADDRESS, ic->ic_myaddr, sizeof(ic->ic_myaddr)); @@ -2579,6 +2581,9 @@ ural_cfg_read_multi(sc, RAL_STA_CSR0, sc->sc_sta, sizeof(sc->sc_sta)); + DPRINTF(sc, 0, "rx_ant=%d, tx_ant=%d\n", + sc->sc_rx_ant, sc->sc_tx_ant); + ural_cfg_set_txantenna(sc, sc->sc_tx_ant); ural_cfg_set_rxantenna(sc, sc->sc_rx_ant); From owner-p4-projects@FreeBSD.ORG Thu Aug 3 15:01:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B602F16A4DF; Thu, 3 Aug 2006 15:01:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E09D16A4DA for ; Thu, 3 Aug 2006 15:01:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C7F543D45 for ; Thu, 3 Aug 2006 15:01:00 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73F0xlE035734 for ; Thu, 3 Aug 2006 15:01:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73F0xf6035730 for perforce@freebsd.org; Thu, 3 Aug 2006 15:00:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 3 Aug 2006 15:00:59 GMT Message-Id: <200608031500.k73F0xf6035730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 15:01:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103118 Change 103118 by hselasky@hselasky_mini_itx on 2006/08/03 15:00:54 Allow mutex passed to usbd_do_request_flags_mtx(), to be recursed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#13 (text+ko) ==== @@ -1199,6 +1199,7 @@ struct usbd_config usbd_config[1] = { /* zero */ }; struct usbd_xfer *xfer = NULL; u_int16_t length = UGETW(req->wLength); + u_int32_t level = 0; usbd_status err; usbd_config[0].type = UE_CONTROL; @@ -1210,9 +1211,8 @@ usbd_config[0].callback = &usbd_default_callback; if (mtx) { - mtx_assert(mtx, MA_OWNED); + level = mtx_drop_recurse(mtx); mtx_unlock(mtx); - mtx_assert(mtx, MA_NOTOWNED); } /* setup transfer */ @@ -1221,6 +1221,7 @@ if (mtx) { mtx_lock(mtx); + mtx_pickup_recurse(mtx, level); } if(err) From owner-p4-projects@FreeBSD.ORG Thu Aug 3 15:06:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D33516A4E5; Thu, 3 Aug 2006 15:06:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD1E416A4DA for ; Thu, 3 Aug 2006 15:06:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EA2F43D53 for ; Thu, 3 Aug 2006 15:06:07 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73F67SW037270 for ; Thu, 3 Aug 2006 15:06:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73F67eL037267 for perforce@freebsd.org; Thu, 3 Aug 2006 15:06:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 3 Aug 2006 15:06:07 GMT Message-Id: <200608031506.k73F67eL037267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 15:06:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=103119 Change 103119 by hselasky@hselasky_mini_itx on 2006/08/03 15:05:54 Add new function, usbd_ether_get_mbuf(). Fix formatting of comments, so that the bounding boxes have the same width. Fix compilation of usbd_m_copy_in_cb() on NetBSD. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#7 (text+ko) ==== @@ -64,6 +64,8 @@ # include # include /* callout_xxx() */ +# include /* ETHER_XXX */ + # ifndef __KASSERT typedef struct cdevsw cdevsw_t; # define __lockmgr lockmgr ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#12 (text+ko) ==== @@ -1552,11 +1552,11 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * allocate mbufs to an usbd interface queue * * returns a pointer that eventually should be passed to "free()" - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void * usbd_alloc_mbufs(struct malloc_type *type, struct usbd_ifqueue *ifq, u_int32_t block_size, u_int16_t block_number) @@ -1600,9 +1600,9 @@ return free_ptr; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_get_page - lookup DMA-able memory for the given offset - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_get_page(struct usbd_page_cache *cache, u_int32_t offset, struct usbd_page_search *res) @@ -1652,9 +1652,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_copy_in - copy directly to DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_copy_in(struct usbd_page_cache *cache, u_int32_t offset, const void *ptr, u_int32_t len) @@ -1683,16 +1683,20 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_m_copy_in - copy a mbuf chain directly into DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ struct usbd_m_copy_in_arg { struct usbd_page_cache *cache; u_int32_t dst_offset; }; static int32_t +#ifdef __FreeBSD__ usbd_m_copy_in_cb(void *arg, void *src, u_int32_t count) +#else +usbd_m_copy_in_cb(void *arg, caddr_t src, u_int32_t count) +#endif { register struct usbd_m_copy_in_arg *ua = arg; usbd_copy_in(ua->cache, ua->dst_offset, src, count); @@ -1710,9 +1714,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_copy_out - copy directly from DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_copy_out(struct usbd_page_cache *cache, u_int32_t offset, void *ptr, u_int32_t len) @@ -1741,9 +1745,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_bzero - zero DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_bzero(struct usbd_page_cache *cache, u_int32_t offset, u_int32_t len) { @@ -1770,13 +1774,13 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_alloc - allocate multiple DMA-able memory pages * * return values: * 1: failure * 0: success - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ u_int8_t usbd_page_alloc(bus_dma_tag_t tag, struct usbd_page *page, u_int32_t npages) @@ -1815,9 +1819,9 @@ return 0; /* success */ } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_free - free multiple DMA-able memory pages - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_page_free(struct usbd_page *page, u_int32_t npages) { @@ -1827,9 +1831,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_get_buf - get virtual buffer - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void * usbd_page_get_buf(struct usbd_page *page, u_int32_t size) { @@ -1838,9 +1842,9 @@ return ADD_BYTES(page->buffer,size); } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_get_phy - get physical buffer - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ bus_size_t usbd_page_get_phy(struct usbd_page *page, u_int32_t size) { @@ -1849,9 +1853,9 @@ return (page->physaddr + size); } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_set_start - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_page_set_start(struct usbd_page_cache *pc, struct usbd_page *page_ptr, u_int32_t size) @@ -1861,9 +1865,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_set_end - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_page_set_end(struct usbd_page_cache *pc, struct usbd_page *page_ptr, u_int32_t size) @@ -1873,9 +1877,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_page_fit_obj - fit object function - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ u_int32_t usbd_page_fit_obj(struct usbd_page *page, u_int32_t size, u_int32_t obj_len) { @@ -1908,9 +1912,9 @@ return adj; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_mem_alloc - allocate DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void * usbd_mem_alloc(bus_dma_tag_t parent, u_int32_t size, u_int8_t align_power) @@ -1943,9 +1947,9 @@ return ptr; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_mem_vtophys - get the physical address of DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ bus_size_t usbd_mem_vtophys(void *ptr, u_int32_t size) { @@ -1958,9 +1962,9 @@ return page->physaddr; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_mem_free - free DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_mem_free(void *ptr, u_int32_t size) { @@ -1981,9 +1985,9 @@ } #ifdef __FreeBSD__ -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * bus_dmamap_load_callback - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ static void bus_dmamap_load_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error) @@ -1998,9 +2002,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_dma_tag_alloc - allocate a bus-DMA tag - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ bus_dma_tag_t usbd_dma_tag_alloc(bus_dma_tag_t parent, u_int32_t size, u_int32_t alignment) @@ -2028,9 +2032,9 @@ return tag; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_dma_tag_free - free a bus-DMA tag - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_dma_tag_free(bus_dma_tag_t tag) { @@ -2038,9 +2042,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_mem_alloc_sub - allocate DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void * usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, u_int32_t size, u_int32_t alignment) @@ -2082,9 +2086,9 @@ return ptr; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_mem_free_sub - free DMA-able memory - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_mem_free_sub(struct usbd_page *page) { @@ -2215,9 +2219,9 @@ } #endif -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_std_transfer_setup - standard transfer setup - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ void usbd_std_transfer_setup(struct usbd_xfer *xfer, const struct usbd_config *setup, @@ -2272,9 +2276,9 @@ return; } -/*---------------------------------------------------------------------------* +/*------------------------------------------------------------------------------* * usbd_make_str_desc - convert an ASCII string into a UNICODE string - *---------------------------------------------------------------------------*/ + *------------------------------------------------------------------------------*/ u_int8_t usbd_make_str_desc(void *ptr, u_int16_t max_len, const char *s) { @@ -2314,9 +2318,9 @@ return totlen; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * mtx_drop_recurse - drop mutex recurse level - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ u_int32_t mtx_drop_recurse(struct mtx *mtx) { @@ -2332,9 +2336,9 @@ return recurse_level; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * mtx_pickup_recurse - pickup mutex recurse level - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ void mtx_pickup_recurse(struct mtx *mtx, u_int32_t recurse_level) { @@ -2347,9 +2351,9 @@ } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_thread - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ static void usbd_config_td_thread(void *arg) { @@ -2399,7 +2403,7 @@ return; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_setup * * NOTE: the structure pointed to by "ctd" must be zeroed before calling @@ -2408,7 +2412,7 @@ * Return values: * 0: success * else: failure - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ u_int8_t usbd_config_td_setup(struct usbd_config_td *ctd, void *priv_sc, struct mtx *priv_mtx, @@ -2451,9 +2455,9 @@ return 1; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_dummy_cmd - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ static void usbd_config_td_dummy_cmd(struct usbd_config_td_softc *sc, struct usbd_config_td_cc *cc, @@ -2462,12 +2466,12 @@ return; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_stop * * NOTE: If the structure pointed to by "ctd" is all zero, * this function does nothing. - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ void usbd_config_td_stop(struct usbd_config_td *ctd) { @@ -2492,12 +2496,12 @@ return; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_unsetup * * NOTE: If the structure pointed to by "ctd" is all zero, * this function does nothing. - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ void usbd_config_td_unsetup(struct usbd_config_td *ctd) { @@ -2513,9 +2517,9 @@ return; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_queue_command - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ void usbd_config_td_queue_command(struct usbd_config_td *ctd, usbd_config_td_command_t *command_func, @@ -2586,11 +2590,11 @@ return; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_check_gone * * NOTE: this function can only be called from the config thread - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ void usbd_config_td_check_gone(struct usbd_config_td *ctd) { @@ -2613,11 +2617,11 @@ return; } -/*------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* * usbd_config_td_sleep * * NOTE: this function can only be called from the config thread - *------------------------------------------------------------------------*/ + *---------------------------------------------------------------------------*/ void usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout) { @@ -2638,3 +2642,19 @@ return; } + +/*---------------------------------------------------------------------------* + * usbd_ether_get_mbuf - get a new ethernet mbuf + *---------------------------------------------------------------------------*/ +struct mbuf * +usbd_ether_get_mbuf(void) +{ + register struct mbuf *m_new; + + m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m_new) { + m_new->m_len = m_new->m_pkthdr.len = MCLBYTES; + m_adj(m_new, ETHER_ALIGN); + } + return (m_new); +} ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#17 (text+ko) ==== @@ -775,6 +775,9 @@ void usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout); +struct mbuf * +usbd_ether_get_mbuf(void); + /* routines from usb.c */ #if 0 From owner-p4-projects@FreeBSD.ORG Thu Aug 3 15:13:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 047AF16A4DF; Thu, 3 Aug 2006 15:13:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFEC216A4DA for ; Thu, 3 Aug 2006 15:13:16 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADD3E43D45 for ; Thu, 3 Aug 2006 15:13:16 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73FDGmi037684 for ; Thu, 3 Aug 2006 15:13:16 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73FDG8u037681 for perforce@freebsd.org; Thu, 3 Aug 2006 15:13:16 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 3 Aug 2006 15:13:16 GMT Message-Id: <200608031513.k73FDG8u037681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 15:13:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=103120 Change 103120 by gonzo@gonzo_hq on 2006/08/03 15:13:15 o Disable switching to 64-bit mode in GeneralException code. o save_kdbaux should use 4-bytes offset of kdbaux array, not 8 bytes. This was causing memory corruption. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#6 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#7 $ */ #include "opt_ddb.h" @@ -127,8 +127,10 @@ jal save_kdbaux nop #endif /* DDB */ + /* li t0, MIPS_SR_KX mtc0 t0, MIPS_COP_0_STATUS + */ /* * If this is an interrupt, call cpu_intr() with the arguments: @@ -480,16 +482,16 @@ */ la k0, kdbaux sw s0, 0x00(k0) - sw s1, 0x08(k0) - sw s2, 0x10(k0) - sw s3, 0x18(k0) - sw s4, 0x20(k0) - sw s5, 0x28(k0) - sw s6, 0x30(k0) - sw s7, 0x38(k0) - sw sp, 0x40(k0) - sw s8, 0x48(k0) - sw gp, 0x50(k0) + sw s1, 0x04(k0) + sw s2, 0x08(k0) + sw s3, 0x0c(k0) + sw s4, 0x10(k0) + sw s5, 0x14(k0) + sw s6, 0x18(k0) + sw s7, 0x1c(k0) + sw sp, 0x20(k0) + sw s8, 0x24(k0) + sw gp, 0x28(k0) jr ra nop From owner-p4-projects@FreeBSD.ORG Thu Aug 3 20:35:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 344A016A4E9; Thu, 3 Aug 2006 20:35:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4F3F16A4E5 for ; Thu, 3 Aug 2006 20:35:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A044B43D45 for ; Thu, 3 Aug 2006 20:35:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KZ7d1068297 for ; Thu, 3 Aug 2006 20:35:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KZ7Yn068283 for perforce@freebsd.org; Thu, 3 Aug 2006 20:35:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 20:35:07 GMT Message-Id: <200608032035.k73KZ7Yn068283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 20:35:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=103132 Change 103132 by jb@jb_freebsd2 on 2006/08/03 20:34:41 Turn libpthread on again by default. Affected files ... .. //depot/projects/dtrace/src/lib/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/Makefile#4 (text+ko) ==== @@ -103,7 +103,7 @@ _libsmb= libsmb .endif -.if ${MK_LIBPTHREAD} != "yes" +.if ${MK_LIBPTHREAD} != "no" _libpthread= libpthread .endif From owner-p4-projects@FreeBSD.ORG Thu Aug 3 20:38:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A734F16A4E0; Thu, 3 Aug 2006 20:38:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52EA516A4DE for ; Thu, 3 Aug 2006 20:38:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC01E43D4C for ; Thu, 3 Aug 2006 20:38:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KcB37068487 for ; Thu, 3 Aug 2006 20:38:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KcBpC068484 for perforce@freebsd.org; Thu, 3 Aug 2006 20:38:11 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 20:38:11 GMT Message-Id: <200608032038.k73KcBpC068484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 20:38:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=103133 Change 103133 by jb@jb_freebsd2 on 2006/08/03 20:37:58 Add the kse source again, but this time it builds with syscall stubs unless KSE is defined as a kernel option. This allows the kse syscalls to be retained, but they will return EOPNOTSUPP if the KSE kernel option isn't specified. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#25 edit .. //depot/projects/dtrace/src/sys/kern/kern_kse.c#3 add Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#25 (text+ko) ==== @@ -1331,6 +1331,7 @@ kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard +kern/kern_kse.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr kern/kern_ktrace.c standard From owner-p4-projects@FreeBSD.ORG Thu Aug 3 20:40:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A76C16A4E7; Thu, 3 Aug 2006 20:40:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E892516A4E5 for ; Thu, 3 Aug 2006 20:40:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D42F43D6D for ; Thu, 3 Aug 2006 20:40:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KeERY068698 for ; Thu, 3 Aug 2006 20:40:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KeEVW068695 for perforce@freebsd.org; Thu, 3 Aug 2006 20:40:14 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 20:40:14 GMT Message-Id: <200608032040.k73KeEVW068695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 20:40:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=103134 Change 103134 by jb@jb_freebsd2 on 2006/08/03 20:39:43 Catch up with the VM changes in -current. We probably should merge sun4v into current so that we don't have to chase things like this. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#11 (text+ko) ==== @@ -1528,22 +1528,12 @@ m->md.pv_list_count = 0; } -/* - * Lower the permission for all mappings to a given page. - */ void -pmap_page_protect(vm_page_t m, vm_prot_t prot) +pmap_remove_write(vm_page_t m) { - - DPRINTF("pmap_page_protect(0x%lx, %d)\n", VM_PAGE_TO_PHYS(m), prot); + DPRINTF("pmap_remove_write(0x%lx)\n", VM_PAGE_TO_PHYS(m)); - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - tte_clear_phys_bit(m, VTD_SW_W); - } else { - pmap_remove_all(m); - } - } + tte_clear_phys_bit(m, VTD_SW_W); } /* From owner-p4-projects@FreeBSD.ORG Thu Aug 3 20:41:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE7D16A4DF; Thu, 3 Aug 2006 20:41:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD82716A4DD for ; Thu, 3 Aug 2006 20:41:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE8FC43D46 for ; Thu, 3 Aug 2006 20:41:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KfGYu068851 for ; Thu, 3 Aug 2006 20:41:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KfGXo068848 for perforce@freebsd.org; Thu, 3 Aug 2006 20:41:16 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 20:41:16 GMT Message-Id: <200608032041.k73KfGXo068848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 20:41:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=103135 Change 103135 by jb@jb_freebsd2 on 2006/08/03 20:40:32 Catch up on the MPSAFE changes to -current. Another reason for merging sun4v into current. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#6 (text+ko) ==== @@ -629,7 +629,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; if (narg <= regcnt) { argp = &tf->tf_out[reg]; @@ -647,13 +647,6 @@ CTR5(KTR_SYSC, "syscall: td=%p %s(%#lx, %#lx, %#lx)", td, syscallnames[code], argp[0], argp[1], argp[2]); - /* - * Try to run the syscall without the MP lock if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, argp); @@ -733,13 +726,6 @@ } /* - * Release Giant if we had to get it. Don't use mtx_owned(), - * we want to catch broken syscalls. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Handle reschedule and other end-of-syscall issues */ userret(td, tf); From owner-p4-projects@FreeBSD.ORG Thu Aug 3 20:43:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06BEA16A4E5; Thu, 3 Aug 2006 20:43:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDF4A16A4DE for ; Thu, 3 Aug 2006 20:43:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F51743D58 for ; Thu, 3 Aug 2006 20:43:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KhJTi068966 for ; Thu, 3 Aug 2006 20:43:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KhJSL068963 for perforce@freebsd.org; Thu, 3 Aug 2006 20:43:19 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 20:43:19 GMT Message-Id: <200608032043.k73KhJSL068963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 20:43:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=103136 Change 103136 by jb@jb_freebsd2 on 2006/08/03 20:42:18 Allow these apps to link if threads aren't built into libc. I still think that -lpthread is the wrong way to do this. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#5 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#5 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .include "../../Makefile.inc" PROG= ctfconvert @@ -37,8 +39,6 @@ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -LDFLAGS+= -pthread - LDADD+= -lctf -ldwarf -lelf -lz .if ${MACHINE_ARCH} != "i386" @@ -46,10 +46,14 @@ LDADD+= -lintl -liconv .endif +.if ${MK_LIBC_THREADS} == "no" +LDADD+= -lpthread +.endif + .PATH: ${.CURDIR} .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt -NO_MAN= +MK_MAN=no .include ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#5 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .include "../../Makefile.inc" PROG= ctfmerge @@ -34,8 +36,6 @@ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -LDFLAGS+= -pthread - LDADD+= -lctf -ldwarf -lelf -lz .if ${MACHINE_ARCH} != "i386" @@ -43,10 +43,14 @@ LDADD+= -lintl -liconv .endif +.if ${MK_LIBC_THREADS} == "no" +LDADD+= -lpthread +.endif + .PATH: ${.CURDIR}/../ctfconvert .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt -NO_MAN= +MK_MAN=no .include From owner-p4-projects@FreeBSD.ORG Thu Aug 3 21:22:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AD8116A4E5; Thu, 3 Aug 2006 21:22:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46E8516A4E1 for ; Thu, 3 Aug 2006 21:22:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7713D43D5A for ; Thu, 3 Aug 2006 21:22:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73LM95i080033 for ; Thu, 3 Aug 2006 21:22:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73LM9Cb080030 for perforce@freebsd.org; Thu, 3 Aug 2006 21:22:09 GMT (envelope-from jhb@freebsd.org) Date: Thu, 3 Aug 2006 21:22:09 GMT Message-Id: <200608032122.k73LM9Cb080030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 21:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=103138 Change 103138 by jhb@jhb_mutex on 2006/08/03 21:21:39 Generate the AUE tags so I can build kernels. Affected files ... .. //depot/projects/smpng/sys/sys/sysproto.h#76 edit Differences ... ==== //depot/projects/smpng/sys/sys/sysproto.h#76 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.200 2006/08/02 08:14:00 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.221 2006/07/28 19:05:28 jhb Exp */ @@ -14,6 +14,8 @@ #include #include +#include + struct proc; struct thread; @@ -2010,6 +2012,337 @@ #endif /* COMPAT_FREEBSD4 */ +#define SYS_AUE_syscall AUE_NULL +#define SYS_AUE_exit AUE_EXIT +#define SYS_AUE_fork AUE_FORK +#define SYS_AUE_read AUE_NULL +#define SYS_AUE_write AUE_NULL +#define SYS_AUE_open AUE_OPEN_RWTC +#define SYS_AUE_close AUE_CLOSE +#define SYS_AUE_wait4 AUE_WAIT4 +#define SYS_AUE_link AUE_LINK +#define SYS_AUE_unlink AUE_UNLINK +#define SYS_AUE_chdir AUE_CHDIR +#define SYS_AUE_fchdir AUE_FCHDIR +#define SYS_AUE_mknod AUE_MKNOD +#define SYS_AUE_chmod AUE_CHMOD +#define SYS_AUE_chown AUE_CHOWN +#define SYS_AUE_break AUE_NULL +#define SYS_AUE_getpid AUE_GETPID +#define SYS_AUE_mount AUE_MOUNT +#define SYS_AUE_unmount AUE_UMOUNT +#define SYS_AUE_setuid AUE_SETUID +#define SYS_AUE_getuid AUE_GETUID +#define SYS_AUE_geteuid AUE_GETEUID +#define SYS_AUE_ptrace AUE_PTRACE +#define SYS_AUE_recvmsg AUE_RECVMSG +#define SYS_AUE_sendmsg AUE_SENDMSG +#define SYS_AUE_recvfrom AUE_RECVFROM +#define SYS_AUE_accept AUE_ACCEPT +#define SYS_AUE_getpeername AUE_GETPEERNAME +#define SYS_AUE_getsockname AUE_GETSOCKNAME +#define SYS_AUE_access AUE_ACCESS +#define SYS_AUE_chflags AUE_CHFLAGS +#define SYS_AUE_fchflags AUE_FCHFLAGS +#define SYS_AUE_sync AUE_SYNC +#define SYS_AUE_kill AUE_KILL +#define SYS_AUE_getppid AUE_GETPPID +#define SYS_AUE_dup AUE_DUP +#define SYS_AUE_pipe AUE_PIPE +#define SYS_AUE_getegid AUE_GETEGID +#define SYS_AUE_profil AUE_PROFILE +#define SYS_AUE_ktrace AUE_KTRACE +#define SYS_AUE_getgid AUE_GETGID +#define SYS_AUE_getlogin AUE_GETLOGIN +#define SYS_AUE_setlogin AUE_SETLOGIN +#define SYS_AUE_acct AUE_ACCT +#define SYS_AUE_sigaltstack AUE_SIGPENDING +#define SYS_AUE_ioctl AUE_IOCTL +#define SYS_AUE_reboot AUE_REBOOT +#define SYS_AUE_revoke AUE_REVOKE +#define SYS_AUE_symlink AUE_SYMLINK +#define SYS_AUE_readlink AUE_READLINK +#define SYS_AUE_execve AUE_EXECVE +#define SYS_AUE_umask AUE_UMASK +#define SYS_AUE_chroot AUE_CHROOT +#define SYS_AUE_msync AUE_MSYNC +#define SYS_AUE_vfork AUE_VFORK +#define SYS_AUE_sbrk AUE_SBRK +#define SYS_AUE_sstk AUE_SSTK +#define SYS_AUE_vadvise AUE_O_VADVISE +#define SYS_AUE_munmap AUE_MUNMAP +#define SYS_AUE_mprotect AUE_MPROTECT +#define SYS_AUE_madvise AUE_MADVISE +#define SYS_AUE_mincore AUE_MINCORE +#define SYS_AUE_getgroups AUE_GETGROUPS +#define SYS_AUE_setgroups AUE_SETGROUPS +#define SYS_AUE_getpgrp AUE_GETPGRP +#define SYS_AUE_setpgid AUE_SETPGRP +#define SYS_AUE_setitimer AUE_SETITIMER +#define SYS_AUE_swapon AUE_SWAPON +#define SYS_AUE_getitimer AUE_GETITIMER +#define SYS_AUE_getdtablesize AUE_GETDTABLESIZE +#define SYS_AUE_dup2 AUE_DUP2 +#define SYS_AUE_fcntl AUE_FCNTL +#define SYS_AUE_select AUE_SELECT +#define SYS_AUE_fsync AUE_FSYNC +#define SYS_AUE_setpriority AUE_SETPRIORITY +#define SYS_AUE_socket AUE_SOCKET +#define SYS_AUE_connect AUE_CONNECT +#define SYS_AUE_getpriority AUE_GETPRIORITY +#define SYS_AUE_bind AUE_BIND +#define SYS_AUE_setsockopt AUE_SETSOCKOPT +#define SYS_AUE_listen AUE_LISTEN +#define SYS_AUE_gettimeofday AUE_GETTIMEOFDAY +#define SYS_AUE_getrusage AUE_GETRUSAGE +#define SYS_AUE_getsockopt AUE_GETSOCKOPT +#define SYS_AUE_readv AUE_READV +#define SYS_AUE_writev AUE_WRITEV +#define SYS_AUE_settimeofday AUE_SETTIMEOFDAY +#define SYS_AUE_fchown AUE_FCHOWN +#define SYS_AUE_fchmod AUE_FCHMOD +#define SYS_AUE_setreuid AUE_SETREUID +#define SYS_AUE_setregid AUE_SETREGID +#define SYS_AUE_rename AUE_RENAME +#define SYS_AUE_flock AUE_FLOCK +#define SYS_AUE_mkfifo AUE_MKFIFO +#define SYS_AUE_sendto AUE_SENDTO +#define SYS_AUE_shutdown AUE_SHUTDOWN +#define SYS_AUE_socketpair AUE_SOCKETPAIR +#define SYS_AUE_mkdir AUE_MKDIR +#define SYS_AUE_rmdir AUE_RMDIR +#define SYS_AUE_utimes AUE_UTIMES +#define SYS_AUE_adjtime AUE_ADJTIME +#define SYS_AUE_setsid AUE_SETSID +#define SYS_AUE_quotactl AUE_QUOTACTL +#define SYS_AUE_nfssvc AUE_NFS_SVC +#define SYS_AUE_lgetfh AUE_LGETFH +#define SYS_AUE_getfh AUE_NFS_GETFH +#define SYS_AUE_getdomainname AUE_SYSCTL +#define SYS_AUE_setdomainname AUE_SYSCTL +#define SYS_AUE_uname AUE_NULL +#define SYS_AUE_sysarch AUE_NULL +#define SYS_AUE_rtprio AUE_NULL +#define SYS_AUE_semsys AUE_SEMSYS +#define SYS_AUE_msgsys AUE_MSGSYS +#define SYS_AUE_shmsys AUE_SHMSYS +#define SYS_AUE_pread AUE_PREAD +#define SYS_AUE_pwrite AUE_PWRITE +#define SYS_AUE_ntp_adjtime AUE_ADJTIME +#define SYS_AUE_setgid AUE_SETGID +#define SYS_AUE_setegid AUE_SETEGID +#define SYS_AUE_seteuid AUE_SETEUID +#define SYS_AUE_stat AUE_STAT +#define SYS_AUE_fstat AUE_FSTAT +#define SYS_AUE_lstat AUE_LSTAT +#define SYS_AUE_pathconf AUE_PATHCONF +#define SYS_AUE_fpathconf AUE_FPATHCONF +#define SYS_AUE_getrlimit AUE_GETRLIMIT +#define SYS_AUE_setrlimit AUE_SETRLIMIT +#define SYS_AUE_getdirentries AUE_GETDIRENTRIES +#define SYS_AUE_mmap AUE_MMAP +#define SYS_AUE_lseek AUE_LSEEK +#define SYS_AUE_truncate AUE_TRUNCATE +#define SYS_AUE_ftruncate AUE_FTRUNCATE +#define SYS_AUE___sysctl AUE_SYSCTL +#define SYS_AUE_mlock AUE_MLOCK +#define SYS_AUE_munlock AUE_MUNLOCK +#define SYS_AUE_undelete AUE_UNDELETE +#define SYS_AUE_futimes AUE_FUTIMES +#define SYS_AUE_getpgid AUE_GETPGID +#define SYS_AUE_poll AUE_POLL +#define SYS_AUE_lkmnosys AUE_NULL +#define SYS_AUE___semctl AUE_SEMCTL +#define SYS_AUE_semget AUE_SEMGET +#define SYS_AUE_semop AUE_SEMOP +#define SYS_AUE_msgctl AUE_MSGCTL +#define SYS_AUE_msgget AUE_MSGGET +#define SYS_AUE_msgsnd AUE_MSGSND +#define SYS_AUE_msgrcv AUE_MSGRCV +#define SYS_AUE_shmat AUE_SHMAT +#define SYS_AUE_shmctl AUE_SHMCTL +#define SYS_AUE_shmdt AUE_SHMDT +#define SYS_AUE_shmget AUE_SHMGET +#define SYS_AUE_clock_gettime AUE_NULL +#define SYS_AUE_clock_settime AUE_NULL +#define SYS_AUE_clock_getres AUE_NULL +#define SYS_AUE_ktimer_create AUE_NULL +#define SYS_AUE_ktimer_delete AUE_NULL +#define SYS_AUE_ktimer_settime AUE_NULL +#define SYS_AUE_ktimer_gettime AUE_NULL +#define SYS_AUE_ktimer_getoverrun AUE_NULL +#define SYS_AUE_nanosleep AUE_NULL +#define SYS_AUE_ntp_gettime AUE_NULL +#define SYS_AUE_minherit AUE_MINHERIT +#define SYS_AUE_rfork AUE_RFORK +#define SYS_AUE_openbsd_poll AUE_POLL +#define SYS_AUE_issetugid AUE_ISSETUGID +#define SYS_AUE_lchown AUE_LCHOWN +#define SYS_AUE_aio_read AUE_NULL +#define SYS_AUE_aio_write AUE_NULL +#define SYS_AUE_lio_listio AUE_NULL +#define SYS_AUE_getdents AUE_O_GETDENTS +#define SYS_AUE_lchmod AUE_LCHMOD +#define SYS_AUE_lutimes AUE_LUTIMES +#define SYS_AUE_nstat AUE_STAT +#define SYS_AUE_nfstat AUE_FSTAT +#define SYS_AUE_nlstat AUE_LSTAT +#define SYS_AUE_preadv AUE_NULL +#define SYS_AUE_pwritev AUE_NULL +#define SYS_AUE_fhopen AUE_FHOPEN +#define SYS_AUE_fhstat AUE_FHSTAT +#define SYS_AUE_modnext AUE_NULL +#define SYS_AUE_modstat AUE_NULL +#define SYS_AUE_modfnext AUE_NULL +#define SYS_AUE_modfind AUE_NULL +#define SYS_AUE_kldload AUE_MODLOAD +#define SYS_AUE_kldunload AUE_MODUNLOAD +#define SYS_AUE_kldfind AUE_NULL +#define SYS_AUE_kldnext AUE_NULL +#define SYS_AUE_kldstat AUE_NULL +#define SYS_AUE_kldfirstmod AUE_NULL +#define SYS_AUE_getsid AUE_GETSID +#define SYS_AUE_setresuid AUE_SETRESUID +#define SYS_AUE_setresgid AUE_SETRESGID +#define SYS_AUE_aio_return AUE_NULL +#define SYS_AUE_aio_suspend AUE_NULL +#define SYS_AUE_aio_cancel AUE_NULL +#define SYS_AUE_aio_error AUE_NULL +#define SYS_AUE_oaio_read AUE_NULL +#define SYS_AUE_oaio_write AUE_NULL +#define SYS_AUE_olio_listio AUE_NULL +#define SYS_AUE_yield AUE_NULL +#define SYS_AUE_mlockall AUE_MLOCKALL +#define SYS_AUE_munlockall AUE_MUNLOCKALL +#define SYS_AUE___getcwd AUE_NULL +#define SYS_AUE_sched_setparam AUE_NULL +#define SYS_AUE_sched_getparam AUE_NULL +#define SYS_AUE_sched_setscheduler AUE_NULL +#define SYS_AUE_sched_getscheduler AUE_NULL +#define SYS_AUE_sched_yield AUE_NULL +#define SYS_AUE_sched_get_priority_max AUE_NULL +#define SYS_AUE_sched_get_priority_min AUE_NULL +#define SYS_AUE_sched_rr_get_interval AUE_NULL +#define SYS_AUE_utrace AUE_NULL +#define SYS_AUE_kldsym AUE_NULL +#define SYS_AUE_jail AUE_JAIL +#define SYS_AUE_sigprocmask AUE_SIGPROCMASK +#define SYS_AUE_sigsuspend AUE_SIGSUSPEND +#define SYS_AUE_sigpending AUE_SIGPENDING +#define SYS_AUE_sigtimedwait AUE_SIGWAIT +#define SYS_AUE_sigwaitinfo AUE_NULL +#define SYS_AUE___acl_get_file AUE_NULL +#define SYS_AUE___acl_set_file AUE_NULL +#define SYS_AUE___acl_get_fd AUE_NULL +#define SYS_AUE___acl_set_fd AUE_NULL +#define SYS_AUE___acl_delete_file AUE_NULL +#define SYS_AUE___acl_delete_fd AUE_NULL +#define SYS_AUE___acl_aclcheck_file AUE_NULL +#define SYS_AUE___acl_aclcheck_fd AUE_NULL +#define SYS_AUE_extattrctl AUE_EXTATTRCTL +#define SYS_AUE_extattr_set_file AUE_EXTATTR_SET_FILE +#define SYS_AUE_extattr_get_file AUE_EXTATTR_GET_FILE +#define SYS_AUE_extattr_delete_file AUE_EXTATTR_DELETE_FILE +#define SYS_AUE_aio_waitcomplete AUE_NULL +#define SYS_AUE_getresuid AUE_GETRESUID +#define SYS_AUE_getresgid AUE_GETRESGID +#define SYS_AUE_kqueue AUE_NULL +#define SYS_AUE_kevent AUE_NULL +#define SYS_AUE_lkmressys AUE_NULL +#define SYS_AUE_extattr_set_fd AUE_EXTATTR_SET_FD +#define SYS_AUE_extattr_get_fd AUE_EXTATTR_GET_FD +#define SYS_AUE_extattr_delete_fd AUE_EXTATTR_DELETE_FD +#define SYS_AUE___setugid AUE_NULL +#define SYS_AUE_nfsclnt AUE_NULL +#define SYS_AUE_eaccess AUE_EACCESS +#define SYS_AUE_nmount AUE_NMOUNT +#define SYS_AUE_kse_exit AUE_NULL +#define SYS_AUE_kse_wakeup AUE_NULL +#define SYS_AUE_kse_create AUE_NULL +#define SYS_AUE_kse_thr_interrupt AUE_NULL +#define SYS_AUE_kse_release AUE_NULL +#define SYS_AUE___mac_get_proc AUE_NULL +#define SYS_AUE___mac_set_proc AUE_NULL +#define SYS_AUE___mac_get_fd AUE_NULL +#define SYS_AUE___mac_get_file AUE_NULL +#define SYS_AUE___mac_set_fd AUE_NULL +#define SYS_AUE___mac_set_file AUE_NULL +#define SYS_AUE_kenv AUE_NULL +#define SYS_AUE_lchflags AUE_LCHFLAGS +#define SYS_AUE_uuidgen AUE_NULL +#define SYS_AUE_sendfile AUE_SENDFILE +#define SYS_AUE_mac_syscall AUE_NULL +#define SYS_AUE_getfsstat AUE_GETFSSTAT +#define SYS_AUE_statfs AUE_STATFS +#define SYS_AUE_fstatfs AUE_FSTATFS +#define SYS_AUE_fhstatfs AUE_NULL +#define SYS_AUE_ksem_close AUE_NULL +#define SYS_AUE_ksem_post AUE_NULL +#define SYS_AUE_ksem_wait AUE_NULL +#define SYS_AUE_ksem_trywait AUE_NULL +#define SYS_AUE_ksem_init AUE_NULL +#define SYS_AUE_ksem_open AUE_NULL +#define SYS_AUE_ksem_unlink AUE_NULL +#define SYS_AUE_ksem_getvalue AUE_NULL +#define SYS_AUE_ksem_destroy AUE_NULL +#define SYS_AUE___mac_get_pid AUE_NULL +#define SYS_AUE___mac_get_link AUE_NULL +#define SYS_AUE___mac_set_link AUE_NULL +#define SYS_AUE_extattr_set_link AUE_EXTATTR_SET_LINK +#define SYS_AUE_extattr_get_link AUE_EXTATTR_GET_LINK +#define SYS_AUE_extattr_delete_link AUE_EXTATTR_DELETE_LINK +#define SYS_AUE___mac_execve AUE_NULL +#define SYS_AUE_sigaction AUE_SIGACTION +#define SYS_AUE_sigreturn AUE_SIGRETURN +#define SYS_AUE_getcontext AUE_NULL +#define SYS_AUE_setcontext AUE_NULL +#define SYS_AUE_swapcontext AUE_NULL +#define SYS_AUE_swapoff AUE_SWAPOFF +#define SYS_AUE___acl_get_link AUE_NULL +#define SYS_AUE___acl_set_link AUE_NULL +#define SYS_AUE___acl_delete_link AUE_NULL +#define SYS_AUE___acl_aclcheck_link AUE_NULL +#define SYS_AUE_sigwait AUE_SIGWAIT +#define SYS_AUE_thr_create AUE_NULL +#define SYS_AUE_thr_exit AUE_NULL +#define SYS_AUE_thr_self AUE_NULL +#define SYS_AUE_thr_kill AUE_NULL +#define SYS_AUE__umtx_lock AUE_NULL +#define SYS_AUE__umtx_unlock AUE_NULL +#define SYS_AUE_jail_attach AUE_NULL +#define SYS_AUE_extattr_list_fd AUE_EXTATTR_LIST_FD +#define SYS_AUE_extattr_list_file AUE_EXTATTR_LIST_FILE +#define SYS_AUE_extattr_list_link AUE_EXTATTR_LIST_LINK +#define SYS_AUE_kse_switchin AUE_NULL +#define SYS_AUE_ksem_timedwait AUE_NULL +#define SYS_AUE_thr_suspend AUE_NULL +#define SYS_AUE_thr_wake AUE_NULL +#define SYS_AUE_kldunloadf AUE_NULL +#define SYS_AUE_audit AUE_AUDIT +#define SYS_AUE_auditon AUE_AUDITON +#define SYS_AUE_getauid AUE_GETAUID +#define SYS_AUE_setauid AUE_SETAUID +#define SYS_AUE_getaudit AUE_GETAUDIT +#define SYS_AUE_setaudit AUE_SETAUDIT +#define SYS_AUE_getaudit_addr AUE_GETAUDIT_ADDR +#define SYS_AUE_setaudit_addr AUE_SETAUDIT_ADDR +#define SYS_AUE_auditctl AUE_AUDITCTL +#define SYS_AUE__umtx_op AUE_NULL +#define SYS_AUE_thr_new AUE_NULL +#define SYS_AUE_sigqueue AUE_NULL +#define SYS_AUE_kmq_open AUE_NULL +#define SYS_AUE_kmq_setattr AUE_NULL +#define SYS_AUE_kmq_timedreceive AUE_NULL +#define SYS_AUE_kmq_timedsend AUE_NULL +#define SYS_AUE_kmq_notify AUE_NULL +#define SYS_AUE_kmq_unlink AUE_NULL +#define SYS_AUE_abort2 AUE_NULL +#define SYS_AUE_thr_set_name AUE_NULL +#define SYS_AUE_aio_fsync AUE_NULL +#define SYS_AUE_thr_setscheduler AUE_NULL +#define SYS_AUE_thr_getscheduler AUE_NULL +#define SYS_AUE_thr_setschedparam AUE_NULL + #undef PAD_ #undef PADL_ #undef PADR_ From owner-p4-projects@FreeBSD.ORG Thu Aug 3 21:36:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB70116A4E6; Thu, 3 Aug 2006 21:36:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A711016A4E0 for ; Thu, 3 Aug 2006 21:36:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B10543D5F for ; Thu, 3 Aug 2006 21:36:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73LaR9d080688 for ; Thu, 3 Aug 2006 21:36:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73LaRER080685 for perforce@freebsd.org; Thu, 3 Aug 2006 21:36:27 GMT (envelope-from jhb@freebsd.org) Date: Thu, 3 Aug 2006 21:36:27 GMT Message-Id: <200608032136.k73LaRER080685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 21:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=103140 Change 103140 by jhb@jhb_mutex on 2006/08/03 21:35:31 - Rename 'show threadchain' to 'show lockchain' and 'show lockchain' to 'show locktree'. - Add a new 'show sleepchain' that attempts to do 'show lockchain' for sleepable locks (i.e. sx and lockmgr). I've had much help tracking down vnode deadlocks at work using a gdb version of this that just grokked lockmgr locks. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#48 edit .. //depot/projects/smpng/sys/kern/kern_sx.c#36 edit .. //depot/projects/smpng/sys/kern/subr_turnstile.c#31 edit .. //depot/projects/smpng/sys/sys/lockmgr.h#16 edit .. //depot/projects/smpng/sys/sys/sx.h#20 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#48 (text+ko) ==== @@ -43,6 +43,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.97 2006/07/14 17:55:36 pjd Exp $"); +#include "opt_ddb.h" + #include #include #include @@ -56,6 +58,10 @@ #include #endif +#ifdef DDB +#include +#endif + /* * Locking primitives implementation. * Locks provide shared/exclusive sychronization. @@ -581,3 +587,33 @@ stack_print(&lkp->lk_stack); #endif } + +#ifdef DDB +/* + * Check to see if a thread that is blocked on a sleep queue is actually + * blocked on a 'struct lock'. If so, output some details and return true. + * If the lock has an exclusive owner, return that in *ownerp. + */ +int +lockmgr_chain(struct thread *td, struct thread **ownerp) +{ + struct lock *lkp; + + lkp = td->td_wchan; + + /* Simple test to see if wchan points to a lockmgr lock. */ + if (lkp->lk_wmesg != td->td_wmesg) + return (0); + + /* Ok, we think we have a lockmgr lock, so output some details. */ + db_printf("blocked on \"%s\" ", lkp->lk_wmesg); + if (lkp->lk_sharecount) { + db_printf("SHARED (count %d)\n", lkp->lk_sharecount); + *ownerp = NULL; + } else { + db_printf("EXCL (count %d)\n", lkp->lk_exclusivecount); + *ownerp = lkp->lk_lockholder; + } + return (1); +} +#endif ==== //depot/projects/smpng/sys/kern/kern_sx.c#36 (text+ko) ==== @@ -48,9 +48,9 @@ #include #include +#ifdef DDB #include -#ifdef DDB static void db_show_sx(struct lock_object *lock); #endif @@ -395,4 +395,57 @@ db_printf(" waiters: %d shared, %d exclusive\n", sx->sx_shrd_wcnt, sx->sx_excl_wcnt); } + +/* + * Check to see if a thread that is blocked on a sleep queue is actually + * blocked on an sx lock. If so, output some details and return true. + * If the lock has an exclusive owner, return that in *ownerp. + */ +int +sx_chain(struct thread *td, struct thread **ownerp) +{ + struct sx *sx; + struct cv *cv; + + /* + * First, see if it looks like td is blocked on a condition + * variable. + */ + cv = td->td_wchan; + if (cv->cv_description != td->td_wmesg) + return (0); + + /* + * Ok, see if it looks like td is blocked on the exclusive + * condition variable. + */ + sx = (struct sx *)((char *)cv - offsetof(struct sx, sx_excl_cv)); + if (LOCK_CLASS(&sx->sx_object) == &lock_class_sx && + sx->sx_excl_wcnt > 0) + goto ok; + + /* + * Second, see if it looks like td is blocked on the shared + * condvar. + */ + sx = (struct sx *)((char *)cv - offsetof(struct sx, sx_shrd_cv)); + if (LOCK_CLASS(&sx->sx_object) == &lock_class_sx && + sx->sx_shrd_wcnt > 0) + goto ok; + + /* Doesn't seem to be an sx lock. */ + return (0); + +ok: + /* We think we have an sx lock, so output some details. */ + db_printf("blocked on sx \"%s\" ", td->td_wmesg); + if (sx->sx_cnt >= 0) { + db_printf("SLOCK (count %d)\n", sx->sx_cnt); + *ownerp = NULL; + } else { + db_printf("XLOCK\n"); + *ownerp = sx->sx_xholder; + } + return (1); +} #endif ==== //depot/projects/smpng/sys/kern/subr_turnstile.c#31 (text+ko) ==== @@ -78,6 +78,8 @@ #ifdef DDB #include #include +#include +#include #endif /* @@ -1035,8 +1037,12 @@ } +/* + * Show all the threads a particular thread is waiting on based on + * non-sleepable and non-spin locks. + */ static void -print_threadchain(struct thread *td, const char *prefix) +print_lockchain(struct thread *td, const char *prefix) { struct lock_object *lock; struct lock_class *class; @@ -1084,7 +1090,7 @@ } } -DB_SHOW_COMMAND(threadchain, db_show_threadchain) +DB_SHOW_COMMAND(lockchain, db_show_lockchain) { struct thread *td; @@ -1094,7 +1100,7 @@ else td = kdb_thread; - print_threadchain(td, ""); + print_lockchain(td, ""); } DB_SHOW_COMMAND(allchains, db_show_allchains) @@ -1108,7 +1114,7 @@ FOREACH_THREAD_IN_PROC(p, td) { if (TD_ON_LOCK(td) && LIST_EMPTY(&td->td_contested)) { db_printf("chain %d:\n", i++); - print_threadchain(td, " "); + print_lockchain(td, " "); } if (db_pager_quit) return; @@ -1116,6 +1122,72 @@ } } + +/* + * Show all the threads a particular thread is waiting on based on + * sleepable locks. + */ +static void +print_sleepchain(struct thread *td, const char *prefix) +{ + struct thread *owner; + + /* + * Follow the chain. We keep walking as long as the thread is + * blocked on a sleep lock that has an owner. + */ + while (!db_pager_quit) { + db_printf("%sthread %d (pid %d, %s) ", prefix, td->td_tid, + td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name : + td->td_proc->p_comm); + switch (td->td_state) { + case TDS_INACTIVE: + db_printf("is inactive\n"); + return; + case TDS_CAN_RUN: + db_printf("can run\n"); + return; + case TDS_RUNQ: + db_printf("is on a run queue\n"); + return; + case TDS_RUNNING: + db_printf("running on CPU %d\n", td->td_oncpu); + return; + case TDS_INHIBITED: + if (TD_ON_SLEEPQ(td)) { + if (lockmgr_chain(td, &owner) || + sx_chain(td, &owner)) { + if (owner == NULL) + return; + td = owner; + break; + } + db_printf("sleeping on %p \"%s\"\n", + td->td_wchan, td->td_wmesg); + return; + } + db_printf("inhibited\n"); + return; + default: + db_printf("??? (%#x)\n", td->td_state); + return; + } + } +} + +DB_SHOW_COMMAND(sleepchain, db_show_sleepchain) +{ + struct thread *td; + + /* Figure out which thread to start with. */ + if (have_addr) + td = db_lookup_thread(addr, TRUE); + else + td = kdb_thread; + + print_sleepchain(td, ""); +} + static void print_waiters(struct turnstile *ts, int indent); static void @@ -1156,7 +1228,7 @@ print_waiter(td, indent + 1); } -DB_SHOW_COMMAND(lockchain, db_show_lockchain) +DB_SHOW_COMMAND(locktree, db_show_locktree) { struct lock_object *lock; struct lock_class *class; ==== //depot/projects/smpng/sys/sys/lockmgr.h#16 (text+ko) ==== @@ -203,5 +203,8 @@ void lockmgr_printinfo(struct lock *); int lockstatus(struct lock *, struct thread *); int lockcount(struct lock *); +#ifdef DDB +int lockmgr_chain(struct thread *td, struct thread **ownerp); +#endif #endif /* !_SYS_LOCKMGR_H_ */ ==== //depot/projects/smpng/sys/sys/sx.h#20 (text+ko) ==== @@ -60,6 +60,9 @@ #ifdef INVARIANT_SUPPORT void _sx_assert(struct sx *sx, int what, const char *file, int line); #endif +#ifdef DDB +int sx_chain(struct thread *td, struct thread **ownerp); +#endif struct sx_args { struct sx *sa_sx; From owner-p4-projects@FreeBSD.ORG Thu Aug 3 21:39:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A03DB16A4EA; Thu, 3 Aug 2006 21:39:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61F8216A4DF for ; Thu, 3 Aug 2006 21:39:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C319243D58 for ; Thu, 3 Aug 2006 21:39:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73LdWYg080821 for ; Thu, 3 Aug 2006 21:39:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73LdViR080818 for perforce@freebsd.org; Thu, 3 Aug 2006 21:39:31 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 21:39:31 GMT Message-Id: <200608032139.k73LdViR080818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 21:39:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103141 Change 103141 by jb@jb_freebsd2 on 2006/08/03 21:39:18 IFC. I bet the changes to em will cause grief on sun4v. Another reason why sun4v should be merged into -current. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#19 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#17 integrate .. //depot/projects/dtrace/ports/UPDATING#9 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/dtrace/src/share/man/man7/hier.7#7 integrate .. //depot/projects/dtrace/src/sys/dev/em/README#3 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rman.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_sock.c#4 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_trantcp.c#4 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#6 integrate .. //depot/projects/dtrace/www/en/news/press.xml#9 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#19 (text+ko) ==== @@ -1,4 +1,4 @@ - + devel/p5-Data-UUID and issue the following command: ==== //depot/projects/dtrace/ports/UPDATING#9 (text+ko) ==== @@ -50,7 +50,7 @@ now works. Please be aware of this when updating if you have it in your config and are using GSSAPI when use_sasl is enabled. Using GSSAPI with a misconfigured krb5_ccname combined with one of the 'hard' bind_policy - options can effectivly lockout users. + options can effectively lockout users. 20060728: AFFECTS: users of polish/ekg and polish/ibgadu @@ -3966,4 +3966,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.377 2006/08/03 00:38:32 mezz Exp $ +$FreeBSD: ports/UPDATING,v 1.378 2006/08/03 18:45:53 blackend Exp $ ==== //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.318 2006/08/03 03:30:53 jb Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -18,8 +18,8 @@ aout .. .. - dtrace - .. + dtrace + .. engines .. .. ==== //depot/projects/dtrace/src/share/man/man7/hier.7#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.119 2006/07/29 19:47:09 simon Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.120 2006/08/03 05:46:32 jb Exp $ .\" .Dd May 10, 2006 .Dt HIER 7 @@ -413,6 +413,8 @@ .It Pa aout/ a.out backward compatibility libraries .El +.It Pa dtrace/ +DTrace library scripts .It Pa engines/ OpenSSL (Cryptography/SSL toolkit) dynamically loadable engines .El ==== //depot/projects/dtrace/src/sys/dev/em/README#3 (text+ko) ==== @@ -1,8 +1,8 @@ -$FreeBSD: src/sys/dev/em/README,v 1.12 2006/04/06 17:09:02 glebius Exp $ +$FreeBSD: src/sys/dev/em/README,v 1.13 2006/08/03 09:20:11 glebius Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ -January 4, 2006 +May 2, 2006 Contents @@ -22,8 +22,7 @@ ======== This file describes the FreeBSD* driver for the Intel(R) PRO/1000 Family of -Adapters. This driver has been developed for use with FreeBSD, Release 4.11 -and greater and Release 5.4. +Adapters. This driver has been developed for use with FreeBSD, Release 6.x. For questions related to hardware requirements, refer to the documentation supplied with your Intel PRO/1000 adapter. All hardware requirements listed @@ -45,8 +44,9 @@ NOTE: Mobile adapters are not fully supported. +NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 +support. - Building and Installation ========================= @@ -92,14 +92,14 @@ cp Makefile.kernel /usr/src/sys/modules/em/Makefile - Edit the /usr/src/sys/conf/files.i386 file, and add the following lines only if + Edit the /usr/src/sys/conf/files file, and add the following lines only if they don't already exist: dev/em/if_em.c optional em dev/em/if_em_hw.c optional em - Remove the following lines from the /usr/src/sys/conf/files.i386 file, + Remove the following lines from the /usr/src/sys/conf/files file, if they exist: dev/em/if_em_fxhw.c optional em @@ -230,6 +230,13 @@ - Using Jumbo Frames at 10 or 100 Mbps may result in poor performance or loss of link. + - The following adapters do not support Jumbo Frames: + Intel(R) 82562V 10/100 Network Connection + Intel(R) 82566DM Gigabit Network Connection + Intel(R) 82566DC Gigabit Network Connection + Intel(R) 82566MM Gigabit Network Connection + Intel(R) 82566MC Gigabit Network Connection + VLANs ----- ==== //depot/projects/dtrace/src/sys/dev/em/if_em.c#8 (text+ko) ==== @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2001-2005, Intel Corporation +Copyright (c) 2001-2006, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.119 2006/07/20 04:18:45 yongari Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.124 2006/08/03 19:05:04 pdeuskar Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -86,7 +86,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "Version - 5.1.5"; +char em_driver_version[] = "Version - 6.0.5"; /********************************************************************* @@ -159,10 +159,17 @@ { 0x8086, E1000_DEV_ID_82573E, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82573E_IAMT, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82573L, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_SPT, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_SPT, + PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_DPT, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_DPT, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH8_IGP_AMT, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH8_IGP_C, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH8_IFE, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} @@ -190,64 +197,64 @@ static int em_ioctl(struct ifnet *, u_long, caddr_t); static void em_watchdog(struct ifnet *); static void em_init(void *); -static void em_init_locked(struct em_softc *); +static void em_init_locked(struct adapter *); static void em_stop(void *); static void em_media_status(struct ifnet *, struct ifmediareq *); static int em_media_change(struct ifnet *); -static void em_identify_hardware(struct em_softc *); -static int em_allocate_pci_resources(struct em_softc *); -static int em_allocate_intr(struct em_softc *); -static void em_free_intr(struct em_softc *); -static void em_free_pci_resources(struct em_softc *); +static void em_identify_hardware(struct adapter *); +static int em_allocate_pci_resources(struct adapter *); +static int em_allocate_intr(struct adapter *); +static void em_free_intr(struct adapter *); +static void em_free_pci_resources(struct adapter *); static void em_local_timer(void *); -static int em_hardware_init(struct em_softc *); -static void em_setup_interface(device_t, struct em_softc *); -static int em_setup_transmit_structures(struct em_softc *); -static void em_initialize_transmit_unit(struct em_softc *); -static int em_setup_receive_structures(struct em_softc *); -static void em_initialize_receive_unit(struct em_softc *); -static void em_enable_intr(struct em_softc *); -static void em_disable_intr(struct em_softc *); -static void em_free_transmit_structures(struct em_softc *); -static void em_free_receive_structures(struct em_softc *); -static void em_update_stats_counters(struct em_softc *); -static void em_txeof(struct em_softc *); -static int em_allocate_receive_structures(struct em_softc *); -static int em_allocate_transmit_structures(struct em_softc *); -static int em_rxeof(struct em_softc *, int); +static int em_hardware_init(struct adapter *); +static void em_setup_interface(device_t, struct adapter *); +static int em_setup_transmit_structures(struct adapter *); +static void em_initialize_transmit_unit(struct adapter *); +static int em_setup_receive_structures(struct adapter *); +static void em_initialize_receive_unit(struct adapter *); +static void em_enable_intr(struct adapter *); +static void em_disable_intr(struct adapter *); +static void em_free_transmit_structures(struct adapter *); +static void em_free_receive_structures(struct adapter *); +static void em_update_stats_counters(struct adapter *); +static void em_txeof(struct adapter *); +static int em_allocate_receive_structures(struct adapter *); +static int em_allocate_transmit_structures(struct adapter *); +static int em_rxeof(struct adapter *, int); #ifndef __NO_STRICT_ALIGNMENT -static int em_fixup_rx(struct em_softc *); +static int em_fixup_rx(struct adapter *); #endif -static void em_receive_checksum(struct em_softc *, struct em_rx_desc *, +static void em_receive_checksum(struct adapter *, struct em_rx_desc *, struct mbuf *); -static void em_transmit_checksum_setup(struct em_softc *, struct mbuf *, +static void em_transmit_checksum_setup(struct adapter *, struct mbuf *, uint32_t *, uint32_t *); -static void em_set_promisc(struct em_softc *); -static void em_disable_promisc(struct em_softc *); -static void em_set_multi(struct em_softc *); -static void em_print_hw_stats(struct em_softc *); -static void em_update_link_status(struct em_softc *); -static int em_get_buf(int i, struct em_softc *, struct mbuf *); -static void em_enable_vlans(struct em_softc *); -static void em_disable_vlans(struct em_softc *); -static int em_encap(struct em_softc *, struct mbuf **); -static void em_smartspeed(struct em_softc *); -static int em_82547_fifo_workaround(struct em_softc *, int); -static void em_82547_update_fifo_head(struct em_softc *, int); -static int em_82547_tx_fifo_reset(struct em_softc *); +static void em_set_promisc(struct adapter *); +static void em_disable_promisc(struct adapter *); +static void em_set_multi(struct adapter *); +static void em_print_hw_stats(struct adapter *); +static void em_update_link_status(struct adapter *); +static int em_get_buf(int i, struct adapter *, struct mbuf *); +static void em_enable_vlans(struct adapter *); +static void em_disable_vlans(struct adapter *); +static int em_encap(struct adapter *, struct mbuf **); +static void em_smartspeed(struct adapter *); +static int em_82547_fifo_workaround(struct adapter *, int); +static void em_82547_update_fifo_head(struct adapter *, int); +static int em_82547_tx_fifo_reset(struct adapter *); static void em_82547_move_tail(void *arg); -static void em_82547_move_tail_locked(struct em_softc *); -static int em_dma_malloc(struct em_softc *, bus_size_t, +static void em_82547_move_tail_locked(struct adapter *); +static int em_dma_malloc(struct adapter *, bus_size_t, struct em_dma_alloc *, int); -static void em_dma_free(struct em_softc *, struct em_dma_alloc *); -static void em_print_debug_info(struct em_softc *); +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(uint8_t *); static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static uint32_t em_fill_descriptors (bus_addr_t address, uint32_t length, PDESC_ARRAY desc_array); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); -static void em_add_int_delay_sysctl(struct em_softc *, const char *, +static void em_add_int_delay_sysctl(struct adapter *, const char *, const char *, struct em_int_delay_info *, int, int); /* @@ -259,7 +266,7 @@ static void em_intr(void *); #else static void em_intr_fast(void *); -static void em_add_int_process_limit(struct em_softc *, const char *, +static void em_add_int_process_limit(struct adapter *, const char *, const char *, int *, int); static void em_handle_rxtx(void *context, int pending); static void em_handle_link(void *context, int pending); @@ -281,7 +288,7 @@ }; static driver_t em_driver = { - "em", em_methods, sizeof(struct em_softc), + "em", em_methods, sizeof(struct adapter), }; static devclass_t em_devclass; @@ -302,6 +309,7 @@ static int em_rx_abs_int_delay_dflt = E1000_TICKS_TO_USECS(EM_RADV); static int em_rxd = EM_DEFAULT_RXD; static int em_txd = EM_DEFAULT_TXD; +static int em_smart_pwr_down = FALSE; TUNABLE_INT("hw.em.tx_int_delay", &em_tx_int_delay_dflt); TUNABLE_INT("hw.em.rx_int_delay", &em_rx_int_delay_dflt); @@ -309,6 +317,7 @@ TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt); TUNABLE_INT("hw.em.rxd", &em_rxd); TUNABLE_INT("hw.em.txd", &em_txd); +TUNABLE_INT("hw.em.smart_pwr_down", &em_smart_pwr_down); #ifndef DEVICE_POLLING static int em_rx_process_limit = 100; TUNABLE_INT("hw.em.rx_process_limit", &em_rx_process_limit); @@ -378,199 +387,199 @@ static int em_attach(device_t dev) { - struct em_softc *sc; + struct adapter *adapter; int tsize, rsize; int error = 0; INIT_DEBUGOUT("em_attach: begin"); - sc = device_get_softc(dev); - sc->dev = sc->osdep.dev = dev; - EM_LOCK_INIT(sc, device_get_nameunit(dev)); + adapter = device_get_softc(dev); + adapter->dev = adapter->osdep.dev = dev; + EM_LOCK_INIT(adapter, device_get_nameunit(dev)); /* SYSCTL stuff */ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, sc, 0, + OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, em_sysctl_debug_info, "I", "Debug Information"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, sc, 0, + OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, em_sysctl_stats, "I", "Statistics"); - callout_init(&sc->timer, CALLOUT_MPSAFE); - callout_init(&sc->tx_fifo_timer, CALLOUT_MPSAFE); + callout_init(&adapter->timer, CALLOUT_MPSAFE); + callout_init(&adapter->tx_fifo_timer, CALLOUT_MPSAFE); /* Determine hardware revision */ - em_identify_hardware(sc); + em_identify_hardware(adapter); /* Set up some sysctls for the tunable interrupt delays */ - em_add_int_delay_sysctl(sc, "rx_int_delay", - "receive interrupt delay in usecs", &sc->rx_int_delay, - E1000_REG_OFFSET(&sc->hw, RDTR), em_rx_int_delay_dflt); - em_add_int_delay_sysctl(sc, "tx_int_delay", - "transmit interrupt delay in usecs", &sc->tx_int_delay, - E1000_REG_OFFSET(&sc->hw, TIDV), em_tx_int_delay_dflt); - if (sc->hw.mac_type >= em_82540) { - em_add_int_delay_sysctl(sc, "rx_abs_int_delay", + em_add_int_delay_sysctl(adapter, "rx_int_delay", + "receive interrupt delay in usecs", &adapter->rx_int_delay, + E1000_REG_OFFSET(&adapter->hw, RDTR), em_rx_int_delay_dflt); + em_add_int_delay_sysctl(adapter, "tx_int_delay", + "transmit interrupt delay in usecs", &adapter->tx_int_delay, + E1000_REG_OFFSET(&adapter->hw, TIDV), em_tx_int_delay_dflt); + if (adapter->hw.mac_type >= em_82540) { + em_add_int_delay_sysctl(adapter, "rx_abs_int_delay", "receive interrupt delay limit in usecs", - &sc->rx_abs_int_delay, - E1000_REG_OFFSET(&sc->hw, RADV), + &adapter->rx_abs_int_delay, + E1000_REG_OFFSET(&adapter->hw, RADV), em_rx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "tx_abs_int_delay", + em_add_int_delay_sysctl(adapter, "tx_abs_int_delay", "transmit interrupt delay limit in usecs", - &sc->tx_abs_int_delay, - E1000_REG_OFFSET(&sc->hw, TADV), + &adapter->tx_abs_int_delay, + E1000_REG_OFFSET(&adapter->hw, TADV), em_tx_abs_int_delay_dflt); } #ifndef DEVICE_POLLING /* Sysctls for limiting the amount of work done in the taskqueue */ - em_add_int_process_limit(sc, "rx_processing_limit", - "max number of rx packets to process", &sc->rx_process_limit, + em_add_int_process_limit(adapter, "rx_processing_limit", + "max number of rx packets to process", &adapter->rx_process_limit, em_rx_process_limit); #endif /* * Validate number of transmit and receive descriptors. It * must not exceed hardware maximum, and must be multiple - * of E1000_DBA_ALIGN. + * of EM_DBA_ALIGN. */ - if (((em_txd * sizeof(struct em_tx_desc)) % E1000_DBA_ALIGN) != 0 || - (sc->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || - (sc->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || + if (((em_txd * sizeof(struct em_tx_desc)) % EM_DBA_ALIGN) != 0 || + (adapter->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || + (adapter->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || (em_txd < EM_MIN_TXD)) { device_printf(dev, "Using %d TX descriptors instead of %d!\n", EM_DEFAULT_TXD, em_txd); - sc->num_tx_desc = EM_DEFAULT_TXD; + adapter->num_tx_desc = EM_DEFAULT_TXD; } else - sc->num_tx_desc = em_txd; - if (((em_rxd * sizeof(struct em_rx_desc)) % E1000_DBA_ALIGN) != 0 || - (sc->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || - (sc->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || + adapter->num_tx_desc = em_txd; + if (((em_rxd * sizeof(struct em_rx_desc)) % EM_DBA_ALIGN) != 0 || + (adapter->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || + (adapter->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || (em_rxd < EM_MIN_RXD)) { device_printf(dev, "Using %d RX descriptors instead of %d!\n", EM_DEFAULT_RXD, em_rxd); - sc->num_rx_desc = EM_DEFAULT_RXD; + adapter->num_rx_desc = EM_DEFAULT_RXD; } else - sc->num_rx_desc = em_rxd; + adapter->num_rx_desc = em_rxd; - sc->hw.autoneg = DO_AUTO_NEG; - sc->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; - sc->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; - sc->hw.tbi_compatibility_en = TRUE; - sc->rx_buffer_len = EM_RXBUFFER_2048; + adapter->hw.autoneg = DO_AUTO_NEG; + adapter->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; + adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; + adapter->hw.tbi_compatibility_en = TRUE; + adapter->rx_buffer_len = EM_RXBUFFER_2048; - sc->hw.phy_init_script = 1; - sc->hw.phy_reset_disable = FALSE; + adapter->hw.phy_init_script = 1; + adapter->hw.phy_reset_disable = FALSE; #ifndef EM_MASTER_SLAVE - sc->hw.master_slave = em_ms_hw_default; + adapter->hw.master_slave = em_ms_hw_default; #else - sc->hw.master_slave = EM_MASTER_SLAVE; + adapter->hw.master_slave = EM_MASTER_SLAVE; #endif /* * Set the max frame size assuming standard ethernet * sized frames. */ - sc->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; + adapter->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; - sc->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; + adapter->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; /* * This controls when hardware reports transmit completion * status. */ - sc->hw.report_tx_early = 1; - if (em_allocate_pci_resources(sc)) { + adapter->hw.report_tx_early = 1; + if (em_allocate_pci_resources(adapter)) { device_printf(dev, "Allocation of PCI resources failed\n"); error = ENXIO; goto err_pci; } /* Initialize eeprom parameters */ - em_init_eeprom_params(&sc->hw); + em_init_eeprom_params(&adapter->hw); - tsize = roundup2(sc->num_tx_desc * sizeof(struct em_tx_desc), - E1000_DBA_ALIGN); + tsize = roundup2(adapter->num_tx_desc * sizeof(struct em_tx_desc), + EM_DBA_ALIGN); /* Allocate Transmit Descriptor ring */ - if (em_dma_malloc(sc, tsize, &sc->txdma, BUS_DMA_NOWAIT)) { + if (em_dma_malloc(adapter, tsize, &adapter->txdma, BUS_DMA_NOWAIT)) { device_printf(dev, "Unable to allocate tx_desc memory\n"); error = ENOMEM; goto err_tx_desc; } - sc->tx_desc_base = (struct em_tx_desc *)sc->txdma.dma_vaddr; + adapter->tx_desc_base = (struct em_tx_desc *)adapter->txdma.dma_vaddr; - rsize = roundup2(sc->num_rx_desc * sizeof(struct em_rx_desc), - E1000_DBA_ALIGN); + rsize = roundup2(adapter->num_rx_desc * sizeof(struct em_rx_desc), + EM_DBA_ALIGN); /* Allocate Receive Descriptor ring */ - if (em_dma_malloc(sc, rsize, &sc->rxdma, BUS_DMA_NOWAIT)) { + if (em_dma_malloc(adapter, rsize, &adapter->rxdma, BUS_DMA_NOWAIT)) { device_printf(dev, "Unable to allocate rx_desc memory\n"); error = ENOMEM; goto err_rx_desc; } - sc->rx_desc_base = (struct em_rx_desc *)sc->rxdma.dma_vaddr; + adapter->rx_desc_base = (struct em_rx_desc *)adapter->rxdma.dma_vaddr; /* Initialize the hardware */ - if (em_hardware_init(sc)) { + if (em_hardware_init(adapter)) { device_printf(dev, "Unable to initialize the hardware\n"); error = EIO; goto err_hw_init; } /* Copy the permanent MAC address out of the EEPROM */ - if (em_read_mac_addr(&sc->hw) < 0) { + if (em_read_mac_addr(&adapter->hw) < 0) { device_printf(dev, "EEPROM read error while reading MAC" " address\n"); error = EIO; goto err_hw_init; } - if (!em_is_valid_ether_addr(sc->hw.mac_addr)) { + if (!em_is_valid_ether_addr(adapter->hw.mac_addr)) { device_printf(dev, "Invalid MAC address\n"); error = EIO; goto err_hw_init; } /* Setup OS specific network interface */ - em_setup_interface(dev, sc); + em_setup_interface(dev, adapter); - em_allocate_intr(sc); + em_allocate_intr(adapter); /* Initialize statistics */ - em_clear_hw_cntrs(&sc->hw); - em_update_stats_counters(sc); - sc->hw.get_link_status = 1; - em_update_link_status(sc); + em_clear_hw_cntrs(&adapter->hw); + em_update_stats_counters(adapter); + adapter->hw.get_link_status = 1; + em_update_link_status(adapter); /* Indicate SOL/IDER usage */ - if (em_check_phy_reset_block(&sc->hw)) + if (em_check_phy_reset_block(&adapter->hw)) device_printf(dev, "PHY reset is blocked due to SOL/IDER session.\n"); /* Identify 82544 on PCIX */ - em_get_bus_info(&sc->hw); - if(sc->hw.bus_type == em_bus_type_pcix && sc->hw.mac_type == em_82544) - sc->pcix_82544 = TRUE; + em_get_bus_info(&adapter->hw); + if(adapter->hw.bus_type == em_bus_type_pcix && adapter->hw.mac_type == em_82544) + adapter->pcix_82544 = TRUE; else - sc->pcix_82544 = FALSE; + adapter->pcix_82544 = FALSE; INIT_DEBUGOUT("em_attach: end"); return (0); err_hw_init: - em_dma_free(sc, &sc->rxdma); + em_dma_free(adapter, &adapter->rxdma); err_rx_desc: - em_dma_free(sc, &sc->txdma); + em_dma_free(adapter, &adapter->txdma); err_tx_desc: err_pci: - em_free_intr(sc); - em_free_pci_resources(sc); - EM_LOCK_DESTROY(sc); + em_free_intr(adapter); + em_free_pci_resources(adapter); + EM_LOCK_DESTROY(adapter); return (error); } @@ -588,8 +597,8 @@ static int em_detach(device_t dev) { - struct em_softc *sc = device_get_softc(dev); - struct ifnet *ifp = sc->ifp; + struct adapter *adapter = device_get_softc(dev); + struct ifnet *ifp = adapter->ifp; INIT_DEBUGOUT("em_detach: begin"); @@ -598,31 +607,31 @@ ether_poll_deregister(ifp); #endif - em_free_intr(sc); - EM_LOCK(sc); - sc->in_detach = 1; - em_stop(sc); - em_phy_hw_reset(&sc->hw); - EM_UNLOCK(sc); - ether_ifdetach(sc->ifp); + em_free_intr(adapter); + EM_LOCK(adapter); + adapter->in_detach = 1; + em_stop(adapter); + em_phy_hw_reset(&adapter->hw); + EM_UNLOCK(adapter); + ether_ifdetach(adapter->ifp); - em_free_pci_resources(sc); + em_free_pci_resources(adapter); bus_generic_detach(dev); if_free(ifp); /* Free Transmit Descriptor ring */ - if (sc->tx_desc_base) { - em_dma_free(sc, &sc->txdma); - sc->tx_desc_base = NULL; + if (adapter->tx_desc_base) { + em_dma_free(adapter, &adapter->txdma); + adapter->tx_desc_base = NULL; } /* Free Receive Descriptor ring */ - if (sc->rx_desc_base) { - em_dma_free(sc, &sc->rxdma); - sc->rx_desc_base = NULL; + if (adapter->rx_desc_base) { + em_dma_free(adapter, &adapter->rxdma); + adapter->rx_desc_base = NULL; } - EM_LOCK_DESTROY(sc); + EM_LOCK_DESTROY(adapter); return (0); } @@ -636,10 +645,10 @@ static int em_shutdown(device_t dev) { - struct em_softc *sc = device_get_softc(dev); - EM_LOCK(sc); - em_stop(sc); - EM_UNLOCK(sc); + struct adapter *adapter = device_get_softc(dev); + EM_LOCK(adapter); + em_stop(adapter); + EM_UNLOCK(adapter); return (0); } @@ -649,11 +658,11 @@ static int em_suspend(device_t dev) { - struct em_softc *sc = device_get_softc(dev); + struct adapter *adapter = device_get_softc(dev); - EM_LOCK(sc); - em_stop(sc); - EM_UNLOCK(sc); + EM_LOCK(adapter); + em_stop(adapter); + EM_UNLOCK(adapter); return bus_generic_suspend(dev); } @@ -661,15 +670,15 @@ static int em_resume(device_t dev) { - struct em_softc *sc = device_get_softc(dev); - struct ifnet *ifp = sc->ifp; + struct adapter *adapter = device_get_softc(dev); + struct ifnet *ifp = adapter->ifp; - EM_LOCK(sc); - em_init_locked(sc); + EM_LOCK(adapter); + em_init_locked(adapter); if ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) em_start_locked(ifp); - EM_UNLOCK(sc); + EM_UNLOCK(adapter); return bus_generic_resume(dev); } @@ -688,15 +697,15 @@ static void em_start_locked(struct ifnet *ifp) { - struct em_softc *sc = ifp->if_softc; + struct adapter *adapter = ifp->if_softc; struct mbuf *m_head; - EM_LOCK_ASSERT(sc); + EM_LOCK_ASSERT(adapter); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING) return; - if (!sc->link_active) + if (!adapter->link_active) return; while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { @@ -708,7 +717,7 @@ * em_encap() can modify our pointer, and or make it NULL on * failure. In that event, we can't requeue. */ - if (em_encap(sc, &m_head)) { + if (em_encap(adapter, &m_head)) { if (m_head == NULL) break; ifp->if_drv_flags |= IFF_DRV_OACTIVE; @@ -727,12 +736,12 @@ static void em_start(struct ifnet *ifp) { - struct em_softc *sc = ifp->if_softc; + struct adapter *adapter = ifp->if_softc; - EM_LOCK(sc); + EM_LOCK(adapter); if (ifp->if_drv_flags & IFF_DRV_RUNNING) em_start_locked(ifp); - EM_UNLOCK(sc); + EM_UNLOCK(adapter); } /********************************************************************* @@ -747,12 +756,12 @@ static int em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { - struct em_softc *sc = ifp->if_softc; + struct adapter *adapter = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; struct ifaddr *ifa = (struct ifaddr *)data; int error = 0; - if (sc->in_detach) + if (adapter->in_detach) return (error); switch (command) { @@ -768,9 +777,9 @@ */ ifp->if_flags |= IFF_UP; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { - EM_LOCK(sc); - em_init_locked(sc); - EM_UNLOCK(sc); + EM_LOCK(adapter); + em_init_locked(adapter); + EM_UNLOCK(adapter); } arp_ifinit(ifp, ifa); } else @@ -783,14 +792,14 @@ IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFMTU (Set Interface MTU)"); - EM_LOCK(sc); - switch (sc->hw.mac_type) { + EM_LOCK(adapter); + switch (adapter->hw.mac_type) { case em_82573: /* * 82573 only supports jumbo frames * if ASPM is disabled. */ - em_read_eeprom(&sc->hw, EEPROM_INIT_3GIO_3, 1, + em_read_eeprom(&adapter->hw, EEPROM_INIT_3GIO_3, 1, &eeprom_data); if (eeprom_data & EEPROM_WORD1A_ASPM_MASK) { max_frame_size = ETHER_MAX_LEN; @@ -802,64 +811,68 @@ case em_80003es2lan: /* Limit Jumbo Frame size */ max_frame_size = 9234; break; + case em_ich8lan: + /* ICH8 does not support jumbo frames */ + max_frame_size = ETHER_MAX_LEN; + break; default: max_frame_size = MAX_JUMBO_FRAME_SIZE; } if (ifr->ifr_mtu > max_frame_size - ETHER_HDR_LEN - ETHER_CRC_LEN) { - EM_UNLOCK(sc); + EM_UNLOCK(adapter); error = EINVAL; break; } ifp->if_mtu = ifr->ifr_mtu; - sc->hw.max_frame_size = + adapter->hw.max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; - em_init_locked(sc); - EM_UNLOCK(sc); + em_init_locked(adapter); + EM_UNLOCK(adapter); break; } case SIOCSIFFLAGS: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); - EM_LOCK(sc); + EM_LOCK(adapter); if (ifp->if_flags & IFF_UP) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) { - if ((ifp->if_flags ^ sc->if_flags) & + if ((ifp->if_flags ^ adapter->if_flags) & IFF_PROMISC) { - em_disable_promisc(sc); - em_set_promisc(sc); + em_disable_promisc(adapter); + em_set_promisc(adapter); } } else - em_init_locked(sc); + em_init_locked(adapter); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - em_stop(sc); + em_stop(adapter); } } - sc->if_flags = ifp->if_flags; - EM_UNLOCK(sc); + adapter->if_flags = ifp->if_flags; + EM_UNLOCK(adapter); break; case SIOCADDMULTI: case SIOCDELMULTI: IOCTL_DEBUGOUT("ioctl rcv'd: SIOC(ADD|DEL)MULTI"); if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - EM_LOCK(sc); - em_disable_intr(sc); - em_set_multi(sc); - if (sc->hw.mac_type == em_82542_rev2_0) { - em_initialize_receive_unit(sc); + EM_LOCK(adapter); + em_disable_intr(adapter); + em_set_multi(adapter); + if (adapter->hw.mac_type == em_82542_rev2_0) { + em_initialize_receive_unit(adapter); } #ifdef DEVICE_POLLING if (!(ifp->if_capenable & IFCAP_POLLING)) #endif - em_enable_intr(sc); - EM_UNLOCK(sc); + em_enable_intr(adapter); + EM_UNLOCK(adapter); } break; case SIOCSIFMEDIA: case SIOCGIFMEDIA: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCxIFMEDIA (Get/Set Interface Media)"); - error = ifmedia_ioctl(ifp, ifr, &sc->media, command); + error = ifmedia_ioctl(ifp, ifr, &adapter->media, command); break; case SIOCSIFCAP: { @@ -874,17 +887,17 @@ error = ether_poll_register(em_poll, ifp); if (error) return (error); - EM_LOCK(sc); - em_disable_intr(sc); + EM_LOCK(adapter); + em_disable_intr(adapter); ifp->if_capenable |= IFCAP_POLLING; - EM_UNLOCK(sc); + EM_UNLOCK(adapter); } else { error = ether_poll_deregister(ifp); /* Enable interrupt even in error case */ - EM_LOCK(sc); - em_enable_intr(sc); + EM_LOCK(adapter); + em_enable_intr(adapter); ifp->if_capenable &= ~IFCAP_POLLING; - EM_UNLOCK(sc); + EM_UNLOCK(adapter); } } #endif @@ -897,7 +910,7 @@ reinit = 1; } if (reinit && (ifp->if_drv_flags & IFF_DRV_RUNNING)) - em_init(sc); + em_init(adapter); VLAN_CAPABILITIES(ifp); break; } @@ -919,26 +932,26 @@ static void em_watchdog(struct ifnet *ifp) { - struct em_softc *sc = ifp->if_softc; + struct adapter *adapter = ifp->if_softc; - EM_LOCK(sc); + EM_LOCK(adapter); /* If we are in this routine because of pause frames, then * don't reset the hardware. */ - if (E1000_READ_REG(&sc->hw, STATUS) & E1000_STATUS_TXOFF) { + if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF) { ifp->if_timer = EM_TX_TIMEOUT; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 3 22:15:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D23AB16A4E0; Thu, 3 Aug 2006 22:15:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A3E716A4DD for ; Thu, 3 Aug 2006 22:15:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28FB743D49 for ; Thu, 3 Aug 2006 22:15:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73MFIp3084072 for ; Thu, 3 Aug 2006 22:15:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73MFHx4084054 for perforce@freebsd.org; Thu, 3 Aug 2006 22:15:17 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 22:15:17 GMT Message-Id: <200608032215.k73MFHx4084054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 22:15:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103143 Change 103143 by jb@jb_freebsd2 on 2006/08/03 22:15:01 Back out the breakage introduced by the IFC. It seems there is a battle for control of this driver in current. I'll stay out of that and stick with this version for the time being. I can't do without a functional 'em' on sun4v and it is just a waste of my time having to deal with commit wars over white space. My branch now ignores src/sys/dev/em. Affected files ... .. //depot/projects/dtrace/src/sys/dev/em/README#4 edit .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#9 edit .. //depot/projects/dtrace/src/sys/dev/em/if_em.h#5 edit .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.c#6 edit .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.h#4 edit .. //depot/projects/dtrace/src/sys/dev/em/if_em_osdep.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/em/README#4 (text+ko) ==== @@ -1,8 +1,9 @@ -$FreeBSD: src/sys/dev/em/README,v 1.13 2006/08/03 09:20:11 glebius Exp $ +//depot/projects/dtrace/src/sys/dev/em/README#2 - integrate change 100573 (text+ko) +$FreeBSD: src/sys/dev/em/README,v 1.12 2006/04/06 17:09:02 glebius Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ -May 2, 2006 +January 4, 2006 Contents @@ -22,7 +23,8 @@ ======== This file describes the FreeBSD* driver for the Intel(R) PRO/1000 Family of -Adapters. This driver has been developed for use with FreeBSD, Release 6.x. +Adapters. This driver has been developed for use with FreeBSD, Release 4.11 +and greater and Release 5.4. For questions related to hardware requirements, refer to the documentation supplied with your Intel PRO/1000 adapter. All hardware requirements listed @@ -44,8 +46,7 @@ NOTE: Mobile adapters are not fully supported. -NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 -support. + Building and Installation ========================= @@ -92,14 +93,14 @@ cp Makefile.kernel /usr/src/sys/modules/em/Makefile - Edit the /usr/src/sys/conf/files file, and add the following lines only if + Edit the /usr/src/sys/conf/files.i386 file, and add the following lines only if they don't already exist: dev/em/if_em.c optional em dev/em/if_em_hw.c optional em - Remove the following lines from the /usr/src/sys/conf/files file, + Remove the following lines from the /usr/src/sys/conf/files.i386 file, if they exist: dev/em/if_em_fxhw.c optional em @@ -230,13 +231,6 @@ - Using Jumbo Frames at 10 or 100 Mbps may result in poor performance or loss of link. - - The following adapters do not support Jumbo Frames: - Intel(R) 82562V 10/100 Network Connection - Intel(R) 82566DM Gigabit Network Connection - Intel(R) 82566DC Gigabit Network Connection - Intel(R) 82566MM Gigabit Network Connection - Intel(R) 82566MC Gigabit Network Connection - VLANs ----- ==== //depot/projects/dtrace/src/sys/dev/em/if_em.c#9 (text+ko) ==== @@ -1,6 +1,7 @@ +//depot/projects/dtrace/src/sys/dev/em/if_em.c#7 - edit change 102692 (text+ko) /************************************************************************** -Copyright (c) 2001-2006, Intel Corporation +Copyright (c) 2001-2005, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,7 +32,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.124 2006/08/03 19:05:04 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.119 2006/07/20 04:18:45 yongari Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -86,7 +87,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "Version - 6.0.5"; +char em_driver_version[] = "Version - 5.1.5"; /********************************************************************* @@ -159,17 +160,10 @@ { 0x8086, E1000_DEV_ID_82573E, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82573E_IAMT, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82573L, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_SPT, - PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_SPT, - PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_DPT, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_DPT, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_ICH8_IGP_AMT, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_ICH8_IGP_C, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_ICH8_IFE, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} @@ -197,64 +191,64 @@ static int em_ioctl(struct ifnet *, u_long, caddr_t); static void em_watchdog(struct ifnet *); static void em_init(void *); -static void em_init_locked(struct adapter *); +static void em_init_locked(struct em_softc *); static void em_stop(void *); static void em_media_status(struct ifnet *, struct ifmediareq *); static int em_media_change(struct ifnet *); -static void em_identify_hardware(struct adapter *); -static int em_allocate_pci_resources(struct adapter *); -static int em_allocate_intr(struct adapter *); -static void em_free_intr(struct adapter *); -static void em_free_pci_resources(struct adapter *); +static void em_identify_hardware(struct em_softc *); +static int em_allocate_pci_resources(struct em_softc *); +static int em_allocate_intr(struct em_softc *); +static void em_free_intr(struct em_softc *); +static void em_free_pci_resources(struct em_softc *); static void em_local_timer(void *); -static int em_hardware_init(struct adapter *); -static void em_setup_interface(device_t, struct adapter *); -static int em_setup_transmit_structures(struct adapter *); -static void em_initialize_transmit_unit(struct adapter *); -static int em_setup_receive_structures(struct adapter *); -static void em_initialize_receive_unit(struct adapter *); -static void em_enable_intr(struct adapter *); -static void em_disable_intr(struct adapter *); -static void em_free_transmit_structures(struct adapter *); -static void em_free_receive_structures(struct adapter *); -static void em_update_stats_counters(struct adapter *); -static void em_txeof(struct adapter *); -static int em_allocate_receive_structures(struct adapter *); -static int em_allocate_transmit_structures(struct adapter *); -static int em_rxeof(struct adapter *, int); +static int em_hardware_init(struct em_softc *); +static void em_setup_interface(device_t, struct em_softc *); +static int em_setup_transmit_structures(struct em_softc *); +static void em_initialize_transmit_unit(struct em_softc *); +static int em_setup_receive_structures(struct em_softc *); +static void em_initialize_receive_unit(struct em_softc *); +static void em_enable_intr(struct em_softc *); +static void em_disable_intr(struct em_softc *); +static void em_free_transmit_structures(struct em_softc *); +static void em_free_receive_structures(struct em_softc *); +static void em_update_stats_counters(struct em_softc *); +static void em_txeof(struct em_softc *); +static int em_allocate_receive_structures(struct em_softc *); +static int em_allocate_transmit_structures(struct em_softc *); +static int em_rxeof(struct em_softc *, int); #ifndef __NO_STRICT_ALIGNMENT -static int em_fixup_rx(struct adapter *); +static int em_fixup_rx(struct em_softc *); #endif -static void em_receive_checksum(struct adapter *, struct em_rx_desc *, +static void em_receive_checksum(struct em_softc *, struct em_rx_desc *, struct mbuf *); -static void em_transmit_checksum_setup(struct adapter *, struct mbuf *, +static void em_transmit_checksum_setup(struct em_softc *, struct mbuf *, uint32_t *, uint32_t *); -static void em_set_promisc(struct adapter *); -static void em_disable_promisc(struct adapter *); -static void em_set_multi(struct adapter *); -static void em_print_hw_stats(struct adapter *); -static void em_update_link_status(struct adapter *); -static int em_get_buf(int i, struct adapter *, struct mbuf *); -static void em_enable_vlans(struct adapter *); -static void em_disable_vlans(struct adapter *); -static int em_encap(struct adapter *, struct mbuf **); -static void em_smartspeed(struct adapter *); -static int em_82547_fifo_workaround(struct adapter *, int); -static void em_82547_update_fifo_head(struct adapter *, int); -static int em_82547_tx_fifo_reset(struct adapter *); +static void em_set_promisc(struct em_softc *); +static void em_disable_promisc(struct em_softc *); +static void em_set_multi(struct em_softc *); +static void em_print_hw_stats(struct em_softc *); +static void em_update_link_status(struct em_softc *); +static int em_get_buf(int i, struct em_softc *, struct mbuf *); +static void em_enable_vlans(struct em_softc *); +static void em_disable_vlans(struct em_softc *); +static int em_encap(struct em_softc *, struct mbuf **); +static void em_smartspeed(struct em_softc *); +static int em_82547_fifo_workaround(struct em_softc *, int); +static void em_82547_update_fifo_head(struct em_softc *, int); +static int em_82547_tx_fifo_reset(struct em_softc *); static void em_82547_move_tail(void *arg); -static void em_82547_move_tail_locked(struct adapter *); -static int em_dma_malloc(struct adapter *, bus_size_t, +static void em_82547_move_tail_locked(struct em_softc *); +static int em_dma_malloc(struct em_softc *, 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 void em_dma_free(struct em_softc *, struct em_dma_alloc *); +static void em_print_debug_info(struct em_softc *); static int em_is_valid_ether_addr(uint8_t *); static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static uint32_t em_fill_descriptors (bus_addr_t address, uint32_t length, PDESC_ARRAY desc_array); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); -static void em_add_int_delay_sysctl(struct adapter *, const char *, +static void em_add_int_delay_sysctl(struct em_softc *, const char *, const char *, struct em_int_delay_info *, int, int); /* @@ -266,7 +260,7 @@ static void em_intr(void *); #else static void em_intr_fast(void *); -static void em_add_int_process_limit(struct adapter *, const char *, +static void em_add_int_process_limit(struct em_softc *, const char *, const char *, int *, int); static void em_handle_rxtx(void *context, int pending); static void em_handle_link(void *context, int pending); @@ -288,7 +282,7 @@ }; static driver_t em_driver = { - "em", em_methods, sizeof(struct adapter), + "em", em_methods, sizeof(struct em_softc), }; static devclass_t em_devclass; @@ -309,7 +303,6 @@ static int em_rx_abs_int_delay_dflt = E1000_TICKS_TO_USECS(EM_RADV); static int em_rxd = EM_DEFAULT_RXD; static int em_txd = EM_DEFAULT_TXD; -static int em_smart_pwr_down = FALSE; TUNABLE_INT("hw.em.tx_int_delay", &em_tx_int_delay_dflt); TUNABLE_INT("hw.em.rx_int_delay", &em_rx_int_delay_dflt); @@ -317,7 +310,6 @@ TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt); TUNABLE_INT("hw.em.rxd", &em_rxd); TUNABLE_INT("hw.em.txd", &em_txd); -TUNABLE_INT("hw.em.smart_pwr_down", &em_smart_pwr_down); #ifndef DEVICE_POLLING static int em_rx_process_limit = 100; TUNABLE_INT("hw.em.rx_process_limit", &em_rx_process_limit); @@ -387,199 +379,199 @@ static int em_attach(device_t dev) { - struct adapter *adapter; + struct em_softc *sc; int tsize, rsize; int error = 0; INIT_DEBUGOUT("em_attach: begin"); - adapter = device_get_softc(dev); - adapter->dev = adapter->osdep.dev = dev; - EM_LOCK_INIT(adapter, device_get_nameunit(dev)); + sc = device_get_softc(dev); + sc->dev = sc->osdep.dev = dev; + EM_LOCK_INIT(sc, device_get_nameunit(dev)); /* SYSCTL stuff */ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, + OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, sc, 0, em_sysctl_debug_info, "I", "Debug Information"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, + OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, sc, 0, em_sysctl_stats, "I", "Statistics"); - callout_init(&adapter->timer, CALLOUT_MPSAFE); - callout_init(&adapter->tx_fifo_timer, CALLOUT_MPSAFE); + callout_init(&sc->timer, CALLOUT_MPSAFE); + callout_init(&sc->tx_fifo_timer, CALLOUT_MPSAFE); /* Determine hardware revision */ - em_identify_hardware(adapter); + em_identify_hardware(sc); /* Set up some sysctls for the tunable interrupt delays */ - em_add_int_delay_sysctl(adapter, "rx_int_delay", - "receive interrupt delay in usecs", &adapter->rx_int_delay, - E1000_REG_OFFSET(&adapter->hw, RDTR), em_rx_int_delay_dflt); - em_add_int_delay_sysctl(adapter, "tx_int_delay", - "transmit interrupt delay in usecs", &adapter->tx_int_delay, - E1000_REG_OFFSET(&adapter->hw, TIDV), em_tx_int_delay_dflt); - if (adapter->hw.mac_type >= em_82540) { - em_add_int_delay_sysctl(adapter, "rx_abs_int_delay", + em_add_int_delay_sysctl(sc, "rx_int_delay", + "receive interrupt delay in usecs", &sc->rx_int_delay, + E1000_REG_OFFSET(&sc->hw, RDTR), em_rx_int_delay_dflt); + em_add_int_delay_sysctl(sc, "tx_int_delay", + "transmit interrupt delay in usecs", &sc->tx_int_delay, + E1000_REG_OFFSET(&sc->hw, TIDV), em_tx_int_delay_dflt); + if (sc->hw.mac_type >= em_82540) { + em_add_int_delay_sysctl(sc, "rx_abs_int_delay", "receive interrupt delay limit in usecs", - &adapter->rx_abs_int_delay, - E1000_REG_OFFSET(&adapter->hw, RADV), + &sc->rx_abs_int_delay, + E1000_REG_OFFSET(&sc->hw, RADV), em_rx_abs_int_delay_dflt); - em_add_int_delay_sysctl(adapter, "tx_abs_int_delay", + em_add_int_delay_sysctl(sc, "tx_abs_int_delay", "transmit interrupt delay limit in usecs", - &adapter->tx_abs_int_delay, - E1000_REG_OFFSET(&adapter->hw, TADV), + &sc->tx_abs_int_delay, + E1000_REG_OFFSET(&sc->hw, TADV), em_tx_abs_int_delay_dflt); } #ifndef DEVICE_POLLING /* Sysctls for limiting the amount of work done in the taskqueue */ - em_add_int_process_limit(adapter, "rx_processing_limit", - "max number of rx packets to process", &adapter->rx_process_limit, + em_add_int_process_limit(sc, "rx_processing_limit", + "max number of rx packets to process", &sc->rx_process_limit, em_rx_process_limit); #endif /* * Validate number of transmit and receive descriptors. It * must not exceed hardware maximum, and must be multiple - * of EM_DBA_ALIGN. + * of E1000_DBA_ALIGN. */ - if (((em_txd * sizeof(struct em_tx_desc)) % EM_DBA_ALIGN) != 0 || - (adapter->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || - (adapter->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || + if (((em_txd * sizeof(struct em_tx_desc)) % E1000_DBA_ALIGN) != 0 || + (sc->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || + (sc->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || (em_txd < EM_MIN_TXD)) { device_printf(dev, "Using %d TX descriptors instead of %d!\n", EM_DEFAULT_TXD, em_txd); - adapter->num_tx_desc = EM_DEFAULT_TXD; + sc->num_tx_desc = EM_DEFAULT_TXD; } else - adapter->num_tx_desc = em_txd; - if (((em_rxd * sizeof(struct em_rx_desc)) % EM_DBA_ALIGN) != 0 || - (adapter->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || - (adapter->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || + sc->num_tx_desc = em_txd; + if (((em_rxd * sizeof(struct em_rx_desc)) % E1000_DBA_ALIGN) != 0 || + (sc->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || + (sc->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || (em_rxd < EM_MIN_RXD)) { device_printf(dev, "Using %d RX descriptors instead of %d!\n", EM_DEFAULT_RXD, em_rxd); - adapter->num_rx_desc = EM_DEFAULT_RXD; + sc->num_rx_desc = EM_DEFAULT_RXD; } else - adapter->num_rx_desc = em_rxd; + sc->num_rx_desc = em_rxd; - adapter->hw.autoneg = DO_AUTO_NEG; - adapter->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; - adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; - adapter->hw.tbi_compatibility_en = TRUE; - adapter->rx_buffer_len = EM_RXBUFFER_2048; + sc->hw.autoneg = DO_AUTO_NEG; + sc->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; + sc->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; + sc->hw.tbi_compatibility_en = TRUE; + sc->rx_buffer_len = EM_RXBUFFER_2048; - adapter->hw.phy_init_script = 1; - adapter->hw.phy_reset_disable = FALSE; + sc->hw.phy_init_script = 1; + sc->hw.phy_reset_disable = FALSE; #ifndef EM_MASTER_SLAVE - adapter->hw.master_slave = em_ms_hw_default; + sc->hw.master_slave = em_ms_hw_default; #else - adapter->hw.master_slave = EM_MASTER_SLAVE; + sc->hw.master_slave = EM_MASTER_SLAVE; #endif /* * Set the max frame size assuming standard ethernet * sized frames. */ - adapter->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; + sc->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; - adapter->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; + sc->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; /* * This controls when hardware reports transmit completion * status. */ - adapter->hw.report_tx_early = 1; - if (em_allocate_pci_resources(adapter)) { + sc->hw.report_tx_early = 1; + if (em_allocate_pci_resources(sc)) { device_printf(dev, "Allocation of PCI resources failed\n"); error = ENXIO; goto err_pci; } /* Initialize eeprom parameters */ - em_init_eeprom_params(&adapter->hw); + em_init_eeprom_params(&sc->hw); - tsize = roundup2(adapter->num_tx_desc * sizeof(struct em_tx_desc), - EM_DBA_ALIGN); + tsize = roundup2(sc->num_tx_desc * sizeof(struct em_tx_desc), + E1000_DBA_ALIGN); /* Allocate Transmit Descriptor ring */ - if (em_dma_malloc(adapter, tsize, &adapter->txdma, BUS_DMA_NOWAIT)) { + if (em_dma_malloc(sc, tsize, &sc->txdma, BUS_DMA_NOWAIT)) { device_printf(dev, "Unable to allocate tx_desc memory\n"); error = ENOMEM; goto err_tx_desc; } - adapter->tx_desc_base = (struct em_tx_desc *)adapter->txdma.dma_vaddr; + sc->tx_desc_base = (struct em_tx_desc *)sc->txdma.dma_vaddr; - rsize = roundup2(adapter->num_rx_desc * sizeof(struct em_rx_desc), - EM_DBA_ALIGN); + rsize = roundup2(sc->num_rx_desc * sizeof(struct em_rx_desc), + E1000_DBA_ALIGN); /* Allocate Receive Descriptor ring */ - if (em_dma_malloc(adapter, rsize, &adapter->rxdma, BUS_DMA_NOWAIT)) { + if (em_dma_malloc(sc, rsize, &sc->rxdma, BUS_DMA_NOWAIT)) { device_printf(dev, "Unable to allocate rx_desc memory\n"); error = ENOMEM; goto err_rx_desc; } - adapter->rx_desc_base = (struct em_rx_desc *)adapter->rxdma.dma_vaddr; + sc->rx_desc_base = (struct em_rx_desc *)sc->rxdma.dma_vaddr; /* Initialize the hardware */ - if (em_hardware_init(adapter)) { + if (em_hardware_init(sc)) { device_printf(dev, "Unable to initialize the hardware\n"); error = EIO; goto err_hw_init; } /* Copy the permanent MAC address out of the EEPROM */ - if (em_read_mac_addr(&adapter->hw) < 0) { + if (em_read_mac_addr(&sc->hw) < 0) { device_printf(dev, "EEPROM read error while reading MAC" " address\n"); error = EIO; goto err_hw_init; } - if (!em_is_valid_ether_addr(adapter->hw.mac_addr)) { + if (!em_is_valid_ether_addr(sc->hw.mac_addr)) { device_printf(dev, "Invalid MAC address\n"); error = EIO; goto err_hw_init; } /* Setup OS specific network interface */ - em_setup_interface(dev, adapter); + em_setup_interface(dev, sc); - em_allocate_intr(adapter); + em_allocate_intr(sc); /* Initialize statistics */ - em_clear_hw_cntrs(&adapter->hw); - em_update_stats_counters(adapter); - adapter->hw.get_link_status = 1; - em_update_link_status(adapter); + em_clear_hw_cntrs(&sc->hw); + em_update_stats_counters(sc); + sc->hw.get_link_status = 1; + em_update_link_status(sc); /* Indicate SOL/IDER usage */ - if (em_check_phy_reset_block(&adapter->hw)) + if (em_check_phy_reset_block(&sc->hw)) device_printf(dev, "PHY reset is blocked due to SOL/IDER session.\n"); /* Identify 82544 on PCIX */ - em_get_bus_info(&adapter->hw); - if(adapter->hw.bus_type == em_bus_type_pcix && adapter->hw.mac_type == em_82544) - adapter->pcix_82544 = TRUE; + em_get_bus_info(&sc->hw); + if(sc->hw.bus_type == em_bus_type_pcix && sc->hw.mac_type == em_82544) + sc->pcix_82544 = TRUE; else - adapter->pcix_82544 = FALSE; + sc->pcix_82544 = FALSE; INIT_DEBUGOUT("em_attach: end"); return (0); err_hw_init: - em_dma_free(adapter, &adapter->rxdma); + em_dma_free(sc, &sc->rxdma); err_rx_desc: - em_dma_free(adapter, &adapter->txdma); + em_dma_free(sc, &sc->txdma); err_tx_desc: err_pci: - em_free_intr(adapter); - em_free_pci_resources(adapter); - EM_LOCK_DESTROY(adapter); + em_free_intr(sc); + em_free_pci_resources(sc); + EM_LOCK_DESTROY(sc); return (error); } @@ -597,8 +589,8 @@ static int em_detach(device_t dev) { - struct adapter *adapter = device_get_softc(dev); - struct ifnet *ifp = adapter->ifp; + struct em_softc *sc = device_get_softc(dev); + struct ifnet *ifp = sc->ifp; INIT_DEBUGOUT("em_detach: begin"); @@ -607,31 +599,31 @@ ether_poll_deregister(ifp); #endif - em_free_intr(adapter); - EM_LOCK(adapter); - adapter->in_detach = 1; - em_stop(adapter); - em_phy_hw_reset(&adapter->hw); - EM_UNLOCK(adapter); - ether_ifdetach(adapter->ifp); + em_free_intr(sc); + EM_LOCK(sc); + sc->in_detach = 1; + em_stop(sc); + em_phy_hw_reset(&sc->hw); + EM_UNLOCK(sc); + ether_ifdetach(sc->ifp); - em_free_pci_resources(adapter); + em_free_pci_resources(sc); bus_generic_detach(dev); if_free(ifp); /* Free Transmit Descriptor ring */ - if (adapter->tx_desc_base) { - em_dma_free(adapter, &adapter->txdma); - adapter->tx_desc_base = NULL; + if (sc->tx_desc_base) { + em_dma_free(sc, &sc->txdma); + sc->tx_desc_base = NULL; } /* Free Receive Descriptor ring */ - if (adapter->rx_desc_base) { - em_dma_free(adapter, &adapter->rxdma); - adapter->rx_desc_base = NULL; + if (sc->rx_desc_base) { + em_dma_free(sc, &sc->rxdma); + sc->rx_desc_base = NULL; } - EM_LOCK_DESTROY(adapter); + EM_LOCK_DESTROY(sc); return (0); } @@ -645,10 +637,10 @@ static int em_shutdown(device_t dev) { - struct adapter *adapter = device_get_softc(dev); - EM_LOCK(adapter); - em_stop(adapter); - EM_UNLOCK(adapter); + struct em_softc *sc = device_get_softc(dev); + EM_LOCK(sc); + em_stop(sc); + EM_UNLOCK(sc); return (0); } @@ -658,11 +650,11 @@ static int em_suspend(device_t dev) { - struct adapter *adapter = device_get_softc(dev); + struct em_softc *sc = device_get_softc(dev); - EM_LOCK(adapter); - em_stop(adapter); - EM_UNLOCK(adapter); + EM_LOCK(sc); + em_stop(sc); + EM_UNLOCK(sc); return bus_generic_suspend(dev); } @@ -670,15 +662,15 @@ static int em_resume(device_t dev) { - struct adapter *adapter = device_get_softc(dev); - struct ifnet *ifp = adapter->ifp; + struct em_softc *sc = device_get_softc(dev); + struct ifnet *ifp = sc->ifp; - EM_LOCK(adapter); - em_init_locked(adapter); + EM_LOCK(sc); + em_init_locked(sc); if ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) em_start_locked(ifp); - EM_UNLOCK(adapter); + EM_UNLOCK(sc); return bus_generic_resume(dev); } @@ -697,15 +689,15 @@ static void em_start_locked(struct ifnet *ifp) { - struct adapter *adapter = ifp->if_softc; + struct em_softc *sc = ifp->if_softc; struct mbuf *m_head; - EM_LOCK_ASSERT(adapter); + EM_LOCK_ASSERT(sc); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING) return; - if (!adapter->link_active) + if (!sc->link_active) return; while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { @@ -717,7 +709,7 @@ * em_encap() can modify our pointer, and or make it NULL on * failure. In that event, we can't requeue. */ - if (em_encap(adapter, &m_head)) { + if (em_encap(sc, &m_head)) { if (m_head == NULL) break; ifp->if_drv_flags |= IFF_DRV_OACTIVE; @@ -736,12 +728,12 @@ static void em_start(struct ifnet *ifp) { - struct adapter *adapter = ifp->if_softc; + struct em_softc *sc = ifp->if_softc; - EM_LOCK(adapter); + EM_LOCK(sc); if (ifp->if_drv_flags & IFF_DRV_RUNNING) em_start_locked(ifp); - EM_UNLOCK(adapter); + EM_UNLOCK(sc); } /********************************************************************* @@ -756,12 +748,12 @@ static int em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { - struct adapter *adapter = ifp->if_softc; + struct em_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; struct ifaddr *ifa = (struct ifaddr *)data; int error = 0; - if (adapter->in_detach) + if (sc->in_detach) return (error); switch (command) { @@ -777,9 +769,9 @@ */ ifp->if_flags |= IFF_UP; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { - EM_LOCK(adapter); - em_init_locked(adapter); - EM_UNLOCK(adapter); + EM_LOCK(sc); + em_init_locked(sc); + EM_UNLOCK(sc); } arp_ifinit(ifp, ifa); } else @@ -792,14 +784,14 @@ IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFMTU (Set Interface MTU)"); - EM_LOCK(adapter); - switch (adapter->hw.mac_type) { + EM_LOCK(sc); + switch (sc->hw.mac_type) { case em_82573: /* * 82573 only supports jumbo frames * if ASPM is disabled. */ - em_read_eeprom(&adapter->hw, EEPROM_INIT_3GIO_3, 1, + em_read_eeprom(&sc->hw, EEPROM_INIT_3GIO_3, 1, &eeprom_data); if (eeprom_data & EEPROM_WORD1A_ASPM_MASK) { max_frame_size = ETHER_MAX_LEN; @@ -811,68 +803,64 @@ case em_80003es2lan: /* Limit Jumbo Frame size */ max_frame_size = 9234; break; - case em_ich8lan: - /* ICH8 does not support jumbo frames */ - max_frame_size = ETHER_MAX_LEN; - break; default: max_frame_size = MAX_JUMBO_FRAME_SIZE; } if (ifr->ifr_mtu > max_frame_size - ETHER_HDR_LEN - ETHER_CRC_LEN) { - EM_UNLOCK(adapter); + EM_UNLOCK(sc); error = EINVAL; break; } ifp->if_mtu = ifr->ifr_mtu; - adapter->hw.max_frame_size = + sc->hw.max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; - em_init_locked(adapter); - EM_UNLOCK(adapter); + em_init_locked(sc); + EM_UNLOCK(sc); break; } case SIOCSIFFLAGS: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); - EM_LOCK(adapter); + EM_LOCK(sc); if (ifp->if_flags & IFF_UP) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) { - if ((ifp->if_flags ^ adapter->if_flags) & + if ((ifp->if_flags ^ sc->if_flags) & IFF_PROMISC) { - em_disable_promisc(adapter); - em_set_promisc(adapter); + em_disable_promisc(sc); + em_set_promisc(sc); } } else - em_init_locked(adapter); + em_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - em_stop(adapter); + em_stop(sc); } } - adapter->if_flags = ifp->if_flags; - EM_UNLOCK(adapter); + sc->if_flags = ifp->if_flags; + EM_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: IOCTL_DEBUGOUT("ioctl rcv'd: SIOC(ADD|DEL)MULTI"); if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - EM_LOCK(adapter); - em_disable_intr(adapter); - em_set_multi(adapter); - if (adapter->hw.mac_type == em_82542_rev2_0) { - em_initialize_receive_unit(adapter); + EM_LOCK(sc); + em_disable_intr(sc); + em_set_multi(sc); + if (sc->hw.mac_type == em_82542_rev2_0) { + em_initialize_receive_unit(sc); } #ifdef DEVICE_POLLING if (!(ifp->if_capenable & IFCAP_POLLING)) #endif - em_enable_intr(adapter); - EM_UNLOCK(adapter); + em_enable_intr(sc); + EM_UNLOCK(sc); } break; case SIOCSIFMEDIA: case SIOCGIFMEDIA: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCxIFMEDIA (Get/Set Interface Media)"); - error = ifmedia_ioctl(ifp, ifr, &adapter->media, command); + error = ifmedia_ioctl(ifp, ifr, &sc->media, command); break; case SIOCSIFCAP: { @@ -887,17 +875,17 @@ error = ether_poll_register(em_poll, ifp); if (error) return (error); - EM_LOCK(adapter); - em_disable_intr(adapter); + EM_LOCK(sc); + em_disable_intr(sc); ifp->if_capenable |= IFCAP_POLLING; - EM_UNLOCK(adapter); + EM_UNLOCK(sc); } else { error = ether_poll_deregister(ifp); /* Enable interrupt even in error case */ - EM_LOCK(adapter); - em_enable_intr(adapter); + EM_LOCK(sc); + em_enable_intr(sc); ifp->if_capenable &= ~IFCAP_POLLING; - EM_UNLOCK(adapter); + EM_UNLOCK(sc); } } #endif @@ -910,7 +898,7 @@ reinit = 1; } if (reinit && (ifp->if_drv_flags & IFF_DRV_RUNNING)) - em_init(adapter); + em_init(sc); VLAN_CAPABILITIES(ifp); break; } @@ -932,26 +920,26 @@ static void em_watchdog(struct ifnet *ifp) { - struct adapter *adapter = ifp->if_softc; + struct em_softc *sc = ifp->if_softc; - EM_LOCK(adapter); + EM_LOCK(sc); /* If we are in this routine because of pause frames, then * don't reset the hardware. */ - if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF) { + if (E1000_READ_REG(&sc->hw, STATUS) & E1000_STATUS_TXOFF) { ifp->if_timer = EM_TX_TIMEOUT; - EM_UNLOCK(adapter); + EM_UNLOCK(sc); return; } - if (em_check_for_link(&adapter->hw) == 0) - device_printf(adapter->dev, "watchdog timeout -- resetting\n"); + if (em_check_for_link(&sc->hw) == 0) + device_printf(sc->dev, "watchdog timeout -- resetting\n"); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - adapter->watchdog_events++; + sc->watchdog_events++; - em_init_locked(adapter); - EM_UNLOCK(adapter); + em_init_locked(sc); + EM_UNLOCK(sc); } /********************************************************************* @@ -966,39 +954,33 @@ **********************************************************************/ static void -em_init_locked(struct adapter *adapter) +em_init_locked(struct em_softc *sc) { - struct ifnet *ifp = adapter->ifp; - device_t dev = adapter->dev; + struct ifnet *ifp = sc->ifp; + device_t dev = sc->dev; uint32_t pba; INIT_DEBUGOUT("em_init: begin"); - EM_LOCK_ASSERT(adapter); + EM_LOCK_ASSERT(sc); - em_stop(adapter); + em_stop(sc); /* * Packet Buffer Allocation (PBA) * Writing PBA sets the receive portion of the buffer * the remainder is used for the transmit buffer. - * - * Devices before the 82547 had a Packet Buffer of 64K. - * Default allocation: PBA=48K for Rx, leaving 16K for Tx. - * After the 82547 the buffer was reduced to 40K. - * Default allocation: PBA=30K for Rx, leaving 10K for Tx. - * Note: default does not leave enough room for Jumbo Frame >10k. */ - switch (adapter->hw.mac_type) { + switch (sc->hw.mac_type) { case em_82547: case em_82547_rev_2: /* 82547: Total Packet Buffer is 40K */ - if (adapter->hw.max_frame_size > EM_RXBUFFER_8192) + if (sc->hw.max_frame_size > EM_RXBUFFER_8192) pba = E1000_PBA_22K; /* 22K for Rx, 18K for Tx */ else pba = E1000_PBA_30K; /* 30K for Rx, 10K for Tx */ - adapter->tx_fifo_head = 0; - adapter->tx_head_addr = pba << EM_TX_HEAD_ADDR_SHIFT; - adapter->tx_fifo_size = (E1000_PBA_40K - pba) << EM_PBA_BYTES_SHIFT; + sc->tx_fifo_head = 0; + sc->tx_head_addr = pba << EM_TX_HEAD_ADDR_SHIFT; + sc->tx_fifo_size = (E1000_PBA_40K - pba) << EM_PBA_BYTES_SHIFT; break; case em_80003es2lan: /* 80003es2lan: Total Packet Buffer is 48K */ case em_82571: /* 82571: Total Packet Buffer is 48K */ @@ -1009,90 +991,87 @@ /* Jumbo frames not supported */ pba = E1000_PBA_12K; /* 12K for Rx, 20K for Tx */ break; - case em_ich8lan: - pba = E1000_PBA_8K; - break; default: /* Devices before 82547 had a Packet Buffer of 64K. */ - if(adapter->hw.max_frame_size > EM_RXBUFFER_8192) + if(sc->hw.max_frame_size > EM_RXBUFFER_8192) pba = E1000_PBA_40K; /* 40K for Rx, 24K for Tx */ else pba = E1000_PBA_48K; /* 48K for Rx, 16K for Tx */ } INIT_DEBUGOUT1("em_init: pba=%dK",pba); - E1000_WRITE_REG(&adapter->hw, PBA, pba); + E1000_WRITE_REG(&sc->hw, PBA, pba); /* Get the latest mac address, User can use a LAA */ - bcopy(IF_LLADDR(adapter->ifp), adapter->hw.mac_addr, ETHER_ADDR_LEN); + bcopy(IF_LLADDR(sc->ifp), sc->hw.mac_addr, ETHER_ADDR_LEN); /* Initialize the hardware */ - if (em_hardware_init(adapter)) { + if (em_hardware_init(sc)) { device_printf(dev, "Unable to initialize the hardware\n"); return; } - em_update_link_status(adapter); + em_update_link_status(sc); if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) - em_enable_vlans(adapter); + em_enable_vlans(sc); /* Prepare transmit descriptors and buffers */ - if (em_setup_transmit_structures(adapter)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 3 22:39:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3895A16A4DF; Thu, 3 Aug 2006 22:39:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E684D16A4DD for ; Thu, 3 Aug 2006 22:39:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A42A543D58 for ; Thu, 3 Aug 2006 22:39:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73Mdnl1085692 for ; Thu, 3 Aug 2006 22:39:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73Mdn32085689 for perforce@freebsd.org; Thu, 3 Aug 2006 22:39:49 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 22:39:49 GMT Message-Id: <200608032239.k73Mdn32085689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 22:39:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=103145 Change 103145 by jb@jb_freebsd2 on 2006/08/03 22:39:47 Link to libpthread when threads aren't in libc. Affected files ... .. //depot/projects/dtrace/src/usr.bin/csup/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/csup/Makefile#3 (text) ==== @@ -1,5 +1,7 @@ # $FreeBSD: src/usr.bin/csup/Makefile,v 1.3 2006/03/14 03:53:50 mux Exp $ +.include + .PATH: ${.CURDIR}/../../contrib/csup PROG= csup @@ -33,4 +35,8 @@ DPADD= ${LIBCRYPTO} ${LIBZ} LDADD= -lcrypto -lz +.if ${MK_LIBC_THREADS} == "no" +LDADD+= -lpthread +.endif + .include From owner-p4-projects@FreeBSD.ORG Thu Aug 3 23:37:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7791516A4ED; Thu, 3 Aug 2006 23:37:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4034D16A4E8 for ; Thu, 3 Aug 2006 23:37:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C87E43DC1 for ; Thu, 3 Aug 2006 23:37:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73Nb1hX095367 for ; Thu, 3 Aug 2006 23:37:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73Nb0t5095364 for perforce@freebsd.org; Thu, 3 Aug 2006 23:37:00 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 23:37:00 GMT Message-Id: <200608032337.k73Nb0t5095364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 23:37:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=103147 Change 103147 by jb@jb_freebsd2 on 2006/08/03 23:36:11 IFC Affected files ... .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/logger/logger.1#4 integrate .. //depot/projects/dtrace/www/en/about.sgml#2 integrate Differences ... ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.95 2006/05/16 14:32:17 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.96 2006/08/03 22:44:46 sobomax Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -339,7 +339,7 @@ bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize); bcopy(&trapcode, (void *)EXC_ISI, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_EXI, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_ALI, (size_t)&trapsize); + bcopy(&alitrap, (void *)EXC_ALI, (size_t)&alisize); bcopy(&trapcode, (void *)EXC_PGM, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_FPU, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_DECR, (size_t)&trapsize); ==== //depot/projects/dtrace/src/usr.bin/logger/logger.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)logger.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.17 2006/08/02 13:21:44 bms Exp $ +.\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.18 2006/08/03 20:43:51 bms Exp $ .\" -.Dd June 6, 1993 +.Dd August 2, 2006 .Dt LOGGER 1 .Os .Sh NAME ==== //depot/projects/dtrace/www/en/about.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ + %navincludes; %includes; @@ -89,7 +89,7 @@ Foundation is a non-profit organization for which direct contributions are fully tax deductible. Please contact bod@FreeBSDFoundation.org + href="mailto:board@FreeBSDFoundation.org">board@FreeBSDFoundation.org for more information or write to: The FreeBSD Foundation, 7321 Brockway Dr., Boulder, CO 80303, USA.

From owner-p4-projects@FreeBSD.ORG Fri Aug 4 00:41:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CE3616A4E5; Fri, 4 Aug 2006 00:41:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5832516A4E0 for ; Fri, 4 Aug 2006 00:41:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24E0343D55 for ; Fri, 4 Aug 2006 00:41:23 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k740fMAR001013 for ; Fri, 4 Aug 2006 00:41:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k740fMU1001010 for perforce@freebsd.org; Fri, 4 Aug 2006 00:41:22 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 00:41:22 GMT Message-Id: <200608040041.k740fMU1001010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 00:41:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=103149 Change 103149 by jb@jb_freebsd2 on 2006/08/04 00:41:13 Add the library to the other libraries rather than clobbering them. Adding LIBPTHREAD as a library dependency is a bit silly because it's an absolute path and the thread library isn't necessarily libpthread. Affected files ... .. //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#4 (text+ko) ==== @@ -9,8 +9,7 @@ LDADD= -ledit -ltermcap .if ${MK_LIBC_THREADS} == "no" -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LDADD+= -lpthread .endif .include From owner-p4-projects@FreeBSD.ORG Fri Aug 4 01:28:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6401516A4E6; Fri, 4 Aug 2006 01:28:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 279B716A4E2 for ; Fri, 4 Aug 2006 01:28:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0C4A43D4C for ; Fri, 4 Aug 2006 01:28:23 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k741SNT8012475 for ; Fri, 4 Aug 2006 01:28:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k741SNaF012472 for perforce@freebsd.org; Fri, 4 Aug 2006 01:28:23 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 01:28:23 GMT Message-Id: <200608040128.k741SNaF012472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 01:28:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103151 Change 103151 by jb@jb_freebsd2 on 2006/08/04 01:28:16 Don't need to include opt_global.h because it's inclusion is forced via the compile arguments (-include). Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_kse.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_kse.c#4 (text+ko) ==== @@ -26,8 +26,6 @@ * DAMAGE. */ -#include "opt_global.h" - #include __FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.223 2006/02/22 18:57:49 jhb Exp $"); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 02:20:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC1D416A4E2; Fri, 4 Aug 2006 02:20:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FAD216A4E0; Fri, 4 Aug 2006 02:20:03 +0000 (UTC) (envelope-from kmacy@fsmware.com) Received: from demos.bsdclusters.com (demos.bsdclusters.com [69.55.225.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1BB743D49; Fri, 4 Aug 2006 02:20:02 +0000 (GMT) (envelope-from kmacy@fsmware.com) Received: from demos.bsdclusters.com (demos [69.55.225.36]) by demos.bsdclusters.com (8.12.8p1/8.12.8) with ESMTP id k742K2lZ054104; Thu, 3 Aug 2006 19:20:02 -0700 (PDT) (envelope-from kmacy@fsmware.com) Received: from localhost (kmacy@localhost) by demos.bsdclusters.com (8.12.8p1/8.12.8/Submit) with ESMTP id k742K2kp054101; Thu, 3 Aug 2006 19:20:02 -0700 (PDT) X-Authentication-Warning: demos.bsdclusters.com: kmacy owned process doing -bs Date: Thu, 3 Aug 2006 19:20:02 -0700 (PDT) From: Kip Macy X-X-Sender: kmacy@demos.bsdclusters.com To: John Birrell In-Reply-To: <200608032139.k73LdViR080818@repoman.freebsd.org> Message-ID: <20060803191858.C53360@demos.bsdclusters.com> References: <200608032139.k73LdViR080818@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Perforce Change Reviews Subject: Re: PERFORCE change 103141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 02:20:04 -0000 Hey - you were the one who said it wasn't ready! As you know, KSE needs to be optional at compile-time first. -Kip On Thu, 3 Aug 2006, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=103141 > > Change 103141 by jb@jb_freebsd2 on 2006/08/03 21:39:18 > > IFC. > > I bet the changes to em will cause grief on sun4v. > > Another reason why sun4v should be merged into -current. > > Affected files ... > > .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#19 integrate > .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#17 integrate > .. //depot/projects/dtrace/ports/UPDATING#9 integrate > .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#7 integrate > .. //depot/projects/dtrace/src/share/man/man7/hier.7#7 integrate > .. //depot/projects/dtrace/src/sys/dev/em/README#3 integrate > .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#8 integrate > .. //depot/projects/dtrace/src/sys/dev/em/if_em.h#4 integrate > .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.c#5 integrate > .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.h#3 integrate > .. //depot/projects/dtrace/src/sys/dev/em/if_em_osdep.h#4 integrate > .. //depot/projects/dtrace/src/sys/kern/subr_rman.c#6 integrate > .. //depot/projects/dtrace/src/sys/net/if_vlan.c#5 integrate > .. //depot/projects/dtrace/src/sys/netncp/ncp_sock.c#4 integrate > .. //depot/projects/dtrace/src/sys/netsmb/smb_trantcp.c#4 integrate > .. //depot/projects/dtrace/www/en/gnome/news.xml#6 integrate > .. //depot/projects/dtrace/www/en/news/press.xml#9 integrate > > Differences ... > > ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#19 (text+ko) ==== > > @@ -1,4 +1,4 @@ > - > + > > > @@ -7174,8 +7174,9 @@ > this entry (in quotes). You should generate a UUID > for each new VuXML entry (and do not forget to substitute > it for the template UUID unless you are writing the > - entry from scratch). You can use &man.uuidgen.1; in > - FreeBSD 5.x, or you may install the port + entry from scratch). You can use &man.uuidgen.1; to > + generate a VuXML UUID; alternatively, if you are using > + FreeBSD 4.x, you may install the port role="package">devel/p5-Data-UUID and issue > the following command: > > > ==== //depot/projects/dtrace/ports/UPDATING#9 (text+ko) ==== > > @@ -50,7 +50,7 @@ > now works. Please be aware of this when updating if you have it in your > config and are using GSSAPI when use_sasl is enabled. Using GSSAPI with a > misconfigured krb5_ccname combined with one of the 'hard' bind_policy > - options can effectivly lockout users. > + options can effectively lockout users. > > 20060728: > AFFECTS: users of polish/ekg and polish/ibgadu > @@ -3966,4 +3966,4 @@ > 2) Update all p5-* modules. > portupgrade -f p5-\* > > -$FreeBSD: ports/UPDATING,v 1.377 2006/08/03 00:38:32 mezz Exp $ > +$FreeBSD: ports/UPDATING,v 1.378 2006/08/03 18:45:53 blackend Exp $ > > ==== //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#7 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.318 2006/08/03 03:30:53 jb Exp $ > +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $ > # > # Please see the file src/etc/mtree/README before making changes to this file. > # > @@ -18,8 +18,8 @@ > aout > .. > .. > - dtrace > - .. > + dtrace > + .. > engines > .. > .. > > ==== //depot/projects/dtrace/src/share/man/man7/hier.7#7 (text+ko) ==== > > @@ -30,7 +30,7 @@ > .\" SUCH DAMAGE. > .\" > .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 > -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.119 2006/07/29 19:47:09 simon Exp $ > +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.120 2006/08/03 05:46:32 jb Exp $ > .\" > .Dd May 10, 2006 > .Dt HIER 7 > @@ -413,6 +413,8 @@ > .It Pa aout/ > a.out backward compatibility libraries > .El > +.It Pa dtrace/ > +DTrace library scripts > .It Pa engines/ > OpenSSL (Cryptography/SSL toolkit) dynamically loadable engines > .El > > ==== //depot/projects/dtrace/src/sys/dev/em/README#3 (text+ko) ==== > > @@ -1,8 +1,8 @@ > -$FreeBSD: src/sys/dev/em/README,v 1.12 2006/04/06 17:09:02 glebius Exp $ > +$FreeBSD: src/sys/dev/em/README,v 1.13 2006/08/03 09:20:11 glebius Exp $ > FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters > ============================================================ > > -January 4, 2006 > +May 2, 2006 > > > Contents > @@ -22,8 +22,7 @@ > ======== > > This file describes the FreeBSD* driver for the Intel(R) PRO/1000 Family of > -Adapters. This driver has been developed for use with FreeBSD, Release 4.11 > -and greater and Release 5.4. > +Adapters. This driver has been developed for use with FreeBSD, Release 6.x. > > For questions related to hardware requirements, refer to the documentation > supplied with your Intel PRO/1000 adapter. All hardware requirements listed > @@ -45,8 +44,9 @@ > > > NOTE: Mobile adapters are not fully supported. > +NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 > +support. > > - > Building and Installation > ========================= > > @@ -92,14 +92,14 @@ > > cp Makefile.kernel /usr/src/sys/modules/em/Makefile > > - Edit the /usr/src/sys/conf/files.i386 file, and add the following lines only if > + Edit the /usr/src/sys/conf/files file, and add the following lines only if > they don't already exist: > > dev/em/if_em.c optional em > > dev/em/if_em_hw.c optional em > > - Remove the following lines from the /usr/src/sys/conf/files.i386 file, > + Remove the following lines from the /usr/src/sys/conf/files file, > if they exist: > > dev/em/if_em_fxhw.c optional em > @@ -230,6 +230,13 @@ > - Using Jumbo Frames at 10 or 100 Mbps may result in poor performance or > loss of link. > > + - The following adapters do not support Jumbo Frames: > + Intel(R) 82562V 10/100 Network Connection > + Intel(R) 82566DM Gigabit Network Connection > + Intel(R) 82566DC Gigabit Network Connection > + Intel(R) 82566MM Gigabit Network Connection > + Intel(R) 82566MC Gigabit Network Connection > + > > VLANs > ----- > > ==== //depot/projects/dtrace/src/sys/dev/em/if_em.c#8 (text+ko) ==== > > @@ -1,6 +1,6 @@ > /************************************************************************** > > -Copyright (c) 2001-2005, Intel Corporation > +Copyright (c) 2001-2006, Intel Corporation > All rights reserved. > > Redistribution and use in source and binary forms, with or without > @@ -31,7 +31,7 @@ > > ***************************************************************************/ > > -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.119 2006/07/20 04:18:45 yongari Exp $*/ > +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.124 2006/08/03 19:05:04 pdeuskar Exp $*/ > > #ifdef HAVE_KERNEL_OPTION_HEADERS > #include "opt_device_polling.h" > @@ -86,7 +86,7 @@ > * Driver version > *********************************************************************/ > > -char em_driver_version[] = "Version - 5.1.5"; > +char em_driver_version[] = "Version - 6.0.5"; > > > /********************************************************************* > @@ -159,10 +159,17 @@ > { 0x8086, E1000_DEV_ID_82573E, PCI_ANY_ID, PCI_ANY_ID, 0}, > { 0x8086, E1000_DEV_ID_82573E_IAMT, PCI_ANY_ID, PCI_ANY_ID, 0}, > { 0x8086, E1000_DEV_ID_82573L, PCI_ANY_ID, PCI_ANY_ID, 0}, > + { 0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_SPT, > + PCI_ANY_ID, PCI_ANY_ID, 0}, > + { 0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_SPT, > + PCI_ANY_ID, PCI_ANY_ID, 0}, > { 0x8086, E1000_DEV_ID_80003ES2LAN_COPPER_DPT, > PCI_ANY_ID, PCI_ANY_ID, 0}, > { 0x8086, E1000_DEV_ID_80003ES2LAN_SERDES_DPT, > PCI_ANY_ID, PCI_ANY_ID, 0}, > + { 0x8086, E1000_DEV_ID_ICH8_IGP_AMT, PCI_ANY_ID, PCI_ANY_ID, 0}, > + { 0x8086, E1000_DEV_ID_ICH8_IGP_C, PCI_ANY_ID, PCI_ANY_ID, 0}, > + { 0x8086, E1000_DEV_ID_ICH8_IFE, PCI_ANY_ID, PCI_ANY_ID, 0}, > > /* required last entry */ > { 0, 0, 0, 0, 0} > @@ -190,64 +197,64 @@ > static int em_ioctl(struct ifnet *, u_long, caddr_t); > static void em_watchdog(struct ifnet *); > static void em_init(void *); > -static void em_init_locked(struct em_softc *); > +static void em_init_locked(struct adapter *); > static void em_stop(void *); > static void em_media_status(struct ifnet *, struct ifmediareq *); > static int em_media_change(struct ifnet *); > -static void em_identify_hardware(struct em_softc *); > -static int em_allocate_pci_resources(struct em_softc *); > -static int em_allocate_intr(struct em_softc *); > -static void em_free_intr(struct em_softc *); > -static void em_free_pci_resources(struct em_softc *); > +static void em_identify_hardware(struct adapter *); > +static int em_allocate_pci_resources(struct adapter *); > +static int em_allocate_intr(struct adapter *); > +static void em_free_intr(struct adapter *); > +static void em_free_pci_resources(struct adapter *); > static void em_local_timer(void *); > -static int em_hardware_init(struct em_softc *); > -static void em_setup_interface(device_t, struct em_softc *); > -static int em_setup_transmit_structures(struct em_softc *); > -static void em_initialize_transmit_unit(struct em_softc *); > -static int em_setup_receive_structures(struct em_softc *); > -static void em_initialize_receive_unit(struct em_softc *); > -static void em_enable_intr(struct em_softc *); > -static void em_disable_intr(struct em_softc *); > -static void em_free_transmit_structures(struct em_softc *); > -static void em_free_receive_structures(struct em_softc *); > -static void em_update_stats_counters(struct em_softc *); > -static void em_txeof(struct em_softc *); > -static int em_allocate_receive_structures(struct em_softc *); > -static int em_allocate_transmit_structures(struct em_softc *); > -static int em_rxeof(struct em_softc *, int); > +static int em_hardware_init(struct adapter *); > +static void em_setup_interface(device_t, struct adapter *); > +static int em_setup_transmit_structures(struct adapter *); > +static void em_initialize_transmit_unit(struct adapter *); > +static int em_setup_receive_structures(struct adapter *); > +static void em_initialize_receive_unit(struct adapter *); > +static void em_enable_intr(struct adapter *); > +static void em_disable_intr(struct adapter *); > +static void em_free_transmit_structures(struct adapter *); > +static void em_free_receive_structures(struct adapter *); > +static void em_update_stats_counters(struct adapter *); > +static void em_txeof(struct adapter *); > +static int em_allocate_receive_structures(struct adapter *); > +static int em_allocate_transmit_structures(struct adapter *); > +static int em_rxeof(struct adapter *, int); > #ifndef __NO_STRICT_ALIGNMENT > -static int em_fixup_rx(struct em_softc *); > +static int em_fixup_rx(struct adapter *); > #endif > -static void em_receive_checksum(struct em_softc *, struct em_rx_desc *, > +static void em_receive_checksum(struct adapter *, struct em_rx_desc *, > struct mbuf *); > -static void em_transmit_checksum_setup(struct em_softc *, struct mbuf *, > +static void em_transmit_checksum_setup(struct adapter *, struct mbuf *, > uint32_t *, uint32_t *); > -static void em_set_promisc(struct em_softc *); > -static void em_disable_promisc(struct em_softc *); > -static void em_set_multi(struct em_softc *); > -static void em_print_hw_stats(struct em_softc *); > -static void em_update_link_status(struct em_softc *); > -static int em_get_buf(int i, struct em_softc *, struct mbuf *); > -static void em_enable_vlans(struct em_softc *); > -static void em_disable_vlans(struct em_softc *); > -static int em_encap(struct em_softc *, struct mbuf **); > -static void em_smartspeed(struct em_softc *); > -static int em_82547_fifo_workaround(struct em_softc *, int); > -static void em_82547_update_fifo_head(struct em_softc *, int); > -static int em_82547_tx_fifo_reset(struct em_softc *); > +static void em_set_promisc(struct adapter *); > +static void em_disable_promisc(struct adapter *); > +static void em_set_multi(struct adapter *); > +static void em_print_hw_stats(struct adapter *); > +static void em_update_link_status(struct adapter *); > +static int em_get_buf(int i, struct adapter *, struct mbuf *); > +static void em_enable_vlans(struct adapter *); > +static void em_disable_vlans(struct adapter *); > +static int em_encap(struct adapter *, struct mbuf **); > +static void em_smartspeed(struct adapter *); > +static int em_82547_fifo_workaround(struct adapter *, int); > +static void em_82547_update_fifo_head(struct adapter *, int); > +static int em_82547_tx_fifo_reset(struct adapter *); > static void em_82547_move_tail(void *arg); > -static void em_82547_move_tail_locked(struct em_softc *); > -static int em_dma_malloc(struct em_softc *, bus_size_t, > +static void em_82547_move_tail_locked(struct adapter *); > +static int em_dma_malloc(struct adapter *, bus_size_t, > struct em_dma_alloc *, int); > -static void em_dma_free(struct em_softc *, struct em_dma_alloc *); > -static void em_print_debug_info(struct em_softc *); > +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(uint8_t *); > static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); > static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); > static uint32_t em_fill_descriptors (bus_addr_t address, uint32_t length, > PDESC_ARRAY desc_array); > static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); > -static void em_add_int_delay_sysctl(struct em_softc *, const char *, > +static void em_add_int_delay_sysctl(struct adapter *, const char *, > const char *, struct em_int_delay_info *, int, int); > > /* > @@ -259,7 +266,7 @@ > static void em_intr(void *); > #else > static void em_intr_fast(void *); > -static void em_add_int_process_limit(struct em_softc *, const char *, > +static void em_add_int_process_limit(struct adapter *, const char *, > const char *, int *, int); > static void em_handle_rxtx(void *context, int pending); > static void em_handle_link(void *context, int pending); > @@ -281,7 +288,7 @@ > }; > > static driver_t em_driver = { > - "em", em_methods, sizeof(struct em_softc), > + "em", em_methods, sizeof(struct adapter), > }; > > static devclass_t em_devclass; > @@ -302,6 +309,7 @@ > static int em_rx_abs_int_delay_dflt = E1000_TICKS_TO_USECS(EM_RADV); > static int em_rxd = EM_DEFAULT_RXD; > static int em_txd = EM_DEFAULT_TXD; > +static int em_smart_pwr_down = FALSE; > > TUNABLE_INT("hw.em.tx_int_delay", &em_tx_int_delay_dflt); > TUNABLE_INT("hw.em.rx_int_delay", &em_rx_int_delay_dflt); > @@ -309,6 +317,7 @@ > TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt); > TUNABLE_INT("hw.em.rxd", &em_rxd); > TUNABLE_INT("hw.em.txd", &em_txd); > +TUNABLE_INT("hw.em.smart_pwr_down", &em_smart_pwr_down); > #ifndef DEVICE_POLLING > static int em_rx_process_limit = 100; > TUNABLE_INT("hw.em.rx_process_limit", &em_rx_process_limit); > @@ -378,199 +387,199 @@ > static int > em_attach(device_t dev) > { > - struct em_softc *sc; > + struct adapter *adapter; > int tsize, rsize; > int error = 0; > > INIT_DEBUGOUT("em_attach: begin"); > > - sc = device_get_softc(dev); > - sc->dev = sc->osdep.dev = dev; > - EM_LOCK_INIT(sc, device_get_nameunit(dev)); > + adapter = device_get_softc(dev); > + adapter->dev = adapter->osdep.dev = dev; > + EM_LOCK_INIT(adapter, device_get_nameunit(dev)); > > /* SYSCTL stuff */ > SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), > SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), > - OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, sc, 0, > + OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, > em_sysctl_debug_info, "I", "Debug Information"); > > SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), > SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), > - OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, sc, 0, > + OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, > em_sysctl_stats, "I", "Statistics"); > > - callout_init(&sc->timer, CALLOUT_MPSAFE); > - callout_init(&sc->tx_fifo_timer, CALLOUT_MPSAFE); > + callout_init(&adapter->timer, CALLOUT_MPSAFE); > + callout_init(&adapter->tx_fifo_timer, CALLOUT_MPSAFE); > > /* Determine hardware revision */ > - em_identify_hardware(sc); > + em_identify_hardware(adapter); > > /* Set up some sysctls for the tunable interrupt delays */ > - em_add_int_delay_sysctl(sc, "rx_int_delay", > - "receive interrupt delay in usecs", &sc->rx_int_delay, > - E1000_REG_OFFSET(&sc->hw, RDTR), em_rx_int_delay_dflt); > - em_add_int_delay_sysctl(sc, "tx_int_delay", > - "transmit interrupt delay in usecs", &sc->tx_int_delay, > - E1000_REG_OFFSET(&sc->hw, TIDV), em_tx_int_delay_dflt); > - if (sc->hw.mac_type >= em_82540) { > - em_add_int_delay_sysctl(sc, "rx_abs_int_delay", > + em_add_int_delay_sysctl(adapter, "rx_int_delay", > + "receive interrupt delay in usecs", &adapter->rx_int_delay, > + E1000_REG_OFFSET(&adapter->hw, RDTR), em_rx_int_delay_dflt); > + em_add_int_delay_sysctl(adapter, "tx_int_delay", > + "transmit interrupt delay in usecs", &adapter->tx_int_delay, > + E1000_REG_OFFSET(&adapter->hw, TIDV), em_tx_int_delay_dflt); > + if (adapter->hw.mac_type >= em_82540) { > + em_add_int_delay_sysctl(adapter, "rx_abs_int_delay", > "receive interrupt delay limit in usecs", > - &sc->rx_abs_int_delay, > - E1000_REG_OFFSET(&sc->hw, RADV), > + &adapter->rx_abs_int_delay, > + E1000_REG_OFFSET(&adapter->hw, RADV), > em_rx_abs_int_delay_dflt); > - em_add_int_delay_sysctl(sc, "tx_abs_int_delay", > + em_add_int_delay_sysctl(adapter, "tx_abs_int_delay", > "transmit interrupt delay limit in usecs", > - &sc->tx_abs_int_delay, > - E1000_REG_OFFSET(&sc->hw, TADV), > + &adapter->tx_abs_int_delay, > + E1000_REG_OFFSET(&adapter->hw, TADV), > em_tx_abs_int_delay_dflt); > } > > #ifndef DEVICE_POLLING > /* Sysctls for limiting the amount of work done in the taskqueue */ > - em_add_int_process_limit(sc, "rx_processing_limit", > - "max number of rx packets to process", &sc->rx_process_limit, > + em_add_int_process_limit(adapter, "rx_processing_limit", > + "max number of rx packets to process", &adapter->rx_process_limit, > em_rx_process_limit); > #endif > > /* > * Validate number of transmit and receive descriptors. It > * must not exceed hardware maximum, and must be multiple > - * of E1000_DBA_ALIGN. > + * of EM_DBA_ALIGN. > */ > - if (((em_txd * sizeof(struct em_tx_desc)) % E1000_DBA_ALIGN) != 0 || > - (sc->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || > - (sc->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || > + if (((em_txd * sizeof(struct em_tx_desc)) % EM_DBA_ALIGN) != 0 || > + (adapter->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || > + (adapter->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || > (em_txd < EM_MIN_TXD)) { > device_printf(dev, "Using %d TX descriptors instead of %d!\n", > EM_DEFAULT_TXD, em_txd); > - sc->num_tx_desc = EM_DEFAULT_TXD; > + adapter->num_tx_desc = EM_DEFAULT_TXD; > } else > - sc->num_tx_desc = em_txd; > - if (((em_rxd * sizeof(struct em_rx_desc)) % E1000_DBA_ALIGN) != 0 || > - (sc->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || > - (sc->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || > + adapter->num_tx_desc = em_txd; > + if (((em_rxd * sizeof(struct em_rx_desc)) % EM_DBA_ALIGN) != 0 || > + (adapter->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || > + (adapter->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || > (em_rxd < EM_MIN_RXD)) { > device_printf(dev, "Using %d RX descriptors instead of %d!\n", > EM_DEFAULT_RXD, em_rxd); > - sc->num_rx_desc = EM_DEFAULT_RXD; > + adapter->num_rx_desc = EM_DEFAULT_RXD; > } else > - sc->num_rx_desc = em_rxd; > + adapter->num_rx_desc = em_rxd; > > - sc->hw.autoneg = DO_AUTO_NEG; > - sc->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; > - sc->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; > - sc->hw.tbi_compatibility_en = TRUE; > - sc->rx_buffer_len = EM_RXBUFFER_2048; > + adapter->hw.autoneg = DO_AUTO_NEG; > + adapter->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; > + adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; > + adapter->hw.tbi_compatibility_en = TRUE; > + adapter->rx_buffer_len = EM_RXBUFFER_2048; > > - sc->hw.phy_init_script = 1; > - sc->hw.phy_reset_disable = FALSE; > + adapter->hw.phy_init_script = 1; > + adapter->hw.phy_reset_disable = FALSE; > > #ifndef EM_MASTER_SLAVE > - sc->hw.master_slave = em_ms_hw_default; > + adapter->hw.master_slave = em_ms_hw_default; > #else > - sc->hw.master_slave = EM_MASTER_SLAVE; > + adapter->hw.master_slave = EM_MASTER_SLAVE; > #endif > /* > * Set the max frame size assuming standard ethernet > * sized frames. > */ > - sc->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; > + adapter->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; > > - sc->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; > + adapter->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; > > /* > * This controls when hardware reports transmit completion > * status. > */ > - sc->hw.report_tx_early = 1; > - if (em_allocate_pci_resources(sc)) { > + adapter->hw.report_tx_early = 1; > + if (em_allocate_pci_resources(adapter)) { > device_printf(dev, "Allocation of PCI resources failed\n"); > error = ENXIO; > goto err_pci; > } > > /* Initialize eeprom parameters */ > - em_init_eeprom_params(&sc->hw); > + em_init_eeprom_params(&adapter->hw); > > - tsize = roundup2(sc->num_tx_desc * sizeof(struct em_tx_desc), > - E1000_DBA_ALIGN); > + tsize = roundup2(adapter->num_tx_desc * sizeof(struct em_tx_desc), > + EM_DBA_ALIGN); > > /* Allocate Transmit Descriptor ring */ > - if (em_dma_malloc(sc, tsize, &sc->txdma, BUS_DMA_NOWAIT)) { > + if (em_dma_malloc(adapter, tsize, &adapter->txdma, BUS_DMA_NOWAIT)) { > device_printf(dev, "Unable to allocate tx_desc memory\n"); > error = ENOMEM; > goto err_tx_desc; > } > - sc->tx_desc_base = (struct em_tx_desc *)sc->txdma.dma_vaddr; > + adapter->tx_desc_base = (struct em_tx_desc *)adapter->txdma.dma_vaddr; > > - rsize = roundup2(sc->num_rx_desc * sizeof(struct em_rx_desc), > - E1000_DBA_ALIGN); > + rsize = roundup2(adapter->num_rx_desc * sizeof(struct em_rx_desc), > + EM_DBA_ALIGN); > > /* Allocate Receive Descriptor ring */ > - if (em_dma_malloc(sc, rsize, &sc->rxdma, BUS_DMA_NOWAIT)) { > + if (em_dma_malloc(adapter, rsize, &adapter->rxdma, BUS_DMA_NOWAIT)) { > device_printf(dev, "Unable to allocate rx_desc memory\n"); > error = ENOMEM; > goto err_rx_desc; > } > - sc->rx_desc_base = (struct em_rx_desc *)sc->rxdma.dma_vaddr; > + adapter->rx_desc_base = (struct em_rx_desc *)adapter->rxdma.dma_vaddr; > > /* Initialize the hardware */ > - if (em_hardware_init(sc)) { > + if (em_hardware_init(adapter)) { > device_printf(dev, "Unable to initialize the hardware\n"); > error = EIO; > goto err_hw_init; > } > > /* Copy the permanent MAC address out of the EEPROM */ > - if (em_read_mac_addr(&sc->hw) < 0) { > + if (em_read_mac_addr(&adapter->hw) < 0) { > device_printf(dev, "EEPROM read error while reading MAC" > " address\n"); > error = EIO; > goto err_hw_init; > } > > - if (!em_is_valid_ether_addr(sc->hw.mac_addr)) { > + if (!em_is_valid_ether_addr(adapter->hw.mac_addr)) { > device_printf(dev, "Invalid MAC address\n"); > error = EIO; > goto err_hw_init; > } > > /* Setup OS specific network interface */ > - em_setup_interface(dev, sc); > + em_setup_interface(dev, adapter); > > - em_allocate_intr(sc); > + em_allocate_intr(adapter); > > /* Initialize statistics */ > - em_clear_hw_cntrs(&sc->hw); > - em_update_stats_counters(sc); > - sc->hw.get_link_status = 1; > - em_update_link_status(sc); > + em_clear_hw_cntrs(&adapter->hw); > + em_update_stats_counters(adapter); > + adapter->hw.get_link_status = 1; > + em_update_link_status(adapter); > > /* Indicate SOL/IDER usage */ > - if (em_check_phy_reset_block(&sc->hw)) > + if (em_check_phy_reset_block(&adapter->hw)) > device_printf(dev, > "PHY reset is blocked due to SOL/IDER session.\n"); > > /* Identify 82544 on PCIX */ > - em_get_bus_info(&sc->hw); > - if(sc->hw.bus_type == em_bus_type_pcix && sc->hw.mac_type == em_82544) > - sc->pcix_82544 = TRUE; > + em_get_bus_info(&adapter->hw); > + if(adapter->hw.bus_type == em_bus_type_pcix && adapter->hw.mac_type == em_82544) > + adapter->pcix_82544 = TRUE; > else > - sc->pcix_82544 = FALSE; > + adapter->pcix_82544 = FALSE; > > INIT_DEBUGOUT("em_attach: end"); > > return (0); > > err_hw_init: > - em_dma_free(sc, &sc->rxdma); > + em_dma_free(adapter, &adapter->rxdma); > err_rx_desc: > - em_dma_free(sc, &sc->txdma); > + em_dma_free(adapter, &adapter->txdma); > err_tx_desc: > err_pci: > - em_free_intr(sc); > - em_free_pci_resources(sc); > - EM_LOCK_DESTROY(sc); > + em_free_intr(adapter); > + em_free_pci_resources(adapter); > + EM_LOCK_DESTROY(adapter); > > return (error); > } > @@ -588,8 +597,8 @@ > static int > em_detach(device_t dev) > { > - struct em_softc *sc = device_get_softc(dev); > - struct ifnet *ifp = sc->ifp; > + struct adapter *adapter = device_get_softc(dev); > + struct ifnet *ifp = adapter->ifp; > > INIT_DEBUGOUT("em_detach: begin"); > > @@ -598,31 +607,31 @@ > ether_poll_deregister(ifp); > #endif > > - em_free_intr(sc); > - EM_LOCK(sc); > - sc->in_detach = 1; > - em_stop(sc); > - em_phy_hw_reset(&sc->hw); > - EM_UNLOCK(sc); > - ether_ifdetach(sc->ifp); > + em_free_intr(adapter); > + EM_LOCK(adapter); > + adapter->in_detach = 1; > + em_stop(adapter); > + em_phy_hw_reset(&adapter->hw); > + EM_UNLOCK(adapter); > + ether_ifdetach(adapter->ifp); > > - em_free_pci_resources(sc); > + em_free_pci_resources(adapter); > bus_generic_detach(dev); > if_free(ifp); > > /* Free Transmit Descriptor ring */ > - if (sc->tx_desc_base) { > - em_dma_free(sc, &sc->txdma); > - sc->tx_desc_base = NULL; > + if (adapter->tx_desc_base) { > + em_dma_free(adapter, &adapter->txdma); > + adapter->tx_desc_base = NULL; > } > > /* Free Receive Descriptor ring */ > - if (sc->rx_desc_base) { > - em_dma_free(sc, &sc->rxdma); > - sc->rx_desc_base = NULL; > + if (adapter->rx_desc_base) { > + em_dma_free(adapter, &adapter->rxdma); > + adapter->rx_desc_base = NULL; > } > > - EM_LOCK_DESTROY(sc); > + EM_LOCK_DESTROY(adapter); > > return (0); > } > @@ -636,10 +645,10 @@ > static int > em_shutdown(device_t dev) > { > - struct em_softc *sc = device_get_softc(dev); > - EM_LOCK(sc); > - em_stop(sc); > - EM_UNLOCK(sc); > + struct adapter *adapter = device_get_softc(dev); > + EM_LOCK(adapter); > + em_stop(adapter); > + EM_UNLOCK(adapter); > return (0); > } > > @@ -649,11 +658,11 @@ > static int > em_suspend(device_t dev) > { > - struct em_softc *sc = device_get_softc(dev); > + struct adapter *adapter = device_get_softc(dev); > > - EM_LOCK(sc); > - em_stop(sc); > - EM_UNLOCK(sc); > + EM_LOCK(adapter); > + em_stop(adapter); > + EM_UNLOCK(adapter); > > return bus_generic_suspend(dev); > } > @@ -661,15 +670,15 @@ > static int > em_resume(device_t dev) > { > - struct em_softc *sc = device_get_softc(dev); > - struct ifnet *ifp = sc->ifp; > + struct adapter *adapter = device_get_softc(dev); > + struct ifnet *ifp = adapter->ifp; > > - EM_LOCK(sc); > - em_init_locked(sc); > + EM_LOCK(adapter); > + em_init_locked(adapter); > if ((ifp->if_flags & IFF_UP) && > (ifp->if_drv_flags & IFF_DRV_RUNNING)) > em_start_locked(ifp); > - EM_UNLOCK(sc); > + EM_UNLOCK(adapter); > > return bus_generic_resume(dev); > } > @@ -688,15 +697,15 @@ > static void > em_start_locked(struct ifnet *ifp) > { > - struct em_softc *sc = ifp->if_softc; > + struct adapter *adapter = ifp->if_softc; > struct mbuf *m_head; > > - EM_LOCK_ASSERT(sc); > + EM_LOCK_ASSERT(adapter); > > if ((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != > IFF_DRV_RUNNING) > return; > - if (!sc->link_active) > + if (!adapter->link_active) > return; > > while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { > @@ -708,7 +717,7 @@ > * em_encap() can modify our pointer, and or make it NULL on > * failure. In that event, we can't requeue. > */ > - if (em_encap(sc, &m_head)) { > + if (em_encap(adapter, &m_head)) { > if (m_head == NULL) > break; > ifp->if_drv_flags |= IFF_DRV_OACTIVE; > @@ -727,12 +736,12 @@ > static void > em_start(struct ifnet *ifp) > { > - struct em_softc *sc = ifp->if_softc; > + struct adapter *adapter = ifp->if_softc; > > - EM_LOCK(sc); > + EM_LOCK(adapter); > if (ifp->if_drv_flags & IFF_DRV_RUNNING) > em_start_locked(ifp); > - EM_UNLOCK(sc); > + EM_UNLOCK(adapter); > } > > /********************************************************************* > @@ -747,12 +756,12 @@ > static int > em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) > { > - struct em_softc *sc = ifp->if_softc; > + struct adapter *adapter = ifp->if_softc; > struct ifreq *ifr = (struct ifreq *)data; > struct ifaddr *ifa = (struct ifaddr *)data; > int error = 0; > > - if (sc->in_detach) > + if (adapter->in_detach) > return (error); > > switch (command) { > @@ -768,9 +777,9 @@ > */ > ifp->if_flags |= IFF_UP; > if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { > - EM_LOCK(sc); > - em_init_locked(sc); > - EM_UNLOCK(sc); > + EM_LOCK(adapter); > + em_init_locked(adapter); > + EM_UNLOCK(adapter); > } > arp_ifinit(ifp, ifa); > } else > @@ -783,14 +792,14 @@ > > IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFMTU (Set Interface MTU)"); > > - EM_LOCK(sc); > - switch (sc->hw.mac_type) { > + EM_LOCK(adapter); > + switch (adapter->hw.mac_type) { > case em_82573: > /* > * 82573 only supports jumbo frames > * if ASPM is disabled. > */ > - em_read_eeprom(&sc->hw, EEPROM_INIT_3GIO_3, 1, > + em_read_eeprom(&adapter->hw, EEPROM_INIT_3GIO_3, 1, > &eeprom_data); > if (eeprom_data & EEPROM_WORD1A_ASPM_MASK) { > max_frame_size = ETHER_MAX_LEN; > @@ -802,64 +811,68 @@ > case em_80003es2lan: /* Limit Jumbo Frame size */ > max_frame_size = 9234; > break; > + case em_ich8lan: > + /* ICH8 does not support jumbo frames */ > + max_frame_size = ETHER_MAX_LEN; > + break; > default: > max_frame_size = MAX_JUMBO_FRAME_SIZE; > } > if (ifr->ifr_mtu > max_frame_size - ETHER_HDR_LEN - > ETHER_CRC_LEN) { > - EM_UNLOCK(sc); > + EM_UNLOCK(adapter); > error = EINVAL; > break; > } > > ifp->if_mtu = ifr->ifr_mtu; > - sc->hw.max_frame_size = > + adapter->hw.max_frame_size = > ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; > - em_init_locked(sc); > - EM_UNLOCK(sc); > + em_init_locked(adapter); > + EM_UNLOCK(adapter); > break; > } > case SIOCSIFFLAGS: > IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); > - EM_LOCK(sc); > + EM_LOCK(adapter); > if (ifp->if_flags & IFF_UP) { > if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) { > - if ((ifp->if_flags ^ sc->if_flags) & > + if ((ifp->if_flags ^ adapter->if_flags) & > IFF_PROMISC) { > - em_disable_promisc(sc); > - em_set_promisc(sc); > + em_disable_promisc(adapter); > + em_set_promisc(adapter); > } > } else > - em_init_locked(sc); > + em_init_locked(adapter); > } else { > if (ifp->if_drv_flags & IFF_DRV_RUNNING) { > - em_stop(sc); > + em_stop(adapter); > } > } > - sc->if_flags = ifp->if_flags; > - EM_UNLOCK(sc); > + adapter->if_flags = ifp->if_flags; > + EM_UNLOCK(adapter); > break; > case SIOCADDMULTI: > case SIOCDELMULTI: > IOCTL_DEBUGOUT("ioctl rcv'd: SIOC(ADD|DEL)MULTI"); > if (ifp->if_drv_flags & IFF_DRV_RUNNING) { > - EM_LOCK(sc); > - em_disable_intr(sc); > - em_set_multi(sc); > - if (sc->hw.mac_type == em_82542_rev2_0) { > - em_initialize_receive_unit(sc); > + EM_LOCK(adapter); > + em_disable_intr(adapter); > + em_set_multi(adapter); > + if (adapter->hw.mac_type == em_82542_rev2_0) { > + em_initialize_receive_unit(adapter); > } > #ifdef DEVICE_POLLING > if (!(ifp->if_capenable & IFCAP_POLLING)) > #endif > - em_enable_intr(sc); > - EM_UNLOCK(sc); > + em_enable_intr(adapter); > + EM_UNLOCK(adapter); > } > break; > case SIOCSIFMEDIA: > case SIOCGIFMEDIA: > IOCTL_DEBUGOUT("ioctl rcv'd: SIOCxIFMEDIA (Get/Set Interface Media)"); > - error = ifmedia_ioctl(ifp, ifr, &sc->media, command); > + error = ifmedia_ioctl(ifp, ifr, &adapter->media, command); > break; > case SIOCSIFCAP: > { > @@ -874,17 +887,17 @@ > error = ether_poll_register(em_poll, ifp); > if (error) > return (error); > - EM_LOCK(sc); > - em_disable_intr(sc); > + EM_LOCK(adapter); > + em_disable_intr(adapter); > ifp->if_capenable |= IFCAP_POLLING; > - EM_UNLOCK(sc); > + EM_UNLOCK(adapter); > } else { > error = ether_poll_deregister(ifp); > /* Enable interrupt even in error case */ > - EM_LOCK(sc); > - em_enable_intr(sc); > + EM_LOCK(adapter); > + em_enable_intr(adapter); > ifp->if_capenable &= ~IFCAP_POLLING; > - EM_UNLOCK(sc); > + EM_UNLOCK(adapter); > } > } > #endif > @@ -897,7 +910,7 @@ > reinit = 1; > } > if (reinit && (ifp->if_drv_flags & IFF_DRV_RUNNING)) > - em_init(sc); > + em_init(adapter); > VLAN_CAPABILITIES(ifp); > break; > } > @@ -919,26 +932,26 @@ > static void > em_watchdog(struct ifnet *ifp) > { > - struct em_softc *sc = ifp->if_softc; > + struct adapter *adapter = ifp->if_softc; > > - EM_LOCK(sc); > + EM_LOCK(adapter); > /* If we are in this routine because of pause frames, then > * don't reset the hardware. > */ > - if (E1000_READ_REG(&sc->hw, STATUS) & E1000_STATUS_TXOFF) { > + if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF) { > ifp->if_timer = EM_TX_TIMEOUT; > > >>> TRUNCATED FOR MAIL (1000 lines) <<< > From owner-p4-projects@FreeBSD.ORG Fri Aug 4 02:56:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD0916A4DF; Fri, 4 Aug 2006 02:56:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E91D116A4DD; Fri, 4 Aug 2006 02:56:28 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id A433043D46; Fri, 4 Aug 2006 02:56:28 +0000 (GMT) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id E7F6978C1F; Fri, 4 Aug 2006 02:56:25 +0000 (GMT) Date: Fri, 4 Aug 2006 02:56:25 +0000 From: John Birrell To: Kip Macy Message-ID: <20060804025625.GA63836@what-creek.com> References: <200608032139.k73LdViR080818@repoman.freebsd.org> <20060803191858.C53360@demos.bsdclusters.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060803191858.C53360@demos.bsdclusters.com> User-Agent: Mutt/1.4.2.1i Cc: John Birrell , Perforce Change Reviews Subject: Re: PERFORCE change 103141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 02:56:29 -0000 On Thu, Aug 03, 2006 at 07:20:02PM -0700, Kip Macy wrote: > Hey - you were the one who said it wasn't ready! Yeah. So sue me! There have been too many rug-changing-under-foot things lately. > As you know, KSE needs to be optional at compile-time first. Work-in-progress! I've added the kse syscalls back into the dtrace tree and also kern_kse.c with a kernel option 'KSE' that will stub out the kse syscalls if KSE isn't defined. I need to go though the rest of the kernel sources and #ifdef KSE to get kse support back in and bike_sched otherwise. -- John Birrell From owner-p4-projects@FreeBSD.ORG Fri Aug 4 11:59:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B9A16A4E0; Fri, 4 Aug 2006 11:59:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6C6F16A4DE for ; Fri, 4 Aug 2006 11:59:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C51443D5A for ; Fri, 4 Aug 2006 11:59:00 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74Bx0K7072497 for ; Fri, 4 Aug 2006 11:59:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74BwxRD072494 for perforce@freebsd.org; Fri, 4 Aug 2006 11:58:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 4 Aug 2006 11:58:59 GMT Message-Id: <200608041158.k74BwxRD072494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 11:59:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=103161 Change 103161 by hselasky@hselasky_mini_itx on 2006/08/04 11:58:01 Improve the config thread layer by not allowing "kthread_exit()" calls from subroutines. When the thread is being torn down, sleep calls and USB request calls should just return immediately and perform no operation. To check if the config thread is gone, there is a new function, usbd_config_td_is_gone(). Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#8 (text+ko) ==== @@ -627,19 +627,24 @@ ural_cfg_do_request(struct ural_softc *sc, usb_device_request_t *req, void *data) { + u_int16_t length; usbd_status err; + if (usbd_config_td_is_gone(&(sc->sc_config_td))) { + goto error; + } + err = usbd_do_request_flags_mtx(sc->sc_udev, &(sc->sc_mtx), req, data, 0, NULL, 1000); - usbd_config_td_check_gone(&(sc->sc_config_td)); - if (err) { - u_int16_t length = UGETW(req->wLength); printf("%s: device request failed, err=%s " "(ignored)\n", sc->sc_name, usbd_errstr(err)); + error: + length = UGETW(req->wLength); + if ((req->bmRequestType & UT_READ) && length) { bzero(data, length); } @@ -1962,10 +1967,12 @@ while (sc->sc_flags & (URAL_FLAG_SEND_BYTE_FRAME| URAL_FLAG_SEND_BCN_FRAME)) { + if (usbd_config_td_is_gone(&(sc->sc_config_td))) { + break; + } + error = msleep(&(sc->sc_wakeup_bcn), &(sc->sc_mtx), 0, "ural beacon sleep", 0); - - usbd_config_td_check_gone(&(sc->sc_config_td)); } } return; @@ -2471,7 +2478,9 @@ if (ural_cfg_bbp_read(sc, RAL_BBP_VERSION) != 0) { break; } - usbd_config_td_sleep(&(sc->sc_config_td), hz/100); + if (usbd_config_td_sleep(&(sc->sc_config_td), hz/100)) { + break; + } } else { printf("%s: timeout waiting for BBP\n", sc->sc_name); @@ -2556,7 +2565,9 @@ (RAL_BBP_AWAKE | RAL_RF_AWAKE)) { break; } - usbd_config_td_sleep(&(sc->sc_config_td), hz/100); + if (usbd_config_td_sleep(&(sc->sc_config_td), hz/100)) { + break; + } } else { printf("%s: timeout waiting for " "BBP/RF to wakeup\n", sc->sc_name); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#13 (text+ko) ==== @@ -2366,7 +2366,9 @@ while(1) { - usbd_config_td_check_gone(ctd); + if (ctd->flag_config_td_gone) { + break; + } USBD_IF_DEQUEUE(&(ctd->cmd_used), m); @@ -2396,6 +2398,8 @@ ctd->config_thread = NULL; + wakeup(&(ctd->wakeup_config_td_gone)); + mtx_unlock(ctd->p_mtx); kthread_exit(0); @@ -2591,41 +2595,39 @@ } /*---------------------------------------------------------------------------* - * usbd_config_td_check_gone + * usbd_config_td_is_gone * - * NOTE: this function can only be called from the config thread + * Return values: + * 0: config thread is running + * else: config thread is gone *---------------------------------------------------------------------------*/ -void -usbd_config_td_check_gone(struct usbd_config_td *ctd) +u_int8_t +usbd_config_td_is_gone(struct usbd_config_td *ctd) { - u_int32_t level; - mtx_assert(ctd->p_mtx, MA_OWNED); - if (ctd->flag_config_td_gone) { - - ctd->config_thread = NULL; - - wakeup(&(ctd->wakeup_config_td_gone)); - - level = mtx_drop_recurse(ctd->p_mtx); - - mtx_unlock(ctd->p_mtx); - - kthread_exit(0); - } - return; + return ctd->flag_config_td_gone ? 1 : 0; } /*---------------------------------------------------------------------------* * usbd_config_td_sleep * * NOTE: this function can only be called from the config thread + * + * Return values: + * 0: normal delay + * else: config thread is gone *---------------------------------------------------------------------------*/ -void +u_int8_t usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout) { register int error; + u_int8_t is_gone = usbd_config_td_is_gone(ctd); + u_int32_t level; + + if (is_gone) { + goto done; + } if (timeout == 0) { /* zero means no timeout, @@ -2635,12 +2637,15 @@ timeout = 1; } + level = mtx_drop_recurse(ctd->p_mtx); + error = msleep(ctd, ctd->p_mtx, 0, "config td sleep", timeout); - usbd_config_td_check_gone(ctd); + mtx_pickup_recurse(ctd->p_mtx, level); - return; + done: + return is_gone; } /*---------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#18 (text+ko) ==== @@ -769,10 +769,10 @@ usbd_config_td_queue_command(struct usbd_config_td *ctd, usbd_config_td_command_t *command_func, u_int16_t command_ref); -void -usbd_config_td_check_gone(struct usbd_config_td *ctd); +u_int8_t +usbd_config_td_is_gone(struct usbd_config_td *ctd); -void +u_int8_t usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout); struct mbuf * From owner-p4-projects@FreeBSD.ORG Fri Aug 4 12:38:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2086616A4E0; Fri, 4 Aug 2006 12:38:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED78916A4DE for ; Fri, 4 Aug 2006 12:38:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A918243D49 for ; Fri, 4 Aug 2006 12:38:51 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74CcpGB076935 for ; Fri, 4 Aug 2006 12:38:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74Ccp40076932 for perforce@freebsd.org; Fri, 4 Aug 2006 12:38:51 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 4 Aug 2006 12:38:51 GMT Message-Id: <200608041238.k74Ccp40076932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 12:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103162 Change 103162 by rdivacky@rdivacky_witten on 2006/08/04 12:38:26 Switch to using atomic_add_int() for refcounting. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#13 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#13 (text+ko) ==== @@ -274,7 +274,7 @@ FUTEX_LOCK; LIST_FOREACH(f, &futex_list, f_list) { if (f->f_uaddr == uaddr) { - f->f_refcount++; + atomic_add_int(&f->f_refcount, 1); FUTEX_UNLOCK; return f; } @@ -284,7 +284,7 @@ /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); f->f_uaddr = uaddr; - f->f_refcount = 1; + atomic_set_int(&f->f_refcount, 1); TAILQ_INIT(&f->f_waiting_proc); FUTEX_LOCK; LIST_INSERT_HEAD(&futex_list, f, f_list); @@ -297,7 +297,7 @@ futex_put(f) struct futex *f; { - f->f_refcount--; + atomic_add_int(&f->f_refcount, -1); if (f->f_refcount == 0) { FUTEX_LOCK; LIST_REMOVE(f, f_list); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 13:07:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A2DE16A4E0; Fri, 4 Aug 2006 13:07:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0255A16A4DA for ; Fri, 4 Aug 2006 13:07:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEC8E43D46 for ; Fri, 4 Aug 2006 13:07:28 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74D7S2Q087577 for ; Fri, 4 Aug 2006 13:07:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74D7S01087574 for perforce@freebsd.org; Fri, 4 Aug 2006 13:07:28 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 4 Aug 2006 13:07:28 GMT Message-Id: <200608041307.k74D7S01087574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 13:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=103163 Change 103163 by rdivacky@rdivacky_witten on 2006/08/04 13:07:11 Fix the previous commit. set != store. Also change the checking of the refcount to be atomic as well. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#14 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#14 (text+ko) ==== @@ -284,7 +284,7 @@ /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); f->f_uaddr = uaddr; - atomic_set_int(&f->f_refcount, 1); + f->f_refcount = 1; TAILQ_INIT(&f->f_waiting_proc); FUTEX_LOCK; LIST_INSERT_HEAD(&futex_list, f, f_list); @@ -297,8 +297,7 @@ futex_put(f) struct futex *f; { - atomic_add_int(&f->f_refcount, -1); - if (f->f_refcount == 0) { + if (atomic_fetchadd_int(&f->f_refcount, -1) == 1) { FUTEX_LOCK; LIST_REMOVE(f, f_list); FUTEX_UNLOCK; From owner-p4-projects@FreeBSD.ORG Fri Aug 4 13:29:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C88516A4E1; Fri, 4 Aug 2006 13:29:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB0A116A4DF for ; Fri, 4 Aug 2006 13:29:58 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5F8943D45 for ; Fri, 4 Aug 2006 13:29:58 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74DTwqL088632 for ; Fri, 4 Aug 2006 13:29:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74DTwj2088629 for perforce@freebsd.org; Fri, 4 Aug 2006 13:29:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 4 Aug 2006 13:29:58 GMT Message-Id: <200608041329.k74DTwj2088629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 13:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=103164 Change 103164 by rdivacky@rdivacky_witten on 2006/08/04 13:29:10 The futex_put() must be called symmetrically to futex_get() so do it in the FUTEX_WAKE_OP case. This fixes the memleak with realplay. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#15 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#15 (text+ko) ==== @@ -252,9 +252,9 @@ op_ret = 0; /* Linux always puts there 0 retries */ op_ret += futex_wake(f2, 0, NULL); - futex_put(f2); ret += op_ret; } + futex_put(f2); td->td_retval[0] = ret; break; From owner-p4-projects@FreeBSD.ORG Fri Aug 4 13:56:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ABB816A4E2; Fri, 4 Aug 2006 13:56:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 610FE16A4DF for ; Fri, 4 Aug 2006 13:56:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BF1643D68 for ; Fri, 4 Aug 2006 13:56:34 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74DuYkL090382 for ; Fri, 4 Aug 2006 13:56:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74DuXm9090379 for perforce@freebsd.org; Fri, 4 Aug 2006 13:56:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 4 Aug 2006 13:56:33 GMT Message-Id: <200608041356.k74DuXm9090379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 13:56:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=103168 Change 103168 by rdivacky@rdivacky_witten on 2006/08/04 13:56:07 Check for the uaddr being in userspace. Otherwise return EFAULT via our fault handler. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#3 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#3 (text+ko) ==== @@ -1553,6 +1553,8 @@ movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax movl 8(%esp), %edx + cmpl $VM_MAXUSER_ADDRESS,%edx + ja futex_fault xchgl %eax, (%edx) movl 0xc(%esp), %edx @@ -1570,6 +1572,8 @@ movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax movl 8(%esp), %edx + cmpl $VM_MAXUSER_ADDRESS,%edx + ja futex_fault MPLOCKED xaddl %eax, (%edx) movl 0xc(%esp), %edx @@ -1587,6 +1591,8 @@ movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax movl 8(%esp), %edx + cmpl $VM_MAXUSER_ADDRESS,%edx + ja futex_fault orl %eax, (%edx) movl 0xc(%esp), %edx @@ -1604,6 +1610,8 @@ movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax movl 8(%esp), %edx + cmpl $VM_MAXUSER_ADDRESS,%edx + ja futex_fault notl (%edx) andl %eax, (%edx) @@ -1622,6 +1630,8 @@ movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax movl 8(%esp), %edx + cmpl $VM_MAXUSER_ADDRESS,%edx + ja futex_fault xorl %eax, (%edx) movl 0xc(%esp), %edx From owner-p4-projects@FreeBSD.ORG Fri Aug 4 14:10:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 591EE16A4E2; Fri, 4 Aug 2006 14:10:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3012116A4DE for ; Fri, 4 Aug 2006 14:10:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC70743D49 for ; Fri, 4 Aug 2006 14:10:51 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74EApjc092802 for ; Fri, 4 Aug 2006 14:10:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74EApe4092792 for perforce@freebsd.org; Fri, 4 Aug 2006 14:10:51 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 4 Aug 2006 14:10:51 GMT Message-Id: <200608041410.k74EApe4092792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 14:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103169 Change 103169 by rdivacky@rdivacky_witten on 2006/08/04 14:09:57 MPLOCKED all futex ops. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#4 (text+ko) ==== @@ -1556,7 +1556,7 @@ cmpl $VM_MAXUSER_ADDRESS,%edx ja futex_fault - xchgl %eax, (%edx) + MPLOCKED xchgl %eax, (%edx) movl 0xc(%esp), %edx movl %eax, (%edx) xorl %eax, %eax @@ -1594,7 +1594,7 @@ cmpl $VM_MAXUSER_ADDRESS,%edx ja futex_fault - orl %eax, (%edx) + MPLOCKED orl %eax, (%edx) movl 0xc(%esp), %edx movl %eax, (%edx) xorl %eax, %eax @@ -1614,7 +1614,7 @@ ja futex_fault notl (%edx) - andl %eax, (%edx) + MPLOCKED andl %eax, (%edx) movl 0xc(%esp), %edx movl %eax, (%edx) xorl %eax, %eax @@ -1633,7 +1633,7 @@ cmpl $VM_MAXUSER_ADDRESS,%edx ja futex_fault - xorl %eax, (%edx) + MPLOCKED xorl %eax, (%edx) movl 0xc(%esp), %edx movl %eax, (%edx) xorl %eax, %eax From owner-p4-projects@FreeBSD.ORG Fri Aug 4 14:19:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A52D16A4E0; Fri, 4 Aug 2006 14:19:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 373CC16A4DF for ; Fri, 4 Aug 2006 14:19:03 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D776943D5C for ; Fri, 4 Aug 2006 14:19:02 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74EJ21d095332 for ; Fri, 4 Aug 2006 14:19:02 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74EJ2di095329 for perforce@freebsd.org; Fri, 4 Aug 2006 14:19:02 GMT (envelope-from kevlo@freebsd.org) Date: Fri, 4 Aug 2006 14:19:02 GMT Message-Id: <200608041419.k74EJ2di095329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 103170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 14:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=103170 Change 103170 by kevlo@kevlo_monet on 2006/08/04 14:18:56 Bring in gpio-based i2c interface support. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#4 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#9 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 add .. //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA#2 (text+ko) ==== @@ -89,6 +89,13 @@ #options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. +# I2C Bus +device iicbus +device iicbb +device iic + +device ixpiic + # Debugging for use in -current options KDB options DDB #Enable the kernel debugger ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#4 (text+ko) ==== @@ -5,6 +5,7 @@ arm/xscale/ixp425/ixp425_mem.c standard arm/xscale/ixp425/ixp425_space.c standard arm/xscale/ixp425/ixp425_timer.c standard +arm/xscale/ixp425/ixp425_iic.c optional ixpiic arm/xscale/ixp425/ixp425_pci.c optional pci arm/xscale/ixp425/ixp425_pci_asm.S optional pci arm/xscale/ixp425/ixp425_pci_space.c optional pci ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#2 (text+ko) ==== @@ -43,7 +43,9 @@ #define GPIO_PCI_INTC 9 #define GPIO_PCI_INTD 8 #define GPIO_I2C_SDA 7 +#define GPIO_I2C_SDA_BIT (1U << 7) #define GPIO_I2C_SCL 6 +#define GPIO_I2C_SCL_BIT (1U << 6) /* Interrupt */ #define PCI_INT_A IXP425_INT_GPIO_11 #define PCI_INT_B IXP425_INT_GPIO_10 ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#9 (text+ko) ==== @@ -228,6 +228,7 @@ device_add_child(dev, "pcib", 0); device_add_child(dev, "ixpclk", 0); + device_add_child(dev, "ixpiic", 0); if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) ==== //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#3 (text+ko) ==== @@ -379,6 +379,7 @@ } DRIVER_MODULE(iicbb, bktr, iicbb_driver, iicbb_devclass, 0, 0); +DRIVER_MODULE(iicbb, ixpiic, iicbb_driver, iicbb_devclass, 0, 0); DRIVER_MODULE(iicbb, lpbb, iicbb_driver, iicbb_devclass, 0, 0); DRIVER_MODULE(iicbb, viapm, iicbb_driver, iicbb_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 14:43:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B058E16A4DE; Fri, 4 Aug 2006 14:43:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B71216A4DA for ; Fri, 4 Aug 2006 14:43:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20D2043D73 for ; Fri, 4 Aug 2006 14:43:34 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74EhXGl096856 for ; Fri, 4 Aug 2006 14:43:33 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74EhXDD096852 for perforce@freebsd.org; Fri, 4 Aug 2006 14:43:33 GMT (envelope-from piso@freebsd.org) Date: Fri, 4 Aug 2006 14:43:33 GMT Message-Id: <200608041443.k74EhXDD096852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 14:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=103172 Change 103172 by piso@piso_newluxor on 2006/08/04 14:43:24 Modify again bfe: this time use a combination of ithread handler (transmission path) and taskqueue (errors and link handling). The advantage of this approach is that we don't have to introduce any mutex to synchronize the filter and the thread/tasks, but on the other hand every driver will grow its own taskqueue+tasks, and it will result in some code duplication. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfereg.h#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#5 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -93,6 +94,8 @@ #endif static int bfe_filter (void *); static void bfe_handler (void *); +static void bfe_errors (void *, int); +static void bfe_stops (void *, int); static void bfe_start (struct ifnet *); static void bfe_start_locked (struct ifnet *); static int bfe_ioctl (struct ifnet *, u_long, caddr_t); @@ -419,6 +422,14 @@ ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable |= IFCAP_VLAN_MTU; + sc->sc_tq = taskqueue_create("bfe_taskq", M_NOWAIT, + taskqueue_thread_enqueue, &sc->sc_tq); + taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, + "%s taskq", ifp->if_xname); + + TASK_INIT(&sc->sc_errorstask, 0, bfe_errors, sc); + TASK_INIT(&sc->sc_stoptask, 0, bfe_stops, sc); + /* * Hook interrupt last to avoid having to lock softc */ @@ -464,6 +475,9 @@ device_delete_child(dev, sc->bfe_miibus); bfe_release_resources(sc); + taskqueue_drain(sc->sc_tq, &sc->sc_stoptask); + taskqueue_drain(sc->sc_tq, &sc->sc_errorstask); + taskqueue_free(sc->sc_tq); BFE_UNLOCK(sc); mtx_destroy(&sc->bfe_mtx); @@ -1194,9 +1208,10 @@ bfe_filter(void *xsc) { struct bfe_softc *sc = xsc; - u_int32_t imask; + struct ifnet *ifp; + u_int32_t imask, istat, flag; - sc->bfe_istat = CSR_READ_4(sc, BFE_ISTAT); + istat = CSR_READ_4(sc, BFE_ISTAT); imask = CSR_READ_4(sc, BFE_IMASK); /* @@ -1204,49 +1219,28 @@ * chips interrupt mask register to 0 doesn't actually stop the * interrupts */ - sc->bfe_istat &= imask; - CSR_WRITE_4(sc, BFE_ISTAT, sc->bfe_istat); + istat &= imask; + CSR_WRITE_4(sc, BFE_ISTAT, istat); CSR_READ_4(sc, BFE_ISTAT); /* not expecting this interrupt, disregard it */ - if(sc->bfe_istat == 0) + if(istat == 0) return (FILTER_STRAY); - /* disable interrupts - not that it actually does..*/ - CSR_WRITE_4(sc, BFE_IMASK, 0); - CSR_READ_4(sc, BFE_IMASK); - - return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD); -} - -static void -bfe_handler(void *xsc) -{ - struct bfe_softc *sc = xsc; - struct ifnet *ifp; - u_int32_t istat, flag; - - ifp = sc->bfe_ifp; - - BFE_LOCK(sc); - - istat = sc->bfe_istat; if(istat & BFE_ISTAT_ERRORS) { - if (istat & BFE_ISTAT_DSCE) { printf("if_bfe Descriptor Error\n"); - bfe_stop(sc); - BFE_UNLOCK(sc); - return; + taskqueue_enqueue(sc->sc_tq, &sc->sc_stoptask); + return (FILTER_HANDLED); } if (istat & BFE_ISTAT_DPE) { printf("if_bfe Descriptor Protocol Error\n"); - bfe_stop(sc); - BFE_UNLOCK(sc); - return; + taskqueue_enqueue(sc->sc_tq, &sc->sc_stoptask); + return (FILTER_HANDLED); } + ifp = sc->bfe_ifp; flag = CSR_READ_4(sc, BFE_DMATX_STAT); if(flag & BFE_STAT_EMASK) ifp->if_oerrors++; @@ -1254,28 +1248,61 @@ flag = CSR_READ_4(sc, BFE_DMARX_STAT); if(flag & BFE_RX_FLAG_ERRORS) ifp->if_ierrors++; + + taskqueue_enqueue(sc->sc_tq, &sc->sc_errorstask); + return (FILTER_HANDLED); + } + + /* disable interrupts - not that it actually does..*/ + CSR_WRITE_4(sc, BFE_IMASK, 0); + CSR_READ_4(sc, BFE_IMASK); + + return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD); +} + +static void +bfe_stops(void *context, int p __unused) { + struct bfe_softc *sc = context; + + BFE_LOCK(sc); + bfe_stop(sc); + BFE_UNLOCK(sc); +} + +static void +bfe_errors(void *context, int p __unused) { + struct bfe_softc *sc = context; + struct ifnet *ifp; + + BFE_LOCK(sc); + ifp = sc->bfe_ifp; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + bfe_init_locked(sc); + BFE_UNLOCK(sc); +} + +static void +bfe_handler(void *xsc) { + struct bfe_softc *sc = xsc; + struct ifnet *ifp; - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - bfe_init_locked(sc); - } + BFE_LOCK(sc); + ifp = sc->bfe_ifp; - /* A packet was received */ - if(istat & BFE_ISTAT_RX) - bfe_rxeof(sc); + /* A packet was received */ + bfe_rxeof(sc); /* A packet was sent */ - if(istat & BFE_ISTAT_TX) - bfe_txeof(sc); + bfe_txeof(sc); /* We have packets pending, fire them out */ if (ifp->if_drv_flags & IFF_DRV_RUNNING && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) bfe_start_locked(ifp); - BFE_UNLOCK(sc); - /* Enable interrupts */ CSR_WRITE_4(sc, BFE_IMASK, BFE_IMASK_DEF); + BFE_UNLOCK(sc); } #if 0 ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfereg.h#3 (text+ko) ==== @@ -510,7 +510,9 @@ struct bfe_data bfe_tx_ring[BFE_TX_LIST_CNT]; /* XXX */ struct bfe_data bfe_rx_ring[BFE_RX_LIST_CNT]; /* XXX */ struct mtx bfe_mtx; - u_int32_t bfe_istat; + struct taskqueue *sc_tq; /* private task queue */ + struct task sc_stoptask; + struct task sc_errorstask; u_int32_t bfe_flags; u_int32_t bfe_imask; u_int32_t bfe_dma_offset; From owner-p4-projects@FreeBSD.ORG Fri Aug 4 14:57:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 992B116A4DF; Fri, 4 Aug 2006 14:57:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B74916A4EF for ; Fri, 4 Aug 2006 14:57:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2691843D45 for ; Fri, 4 Aug 2006 14:57:52 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74Evq3k097629 for ; Fri, 4 Aug 2006 14:57:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74EvpSw097626 for perforce@freebsd.org; Fri, 4 Aug 2006 14:57:51 GMT (envelope-from piso@freebsd.org) Date: Fri, 4 Aug 2006 14:57:51 GMT Message-Id: <200608041457.k74EvpSw097626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 14:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103173 Change 103173 by piso@piso_newluxor on 2006/08/04 14:57:30 taskqueue_free() executes all the tasks still pending on that taskqueue: in this case, taskqueue_drain() is superfluous. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#6 (text+ko) ==== @@ -475,8 +475,6 @@ device_delete_child(dev, sc->bfe_miibus); bfe_release_resources(sc); - taskqueue_drain(sc->sc_tq, &sc->sc_stoptask); - taskqueue_drain(sc->sc_tq, &sc->sc_errorstask); taskqueue_free(sc->sc_tq); BFE_UNLOCK(sc); mtx_destroy(&sc->bfe_mtx); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 16:01:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D05C16A4E8; Fri, 4 Aug 2006 16:01:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4823F16A4DD; Fri, 4 Aug 2006 16:01:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92E2643D46; Fri, 4 Aug 2006 16:01:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k74G1ikA004558; Fri, 4 Aug 2006 12:01:46 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Fri, 4 Aug 2006 11:41:53 -0400 User-Agent: KMail/1.9.1 References: <200608041238.k74Ccp40076932@repoman.freebsd.org> In-Reply-To: <200608041238.k74Ccp40076932@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608041141.53715.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 04 Aug 2006 12:01:46 -0400 (EDT) X-Virus-Scanned: ClamAV version 0.87.1, clamav-milter version 0.87 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 103162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 16:01:49 -0000 On Friday 04 August 2006 08:38, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=103162 > > Change 103162 by rdivacky@rdivacky_witten on 2006/08/04 12:38:26 > > Switch to using atomic_add_int() for refcounting. > > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#13 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#13 (text+ko) ==== > > @@ -274,7 +274,7 @@ > FUTEX_LOCK; > LIST_FOREACH(f, &futex_list, f_list) { > if (f->f_uaddr == uaddr) { > - f->f_refcount++; > + atomic_add_int(&f->f_refcount, 1); > FUTEX_UNLOCK; > return f; > } > @@ -284,7 +284,7 @@ > /* Not found, create it */ > f = malloc(sizeof(*f), M_LINUX, M_WAITOK); > f->f_uaddr = uaddr; > - f->f_refcount = 1; > + atomic_set_int(&f->f_refcount, 1); > TAILQ_INIT(&f->f_waiting_proc); > FUTEX_LOCK; > LIST_INSERT_HEAD(&futex_list, f, f_list); > @@ -297,7 +297,7 @@ > futex_put(f) > struct futex *f; > { > - f->f_refcount--; > + atomic_add_int(&f->f_refcount, -1); > if (f->f_refcount == 0) { > FUTEX_LOCK; > LIST_REMOVE(f, f_list); This is racy. Another thread can obtain a reference after you do the 0 check and you will free out from under it. If you wanted to use atomic ops, you should use the refcount API in sys/refcount.h instead. However, that would still be racy in this case because of the LIST of these structures. Instead, you need to revert this and just hold the FUTEX_LOCK earlier in futex_put() before you do the f->f_refcount-- so that you can remove it from the list safely without other threads gaining a reference to it. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Aug 4 16:01:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A472116A4E7; Fri, 4 Aug 2006 16:01:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8200D16A569; Fri, 4 Aug 2006 16:01:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA00F43D46; Fri, 4 Aug 2006 16:01:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k74G1ikB004558; Fri, 4 Aug 2006 12:01:48 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Paolo Pisati Date: Fri, 4 Aug 2006 11:43:26 -0400 User-Agent: KMail/1.9.1 References: <200608041457.k74EvpSw097626@repoman.freebsd.org> In-Reply-To: <200608041457.k74EvpSw097626@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608041143.26838.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 04 Aug 2006 12:01:48 -0400 (EDT) X-Virus-Scanned: ClamAV version 0.87.1, clamav-milter version 0.87 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 103173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 16:01:50 -0000 On Friday 04 August 2006 10:57, Paolo Pisati wrote: > http://perforce.freebsd.org/chv.cgi?CH=103173 > > Change 103173 by piso@piso_newluxor on 2006/08/04 14:57:30 > > taskqueue_free() executes all the tasks still pending > on that taskqueue: in this case, taskqueue_drain() is > superfluous. > > Affected files ... > > .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#6 edit > > Differences ... > > ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#6 (text+ko) ==== > > @@ -475,8 +475,6 @@ > device_delete_child(dev, sc->bfe_miibus); > > bfe_release_resources(sc); > - taskqueue_drain(sc->sc_tq, &sc->sc_stoptask); > - taskqueue_drain(sc->sc_tq, &sc->sc_errorstask); > taskqueue_free(sc->sc_tq); > BFE_UNLOCK(sc); > mtx_destroy(&sc->bfe_mtx); In that case you can't call it while holding the BFE_LOCK. You probably only need the BFE_LOCK around bfe_stop(). -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Aug 4 16:16:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10CBE16A4E5; Fri, 4 Aug 2006 16:16:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C437516A4DD; Fri, 4 Aug 2006 16:16:19 +0000 (UTC) (envelope-from flag@newluxor.wired.org) Received: from mail.oltrelinux.com (krisma.oltrelinux.com [194.242.226.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE12D43D58; Fri, 4 Aug 2006 16:16:12 +0000 (GMT) (envelope-from flag@newluxor.wired.org) Received: from newluxor.wired.org (ip-115-167.sn1.eutelia.it [62.94.115.167]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.oltrelinux.com (Postfix) with ESMTP id 7628211B25B; Fri, 4 Aug 2006 18:16:11 +0200 (CEST) Received: (from flag@localhost) by newluxor.wired.org (8.13.7/8.13.7/Submit) id k74GEbBX016811; Fri, 4 Aug 2006 18:14:37 +0200 (CEST) (envelope-from flag) Date: Fri, 4 Aug 2006 18:14:37 +0200 From: Paolo Pisati To: John Baldwin Message-ID: <20060804161437.GC1205@tin.it> References: <200608041457.k74EvpSw097626@repoman.freebsd.org> <200608041143.26838.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200608041143.26838.jhb@freebsd.org> User-Agent: Mutt/1.4.2.1i X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at krisma.oltrelinux.com Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 103173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 16:16:20 -0000 On Fri, Aug 04, 2006 at 11:43:26AM -0400, John Baldwin wrote: > > In that case you can't call it while holding the BFE_LOCK. > You probably only > need the BFE_LOCK around bfe_stop(). Right, else it will deadlock, thanks. -- Paolo Piso's first law: nothing works as expected! From owner-p4-projects@FreeBSD.ORG Fri Aug 4 16:19:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B114A16A4DD; Fri, 4 Aug 2006 16:19:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84E2816A4DE for ; Fri, 4 Aug 2006 16:19:50 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4206643D7C for ; Fri, 4 Aug 2006 16:19:47 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74GJl3M005873 for ; Fri, 4 Aug 2006 16:19:47 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74GJkm5005870 for perforce@freebsd.org; Fri, 4 Aug 2006 16:19:46 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 4 Aug 2006 16:19:46 GMT Message-Id: <200608041619.k74GJkm5005870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 16:19:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=103176 Change 103176 by gabor@gabor_spitfire on 2006/08/04 16:19:37 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#5 integrate .. //depot/projects/soc2006/gabor_ports/LEGAL#4 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#10 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.mail.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#72 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.subdir.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#7 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/security-check.awk#3 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#12 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#5 (text+ko) ==== @@ -10,7 +10,41 @@ All ports committers are allowed to commit to this file. -20070717: +20060804: +AUTHOR: gabor@FreeBSD.org +The following functional changes were made to bsd.*.mk and to +Tools/scripts/security-check.awk: + + * Add DESTDIR support to let one install ports into a jail from outside. + A package is installed under ${DESTDIR}${PREFIX} now and registered under + ${DESTDIR}/var/db/pkg. + + * TARGETDIR variable has been added for referencing ${DESTDIR}${PREFIX}. + + * LOCALBASE, LINUXBASE and X11BASE variables point to the final destination + now, LOCALBASE_REL, LINUXBASE_REL and X11BASE_REL can be used for the + old behavior. The behavior has not been changed in PLIST_SUB. + Note, that the three variables are still overrideable with a hack, so this + change doesn't affect POLA, but necessary for DESTDIR support. + + * OSVERSION is now determined from the userland, not from the kernel. + Cross-compiling between releases is still not supported, but this + behavior is more correct for jails with differing userland from + the kernel version. + + * Add some sanity check for PREFIX and DESTDIR. This can be skipped by + defining IGNORE_PATH_CHECKS, but very discouraged. + + * Deinstalling from DESTDIR, determining if a port is already installed in + DESTDIR, etc. are implemented by chrooting those specific commands. + + * Text changes to reflect that we are installing to DESTDIR, removing from + DESTDIR, etc. + +Note, that this change implements only the infrastructure support. Ports should +also be implemented to respect DESTDIR. + +20060717: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -22,7 +56,7 @@ * Again fix USE_LDCONFIG logic to make it work with non-default PREFIX to fix bug introduced in previous revision. -20070705: +20060705: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -1115,4 +1149,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.55 2006/07/18 04:13:11 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.57 2006/08/04 13:17:59 erwin Exp $ ==== //depot/projects/soc2006/gabor_ports/LEGAL#4 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.486 2006/07/30 21:12:29 sat Exp $ +# $FreeBSD: ports/LEGAL,v 1.490 2006/08/03 01:17:28 acm Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -277,6 +277,7 @@ french/aster. For any other purpose, you have to acquire a license hptools-src* devel/hptools Not made or distributed for resale +httprint_freebsd_*.zip security/httprint No cost for personal, education and non-commercial use HyperSpec-*.tar.gz devel/clisp-hyperspec Commercial redistribution prohibited IBMJava2-SDK-131.tgz java/linux-ibm-jdk13 Redistribution of repackaged @@ -491,6 +492,7 @@ qtools-* mail/qtools Possibly restricted binary distribution of modified versions +quake4-linux-* games/linux-quake4* Redistribution is limited, see license Radiator/* net/radiator Commercial software raproxy*.tar.gz audio/raproxy License allows only use in a firewall or with RA products @@ -556,6 +558,9 @@ not permitted susv3.tar.bz2 misc/susv3 Redistribution of the documents is not permitted +svm_light.tar.gz science/svmlight The software must not be further + distributed without prior permission + of the author swing1_1_1* java/jfc Do not distribute without value-added application systemc-2*.tgz cad/systemc License agreement required. ==== //depot/projects/soc2006/gabor_ports/MOVED#10 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1104 2006/07/26 19:44:32 mnag Exp $ +# $FreeBSD: ports/MOVED,v 1.1108 2006/08/04 14:57:47 acm Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -926,7 +926,6 @@ devel/p5-POE-Session-Cascading||2004-03-01|obsolete - deleted from CPAN games/linux_nwndata|games/nwndata|2004-03-01|Data files are not Linux-specific games/linux_nwnclient|games/linux-nwnclient|2004-03-01|Misnamed -sysutils/linux-e2fsprogs|sysutils/e2fsprogs|2004-03-01|Native version available sysutils/fsck_ext2fs|sysutils/e2fsprogs|2004-03-01|Better utility audio/audacity-devel|audio/audacity|2004-03-03|removed (obsolete) japanese/vfxdvi118||2004-03-04|removed (obsolate) @@ -2426,3 +2425,8 @@ www/horde-php5||2006-07-24|Removed: this port is redundant now that php5 is the default sysutils/e17-module-devian|x11/e17-module-devian|2006-07-26|Move e17-module-devian from sysutils to x11 devel/viewcvs|devel/viewvc|2006-07-26|Project name has changed +japanese/eb3||2006-08-01|Has expired: please use a never version in japanese/eb +mail/dspampd||2006-08-01|Has expired: Buggy with recent perl versions, not developed anymore, use mail/dspam[-devel] in --daemon mode instead +net/svnc||2006-08-01|Has expired: mastersite gone, depends on unfetchable, antique version of vnc +devel/p5-IPC-Mmap-SimpleShare||2006-08-01|Has expired +devel/p5-Readonly-XS|devel/p5-Readonly|2006-08-02|p5-Readonly installs XS automatically ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.57 2006/05/16 17:11:20 anray Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.58 2006/08/04 12:34:41 erwin Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.130 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.131 2006/08/04 12:34:41 erwin Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.370 2006/04/27 01:40:22 ahze Exp $ # ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.mail.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.1 2006/01/21 17:37:01 krion Exp $ +# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.2 2006/08/04 12:34:41 erwin Exp $ # # Please view me with 4 column tabs! ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#4 (text+ko) ==== @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.30 2006/05/25 15:17:34 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.31 2006/08/04 12:34:41 erwin Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#72 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.538 2006/07/18 04:12:51 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.539 2006/08/04 12:34:41 erwin Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -2641,7 +2641,7 @@ .if defined(_MANPAGES) .if defined(NOMANCOMPRESS) -__MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}}/%%} +__MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}/%%} .else __MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}/%%:S%$%.gz%} .endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.subdir.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.64 2006/01/28 02:11:05 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.65 2006/08/04 12:34:41 erwin Exp $ # # The include file contains the default targets # for building ports subdirectories. ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.79 2006/06/23 03:35:14 perky Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.81 2006/08/04 12:34:41 erwin Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -298,7 +298,7 @@ # Python-2.5 .if ${PYTHON_VERSION} == "python2.5" -PYTHON_PORTVERSION?=2.5.b1 +PYTHON_PORTVERSION?=2.5.b3 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel PYTHON_REL= 250 PYTHON_SUFFIX= 25 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.152 2006/07/05 02:18:09 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.153 2006/08/04 12:34:41 erwin Exp $ # .if !defined(Ruby_Include) ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.5 2006/07/24 22:49:32 itetcu Exp $ +# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.6 2006/08/04 12:34:41 erwin Exp $ # # bsd.scons.mk - Python-based SCons build system interface. # Author: Alexander Botero-Lowry ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#7 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.392 2006/07/30 22:22:50 sat Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.395 2006/08/03 01:24:34 ahze Exp $ # # Where to put distfiles that don't have any other master site @@ -646,6 +646,12 @@ ftp://ftp.chg.ru/pub/WWW/mozilla/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_MOZILLA_EXTENDED) +MASTER_SITE_MOZILLA_EXTENDED+= \ + http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ + ${MASTER_SITE_MOZILLA} +.endif + .if !defined(IGNORE_MASTER_SITE_MYSQL) MASTER_SITE_MYSQL+= \ ftp://ftp.easynet.be/mysql/Downloads/%SUBDIR%/ \ @@ -925,6 +931,15 @@ ftp://ftp.iDaemons.org/pub/mirror/ftp.ruby-lang.org/ruby/%SUBDIR%/ .endif +# See http://rubyforge.org/credits/ +.if !defined(IGNORE_MASTER_SITE_RUBYFORGE) +MASTER_SITE_RUBYFORGE+= \ + http://rubyforge.rubyuser.de/%SUBDIR%/ \ + http://rubyforge.iasi.roedu.net/files/%SUBDIR%/ \ + http://rubyforge.halostatue.info/%SUBDIR%/ \ + http://files.rubyforge.vm.bytemark.co.uk/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_SAMBA) MASTER_SITE_SAMBA+= \ http://us1.samba.org/samba/ftp/%SUBDIR%/ \ ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/security-check.awk#3 (text+ko) ==== ==== //depot/projects/soc2006/gabor_ports/UPDATING#12 (text+ko) ==== @@ -6,6 +6,22 @@ time you update your ports collection, before attempting any port upgrades. +20060802: + AFFECTS: users of www/linux-opera + AUTHOR: mezz@FreeBSD.org + + The prefix has been changed, linux-opera now lives in LOCALBASE. Be sure to + go in ~/.linux-opera/ and open a few of *.ini files to change all of this + from "/usr/X11R6/share/linux-opera" to "/usr/local/share/linux-opera". Most + of editors have 'search and replace' option, so use it or just use sed. + +20060801: + AFFECTS: users of www/b2evolution + AUTHOR: chinsan.tw@gmail.com + + The default install location has changed from + ${PREFIX}/www/data/b2evolution to ${PREFIX}/www/b2evolution. + 20060801: AFFECTS: users of audio/libtunepimp and any port that depends on it AUTHOR: clsung@FreeBSD.org @@ -34,7 +50,7 @@ now works. Please be aware of this when updating if you have it in your config and are using GSSAPI when use_sasl is enabled. Using GSSAPI with a misconfigured krb5_ccname combined with one of the 'hard' bind_policy - options can effectivly lockout users. + options can effectively lockout users. 20060728: AFFECTS: users of polish/ekg and polish/ibgadu @@ -3950,4 +3966,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.375 2006/08/01 01:51:47 clsung Exp $ +$FreeBSD: ports/UPDATING,v 1.378 2006/08/03 18:45:53 blackend Exp $ From owner-p4-projects@FreeBSD.ORG Fri Aug 4 16:22:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B28016A505; Fri, 4 Aug 2006 16:22:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECC0216A503 for ; Fri, 4 Aug 2006 16:22:51 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A62143D55 for ; Fri, 4 Aug 2006 16:22:51 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74GMpQE006130 for ; Fri, 4 Aug 2006 16:22:51 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74GMpcD006127 for perforce@freebsd.org; Fri, 4 Aug 2006 16:22:51 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 4 Aug 2006 16:22:51 GMT Message-Id: <200608041622.k74GMpcD006127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 16:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103177 Change 103177 by gabor@gabor_spitfire on 2006/08/04 16:22:14 IFC Affected files ... .. //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#13 integrate Differences ... ==== //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ MASTER_SITE_* - (e.g., MASTER_SITE_XCONTRIB and - MASTER_SITE_PERL_GNU). Simply set + (e.g., MASTER_SITE_XCONTRIB, + MASTER_SITE_GNU and + MASTER_SITE_PERL_CPAN). Simply set MASTER_SITES to one of these variables and MASTER_SITE_SUBDIR to the path within the archive. Here is an example: @@ -7264,8 +7265,9 @@ this entry (in quotes). You should generate a UUID for each new VuXML entry (and do not forget to substitute it for the template UUID unless you are writing the - entry from scratch). You can use &man.uuidgen.1; in - FreeBSD 5.x, or you may install the port devel/p5-Data-UUID and issue the following command: @@ -9359,6 +9361,10 @@ 7.0-CURRENT after import of snd_emu10kx. 700018 + + 7.0-CURRENT after import of OpenSSL 0.9.8b. + 700019 + From owner-p4-projects@FreeBSD.ORG Fri Aug 4 16:23:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 833B716A52F; Fri, 4 Aug 2006 16:23:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 468B416A51B for ; Fri, 4 Aug 2006 16:23:54 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6973943D53 for ; Fri, 4 Aug 2006 16:23:53 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74GNrRB006203 for ; Fri, 4 Aug 2006 16:23:53 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74GNrKD006200 for perforce@freebsd.org; Fri, 4 Aug 2006 16:23:53 GMT (envelope-from piso@freebsd.org) Date: Fri, 4 Aug 2006 16:23:53 GMT Message-Id: <200608041623.k74GNrKD006200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 16:23:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=103178 Change 103178 by piso@piso_newluxor on 2006/08/04 16:23:44 Avoid deadlock: during taskqueue_free() some of the predefined tasks could be executed, so watch out not to do it while holding a lock that one of these tasks could try to acquire. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#7 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#7 (text+ko) ==== @@ -475,8 +475,8 @@ device_delete_child(dev, sc->bfe_miibus); bfe_release_resources(sc); + BFE_UNLOCK(sc); taskqueue_free(sc->sc_tq); - BFE_UNLOCK(sc); mtx_destroy(&sc->bfe_mtx); return (0); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 17:13:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABD8916A4E0; Fri, 4 Aug 2006 17:13:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 856C816A4DA for ; Fri, 4 Aug 2006 17:13:57 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CA9C43D5E for ; Fri, 4 Aug 2006 17:13:55 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74HDt2o017869 for ; Fri, 4 Aug 2006 17:13:55 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74HDtTQ017865 for perforce@freebsd.org; Fri, 4 Aug 2006 17:13:55 GMT (envelope-from bushman@freebsd.org) Date: Fri, 4 Aug 2006 17:13:55 GMT Message-Id: <200608041713.k74HDtTQ017865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 103180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 17:13:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103180 Change 103180 by bushman@bushman_nss_ldap_cached on 2006/08/04 17:13:37 Support for SASL authentication added + Most of the configuration options are now supported + A lot of minor enhancements. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.h#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.h#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.h#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#7 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#7 (text+ko) ==== @@ -2,11 +2,10 @@ .include -PROG= nss_ldap -#LIB= nss_ldap -#SHLIB_MAJOR= 1 -#SHLIB_NAME= nss_ldap.so.${SHLIB_MAJOR} -#SHLIBDIR?= /lib +LIB= nss_ldap +SHLIB_MAJOR= 1 +SHLIB_NAME= nss_ldap.so.${SHLIB_MAJOR} +SHLIBDIR?= /lib SRCS= nss_ldap.c ldap_group.c ldap_passwd.c ldap_serv.c ldapconn.c\ ldapconf.c ldapschema.c ldapsearch.c ldaptls.c ldaputil.c @@ -14,11 +13,10 @@ CFLAGS+=-DINET6 CFLAGS+=-g -LDADD+= -lnssutil -lldap +LDADD+= -lnssutil -lldap -lsasl2 LDFLAGS+= -L${.OBJDIR}/../libnssutil -L/usr/local/lib -INCS= +INCS= MAN= -#.include -.include +.include ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#6 (text+ko) ==== @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -41,7 +42,16 @@ #include "ldapconf.h" #include "nss_ldap.h" -static int +static int nss_ldap_parse_group(struct nss_ldap_parse_context *); + +static int ldap_getgrnam_r(const char *, struct group *, char *, size_t, + struct group **); +static int ldap_getgrgid_r(gid_t, struct group *, char *, size_t, + struct group **); +static int ldap_getgrent_r(struct group *, char *, size_t, struct group **); +static void ldap_setgrent(); + +static int nss_ldap_parse_group(struct nss_ldap_parse_context *pctx) { struct nss_ldap_schema *schema; @@ -99,114 +109,9 @@ errfin: return (rv); -/* - - if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS)) - { - groupMembers = groupMembersBuffer; - groupMembersCount = 0; - groupMembersBufferSize = sizeof (groupMembers); - groupMembersBufferIsMalloced = 0; - depth = 0; - - stat = do_parse_group_members (e, &groupMembers, &groupMembersCount, - &groupMembersBufferSize, - &groupMembersBufferIsMalloced, &buffer, - &buflen, &depth, &knownGroups); - if (stat != NSS_SUCCESS) - { - if (groupMembersBufferIsMalloced) - free (groupMembers); - _nss_ldap_namelist_destroy (&knownGroups); - return stat; - } - - stat = do_fix_group_members_buffer (groupMembers, groupMembersCount, - &gr->gr_mem, &buffer, &buflen); - - if (groupMembersBufferIsMalloced) - free (groupMembers); - _nss_ldap_namelist_destroy (&knownGroups); - } - else - { - stat = - _nss_ldap_assign_attrvals (e, ATM (LM_GROUP, memberUid), NULL, - &gr->gr_mem, &buffer, &buflen, NULL); - } - - return stat;*/ - -/* sctx = pctx->sctx; - pwd = (struct passwd *)pctx->mdata; - buf = pctx->buffer; - buflen = pctx->bufsize; - - schema = &sctx->conf->schema; - - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_str(sctx, - _ATM(schema, PASSWD, uid), - &pwd->pw_name, &len, buf, buflen); - if (rv != 0) - goto errfin; - buflen -= len; - buf += len; - - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_uid(sctx, - _AT(schema, uidNumber), - &pwd->pw_uid); - if (rv != 0) - goto errfin; - - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_str(sctx, - _AT(schema, gecos), - &pwd->pw_gecos, &len, buf, buflen); - if (rv != 0) { - pwd->pw_gecos = NULL; - rv = __nss_ldap_assign_attr_str(sctx, - _ATM(schema, PASSWD, cn), - &pwd->pw_gecos, &len, buf, buflen); - } - - if (rv != 0) - goto errfin; - buflen -= len; - buf += len; - - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_str(sctx, - _AT(schema, homeDirectory), - &pwd->pw_dir, &len, buf, buflen); - if (rv != 0) - rv = __nss_ldap_assign_str("", &pwd->pw_dir, &len, buf, - buflen); - if (rv != 0) - goto errfin; - buflen -= len; - buf += len; - - printf("==> %d %s\n", __LINE__, __FILE__); - rv = __nss_ldap_assign_attr_str(sctx, - _AT(schema, loginShell), - &pwd->pw_shell, &len, buf, buflen); - if (rv != 0) - rv = __nss_ldap_assign_str("", &pwd->pw_shell, &len, buf, - buflen); - if (rv != 0) - goto errfin; - buflen -= len; - buf += len; - -fin: - return (0); - -errfin:*/ } -int +static int ldap_getgrnam_r(const char *name, struct group *grp, char *buffer, size_t bufsize, struct group **result) { @@ -231,7 +136,7 @@ return (rv); } -int +static int ldap_getgrgid_r(gid_t gid, struct group *grp, char *buffer, size_t bufsize, struct group **result) { @@ -256,7 +161,7 @@ return (rv); } -int +static int ldap_getgrent_r(struct group *grp, char *buffer, size_t bufsize, struct group **result) { @@ -277,22 +182,77 @@ return (rv); } -void +static void ldap_setgrent() { __nss_ldap_setent(NSS_LDAP_MAP_GROUP); } - int -__ldap_setgrpent(void *retval, void *mdata, va_list ap) +__ldap_setgrent(void *retval, void *mdata, va_list ap) { + + ldap_setgrent(); return (NS_UNAVAIL); } int __ldap_group(void *retval, void *mdata, va_list ap) { - return (NS_UNAVAIL); + struct group *grp, *result; + char *buffer; + size_t bufsize; + int *errnop; + + char *name; + gid_t gid; + + int rv; + + assert(mdata != NULL); + + switch ((enum nss_lookup_type)mdata) { + case nss_lt_name: + printf("GGG %s %d\n", __FILE__, __LINE__); + name = va_arg(ap, char *); + break; + case nss_lt_id: + printf("GGG %s %d\n", __FILE__, __LINE__); + gid = va_arg(ap, gid_t); + break; + case nss_lt_all: + printf("GGG %s %d\n", __FILE__, __LINE__); + break; + default: + /* CONSIDERED UNREACHABLE */ + return (NS_UNAVAIL); + } + + grp = va_arg(ap, struct group *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + + switch ((enum nss_lookup_type)mdata) { + case nss_lt_name: + rv = ldap_getgrnam_r(name, grp, buffer, bufsize, &result); + break; + case nss_lt_id: + rv = ldap_getgrgid_r(gid, grp, buffer, bufsize, &result); + break; + case nss_lt_all: + rv = ldap_getgrent_r(grp, buffer, bufsize, &result); + break; + default: + break; + } + + if ((rv == NS_SUCCESS) && (retval != NULL)) + *(struct group **)retval = result; + + if ((rv != NS_SUCCESS) && (rv != NS_NOTFOUND)) + *errnop = errno; + + return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.h#6 (text+ko) ==== @@ -29,18 +29,6 @@ #ifndef _LDAP_GROUP_H_ #define _LDAP_GROUP_H_ -int -ldap_getgrnam_r(const char *name, struct group *grp, - char *buffer, size_t bufsize, struct group **result); -int -ldap_getgrgid_r(gid_t gid, struct group *grp, - char *buffer, size_t bufsize, struct group **result); -int -ldap_getgrent_r(struct group *grp, char *buffer, size_t bufsize, - struct group **result); -void -ldap_setgrent(); - extern int __ldap_setgrent(void *, void *, va_list); extern int __ldap_group(void *, void *, va_list); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#7 (text+ko) ==== @@ -25,11 +25,11 @@ * */ - #include __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -41,8 +41,15 @@ #include "ldapconf.h" #include "nss_ldap.h" -//static int nss_ldap_parse_passwd(struct nss_ldap_parse_context *, -// struct nss_ldap_search_context *); +static int nss_ldap_parse_passwd(struct nss_ldap_parse_context *); + +static int ldap_getpwnam_r(const char *, struct passwd *, char *, size_t, + struct passwd **); +static int ldap_getpwuid_r(uid_t, struct passwd *, char *, size_t, + struct passwd **); +static int ldap_getpwent_r(struct passwd *, char *, size_t, struct passwd **); +static void ldap_setpwent(); + static int nss_ldap_parse_passwd(struct nss_ldap_parse_context *pctx) { @@ -128,6 +135,18 @@ buflen -= len; buf += len; + printf("==> %d %s\n", __LINE__, __FILE__); + rv = __nss_ldap_assign_attr_str(sctx, + _AT(schema, loginClass), + &pwd->pw_class, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) + rv = __nss_ldap_assign_str("", &pwd->pw_class, &len, buf, + buflen); + if (rv != NSS_LDAP_SUCCESS) + goto errfin; + buflen -= len; + buf += len; + printf("==> %d %s\n", __LINE__, __FILE__); rv = __nss_ldap_assign_attr_uid(sctx, _AT(schema, uidNumber), @@ -164,12 +183,12 @@ else pwd->pw_expire = 0; - rv = NS_SUCCESS; + rv = NSS_LDAP_SUCCESS; errfin: return (rv); } -int +static int ldap_getpwnam_r(const char *name, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result) { @@ -194,7 +213,7 @@ return (rv); } -int +static int ldap_getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result) { @@ -219,7 +238,7 @@ return (rv); } -int +static int ldap_getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result) { @@ -240,7 +259,7 @@ return (rv); } -void +static void ldap_setpwent() { @@ -251,11 +270,64 @@ int __ldap_setpwent(void *retval, void *mdata, va_list ap) { + + ldap_setpwent(); return (NS_UNAVAIL); } int __ldap_passwd(void *retval, void *mdata, va_list ap) { - return (NS_UNAVAIL); + struct passwd *pwd, *result; + char *buffer; + size_t bufsize; + int *errnop; + + char *name; + uid_t uid; + + int rv; + + assert(mdata != NULL); + + switch ((enum nss_lookup_type)mdata) { + case nss_lt_name: + name = va_arg(ap, char *); + break; + case nss_lt_id: + uid = va_arg(ap, uid_t); + break; + case nss_lt_all: + break; + default: + /* CONSIDERED UNREACHABLE */ + return (NS_UNAVAIL); + } + + pwd = va_arg(ap, struct passwd *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + + switch ((enum nss_lookup_type)mdata) { + case nss_lt_name: + rv = ldap_getpwnam_r(name, pwd, buffer, bufsize, &result); + break; + case nss_lt_id: + rv = ldap_getpwuid_r(uid, pwd, buffer, bufsize, &result); + break; + case nss_lt_all: + rv = ldap_getpwent_r(pwd, buffer, bufsize, &result); + break; + default: + break; + } + + if ((rv == NS_SUCCESS) && (retval != NULL)) + *(struct passwd **)retval = result; + + if ((rv != NS_SUCCESS) && (rv != NS_NOTFOUND)) + *errnop = errno; + + return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.h#7 (text+ko) ==== @@ -29,18 +29,6 @@ #ifndef _LDAP_PASSWD_H_ #define _LDAP_PASSWD_H_ -int -ldap_getpwnam_r(const char *name, struct passwd *pwd, - char *buffer, size_t bufsize, struct passwd **result); -int -ldap_getpwuid_r(uid_t uid, struct passwd *pwd, - char *buffer, size_t bufsize, struct passwd **result); -int -ldap_getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize, - struct passwd **result); -void -ldap_setpwent(); - extern int __ldap_setpwent(void *, void *, va_list); extern int __ldap_passwd(void *, void *, va_list); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#3 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -56,6 +57,17 @@ size_t count; }; +static int nss_ldap_parse_servent(struct nss_ldap_parse_context *); +static void nss_ldap_destroy_servent(struct nss_ldap_parse_context *); + +static int ldap_getservbyname_r(const char *, const char *, struct servent *, + char *, size_t, struct servent **); +static int ldap_getservbyport_r(int, const char *, struct servent *, + char *, size_t, struct servent **); +static int ldap_getservent_r(struct servent *, char *, size_t, + struct servent **); +static void ldap_setservent(); + static int nss_ldap_parse_servent(struct nss_ldap_parse_context *pctx) { @@ -175,11 +187,12 @@ nss_ldap_destroy_servent(struct nss_ldap_parse_context *pctx) { + printf("here - %s %d\n", __FILE__, __LINE__); assert(pctx != NULL); free(pctx->mdata_ext); } -int +static int ldap_getservbyname_r(const char *name, const char *proto, struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { @@ -215,7 +228,7 @@ return (rv); } -int +static int ldap_getservbyport_r(int port, const char *proto, struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { @@ -251,7 +264,7 @@ return (rv); } -int +static int ldap_getservent_r(struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { @@ -278,22 +291,77 @@ return (rv); } -void +static void ldap_setservent() { __nss_ldap_setent(NSS_LDAP_MAP_SERVICES); } - int __ldap_setservent(void *retval, void *mdata, va_list ap) { + + ldap_setservent(); return (NS_UNAVAIL); } int __ldap_servent(void *retval, void *mdata, va_list ap) { - return (NS_UNAVAIL); + struct servent *serv, *result; + char *buffer; + size_t bufsize; + int *errnop; + + char *name, *proto; + int port; + int rv; + + assert(mdata != NULL); + + switch ((enum nss_lookup_type)mdata) { + case nss_lt_name: + name = va_arg(ap, char *); + proto = va_arg(ap, char *); + break; + case nss_lt_id: + port = va_arg(ap, int); + proto = va_arg(ap, char *); + break; + case nss_lt_all: + break; + default: + /* CONSIDERED UNREACHABLE */ + return (NS_UNAVAIL); + } + + serv = va_arg(ap, struct servent *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + + switch ((enum nss_lookup_type)mdata) { + case nss_lt_name: + rv = ldap_getservbyname_r(name, proto, serv, buffer, bufsize, + &result); + break; + case nss_lt_id: + rv = ldap_getservbyport_r(port, proto, serv, buffer, bufsize, + &result); + break; + case nss_lt_all: + rv = ldap_getservent_r(serv, buffer, bufsize, &result); + break; + default: + break; + } + + if ((rv == NS_SUCCESS) && (retval != NULL)) + *(struct servent **)retval = result; + + if ((rv != NS_SUCCESS) && (rv != NS_NOTFOUND)) + *errnop = errno; + + return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.h#3 (text+ko) ==== @@ -29,18 +29,6 @@ #ifndef _LDAP_SERV_H_ #define _LDAP_SERV_H_ -int -ldap_getservbyname_r(const char *name, const char *proto, struct servent *serv, - char *buffer, size_t bufsize, struct servent **result); -int -ldap_getservbyport_r(int port, const char *proto, struct servent *serv, - char *buffer, size_t bufsize, struct servent **result); -int -ldap_getservent_r(struct servent *serv, char *buffer, size_t bufsize, - struct servent **result); -void -ldap_setservent(); - extern int __ldap_setservent(void *, void *, va_list); extern int __ldap_servent(void *, void *, va_list); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#7 (text+ko) ==== @@ -64,27 +64,39 @@ } static int -get_number(const char *str, int low, int max) +get_number(const char *str, int low, int max, int *res) { - char *end = NULL; - int res = 0; if (str[0] == '\0') return (-1); - res = strtol(str, &end, 10); + *res = strtol(str, &end, 10); if (*end != '\0') return (NSS_LDAP_PARSE_ERROR); else - if (((res >= low) || (low == -1)) && - ((res <= max) || (max == -1))) - return (res); + if (((*res >= low) || (low == -1)) && + ((*res <= max) || (max == -1))) + return (NSS_LDAP_SUCCESS); else return (NSS_LDAP_PARSE_ERROR); } static int +get_yesno(const char *str, int *value) +{ + if (strcmp(str, "yes") == 0) { + *value = NSS_LDAP_OPTION_YES; + return (NSS_LDAP_SUCCESS); + } else if (strcmp(str, "no") == 0) { + *value = NSS_LDAP_OPTION_NO; + return (NSS_LDAP_SUCCESS); + } + + return (NSS_LDAP_PARSE_ERROR); +} + +static int set_base_map(struct nss_ldap_configuration *conf, char const *left_arg, char const *right_arg) { @@ -137,23 +149,31 @@ assert(conf != NULL); memset(conf, 0, sizeof(struct nss_ldap_configuration)); - conf->host = strdup("ident2.r61.net ident1.r61.net"); - assert(conf->host != NULL); - conf->port = LDAP_PORT; conf->proto_version = NSS_LDAP_PROTO_VERSION_3; conf->ssl_mode = NSS_LDAP_SSL_OFF;//NSS_LDAP_SSL_START_TLS; + conf->search_limit = 0; + conf->bind_timelimit = 30; + conf->idle_timelimit = 0; + conf->search_timelimit = 0; + conf->reconnect_sleeptime = 4; + conf->max_reconnect_sleeptime = 64; + conf->max_conntries = 5; + conf->max_reconnect_conntries = 2; + conf->deref = NSS_LDAP_DEREF_NEVER; + conf->scope = NSS_LDAP_SCOPE_SUB; + conf->bind_policy = NSS_LDAP_BIND_POLICY_HARD_OPEN; + conf->connect_policy = NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD; + conf->restart = 0; + conf->debug = 0; - conf->bind_dn = strdup( - "uid=nssproxy,ou=Users,ou=LDAPAccess,ou=Domains,dc=r61,dc=net"); + conf->root_bind_dn = conf->bind_dn = strdup(""); assert(conf->bind_dn != NULL); - - conf->root_bind_dn = strdup(conf->bind_dn); - assert(conf->root_bind_dn != NULL); - - conf->bind_pw = strdup("[passwd]"); + conf->root_bind_pw = conf->bind_pw = strdup(""); assert(conf->bind_pw != NULL); - + conf->root_sasl_authid = conf->sasl_authid = strdup(""); + assert(conf->sasl_authid != NULL); + //__nss_ldap_init_start_tls_simple_auth_method(&conf->connection_method); __nss_ldap_init_simple_auth_method(&conf->connection_method); __nss_ldap_init_default_search_method(&conf->search_method); @@ -166,9 +186,9 @@ { FILE *fin; char buffer[1024]; - char *fields[16]; + char *fields[16], *str; int field_count, line_num, value; - int i, res; + int i, res, rv; assert(conf != NULL); assert(fname != NULL); @@ -195,18 +215,6 @@ case '\0': printf("== %s, %d ==\n", __FILE__, __LINE__); continue; - case 'h': - printf("== %s, %d ==\n", __FILE__, __LINE__); - if (strcmp(fields[0], "host") == 0) { - /* TODO: add support for multiple hosts */ - if (field_count >= 2) { - free(conf->host); - conf->host = strdup(fields[1]); - assert(conf->host != NULL); - continue; - } - } - break; case 'b': printf("== %s, %d ==\n", __FILE__, __LINE__); if (strcmp(fields[0], "base") == 0) { @@ -230,8 +238,100 @@ assert(conf->bind_pw != NULL); continue; } + } else if (strcmp(fields[0], "bind_timelimit") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->bind_timelimit = value; + continue; + } + } else if (strcmp(fields[0], "bind_policy") == 0) { + if (field_count == 2) { + if (strcmp(fields[1], "hard_open") == 0) { + conf->bind_policy = + NSS_LDAP_BIND_POLICY_HARD_OPEN; + continue; + } else if (strcmp(fields[1], "hard_init") == 0) { + conf->bind_policy = + NSS_LDAP_BIND_POLICY_HARD_INIT; + continue; + } else if (strcmp(fields[1], "soft") == 0) { + conf->bind_policy = + NSS_LDAP_BIND_POLICY_SOFT; + continue; + } + } } break; + case 'd': + if (strcmp(fields[0], "deref") == 0) { + if (field_count == 2) { + if (strcmp(fields[1], "never") == 0) { + conf->deref = NSS_LDAP_DEREF_NEVER; + continue; + } else if (strcmp(fields[1], + "searching") == 0) { + conf->deref = NSS_LDAP_DEREF_SEARCHING; + continue; + } else if (strcmp(fields[1], "finding") == 0) { + conf->deref = NSS_LDAP_DEREF_FINDING; + continue; + } else if (strcmp(fields[1], "always") == 0) { + conf->deref = NSS_LDAP_DEREF_ALWAYS; + continue; + } + } + } else if (strcmp(fields[0], "debug") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->debug = value; + continue; + } + } + break; + case 'h': + printf("== %s, %d ==\n", __FILE__, __LINE__); + if (strcmp(fields[0], "host") == 0) { + if (field_count >= 2) { + if (conf->hosts != NULL) + sl_free(conf->hosts, 1); + + conf->hosts = sl_init(); + assert(conf->hosts != NULL); + + for (i = 1; i < field_count; ++i) { + str = strdup(fields[i]); + assert(str != NULL); + rv = sl_add(conf->hosts, str); + if (rv != 0) { + /* TODO: write to logs */ + } + } + continue; + } + } + break; + case 'i': + if (strcmp(fields[0], "idle_timelimit") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->idle_timelimit = value; + continue; + } + } + break; + case 'k': + if (strcmp(fields[0], "krb5_ccname") == 0) { + if (field_count == 2) { + free(conf->krb5_ccname); + conf->krb5_ccname = strdup(fields[1]); + assert(conf->krb5_ccname != NULL); + continue; + } + } + break; case 'l': printf("== %s, %d ==\n", __FILE__, __LINE__); /* NOTE: we'd probably better use @@ -239,11 +339,18 @@ * NSS_LDAP_PROTO_VERSION_3 constants here */ if (strcmp(fields[0], "ldap-version") == 0) { if ((field_count == 2) && - (value = get_number(fields[1], 2, 3) == + (get_number(fields[1], 2, 3, &value) == NSS_LDAP_SUCCESS)) { conf->proto_version = value; continue; } + } else if (strcmp(fields[0], "logdir") == 0) { + if (field_count == 2) { + free(conf->logdir); + conf->logdir = strdup(fields[1]); + assert(conf->logdir); + continue; + } } break; case 'n': @@ -282,13 +389,30 @@ fields[1], fields[2]) == NSS_LDAP_SUCCESS)) continue; + } else if (strcmp(fields[0], "nss_connect_policy") == 0) { + if (field_count == 2) { + if ((strcmp(fields[1], "persist") == 0) || + (strcmp(fields[1], "persist_per_thread") == 0)) { + conf->connect_policy = + NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD; + continue; + } else if (strcmp(fields[1], "persist_per_process") == 0) { + conf->connect_policy = + NSS_LDAP_CONNECT_POLICY_PERSIST_PERPROCESS; + continue; + } else if (strcmp(fields[1], "oneshot") == 0) { + conf->connect_policy = + NSS_LDAP_CONNECT_POLICY_ONESHOT; + continue; + } + } } break; case 'p': printf("== %s, %d ==\n", __FILE__, __LINE__); if (strcmp(fields[0], "port") == 0) { if ((field_count == 2) && - (value = get_number(fields[1], 0, -1) == + (get_number(fields[1], 0, -1, &value) == NSS_LDAP_SUCCESS)) { conf->port = value; continue; @@ -304,11 +428,53 @@ assert(conf->root_bind_dn != NULL); continue; } - } + } else if (strcmp(fields[0], "rootbindpw") == 0) { + if (field_count == 2) { + free(conf->root_bind_pw); + conf->root_bind_pw = strdup(fields[1]); + assert(conf->root_bind_pw != NULL); + continue; + } + } else if (strcmp(fields[0], "restart") == 0) { + if ((field_count == 2) && + (get_yesno(fields[2], &value) == + NSS_LDAP_SUCCESS)) + conf->restart = value; + } else if (strcmp(fields[0], "referrals") == 0) { + if ((field_count == 2) && + (get_yesno(fields[2], &value) == + NSS_LDAP_SUCCESS)) + conf->referrals = value; + } else if (strcmp(fields[0], "rootuse_sasl") == 0) { + if ((field_count == 2) && + (get_yesno(fields[2], &value) == + NSS_LDAP_SUCCESS)) + conf->root_use_sasl = value; + } else if (strcmp(fields[0], "rootsasl_auth_id") == 0) { + if (field_count == 2) { + free(conf->root_sasl_authid); + conf->root_sasl_authid = strdup(fields[1]); + assert(conf->root_sasl_authid != NULL); + continue; + } + } break; case 's': printf("== %s, %d ==\n", __FILE__, __LINE__); - if (strcmp(fields[0], "ssl") == 0) { + if (strcmp(fields[0], "scope") == 0) { + if (field_count == 2) { + if (strcmp(fields[1], "sub") == 0) { + conf->scope = NSS_LDAP_SCOPE_SUB; + continue; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 4 17:45:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D4F16A4DF; Fri, 4 Aug 2006 17:45:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4626B16A4DD for ; Fri, 4 Aug 2006 17:45:38 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDE5F43D49 for ; Fri, 4 Aug 2006 17:45:37 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74HjbdB019318 for ; Fri, 4 Aug 2006 17:45:37 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74HjbL4019315 for perforce@freebsd.org; Fri, 4 Aug 2006 17:45:37 GMT (envelope-from piso@freebsd.org) Date: Fri, 4 Aug 2006 17:45:37 GMT Message-Id: <200608041745.k74HjbL4019315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 17:45:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103182 Change 103182 by piso@piso_newluxor on 2006/08/04 17:44:37 Even for iwi, use the main ithread handler for the rx path, and spawn as many tasks as necessary for all the auxiliary operations. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#4 (text+ko) ==== @@ -141,9 +141,12 @@ static void iwi_frame_intr(struct iwi_softc *, struct iwi_rx_data *, int, struct iwi_frame *); static void iwi_notification_intr(struct iwi_softc *, struct iwi_notif *); -static void iwi_rx_intr(struct iwi_softc *); +static void iwi_rx_intr(void *); static void iwi_tx_intr(struct iwi_softc *, struct iwi_tx_ring *); -static void iwi_intr(void *); +static void iwi_tx_intr1(void *c, int p __unused); +static void iwi_tx_intr2(void *c, int p __unused); +static void iwi_tx_intr3(void *c, int p __unused); +static void iwi_tx_intr4(void *c, int p __unused); static int iwi_filter(void *); static int iwi_cmd(struct iwi_softc *, uint8_t, void *, uint8_t); static void iwi_write_ibssnode(struct iwi_softc *, const u_int8_t [], int); @@ -263,8 +266,6 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); - mtx_init(&sc->sc_smtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_SPIN); sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); @@ -288,6 +289,10 @@ TASK_INIT(&sc->sc_setwmetask, 0, iwi_wme_setparams, sc); TASK_INIT(&sc->sc_downtask, 0, iwi_down, sc); TASK_INIT(&sc->sc_restarttask, 0, iwi_restart, sc); + TASK_INIT(&sc->sc_tx1_done, 0, iwi_tx_intr1, sc); + TASK_INIT(&sc->sc_tx2_done, 0, iwi_tx_intr2, sc); + TASK_INIT(&sc->sc_tx3_done, 0, iwi_tx_intr3, sc); + TASK_INIT(&sc->sc_tx4_done, 0, iwi_tx_intr4, sc); if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { device_printf(dev, "chip is in D%d power mode " @@ -468,7 +473,7 @@ * Hook our interrupt after all initialization is complete. */ error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE, - iwi_filter, iwi_intr, sc, &sc->sc_ih); + iwi_filter, iwi_rx_intr, sc, &sc->sc_ih); if (error != 0) { device_printf(dev, "could not set up interrupt\n"); goto fail; @@ -522,7 +527,6 @@ delete_unrhdr(sc->sc_unr); mtx_destroy(&sc->sc_mtx); - mtx_destroy(&sc->sc_smtx); return 0; } @@ -1563,12 +1567,15 @@ } static void -iwi_rx_intr(struct iwi_softc *sc) +iwi_rx_intr(void *arg) { + struct iwi_softc *sc = arg; struct iwi_rx_data *data; struct iwi_hdr *hdr; uint32_t hw; + IWI_LOCK_DECL; + IWI_LOCK(sc); hw = CSR_READ_4(sc, IWI_CSR_RX_RIDX); for (; sc->rxq.cur != hw;) { @@ -1603,6 +1610,8 @@ /* tell the firmware what we have processed */ hw = (hw == 0) ? IWI_RX_RING_COUNT - 1 : hw - 1; CSR_WRITE_4(sc, IWI_CSR_RX_WIDX, hw); + CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK); + IWI_UNLOCK(sc); } static void @@ -1612,7 +1621,9 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_tx_data *data; uint32_t hw; + IWI_LOCK_DECL; + IWI_LOCK(sc); hw = CSR_READ_4(sc, txq->csr_ridx); for (; txq->next != hw;) { @@ -1641,8 +1652,40 @@ iwi_led_event(sc, IWI_LED_TX); iwi_start(ifp); + IWI_UNLOCK(sc); +} + +static void +iwi_tx_intr1(void *arg, int p __unused) { + struct iwi_softc *sc = arg; + + iwi_tx_intr(sc, &sc->txq[0]); +} + +static void +iwi_tx_intr2(void *arg, int p __unused) { + struct iwi_softc *sc = arg; + + iwi_tx_intr(sc, &sc->txq[1]); +} + +static void +iwi_tx_intr3(void *arg, int p __unused) { + struct iwi_softc *sc = arg; + + iwi_tx_intr(sc, &sc->txq[2]); } +static void +iwi_tx_intr4(void *arg, int p __unused) { + struct iwi_softc *sc = arg; + IWI_LOCK_DECL; + + IWI_LOCK(sc); + iwi_tx_intr(sc, &sc->txq[3]); + IWI_UNLOCK(sc); +} + static int iwi_filter(void *arg) { @@ -1650,11 +1693,8 @@ uint32_t r; int ret = FILTER_HANDLED; - mtx_lock_spin(&sc->sc_smtx); - if ((r = CSR_READ_4(sc, IWI_CSR_INTR)) == 0 || r == 0xffffffff) { - mtx_unlock_spin(&sc->sc_smtx); + if ((r = CSR_READ_4(sc, IWI_CSR_INTR)) == 0 || r == 0xffffffff) return (FILTER_STRAY); - } /* acknowledge interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR, r); @@ -1662,43 +1702,18 @@ if (r & IWI_INTR_FW_INITED) { if (!(r & (IWI_INTR_FATAL_ERROR | IWI_INTR_PARITY_ERROR))) wakeup(sc); - r &= ~(IWI_INTR_FW_INITED | IWI_INTR_FATAL_ERROR | - IWI_INTR_PARITY_ERROR); } if (r & IWI_INTR_CMD_DONE) { sc->flags &= ~IWI_FLAG_BUSY; wakeup(sc); - r &= ~IWI_INTR_CMD_DONE; } if (r & IWI_INTR_PARITY_ERROR) { /* XXX rate-limit */ device_printf(sc->sc_dev, "parity error\n"); - r &= ~IWI_INTR_PARITY_ERROR; } - if (r) { - /* disable interrupts */ - CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); - ret |= FILTER_SCHEDULE_THREAD; - } - sc->intr = r; - mtx_unlock_spin(&sc->sc_smtx); - return (ret); -} - -static void -iwi_intr(void *arg) -{ - struct iwi_softc *sc = arg; - uint32_t r; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - mtx_lock_spin(&sc->sc_smtx); - r = sc->intr; - if (r & IWI_INTR_FATAL_ERROR) { device_printf(sc->sc_dev, "firmware error\n"); taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); @@ -1706,25 +1721,25 @@ if (r & IWI_INTR_RADIO_OFF) taskqueue_enqueue(sc->sc_tq, &sc->sc_radiofftask); - + if (r & IWI_INTR_TX1_DONE) - iwi_tx_intr(sc, &sc->txq[0]); + taskqueue_enqueue(sc->sc_tq, &sc->sc_tx1_done); if (r & IWI_INTR_TX2_DONE) - iwi_tx_intr(sc, &sc->txq[1]); + taskqueue_enqueue(sc->sc_tq, &sc->sc_tx2_done); if (r & IWI_INTR_TX3_DONE) - iwi_tx_intr(sc, &sc->txq[2]); + taskqueue_enqueue(sc->sc_tq, &sc->sc_tx3_done); if (r & IWI_INTR_TX4_DONE) - iwi_tx_intr(sc, &sc->txq[3]); - - if (r & IWI_INTR_RX_DONE) - iwi_rx_intr(sc); - - IWI_UNLOCK(sc); - CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK); - mtx_unlock_spin(&sc->sc_smtx); + taskqueue_enqueue(sc->sc_tq, &sc->sc_tx4_done); + + if (r & IWI_INTR_RX_DONE) { + /* disable interrupts */ + CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); + ret |= FILTER_SCHEDULE_THREAD; + } + return (ret); } static int @@ -2130,10 +2145,8 @@ uint32_t tmp; int ntries; - mtx_lock_spin(&sc->sc_smtx); /* disable interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); - mtx_unlock_spin(&sc->sc_smtx); CSR_WRITE_4(sc, IWI_CSR_RST, IWI_RST_STOP_MASTER); for (ntries = 0; ntries < 5; ntries++) { @@ -2535,10 +2548,8 @@ /* we're done with command blocks processing */ MEM_WRITE_4(sc, 0x3000a4, 0x540c00); - mtx_lock_spin(&sc->sc_smtx); /* allow interrupts so we know when the firmware is ready */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK); - mtx_unlock_spin(&sc->sc_smtx); /* tell the adapter to initialize the firmware */ CSR_WRITE_4(sc, IWI_CSR_RST, 0); @@ -3239,6 +3250,7 @@ struct ifnet *ifp = ic->ic_ifp; if (sc->sc_softled) { + IWI_ASSERT_OWNED(sc); callout_stop(&sc->sc_ledtimer); sc->sc_blinking = 0; } @@ -3300,11 +3312,14 @@ iwi_radio_off(void *arg, int pending) { struct iwi_softc *sc = arg; + IWI_LOCK_DECL; + IWI_LOCK(sc); device_printf(sc->sc_dev, "radio turned off\n"); iwi_stop(sc); sc->sc_rfkill_timer = 2; sc->sc_ifp->if_timer = 1; + IWI_UNLOCK(sc); } static int ==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#3 (text+ko) ==== @@ -123,7 +123,6 @@ device_t sc_dev; struct mtx sc_mtx; - struct mtx sc_smtx; uint8_t sc_mcast[IEEE80211_ADDR_LEN]; struct unrhdr *sc_unr; struct taskqueue *sc_tq; /* private task queue */ @@ -132,7 +131,6 @@ #endif uint32_t flags; - uint32_t intr; #define IWI_FLAG_FW_INITED (1 << 0) #define IWI_FLAG_SCANNING (1 << 1) #define IWI_FLAG_FW_LOADING (1 << 2) @@ -177,6 +175,10 @@ struct task sc_setwmetask; /* set wme params processing */ struct task sc_downtask; /* disassociate processing */ struct task sc_restarttask; /* restart adapter processing */ + struct task sc_tx1_done; + struct task sc_tx2_done; + struct task sc_tx3_done; + struct task sc_tx4_done; unsigned int sc_softled : 1, /* enable LED gpio status */ sc_ledstate: 1, /* LED on/off state */ @@ -226,3 +228,7 @@ if (!__waslocked) \ mtx_unlock(&(sc)->sc_mtx); \ } while (0) + +#define IWI_ASSERT_OWNED(sc) do { \ + mtx_assert(&(sc)->sc_mtx, MA_OWNED); \ +} while (0) From owner-p4-projects@FreeBSD.ORG Fri Aug 4 18:01:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13DAE16A4FC; Fri, 4 Aug 2006 18:01:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C88FC16A4F8 for ; Fri, 4 Aug 2006 18:00:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E70B643D6A for ; Fri, 4 Aug 2006 18:00:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74I0vYH020152 for ; Fri, 4 Aug 2006 18:00:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74I0vwM020149 for perforce@freebsd.org; Fri, 4 Aug 2006 18:00:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 4 Aug 2006 18:00:57 GMT Message-Id: <200608041800.k74I0vwM020149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 18:01:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103183 Change 103183 by rwatson@rwatson_zoo on 2006/08/04 18:00:28 Remove HEADER_VERSION, which is a poorly named define for a public header file. Add new version constants, and allocate a specific constant for OpenBSM, as well as list some constants used by other implementations. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,9 +199,19 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ +#define BSM_MAX_GROUPS 16 -#define BSM_MAX_GROUPS 16 -#define HEADER_VERSION 1 +/* + * A number of BSM versions are floating around and defined. Here are + * constants for them. OpenBSM uses the same token types, etc, used in the + * Solaris BSM version, but has a separate version number in order to + * identify a potentially different event identifier name space. + */ +#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define BSM_HEADER_VERSION_SOLARIS 2 +#define BSM_HEADER_VERSION_TSOL25 3 +#define BSM_HEADER_VERSION_TSOL 4 +#define BSM_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#49 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 $ */ #include @@ -1155,7 +1155,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 19:20:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2E8216A4DF; Fri, 4 Aug 2006 19:20:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAC9516A4DA for ; Fri, 4 Aug 2006 19:20:38 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5713643D46 for ; Fri, 4 Aug 2006 19:20:38 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74JKc8C026704 for ; Fri, 4 Aug 2006 19:20:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74JKbRg026700 for perforce@freebsd.org; Fri, 4 Aug 2006 19:20:37 GMT (envelope-from marcel@freebsd.org) Date: Fri, 4 Aug 2006 19:20:37 GMT Message-Id: <200608041920.k74JKbRg026700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 19:20:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103187 Change 103187 by marcel@marcel_nfs on 2006/08/04 19:20:18 o Replace the i386 specific get_xmmregs and set_xmmregs with the generic get_xregs and set_xregs (resp). o Add get_xregsize where appropriate. o Even avoid using gregset_t and fpregset_t and simply use struct reg and struct fpreg. This eliminates the dependency on and allows struct reg and struct fpreg to be forward declared in NOTE: The initial desire to be as compatible to Sun & Linux has been relaxed because there doesn't seem to be any desire for compatibility. Solaris 10 even changed libthread_db to libc_db. We just follow as closely as possible so that the generic programming model matches. This should allow GDB to unify their code with only limited glueing. Such glueing is effecively already there as they define gdb_gregset_t and gdb_fpregset_t for that exact purpose. The default for said definitions is struct reg and struct fpreg (resp), so we're doing exactly the right thing. The upshot for us that that we don't pollute our sources with unnecessary SysV-isms, Sun-isms and/or Linux-isms, nor with their mistakes. It has only bought us confusion if there was anything we got back for it. Affected files ... .. //depot/projects/gdb/lib/libthread_db/Symbol.map#2 edit .. //depot/projects/gdb/lib/libthread_db/arch/alpha/libc_r_md.c#4 edit .. //depot/projects/gdb/lib/libthread_db/arch/amd64/libc_r_md.c#3 edit .. //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#5 edit .. //depot/projects/gdb/lib/libthread_db/arch/ia64/libc_r_md.c#3 edit .. //depot/projects/gdb/lib/libthread_db/arch/sparc64/libc_r_md.c#3 edit .. //depot/projects/gdb/lib/libthread_db/libc_r_db.c#8 edit .. //depot/projects/gdb/lib/libthread_db/libpthread_db.c#7 edit .. //depot/projects/gdb/lib/libthread_db/libpthread_db.h#4 edit .. //depot/projects/gdb/lib/libthread_db/libthr_db.c#8 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.c#7 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.h#11 edit .. //depot/projects/gdb/lib/libthread_db/thread_db_int.h#9 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/Symbol.map#2 (text) ==== @@ -20,11 +20,12 @@ td_thr_get_info; td_thr_getfpregs; td_thr_getgregs; - td_thr_getxmmregs; # x86 only + td_thr_getxregs; + td_thr_getxregsize; td_thr_set_event; td_thr_setfpregs; td_thr_setgregs; - td_thr_setxmmregs; # x86 only + td_thr_setxregs; td_thr_sstep; # FreeBSD extension to GDB<->thread interface td_thr_tls_get_addr; td_thr_validate; ==== //depot/projects/gdb/lib/libthread_db/arch/alpha/libc_r_md.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ #include void -libc_r_md_getgregs(jmp_buf jb, gregset_t *r) +libc_r_md_getgregs(jmp_buf jb, struct reg *r) { r->r_regs[R_V0] = jb->_jb[4]; r->r_regs[R_T0] = jb->_jb[5]; @@ -68,6 +68,6 @@ } void -libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, struct fpreg *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/amd64/libc_r_md.c#3 (text+ko) ==== @@ -31,11 +31,11 @@ #include void -libc_r_md_getgregs(jmp_buf jb, gregset_t *r) +libc_r_md_getgregs(jmp_buf jb, struct reg *r) { } void -libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, struct fpreg *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/i386/libc_r_md.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ #include void -libc_r_md_getgregs(jmp_buf jb, gregset_t *r) +libc_r_md_getgregs(jmp_buf jb, struct reg *r) { r->r_eip = jb->_jb[0]; r->r_ebx = jb->_jb[1]; @@ -43,6 +43,6 @@ } void -libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, struct fpreg *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/ia64/libc_r_md.c#3 (text+ko) ==== @@ -31,11 +31,11 @@ #include void -libc_r_md_getgregs(jmp_buf jb, gregset_t *r) +libc_r_md_getgregs(jmp_buf jb, struct reg *r) { } void -libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, struct fpreg *r) { } ==== //depot/projects/gdb/lib/libthread_db/arch/sparc64/libc_r_md.c#3 (text+ko) ==== @@ -31,11 +31,11 @@ #include void -libc_r_md_getgregs(jmp_buf jb, gregset_t *r) +libc_r_md_getgregs(jmp_buf jb, struct reg *r) { } void -libc_r_md_getfpregs(jmp_buf jb, fpregset_t *r) +libc_r_md_getfpregs(jmp_buf jb, struct fpreg *r) { } ==== //depot/projects/gdb/lib/libthread_db/libc_r_db.c#8 (text+ko) ==== @@ -35,8 +35,8 @@ #include "thread_db_int.h" -void libc_r_md_getfpregs(jmp_buf jb, fpregset_t *); -void libc_r_md_getgregs(jmp_buf jb, gregset_t *); +void libc_r_md_getfpregs(jmp_buf jb, struct fpreg *); +void libc_r_md_getgregs(jmp_buf jb, struct reg *); struct td_thragent { TD_THRAGENT_FIELDS; @@ -228,16 +228,20 @@ return ((err == PS_OK) ? TD_OK : TD_ERR); } -#ifdef __i386__ +static td_err_e +libc_r_db_thr_getxregs(const td_thrhandle_t *th, void *xregs) +{ + return (TD_NOXREGS); +} + static td_err_e -libc_r_db_thr_getxmmregs(const td_thrhandle_t *th, char *fxsave) +libc_r_db_thr_getxregsize(const td_thrhandle_t *th, int *szp) { - return (TD_NOFPREGS); + return (TD_NOXREGS); } -#endif static td_err_e -libc_r_db_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *r) +libc_r_db_thr_getfpregs(const td_thrhandle_t *th, struct fpreg *r) { jmp_buf jb; const td_thragent_t *ta; @@ -262,7 +266,7 @@ } static td_err_e -libc_r_db_thr_getgregs(const td_thrhandle_t *th, gregset_t *r) +libc_r_db_thr_getgregs(const td_thrhandle_t *th, struct reg *r) { jmp_buf jb; const td_thragent_t *ta; @@ -292,22 +296,20 @@ return (0); } -#ifdef __i386__ static td_err_e -libc_r_db_thr_setxmmregs(const td_thrhandle_t *th, const char *fxsave) +libc_r_db_thr_setxregs(const td_thrhandle_t *th, const void *xregs) { - return (TD_NOFPREGS); + return (TD_NOXREGS); } -#endif static td_err_e -libc_r_db_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *r) +libc_r_db_thr_setfpregs(const td_thrhandle_t *th, const struct fpreg *r) { return (TD_ERR); } static td_err_e -libc_r_db_thr_setgregs(const td_thrhandle_t *th, const gregset_t *r) +libc_r_db_thr_setgregs(const td_thrhandle_t *th, const struct reg *r) { return (TD_ERR); } @@ -337,12 +339,11 @@ .to_thr_get_info = libc_r_db_thr_get_info, .to_thr_getfpregs = libc_r_db_thr_getfpregs, .to_thr_getgregs = libc_r_db_thr_getgregs, + .to_thr_getxregs = libc_r_db_thr_getxregs, + .to_thr_getxregsize = libc_r_db_thr_getxregsize, .to_thr_set_event = libc_r_db_thr_set_event, .to_thr_setfpregs = libc_r_db_thr_setfpregs, .to_thr_setgregs = libc_r_db_thr_setgregs, + .to_thr_setxregs = libc_r_db_thr_setxregs, .to_thr_validate = libc_r_db_thr_validate, -#ifdef __i386__ - .to_thr_getxmmregs = libc_r_db_thr_getxmmregs, - .to_thr_setxmmregs = libc_r_db_thr_setxmmregs, -#endif }; ==== //depot/projects/gdb/lib/libthread_db/libpthread_db.c#7 (text+ko) ==== @@ -218,7 +218,7 @@ static td_err_e pt_ta_map_id2thr(const td_thragent_t *ta, thread_t id, td_thrhandle_t *th) { - gregset_t gregs; + struct reg gregs; TAILQ_HEAD(, pthread) thread_list; psaddr_t pt, tcb_addr; lwpid_t lwp; @@ -678,9 +678,14 @@ return (0); } -#ifdef __i386__ +static td_err_e +pt_thr_getxregsize(const td_thrhandle_t *th, int *sizep) +{ + return (TD_NOXREGS); +} + static td_err_e -pt_thr_getxmmregs(const td_thrhandle_t *th, char *fxsave) +pt_thr_getxregs(const td_thrhandle_t *th, void *xregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -697,7 +702,7 @@ return (ret); if (ta->map[th->th_tid].type == PT_LWP) { - ret = ps_lgetxmmregs(ta->ph, ta->map[th->th_tid].lwp, fxsave); + ret = ps_lgetxregs(ta->ph, ta->map[th->th_tid].lwp, xregs); return (P2T(ret)); } @@ -711,20 +716,19 @@ if (ret != 0) return (P2T(ret)); if (lwp != 0) { - ret = ps_lgetxmmregs(ta->ph, lwp, fxsave); + ret = ps_lgetxregs(ta->ph, lwp, xregs); return (P2T(ret)); } ret = ps_pread(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); if (ret != 0) return (P2T(ret)); - pt_ucontext_to_fxsave(&tmbx.tm_context, fxsave); + pt_ucontext_to_xreg(&tmbx.tm_context, xregs); return (0); } -#endif static td_err_e -pt_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *fpregs) +pt_thr_getfpregs(const td_thrhandle_t *th, struct fpreg *fpregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -765,7 +769,7 @@ } static td_err_e -pt_thr_getgregs(const td_thrhandle_t *th, gregset_t *gregs) +pt_thr_getgregs(const td_thrhandle_t *th, struct reg *gregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -805,9 +809,8 @@ return (0); } -#ifdef __i386__ static td_err_e -pt_thr_setxmmregs(const td_thrhandle_t *th, const char *fxsave) +pt_thr_setxregs(const td_thrhandle_t *th, const void *xregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -824,7 +827,7 @@ return (ret); if (ta->map[th->th_tid].type == PT_LWP) { - ret = ps_lsetxmmregs(ta->ph, ta->map[th->th_tid].lwp, fxsave); + ret = ps_lsetxregs(ta->ph, ta->map[th->th_tid].lwp, xregs); return (P2T(ret)); } @@ -839,7 +842,7 @@ if (ret != 0) return (P2T(ret)); if (lwp != 0) { - ret = ps_lsetxmmregs(ta->ph, lwp, fxsave); + ret = ps_lsetxregs(ta->ph, lwp, xregs); return (P2T(ret)); } /* @@ -850,14 +853,13 @@ if (ret != 0) return (P2T(ret)); - pt_fxsave_to_ucontext(fxsave, &tmbx.tm_context); + pt_xreg_to_ucontext(xregs, &tmbx.tm_context); ret = ps_pwrite(ta->ph, tmbx_addr, &tmbx, sizeof(tmbx)); return (P2T(ret)); } -#endif static td_err_e -pt_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *fpregs) +pt_thr_setfpregs(const td_thrhandle_t *th, const struct fpreg *fpregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -904,7 +906,7 @@ } static td_err_e -pt_thr_setgregs(const td_thrhandle_t *th, const gregset_t *gregs) +pt_thr_setgregs(const td_thrhandle_t *th, const struct reg *gregs) { const td_thragent_t *ta = th->th_ta; struct kse_thr_mailbox tmbx; @@ -1134,16 +1136,15 @@ .to_thr_get_info = pt_thr_get_info, .to_thr_getfpregs = pt_thr_getfpregs, .to_thr_getgregs = pt_thr_getgregs, + .to_thr_getxregs = pt_thr_getxregs, + .to_thr_getxregsize = pt_thr_getxregsize, .to_thr_set_event = pt_thr_set_event, .to_thr_setfpregs = pt_thr_setfpregs, .to_thr_setgregs = pt_thr_setgregs, + .to_thr_setxregs = pt_thr_setxregs, .to_thr_validate = pt_thr_validate, .to_thr_tls_get_addr = pt_thr_tls_get_addr, /* FreeBSD specific extensions. */ .to_thr_sstep = pt_thr_sstep, -#ifdef __i386__ - .to_thr_getxmmregs = pt_thr_getxmmregs, - .to_thr_setxmmregs = pt_thr_setxmmregs, -#endif }; ==== //depot/projects/gdb/lib/libthread_db/libpthread_db.h#4 (text+ko) ==== @@ -84,10 +84,9 @@ void pt_ucontext_to_reg(const ucontext_t *, struct reg *); void pt_fpreg_to_ucontext(const struct fpreg *, ucontext_t *); void pt_ucontext_to_fpreg(const ucontext_t *, struct fpreg *); -#ifdef __i386__ -void pt_fxsave_to_ucontext(const char *, ucontext_t *); -void pt_ucontext_to_fxsave(const ucontext_t *, char *); -#endif +void pt_xreg_to_ucontext(const void *, ucontext_t *); +void pt_ucontext_to_xreg(const ucontext_t *, void *); + int pt_reg_sstep(struct reg *reg, int step); #endif /* _LIBPTHREAD_DB_H_ */ ==== //depot/projects/gdb/lib/libthread_db/libthr_db.c#8 (text+ko) ==== @@ -513,9 +513,14 @@ return (0); } -#ifdef __i386__ +static td_err_e +pt_thr_getxregsize(const td_thrhandle_t *th, int *sizep) +{ + return (TD_NOXREGS); +} + static td_err_e -pt_thr_getxmmregs(const td_thrhandle_t *th, char *fxsave) +pt_thr_getxregs(const td_thrhandle_t *th, void *xregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -526,13 +531,12 @@ if (ret) return (ret); - ret = ps_lgetxmmregs(ta->ph, th->th_tid, fxsave); + ret = ps_lgetxregs(ta->ph, th->th_tid, xregs); return (P2T(ret)); } -#endif static td_err_e -pt_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *fpregs) +pt_thr_getfpregs(const td_thrhandle_t *th, struct fpreg *fpregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -548,7 +552,7 @@ } static td_err_e -pt_thr_getgregs(const td_thrhandle_t *th, gregset_t *gregs) +pt_thr_getgregs(const td_thrhandle_t *th, struct reg *gregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -563,9 +567,8 @@ return (P2T(ret)); } -#ifdef __i386__ static td_err_e -pt_thr_setxmmregs(const td_thrhandle_t *th, const char *fxsave) +pt_thr_setxregs(const td_thrhandle_t *th, const void *xregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -576,13 +579,12 @@ if (ret) return (ret); - ret = ps_lsetxmmregs(ta->ph, th->th_tid, fxsave); + ret = ps_lsetxregs(ta->ph, th->th_tid, xregs); return (P2T(ret)); } -#endif static td_err_e -pt_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *fpregs) +pt_thr_setfpregs(const td_thrhandle_t *th, const struct fpreg *fpregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -598,7 +600,7 @@ } static td_err_e -pt_thr_setgregs(const td_thrhandle_t *th, const gregset_t *gregs) +pt_thr_setgregs(const td_thrhandle_t *th, const struct reg *gregs) { const td_thragent_t *ta = th->th_ta; int ret; @@ -778,16 +780,15 @@ .to_thr_get_info = pt_thr_get_info, .to_thr_getfpregs = pt_thr_getfpregs, .to_thr_getgregs = pt_thr_getgregs, + .to_thr_getxregs = pt_thr_getxregs, + .to_thr_getxregsize = pt_thr_getxregsize, .to_thr_set_event = pt_thr_set_event, .to_thr_setfpregs = pt_thr_setfpregs, .to_thr_setgregs = pt_thr_setgregs, + .to_thr_setxregs = pt_thr_setxregs, .to_thr_validate = pt_thr_validate, .to_thr_tls_get_addr = pt_thr_tls_get_addr, /* FreeBSD specific extensions. */ .to_thr_sstep = pt_thr_sstep, -#ifdef __i386__ - .to_thr_getxmmregs = pt_thr_getxmmregs, - .to_thr_setxmmregs = pt_thr_setxmmregs, -#endif }; ==== //depot/projects/gdb/lib/libthread_db/thread_db.c#7 (text+ko) ==== @@ -184,25 +184,29 @@ return (ta->ta_ops->to_thr_get_info(th, info)); } -#ifdef __i386__ td_err_e -td_thr_getxmmregs(const td_thrhandle_t *th, char *fxsave) +td_thr_getxregs(const td_thrhandle_t *th, void *xreg) { const td_thragent_t *ta = th->th_ta; - return (ta->ta_ops->to_thr_getxmmregs(th, fxsave)); + return (ta->ta_ops->to_thr_getxregs(th, xreg)); } -#endif +td_err_e +td_thr_getxregsize(const td_thrhandle_t *th, int *sizep) +{ + const td_thragent_t *ta = th->th_ta; + return (ta->ta_ops->to_thr_getxregsize(th, sizep)); +} td_err_e -td_thr_getfpregs(const td_thrhandle_t *th, fpregset_t *fpregset) +td_thr_getfpregs(const td_thrhandle_t *th, struct fpreg *fpregs) { const td_thragent_t *ta = th->th_ta; - return (ta->ta_ops->to_thr_getfpregs(th, fpregset)); + return (ta->ta_ops->to_thr_getfpregs(th, fpregs)); } td_err_e -td_thr_getgregs(const td_thrhandle_t *th, gregset_t *gregs) +td_thr_getgregs(const td_thrhandle_t *th, struct reg *gregs) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_getgregs(th, gregs)); @@ -215,24 +219,22 @@ return (ta->ta_ops->to_thr_set_event(th, events)); } -#ifdef __i386__ td_err_e -td_thr_setxmmregs(const td_thrhandle_t *th, const char *fxsave) +td_thr_setxregs(const td_thrhandle_t *th, const void *xreg) { const td_thragent_t *ta = th->th_ta; - return (ta->ta_ops->to_thr_setxmmregs(th, fxsave)); + return (ta->ta_ops->to_thr_setxregs(th, xreg)); } -#endif td_err_e -td_thr_setfpregs(const td_thrhandle_t *th, const fpregset_t *fpregs) +td_thr_setfpregs(const td_thrhandle_t *th, const struct fpreg *fpregs) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_setfpregs(th, fpregs)); } td_err_e -td_thr_setgregs(const td_thrhandle_t *th, const gregset_t *gregs) +td_thr_setgregs(const td_thrhandle_t *th, const struct reg *gregs) { const td_thragent_t *ta = th->th_ta; return (ta->ta_ops->to_thr_setgregs(th, gregs)); ==== //depot/projects/gdb/lib/libthread_db/thread_db.h#11 (text+ko) ==== @@ -227,13 +227,13 @@ td_err_e td_thr_event_enable(const td_thrhandle_t *, int); td_err_e td_thr_event_getmsg(const td_thrhandle_t *, td_event_msg_t *); td_err_e td_thr_get_info(const td_thrhandle_t *, td_thrinfo_t *); -td_err_e td_thr_getfpregs(const td_thrhandle_t *, fpregset_t *); -td_err_e td_thr_getgregs(const td_thrhandle_t *, gregset_t *); +td_err_e td_thr_getfpregs(const td_thrhandle_t *, struct fpreg *); +td_err_e td_thr_getgregs(const td_thrhandle_t *, struct reg *); td_err_e td_thr_getxregs(const td_thrhandle_t *, void *); td_err_e td_thr_getxregsize(const td_thrhandle_t *, int *); td_err_e td_thr_set_event(const td_thrhandle_t *, td_thr_events_t *); -td_err_e td_thr_setfpregs(const td_thrhandle_t *, const fpregset_t *); -td_err_e td_thr_setgregs(const td_thrhandle_t *, const gregset_t *); +td_err_e td_thr_setfpregs(const td_thrhandle_t *, const struct fpreg *); +td_err_e td_thr_setgregs(const td_thrhandle_t *, const struct reg *); td_err_e td_thr_setxregs(const td_thrhandle_t *, const void *); td_err_e td_thr_validate(const td_thrhandle_t *); td_err_e td_thr_tls_get_addr(const td_thrhandle_t *, void *, size_t, void **); ==== //depot/projects/gdb/lib/libthread_db/thread_db_int.h#9 (text+ko) ==== @@ -66,23 +66,22 @@ td_err_e (*to_thr_event_getmsg)(const td_thrhandle_t *, td_event_msg_t *); td_err_e (*to_thr_get_info)(const td_thrhandle_t *, td_thrinfo_t *); - td_err_e (*to_thr_getfpregs)(const td_thrhandle_t *, fpregset_t *); - td_err_e (*to_thr_getgregs)(const td_thrhandle_t *, gregset_t *); + td_err_e (*to_thr_getfpregs)(const td_thrhandle_t *, struct fpreg *); + td_err_e (*to_thr_getgregs)(const td_thrhandle_t *, struct reg *); + td_err_e (*to_thr_getxregs)(const td_thrhandle_t *, void *); + td_err_e (*to_thr_getxregsize)(const td_thrhandle_t *, int *); td_err_e (*to_thr_set_event)(const td_thrhandle_t *, td_thr_events_t *); td_err_e (*to_thr_setfpregs)(const td_thrhandle_t *, - const fpregset_t *); - td_err_e (*to_thr_setgregs)(const td_thrhandle_t *, const gregset_t *); + const struct fpreg *); + td_err_e (*to_thr_setgregs)(const td_thrhandle_t *, const struct reg *); + td_err_e (*to_thr_setxregs)(const td_thrhandle_t *, const void *); td_err_e (*to_thr_validate)(const td_thrhandle_t *); td_err_e (*to_thr_tls_get_addr)(const td_thrhandle_t *, void *, size_t, void **); /* FreeBSD specific extensions. */ td_err_e (*to_thr_sstep)(const td_thrhandle_t *, int); -#if defined(__i386__) - td_err_e (*to_thr_getxmmregs)(const td_thrhandle_t *, char *); - td_err_e (*to_thr_setxmmregs)(const td_thrhandle_t *, const char *); -#endif }; #ifdef TD_DEBUG From owner-p4-projects@FreeBSD.ORG Fri Aug 4 19:27:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D26D16A4E7; Fri, 4 Aug 2006 19:27:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22DAA16A4E6 for ; Fri, 4 Aug 2006 19:27:58 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8F5343D68 for ; Fri, 4 Aug 2006 19:27:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74JRnUL027008 for ; Fri, 4 Aug 2006 19:27:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74JRlh9027005 for perforce@freebsd.org; Fri, 4 Aug 2006 19:27:47 GMT (envelope-from marcel@freebsd.org) Date: Fri, 4 Aug 2006 19:27:47 GMT Message-Id: <200608041927.k74JRlh9027005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 19:27:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103188 Change 103188 by marcel@marcel_nfs on 2006/08/04 19:26:52 IFC @103186 Affected files ... .. //depot/projects/gdb/Makefile.inc1#15 integrate .. //depot/projects/gdb/bin/sh/histedit.c#4 integrate .. //depot/projects/gdb/bin/sh/parser.c#5 integrate .. //depot/projects/gdb/bin/test/test.1#7 integrate .. //depot/projects/gdb/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#8 integrate .. //depot/projects/gdb/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#11 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/gdb/include/Makefile#12 integrate .. //depot/projects/gdb/lib/Makefile#12 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#11 integrate .. //depot/projects/gdb/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/gdb/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/gdb/lib/libc/sys/kse.2#3 integrate .. //depot/projects/gdb/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/gdb/lib/libtelnet/Makefile#4 integrate .. //depot/projects/gdb/lib/libthread_db/arch/powerpc/libc_r_md.c#1 branch .. //depot/projects/gdb/lib/libthread_db/arch/powerpc/libpthread_md.c#1 branch .. //depot/projects/gdb/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/gdb/libexec/telnetd/Makefile#4 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/gdb/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/gdb/release/doc/share/examples/Makefile.relnotesng#3 integrate .. //depot/projects/gdb/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/gdb/sbin/reboot/reboot.c#4 integrate .. //depot/projects/gdb/sbin/sysctl/sysctl.c#5 integrate .. //depot/projects/gdb/share/doc/papers/timecounter/timecounter.ms#3 integrate .. //depot/projects/gdb/share/man/man4/acpi.4#11 integrate .. //depot/projects/gdb/share/man/man4/devctl.4#3 integrate .. //depot/projects/gdb/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.powerpc/Makefile#1 branch .. //depot/projects/gdb/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch .. //depot/projects/gdb/share/man/man4/ng_ether.4#5 integrate .. //depot/projects/gdb/share/man/man5/src.conf.5#2 integrate .. //depot/projects/gdb/share/man/man7/hier.7#12 integrate .. //depot/projects/gdb/share/misc/bsd-family-tree#7 integrate .. //depot/projects/gdb/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/gdb/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/gdb/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/gdb/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/gdb/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/gdb/sys/conf/files.powerpc#8 integrate .. //depot/projects/gdb/sys/conf/options#36 integrate .. //depot/projects/gdb/sys/ddb/db_ps.c#7 integrate .. //depot/projects/gdb/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/gdb/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/gdb/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/gdb/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/gdb/sys/dev/em/README#3 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#10 integrate .. //depot/projects/gdb/sys/dev/em/if_em.h#4 integrate .. //depot/projects/gdb/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/gdb/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/gdb/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe.c#8 integrate .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/gdb/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/gdb/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/gdb/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/gdb/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/gdb/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#10 integrate .. //depot/projects/gdb/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/gdb/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/gdb/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/gdb/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/gdb/sys/fs/hpfs/hpfs.h#4 integrate .. //depot/projects/gdb/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/gdb/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/gdb/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/gdb/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/gdb/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/gdb/sys/kern/init_sysent.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#16 integrate .. //depot/projects/gdb/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_resource.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_tc.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_time.c#6 integrate .. //depot/projects/gdb/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#16 integrate .. //depot/projects/gdb/sys/kern/subr_rman.c#6 integrate .. //depot/projects/gdb/sys/kern/syscalls.c#11 integrate .. //depot/projects/gdb/sys/kern/systrace_args.c#1 branch .. //depot/projects/gdb/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#27 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#17 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#23 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/gdb/sys/modules/Makefile#18 integrate .. //depot/projects/gdb/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/gdb/sys/net/bridgestp.c#2 integrate .. //depot/projects/gdb/sys/net/bridgestp.h#2 integrate .. //depot/projects/gdb/sys/net/if_bridge.c#2 integrate .. //depot/projects/gdb/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#14 integrate .. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_ether.c#10 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/gdb/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/gdb/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/gdb/sys/nfsserver/nfs.h#8 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvcache.c#7 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#10 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/gdb/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/gdb/sys/pci/ncr.c#7 integrate .. //depot/projects/gdb/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#11 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/gdb/sys/sys/kernel.h#7 integrate .. //depot/projects/gdb/sys/sys/socketvar.h#12 integrate .. //depot/projects/gdb/sys/sys/syscall.h#11 integrate .. //depot/projects/gdb/sys/sys/syscall.mk#11 integrate .. //depot/projects/gdb/sys/sys/sysent.h#4 integrate .. //depot/projects/gdb/sys/sys/sysproto.h#11 integrate .. //depot/projects/gdb/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/gdb/sys/vm/pmap.h#7 integrate .. //depot/projects/gdb/sys/vm/swap_pager.c#12 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#11 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#17 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/gdb/tools/build/options/WITHOUT_GNU#1 branch .. //depot/projects/gdb/tools/build/options/WITHOUT_NS_CACHING#1 branch .. //depot/projects/gdb/tools/build/options/WITHOUT_PAM#1 branch .. //depot/projects/gdb/tools/build/options/makeman#2 integrate .. //depot/projects/gdb/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/conv.c#4 integrate .. //depot/projects/gdb/usr.bin/logger/logger.1#4 integrate .. //depot/projects/gdb/usr.bin/logger/logger.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#17 integrate .. //depot/projects/gdb/usr.bin/telnet/Makefile#4 integrate .. //depot/projects/gdb/usr.sbin/Makefile#13 integrate .. //depot/projects/gdb/usr.sbin/elf2exe/Makefile#2 delete .. //depot/projects/gdb/usr.sbin/elf2exe/elf2exe.8#3 delete .. //depot/projects/gdb/usr.sbin/elf2exe/elf2exe.c#2 delete .. //depot/projects/gdb/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/nvram/Makefile#1 branch .. //depot/projects/gdb/usr.sbin/nvram/nvram.8#1 branch .. //depot/projects/gdb/usr.sbin/nvram/nvram.c#1 branch Differences ... ==== //depot/projects/gdb/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -731,7 +731,7 @@ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi - cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all + cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all # # update ==== //depot/projects/gdb/bin/sh/histedit.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.28 2005/10/19 15:37:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.29 2006/08/04 07:56:31 yar Exp $"); #include #include @@ -370,7 +370,7 @@ fputs(s, efp); } /* - * At end? (if we were to loose last, we'd sure be + * At end? (if we were to lose last, we'd sure be * messed up). */ if (he.num == last) ==== //depot/projects/gdb/bin/sh/parser.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.56 2005/08/15 17:49:38 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); #include #include @@ -952,6 +952,7 @@ USTPUTC('\\', out); pungetc(); } else if (c == '\n') { + plinno++; if (doprompt) setprompt(2); else ==== //depot/projects/gdb/bin/test/test.1#7 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.24 2006/07/27 19:08:21 yar Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $ .\" -.Dd July 27, 2006 +.Dd July 31, 2006 .Dt TEST 1 .Os .Sh NAME @@ -339,3 +339,9 @@ .Fl o , unlike in the logical operators of .Xr sh 1 . +For instance, the writable status of +.Pa file +will be tested by the following command even though the former expression +indicated false, which results in a gratuitous access to the file system: +.Pp +.Dl "[ -z abc -a -w file ]" ==== //depot/projects/gdb/etc/mtree/BSD.include.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.106 2006/03/19 15:44:53 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -56,6 +56,8 @@ .. ppbus .. + powermac_nvram + .. smbus .. speaker ==== //depot/projects/gdb/etc/mtree/BSD.local.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.118 2006/01/08 10:15:30 dougb Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -111,8 +111,6 @@ cat3 .. cat4 - alpha - .. i386 .. .. @@ -123,8 +121,6 @@ cat7 .. cat8 - alpha - .. i386 .. .. ==== //depot/projects/gdb/etc/mtree/BSD.usr.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.315 2006/07/29 19:47:09 simon Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -18,6 +18,8 @@ aout .. .. + dtrace + .. engines .. .. @@ -655,8 +657,6 @@ cat3 .. cat4 - alpha - .. amd64 .. i386 @@ -671,8 +671,6 @@ cat7 .. cat8 - alpha - .. amd64 .. i386 @@ -692,8 +690,6 @@ cat3 .. cat4 - alpha - .. amd64 .. i386 @@ -708,8 +704,6 @@ cat7 .. cat8 - alpha - .. amd64 .. i386 @@ -768,8 +762,6 @@ man3 .. man4 - alpha - .. amd64 .. i386 @@ -784,8 +776,6 @@ man7 .. man8 - alpha - .. amd64 .. i386 ==== //depot/projects/gdb/etc/rc.d/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.73 2006/06/01 11:01:54 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.74 2006/08/04 18:37:03 des Exp $ .include @@ -21,7 +21,7 @@ jail \ kadmind kerberos kernel keyserv kldxref kpasswdd \ ldconfig local localpkg lpd \ - mixer motd mountcritlocal mountcritremote \ + mixer motd mountcritlocal mountcritremote mountlate \ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.223 2006/07/10 16:53:32 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.224 2006/08/04 07:56:31 yar Exp $ % ======================================================================= @@ -5459,7 +5459,7 @@ Most of us just sit back and marvel at such a story; how could that terminal know whether the poor guy was sitting or standing? Good debuggers, though, know that there has to be a reason. Electrical theories are the easiest to -hypothesize: was there a loose with under the carpet, or problems with static +hypothesize: was there a loose wire under the carpet, or problems with static electricity? But electrical problems are rarely consistently reproducible. An alert IBMer finally noticed that the problem was in the terminal's keyboard: the tops of two keys were switched. When the programmer was seated he was a ==== //depot/projects/gdb/include/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.261 2006/03/30 20:15:53 ume Exp $ +# $FreeBSD: src/include/Makefile,v 1.262 2006/08/01 22:19:00 sobomax Exp $ # # Doing a "make install" builds /usr/include. @@ -41,7 +41,7 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ - dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ + dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ @@ -55,6 +55,10 @@ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +.if ${MACHINE_ARCH} == "powerpc" +_dev_powermac_nvram= dev/powermac_nvram +.endif + .if ${MK_GPIB} != "no" _dev_ieee488= dev/ieee488 .endif ==== //depot/projects/gdb/lib/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.214 2006/03/20 14:24:57 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.215 2006/08/04 17:56:31 marcel Exp $ .include @@ -111,7 +111,7 @@ _libthr= libthr .endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "arm" _libthread_db= libthread_db .endif ==== //depot/projects/gdb/lib/libarchive/archive_write.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.16 2005/09/24 21:15:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.17 2006/08/01 05:31:29 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -201,7 +201,9 @@ if (a->state & ARCHIVE_STATE_DATA) ((a->format_finish_entry)(a)); - if (archive_entry_dev(entry) == a->skip_file_dev && + if (a->skip_file_dev != 0 && + archive_entry_dev(entry) == a->skip_file_dev && + a->skip_file_ino != 0 && archive_entry_ino(entry) == a->skip_file_ino) { archive_set_error(a, 0, "Can't add archive to itself"); return (ARCHIVE_WARN); ==== //depot/projects/gdb/lib/libc/resolv/res_init.c#2 (text) ==== @@ -73,10 +73,12 @@ static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.2 2006/03/21 15:37:16 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.3 2006/08/04 10:21:11 ume Exp $"); #include "port_before.h" +#include "namespace.h" + #include #include #include @@ -93,6 +95,8 @@ #include #include +#include "un-namespace.h" + #include "port_after.h" /* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */ @@ -735,13 +739,13 @@ int ns; if (statp->_vcsock >= 0) { - (void) close(statp->_vcsock); + (void) _close(statp->_vcsock); statp->_vcsock = -1; statp->_flags &= ~(RES_F_VC | RES_F_CONN); } for (ns = 0; ns < statp->_u._ext.nscount; ns++) { if (statp->_u._ext.nssocks[ns] != -1) { - (void) close(statp->_u._ext.nssocks[ns]); + (void) _close(statp->_u._ext.nssocks[ns]); statp->_u._ext.nssocks[ns] = -1; } } ==== //depot/projects/gdb/lib/libc/resolv/res_send.c#2 (text) ==== @@ -73,7 +73,7 @@ static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.2 2006/03/21 15:37:16 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.3 2006/08/04 12:26:07 ume Exp $"); /* * Send query to name server and wait for reply. @@ -970,6 +970,10 @@ res_nclose(statp); return (0); } +#ifdef USE_KQUEUE + if (kv.ident != s) + goto wait; +#endif errno = 0; fromlen = sizeof(from); resplen = _recvfrom(s, (char*)ans, anssiz,0, ==== //depot/projects/gdb/lib/libc/sys/kse.2#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.17 2005/11/24 07:33:35 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.18 2006/08/04 07:56:31 yar Exp $ .\" .Dd July 12, 2004 .Dt KSE 2 @@ -267,7 +267,7 @@ .Pp As a special case, if the last remaining KSE in the last remaining KSE group invokes this system call, then the KSE is not destroyed; -instead, the KSE just looses the association with its mailbox and +instead, the KSE just loses the association with its mailbox and .Fn kse_exit returns normally. This returns the process to its original, unthreaded state. ==== //depot/projects/gdb/lib/libc/uuid/uuid_compare.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.4 2005/01/03 02:56:15 marcel Exp $ + * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.5 2006/08/03 03:34:36 delphij Exp $ */ #include @@ -41,7 +41,8 @@ int32_t uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status) { - int res; + int res; + int64_t res64; if (status != NULL) *status = uuid_s_ok; @@ -54,10 +55,19 @@ if (b == NULL) return ((uuid_is_nil(a, NULL)) ? 0 : 1); - /* We have to compare the hard way. */ - res = (int)((int64_t)a->time_low - (int64_t)b->time_low); - if (res) - return ((res < 0) ? -1 : 1); + /* + * We have to compare the hard way. + * + * Note that time_low is defined as unsigned 32-bit + * integer, therefore, with a significantly large + * a->time_low and a small b->time_low, we will end + * up with a value which is larger than 0x7fffffff + * which is negative if casted to signed 32-bit + * integer. + */ + res64 = (int64_t)a->time_low - (int64_t)b->time_low; + if (res64) + return ((res64 < 0) ? -1 : 1); res = (int)a->time_mid - (int)b->time_mid; if (res) return ((res < 0) ? -1 : 1); ==== //depot/projects/gdb/lib/libtelnet/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: src/lib/libtelnet/Makefile,v 1.23 2006/03/17 18:54:28 ru Exp $ +# $FreeBSD: src/lib/libtelnet/Makefile,v 1.24 2006/07/31 13:29:35 yar Exp $ .include @@ -19,13 +19,14 @@ .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" SRCS+= kerberos5.c CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .endif -.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa ==== //depot/projects/gdb/libexec/rtld-elf/rtld.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.114 2006/03/28 06:14:22 davidxu Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.115 2006/08/04 13:37:54 delphij Exp $ */ /* @@ -2451,8 +2451,8 @@ } else { if (obj->versyms == NULL) { if (object_match_name(obj, ventry->name)) { - _rtld_error("%s: object %s should provide version %s for ", - "symbol %s", obj->path, ventry->name, + _rtld_error("%s: object %s should provide version %s for " + "symbol %s", obj_rtld.path, obj->path, ventry->name, obj->strtab + symnum); continue; } ==== //depot/projects/gdb/libexec/telnetd/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.28 2006/07/27 12:15:37 yar Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.31 2006/07/31 19:15:09 yar Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -30,18 +30,20 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} +# XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} LDADD+= -lkrb5 -lasn1 -lroken -lcom_err .endif .endif -.endif .include ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../../.. @@ -11,7 +11,7 @@ # SGML content SRCS+= article.sgml -# SRCS+= proc-ia64.sgml +SRCS+= proc-ia64.sgml SRCS+= ../common/hw.ent SRCS+= ../common/artheader.sgml SRCS+= ../common/dev.sgml ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.958 2006/07/25 21:48:28 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.959 2006/07/31 16:49:25 brueffer Exp $ 2000 @@ -618,7 +618,7 @@ The &man.my.4; driver is now MPSAFE. &merged; - The &man.my.4; driver now supports &man.altq.4;. + The &man.my.4; driver now supports &man.altq.4;. &merged; The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet @@ -641,7 +641,7 @@ The &man.sk.4; driver is now MPSAFE. &merged; - The &man.ste.4; driver is now MPSAFE. + The &man.ste.4; driver is now MPSAFE. &merged; The &man.stge.4; driver has been added. It supports the Sundance/Tamarack TC9021 Gigabit Ethernet controller and was ==== //depot/projects/gdb/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD French Documentation Project $Id: proc-alpha.sgml,v 1.5 2002/09/29 17:03:01 eagle Exp $ - $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.5 2002/12/30 21:18:04 schweikh Exp $ + $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.6 2006/08/04 07:56:32 yar Exp $ Original revision: 1.43 --> @@ -1212,7 +1212,7 @@ IDE interface is quite slow, a Promise card gives a 3-4 times speed improvement. - On PC164 the SRM sometimes seems to loose its variable settings. + On PC164 the SRM sometimes seems to lose its variable settings. For PC164, current superstition says that, to avoid losing settings, you want to first downgrade to SRM 4.x and then upgrade to 5.x. One sample error that was observed was: ==== //depot/projects/gdb/release/doc/share/examples/Makefile.relnotesng#3 (text+ko) ==== @@ -1,12 +1,12 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # -ARCHS= amd64 ia64 i386 pc98 sparc64 +ARCHS= amd64 ia64 i386 pc98 powerpc sparc64 MULTITEXTS= installation relnotes hardware UNITEXTS= readme errata ==== //depot/projects/gdb/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.87 2006/07/25 05:13:53 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.88 2006/07/31 17:04:28 brueffer Exp $ # # @@ -46,14 +46,14 @@ arcmsr i386,amd64 asr i386 ath i386 -aue i386,pc98,ia64,amd64 +aue i386,pc98,ia64,amd64,powerpc awi i386,pc98,amd64 -axe i386,pc98,amd64 +axe i386,pc98,amd64,powerpc bce i386,amd64 bge i386,pc98,sparc64,ia64,amd64 bktr i386,pc98 bt i386,amd64 -cdce i386,pc98,ia64,amd64 +cdce i386,pc98,ia64,amd64,powerpc ciss i386,ia64,amd64 ce i386,pc98 cm i386 @@ -61,7 +61,7 @@ cp i386,pc98 ct pc98 ctau i386 -cue i386,pc98,ia64,amd64 +cue i386,pc98,ia64,amd64,powerpc cx i386 de i386,pc98,alpha,ia64,amd64 dpt i386,ia64,amd64 @@ -70,8 +70,8 @@ esp sparc64 ex i386,amd64 fe i386,pc98,amd64 -fwohci i386,sparc64,ia64,amd64 -gem sparc64 +fwohci i386,sparc64,ia64,amd64,powerpc +gem sparc64,powerpc hifn i386,pc98,amd64 hptmv i386,amd64 ida i386 @@ -79,7 +79,7 @@ iir i386,ia64,amd64 ips i386,amd64 ixgb i386,amd64 -kue i386,pc98,ia64,amd64 +kue i386,pc98,ia64,amd64,powerpc lge i386,pc98,amd64 mfi i386,alpha,ia64,amd64 mlx i386,alpha,ia64,amd64 @@ -93,7 +93,7 @@ nge i386,pc98,alpha,amd64 nsp i386,pc98 nve i386,amd64 -ohci i386,pc98,alpha,ia64,amd64 +ohci i386,pc98,alpha,ia64,amd64,powerpc oltr i386 pcn i386,pc98,alpha,ia64,amd64 pst i386 @@ -148,13 +148,13 @@ ucycom i386,pc98,amd64 udav i386,pc98,amd64 uftdi i386,pc98,amd64 -uhci i386,pc98,alpha,ia64,amd64 -ulpt i386,pc98,alpha,amd64 -umass i386,pc98,alpha,amd64 +uhci i386,pc98,alpha,ia64,amd64,powerpc +ulpt i386,pc98,alpha,amd64,powerpc +umass i386,pc98,alpha,amd64,powerpc umodem i386,pc98,amd64 uplcom i386,pc98,amd64 -urio i386,pc98,amd64 -uscanner i386,pc98,amd64 +urio i386,pc98,amd64,powerpc +uscanner i386,pc98,amd64,powerpc uvisor i386,pc98,amd64 uvscom i386,pc98,amd64 vge i386,pc98,amd64 ==== //depot/projects/gdb/sbin/reboot/reboot.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.24 2005/03/21 23:44:04 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.26 2006/08/02 13:05:38 bms Exp $"); #include #include @@ -151,13 +151,26 @@ if (!nflag) sync(); + /* + * Ignore signals that we can get as a result of killing + * parents, group leaders, etc. + */ + (void)signal(SIGHUP, SIG_IGN); + (void)signal(SIGINT, SIG_IGN); + (void)signal(SIGQUIT, SIG_IGN); + (void)signal(SIGTERM, SIG_IGN); + (void)signal(SIGTSTP, SIG_IGN); + + /* + * If we're running in a pipeline, we don't want to die + * after killing whatever we're writing to. + */ + (void)signal(SIGPIPE, SIG_IGN); + /* Just stop init -- if we fail, we'll restart it. */ if (kill(1, SIGTSTP) == -1) err(1, "SIGTSTP init"); - /* Ignore the SIGHUP we get when our parent shell dies. */ - (void)signal(SIGHUP, SIG_IGN); - /* Send a SIGTERM first, a chance to save the buffers. */ if (kill(-1, SIGTERM) == -1 && errno != ESRCH) err(1, "SIGTERM processes"); ==== //depot/projects/gdb/sbin/sysctl/sysctl.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.70 2006/07/25 02:28:43 njl Exp $"; + "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.71 2006/08/04 07:31:55 njl Exp $"; #endif /* not lint */ #ifdef __i386__ @@ -577,15 +577,14 @@ val = ""; while (len >= sizeof(int)) { fputs(val, stdout); - if(*fmt == 'U') + if (*fmt == 'U') >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 4 19:54:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA1AD16A4E0; Fri, 4 Aug 2006 19:54:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 772CE16A4DD for ; Fri, 4 Aug 2006 19:54:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42C4543D60 for ; Fri, 4 Aug 2006 19:54:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74JsPew035341 for ; Fri, 4 Aug 2006 19:54:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74JsN0Y035338 for perforce@freebsd.org; Fri, 4 Aug 2006 19:54:23 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 19:54:23 GMT Message-Id: <200608041954.k74JsN0Y035338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 19:54:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103189 Change 103189 by jb@jb_freebsd2 on 2006/08/04 19:53:58 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/ports/CHANGES#4 integrate .. //depot/projects/dtrace/ports/MOVED#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.mail.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.subdir.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#5 integrate .. //depot/projects/dtrace/ports/Tools/scripts/security-check.awk#2 integrate .. //depot/projects/dtrace/src/bin/sh/histedit.c#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/dtrace/src/lib/Makefile#5 integrate .. //depot/projects/dtrace/src/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/sys/kse.2#3 integrate .. //depot/projects/dtrace/src/lib/libthread_db/arch/powerpc/libc_r_md.c#1 branch .. //depot/projects/dtrace/src/lib/libthread_db/arch/powerpc/libpthread_md.c#1 branch .. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/dtrace/src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/dtrace/src/share/doc/papers/timecounter/timecounter.ms#3 integrate .. //depot/projects/dtrace/src/share/man/man4/acpi.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/devctl.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_ether.4#3 integrate .. //depot/projects/dtrace/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/dtrace/src/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs.h#3 integrate .. //depot/projects/dtrace/src/sys/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#8 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_tc.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/ncr.c#4 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#9 integrate .. //depot/projects/dtrace/www/en/projects/acpi/completed.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/acpi/index.sgml#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.11 2006/06/19 00:16:16 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.12 2006/08/04 17:26:26 linimon Exp $ 2003 @@ -609,6 +609,12 @@ real destination directory, and not one of the symlinks that points to it. + For incremental builds, packages should be uploaded + using rsync so we do not put too much + strain on the mirrors: + + &prompt.root; rsync -n -r -v -l -t -p --delete packages/ portmgr@ftp-master:w/ports/${arch}/${branch}/ | tee log + Distfiles can be transferred via rsync: ==== //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml#2 (text+ko) ==== @@ -1,10 +1,10 @@ óÏÚÄÁÎÉÅ ÉÎÆÏÒÍÁÃÉÏÎÎÙÈ ÆÁÊÌÏ× éÍÅÅÔÓÑ Ä×Á ÉÎÆÏÒÍÁÃÉÏÎÎÙÈ ÆÁÊÌÁ, ËÏÔÏÒÙÅ ÔÒÅÂÕÀÔÓÑ ÄÌÑ ÌÀÂÏÇÏ - ÐÏÒÔÁ, ×ÎÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, Ñ×ÌÑÅÔÓÑ ÌÉ ÏÎ ÐÁËÁÄÖÅÍ ÉÌÉ ÎÅÔ. üÔÏ + ÐÏÒÔÁ, ×ÎÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, Ñ×ÌÑÅÔÓÑ ÌÉ ÏÎ ÐÁËÅÔÏÍ ÉÌÉ ÎÅÔ. üÔÏ pkg-descr É pkg-plist. ðÒÅÆÉËÓ pkg- ÏÔÌÉÞÁÅÔ ÉÈ ÏÔ ÄÒÕÇÉÈ ÆÁÊÌÏ×. @@ -195,7 +195,7 @@ úÄÅÓØ ÐÅÒÅÞÉÓÌÑÀÔÓÑ ×ÓÅ ÆÁÊÌÙ, ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÙÅ ÐÏÒÔÏÍ. åÇÏ ÔÁËÖÅ ÎÁÚÙ×ÁÀÔ ÓÐÉÓËÏÍ ÄÌÑ ÕÐÁËÏ×ËÉ, ÐÏÔÏÍÕ ÞÔÏ - ÐÁËÁÄÖ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ. + ÐÁËÅÔ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ. éÍÅÎÁ ÐÕÔÅÊ ÕËÁÚÙ×ÁÀÔÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÏÞÎÏÇÏ ÐÒÅÆÉËÓÁ (ÏÂÙÞÎÏ /usr/local ÉÌÉ /usr/X11R6). åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ @@ -232,6 +232,41 @@ linkend="porting-autoplist">Á×ÔÏÍÁÔÉÞÅÓËÏÍ ÐÏÓÔÒÏÅÎÉÉ ÓÐÉÓËÁ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÐÏÍÏÞØ ÓÜËÏÎÏÍÉÔØ ×ÒÅÍÑ. + + óÕÝÅÓÔ×ÕÅÔ ÔÏÌØËÏ ÏÄÎÏ ÉÓËÌÀÞÅÎÉÅ, ËÏÇÄÁ Õ ÐÏÒÔÁ ÍÏÖÅÔ + ÏÔÓÕÔÓÔ×Ï×ÁÔØ pkg-plist. åÓÌÉ ÐÏÒÔ + ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÌÉÛØ ÎÅÓËÏÌØËÏ ÆÁÊÌÏ×, Á ×ÏÚÍÏÖÎÏ, É ËÁÔÁÌÏÇÏ×, ÔÏ + ÏÎÉ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÙÈ + PLIST_FILES É PLIST_DIRS, + ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ, ×ÎÕÔÒÉ ÆÁÊÌÁ Makefile ÐÏÒÔÁ. + ë ÐÒÉÍÅÒÕ, ÍÙ ÍÏÖÅÍ ÏÂÏÊÔÉÓØ ÂÅÚ ÆÁÊÌÁ + pkg-plist Õ ÐÒÉ×ÅÄ£ÎÎÏÇÏ ×ÙÛÅ ÐÏÒÔÁ + oneko, ÄÏÂÁ×É× ÓÌÅÄÕÀÝÉÅ ÓÔÒÏËÉ × + Makefile: + + PLIST_FILES= bin/oneko \ + lib/X11/app-defaults/Oneko \ + lib/X11/oneko/cat1.xpm \ + lib/X11/oneko/cat2.xpm \ + lib/X11/oneko/mouse.xpm +PLIST_DIRS= lib/X11/oneko + + ëÏÎÅÞÎÏ, ÐÅÒÅÍÅÎÎÁÑ PLIST_DIRS ÎÅ ÄÏÌÖÎÁ + ÚÁÄÁ×ÁÔØÓÑ, ÅÓÌÉ ÐÏÒÔ ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÎÉËÁËÉÈ ËÁÔÁÌÏÇÏ×. + + ïÂÒÁÔÎÏÊ ÓÔÏÒÏÎÏÊ ÔÁËÏÇÏ ÓÐÏÓÏÂÁ ÐÅÒÅÞÉÓÌÅÎÉÑ ÆÁÊÌÏ× É + ËÁÔÁÌÏÇÏ× ÐÏÒÔÁ Ñ×ÌÑÅÔÓÑ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ + ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ ËÏÍÁÎÄ, ÏÐÉÓÁÎÎÙÈ × &man.pkg.create.1;. + ðÏÜÔÏÍÕ ÏÎ ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÒÏÓÔÙÈ ÐÏÒÔÏ×, ÞÔÏ ÄÅÌÁÅÔ ÉÈ ÅÝ£ ÂÏÌÅÅ + ÐÒÏÓÔÙÍÉ. ïÄÎÏ×ÒÅÍÅÎÎÏ Ó ÜÔÉÍ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÍÏÍÅÎÔÏÍ Ñ×ÌÑÅÔÓÑ + ÕÍÅÎØÛÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÆÁÊÌÏ× × ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×. ðÏÖÁÌÕÊÓÔÁ, + ÐÏÄÕÍÁÊÔÅ ÎÁÄ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÜÔÏÊ ÔÅÈÎÉËÉ, ÐÒÅÖÄÅ ÞÅÍ ÓÏÚÄÁ×ÁÔØ + pkg-plist. + + äÁÌÅÅ ÍÙ Õ×ÉÄÉÍ, ËÁË ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÁÊÌÙ + pkg-plist É PLIST_FILES + ×ÙÐÏÌÎÅÎÉÑ ÂÏÌÅÅ ÓÌÏÖÎÙÈ + ÚÁÄÁÞ. @@ -247,7 +282,7 @@ ôÅÓÔÉÒÏ×ÁÎÉÅ ÐÏÒÔÁ ÷Ù ÄÏÌÖÎÙ ÕÄÏÓÔÏ×ÅÒÉÔØÓÑ, ÞÔÏ ÐÒÁ×ÉÌÁ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔÁ ×ÙÐÏÌÎÑÀÔ - ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×Ù ÈÏÔÉÔÅ, ×ËÌÀÞÁÑ ÓÏÚÄÁÎÉÅ ÐÁËÁÄÖÁ ÄÌÑ ÐÏÒÔÁ. ÷ÏÔ + ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×Ù ÈÏÔÉÔÅ, ×ËÌÀÞÁÑ ÓÏÚÄÁÎÉÅ ÐÁËÅÔÁ ÄÌÑ ÐÏÒÔÁ. ÷ÏÔ ÔÅ ×ÁÖÎÙÅ ×ÅÝÉ, ËÏÔÏÒÙÅ ×Ù ÄÏÌÖÎÙ ÐÒÏ×ÅÒÉÔØ. @@ -310,7 +345,7 @@ ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ. ðÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÛÁÇÁ 3 ÐÒÏ×ÅÒØÔÅ, ÞÔÏ ×ÓÅ ÎÏ×ÙÅ ËÁÔÁÌÏÇÉ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÄÁÌÅÎÙ. ôÁËÖÅ ÐÏÐÒÏÂÕÊÔÅ ÚÁÐÕÓÔÉÔØ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÐÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÛÁÇÁ 4, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ - ÏÎÏ ÒÁÂÏÔÁÅÔ ÐÒÁ×ÉÌØÎÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÚ ÐÁËÁÄÖÁ. + ÏÎÏ ÒÁÂÏÔÁÅÔ ÐÒÁ×ÉÌØÎÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÚ ÐÁËÅÔÁ. @@ -323,7 +358,7 @@ ðÏÒÔÏ×. ÷ ÞÁÓÔÎÏÓÔÉ, ×Ù ÍÏÖÅÔÅ ÚÁÈÏÔÅÔØ ÐÒÏ×ÅÒÉÔØ, ÐÒÁ×ÉÌØÎÏ ÌÉ ÓÆÏÒÍÉÒÏ×ÁÎ ÆÁÊÌ Makefile É ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÌÉ ÏÂÒÁÚÏÍ ÎÁÉÍÅÎÏ×ÁÎ ÐÁËÁÄÖ. + linkend="porting-pkgname">ÐÁËÅÔ. @@ -336,7 +371,7 @@ ôÅÐÅÒØ, ËÏÇÄÁ ×Ù ÓÞÁÓÔÌÉ×Ù ÏÔ Ó×ÏÅÇÏ ÐÅÒ×ÏÇÏ ÐÏÒÔÁ, ÅÄÉÎÓÔ×ÅÎÎÏÅ, ÞÔÏ ÏÓÔÁÌÏÓØ ÓÄÅÌÁÔØ, ÜÔÏ ×ËÌÀÞÉÔØ ÅÇÏ × ÏÓÎÏ×ÎÏÅ ÄÅÒÅ×Ï ÐÏÒÔÏ× FreeBSD É ÏÓÞÁÓÔÌÉ×ÉÔØ ÜÔÉÍ ×ÓÅÈ ÏÓÔÁÌØÎÙÈ. îÁÍ ÎÅ ÎÕÖÅÎ ÎÉ ×ÁÛ - ËÁÔÁÌÏÇ work, ÎÉ ÐÁËÁÄÖ + ËÁÔÁÌÏÇ work, ÎÉ ÐÁËÅÔ pkgname.tgz, ÔÁË ÞÔÏ ÕÄÁÌÉÔÅ ÉÈ ÐÒÑÍÏ ÓÅÊÞÁÓ. úÁÔÅÍ ÐÒÏÓÔÏ ×ËÌÀÞÉÔÅ ×Ù×ÏÄ ËÏÍÁÎÄÙ shar `find port_dir` × ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ É ÐÏÛÌÉÔÅ @@ -369,7 +404,7 @@ ðÏ×ÔÏÒÉÍ ÅÝ£ ÒÁÚ, ÞÔÏ ÎÅ ÎÕÖÎÏ ×ËÌÀÞÁÔØ ÎÉ ÏÒÉÇÉÎÁÌØÎÙÊ ÆÁÊÌ Ó ÄÉÓÔÒÉÂÕÔÉ×ÏÍ, ÎÉ ËÁÔÁÌÏÇ work, - ÎÉ ÐÁËÁÄÖ, ÐÏÓÔÒÏÅÎÎÙÊ ×ÁÍÉ ËÏÍÁÎÄÏÊ + ÎÉ ÐÁËÅÔ, ÐÏÓÔÒÏÅÎÎÙÊ ×ÁÍÉ ËÏÍÁÎÄÏÊ make package. ðÏÓÌÅ ÔÏÇÏ ËÁË ×Ù ÐÏÓÌÁÌÉ ÐÏÒÔ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÔÅÒÐÉÔÅ. @@ -669,11 +704,11 @@ configure, ÎÅ ÎÕÖÎÏ ×ËÌÀÞÁÔØ ÆÁÊÌÙ diff ÄÌÑ configure (ÏÎÉ ÞÁÓÔÅÎØËÏ ×ÙÒÁÓÔÁÀÔ ÄÏ ÎÅÓËÏÌØËÉÈ ÔÙÓÑÞ ÓÔÒÏË!); ÚÁÄÁÊÔÅ USE_AUTOCONF_VER=213 É - ×ËÌÀÞÉÔÅ ÄÉÆÆ-ÆÁÊÌ ÄÌÑ configure.in. + ×ËÌÀÞÉÔÅ diff-ÆÁÊÌ ÄÌÑ configure.in. ëÒÏÍÅ ÔÏÇÏ, ÅÓÌÉ ×Ù ÕÄÁÌÑÅÔÅ ÆÁÊÌ, ÔÏ ÜÔÏ ÍÏÖÎÏ ÓÄÅÌÁÔØ É × ÃÅÌÉ post-extract, Á ÎÅ ×ÎÕÔÒÉ ÐÁÔÞÁ. ëÁË ÔÏÌØËÏ - ×Ù ÂÕÄÅÔÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ ÐÏÌÕÞÁÀÝÉÍÓÑ ÄÉÆÆ-ÆÁÊÌÏÍ, ÒÁÚÂÅÊÔÅ ÅÇÏ ÎÁ + ×Ù ÂÕÄÅÔÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ ÐÏÌÕÞÁÀÝÉÍÓÑ diff-ÆÁÊÌÏÍ, ÒÁÚÂÅÊÔÅ ÅÇÏ ÎÁ ÎÅÓËÏÌØËÏ ÐÏ ÏÄÎÏÍÕ ÐÁÔÞÕ ÎÁ ÏÔÄÅÌØÎÙÊ ÆÁÊÌ. @@ -706,7 +741,7 @@ ðÒÉ ÎÁÌÉÞÉÉ ÒÁÚÕÍÎÙÈ ÏÔ×ÅÔÏ× ÎÁ ÚÁÄÁ×ÁÅÍÙÅ ×ÏÐÒÏÓÙ, ÐÏÄÈÏÄÑÝÉÈ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÔÁËÖÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÐÒÏ×ÅÒÑÔØ ÐÅÒÅÍÅÎÎÕÀ PACKAGE_BUILDING É ×ÙËÌÀÞÁÔØ ÉÎÔÅÒÁËÔÉ×ÎÙÊ ÓËÒÉÐÔ, - ÅÓÌÉ ÏÎ ÅÓÔØ. üÔÏ ÐÏÚ×ÏÌÉÔ ÎÁÍ ÓÔÒÏÉÔØ ÐÁËÁÄÖÉ ÄÌÑ ÐÏÍÅÝÅÎÉÑ ÎÁ + ÅÓÌÉ ÏÎ ÅÓÔØ. üÔÏ ÐÏÚ×ÏÌÉÔ ÎÁÍ ÓÔÒÏÉÔØ ÐÁËÅÔÙ ÄÌÑ ÐÏÍÅÝÅÎÉÑ ÎÁ ËÏÍÐÁËÔ-ÄÉÓËÉ É FTP-ÓÅÒ×ÅÒÙ. @@ -775,15 +810,15 @@ ÍÏÎÏÔÏÎÎÏ Õ×ÅÌÉÞÉ×ÁÀÝÅÅÓÑ ÞÉÓÌÏ, ËÏÔÏÒÏÅ ÏÂÎÕÌÑÅÔÓÑ ÐÒÉ ËÁÖÄÏÍ Õ×ÅÌÉÞÅÎÉÉ ÚÎÁÞÅÎÉÑ ÐÅÒÅÍÅÎÎÏÊ PORTVERSION (ÔÏ ÅÓÔØ ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ ÓÏÚÄÁÔÅÌÑÍÉ ×ÙÐÕÓËÁÅÔÓÑ ÎÏ×ÙÊ ÏÆÉÃÉÁÌØÎÙÊ - ÒÅÌÉÚ), É ÄÏÂÁ×ÌÑÅÔÓÑ Ë ÉÍÅÎÉ ÐÁËÁÄÖÁ, ÅÓÌÉ ÏÎÏ ÎÅ ÒÁ×ÎÏ ÎÕÌÀ. + ÒÅÌÉÚ), É ÄÏÂÁ×ÌÑÅÔÓÑ Ë ÉÍÅÎÉ ÐÁËÅÔÁ, ÅÓÌÉ ÏÎÏ ÎÅ ÒÁ×ÎÏ ÎÕÌÀ. éÚÍÅÎÅÎÉÑ × PORTREVISION ÉÓÐÏÌØÚÕÀÔÓÑ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÙÍÉ ÉÎÓÔÒÕÍÅÎÔÁÍÉ (ÎÁÐÒÉÍÅÒ, &man.pkg.version.1;) - ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÆÁËÔÁ ÐÏÑ×ÌÅÎÉÑ ÎÏ×ÏÇÏ ÐÁËÁÄÖÁ. + ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÆÁËÔÁ ÐÏÑ×ÌÅÎÉÑ ÎÏ×ÏÇÏ ÐÁËÅÔÁ. úÎÁÞÅÎÉÅ PORTREVISION ÄÏÌÖÎÏ Õ×ÅÌÉÞÉ×ÁÔØÓÑ ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ × ÐÏÒÔÅ FreeBSD ÄÅÌÁÀÔÓÑ ÉÚÍÅÎÅÎÉÑ, ËÏÔÏÒÙÅ ÄÏÓÔÁÔÏÞÎÏ ÓÉÌØÎÏ ÚÁÔÒÁÇÉ×ÁÀÔ ÓÏÄÅÒÖÉÍÏÅ ÉÌÉ ÓÔÒÕËÔÕÒÕ - ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÐÁËÁÄÖÁ. + ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÐÁËÅÔÁ. ðÒÉÍÅÒÙ ÓÌÕÞÁÅ×, ËÏÇÄÁ ÚÎÁÞÅÎÉÅ PORTREVISION ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ: @@ -797,20 +832,20 @@ éÚÍÅÎÅÎÉÑ × ÆÁÊÌÅ Makefile ÐÏÒÔÁ ÄÌÑ ×ËÌÀÞÅÎÉÑ É ×ÙËÌÀÞÅÎÉÑ ÐÁÒÁÍÅÔÒÏ×, ÏÐÒÅÄÅÌÑÅÍÙÈ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ - ÐÁËÁÄÖÁ. + ÐÁËÅÔÁ. - éÚÍÅÎÅÎÉÑ × ÓÐÉÓËÅ ÕÐÁËÏ×ËÉ ÉÌÉ × ÐÏ×ÅÄÅÎÉÉ ÐÁËÁÄÖÁ ×Ï + éÚÍÅÎÅÎÉÑ × ÓÐÉÓËÅ ÕÐÁËÏ×ËÉ ÉÌÉ × ÐÏ×ÅÄÅÎÉÉ ÐÁËÅÔÁ ×Ï ×ÒÅÍÑ ÅÇÏ ÕÓÔÁÎÏ×ËÉ (ÎÁÐÒÉÍÅÒ, ÉÚÍÅÎÅÎÉÅ ÓËÒÉÐÔÁ, ÇÅÎÅÒÉÒÕÀÝÅÇÏ - ÎÁÞÁÌØÎÙÅ ÄÁÎÎÙÅ ÄÌÑ ÐÁËÁÄÖÁ, ÔÁËÉÅ, ËÁË ssh-ËÌÀÞÉ ÄÌÑ + ÎÁÞÁÌØÎÙÅ ÄÁÎÎÙÅ ÄÌÑ ÐÁËÅÔÁ, ÔÁËÉÅ, ËÁË ssh-ËÌÀÞÉ ÄÌÑ ÈÏÓÔÁ). õ×ÅÌÉÞÅÎÉÅ ×ÅÒÓÉÉ ÄÉÎÁÍÉÞÅÓËÏÊ ÂÉÂÌÉÏÔÅËÉ, ÏÔ ËÏÔÏÒÏÊ ÚÁ×ÉÓÉÔ ÐÏÒÔ (× ÜÔÏÍ ÓÌÕÞÁÅ ÔÏÔ, ËÔÏ ÐÏÐÙÔÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ - ÓÔÁÒÙÊ ÐÁËÁÄÖ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ ÂÉÂÌÉÏÔÅËÉ, + ÓÔÁÒÙÊ ÐÁËÅÔ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ ÂÉÂÌÉÏÔÅËÉ, ÎÅ ÓÍÏÖÅÔ ÜÔÏÇÏ ÓÄÅÌÁÔØ, ÐÏÔÏÍÕ ÞÔÏ ÐÒÉ ÜÔÏÍ ÂÕÄÅÔ ÄÅÌÁÔØÓÑ ÐÏÉÓË ÓÔÁÒÏÊ ÂÉÂÌÉÏÔÅËÉ libfoo.x, Á ÎÅ libfoo.(x+1)). @@ -833,28 +868,28 @@ éÚÍÅÎÅÎÉÑ ÓÔÉÌÑ × ÓËÅÌÅÔÅ ÐÏÒÔÁ ÂÅÚ ÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ - × ÐÁËÁÄÖÅ. + × ÐÁËÅÔÅ. éÚÍÅÎÅÎÉÑ × ÐÅÒÅÍÅÎÎÏÊ MASTER_SITES ÉÌÉ ÄÒÕÇÉÅ ÆÕÎËÃÉÏÎÁÌØÎÙÅ ÉÚÍÅÎÅÎÉÑ ÐÏÒÔÁ, ËÏÔÏÒÙÅ ÎÅ ÚÁÔÒÁÇÉ×ÁÀÔ - ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÐÁËÁÄÖÁ. + ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÐÁËÅÔÁ. ôÒÉ×ÉÁÌØÎÙÅ ÐÁÔÞÉ Ë ÄÉÓÔÒÉÂÕÔÉ×ÎÏÍÕ ÆÁÊÌÕ, ÔÁËÉÅ, ËÁË ÉÓÐÒÁ×ÌÅÎÉÑ ÏÐÅÞÁÔÏË, ËÏÔÏÒÙÅ ÎÅ ÔÁË ÕÖ ×ÁÖÎÙ, ÞÔÏ ÐÏÌØÚÏ×ÁÔÅÌÉ - ÐÁËÁÄÖÁ ÄÏÌÖÎÙ ÏÚÁÂÏÔÉÔØÓÑ ÏÂÎÏ×ÌÅÎÉÅÍ. + ÐÁËÅÔÁ ÄÏÌÖÎÙ ÏÚÁÂÏÔÉÔØÓÑ ÏÂÎÏ×ÌÅÎÉÅÍ. éÓÐÒÁ×ÌÅÎÉÑ, ËÁÓÁÀÝÉÅÓÑ ÜÔÁÐÁ ÐÏÓÔÒÏÅÎÉÑ, ËÏÔÏÒÙÅ ÄÅÌÁÀÔ - ×ÏÚÍÏÖÎÙÍ ÐÏÓÔÒÏÅÎÉÅ ÐÁËÁÄÖÁ, ÅÓÌÉ ÒÁÎÅÅ ÜÔÏ ÂÙÌÏ ÎÅ×ÏÚÍÏÖÎÏ + ×ÏÚÍÏÖÎÙÍ ÐÏÓÔÒÏÅÎÉÅ ÐÁËÅÔÁ, ÅÓÌÉ ÒÁÎÅÅ ÜÔÏ ÂÙÌÏ ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ (ÐÏËÁ ÉÚÍÅÎÅÎÉÑ ÎÅ ÐÒÉ×ÏÄÑÔ Ë ÉÚÍÅÎÅÎÉÀ ÒÁÂÏÔÙ ÎÁ ÌÀÂÙÈ ÄÒÕÇÉÈ ÐÌÁÔÆÏÒÍÁÈ, ÎÁ ËÏÔÏÒÙÈ ÐÏÒÔ ÒÁÎÅÅ ÓÔÒÏÉÌÓÑ). ôÁË ËÁË - PORTREVISION ÏÔÒÁÖÁÅÔ ÓÏÄÅÒÖÉÍÏÅ ÐÁËÁÄÖÁ, - ÔÏ, ÅÓÌÉ ÒÁÎÅÅ ÐÁËÁÄÖ ÎÅ ÓÔÒÏÉÌÓÑ, ÔÏ ÎÅÔ ÎÕÖÄÙ Õ×ÅÌÉÞÉ×ÁÔØ + PORTREVISION ÏÔÒÁÖÁÅÔ ÓÏÄÅÒÖÉÍÏÅ ÐÁËÅÔÁ, + ÔÏ, ÅÓÌÉ ÒÁÎÅÅ ÐÁËÅÔ ÎÅ ÓÔÒÏÉÌÓÑ, ÔÏ ÎÅÔ ÎÕÖÄÙ Õ×ÅÌÉÞÉ×ÁÔØ PORTREVISION ÄÌÑ ÏÔÍÅÔËÉ ÉÚÍÅÎÅÎÉÑ. @@ -863,7 +898,7 @@ ÔÏÍ, ÞÔÏ ÎÕÖÎÏ ÓÐÒÁÛÉ×ÁÔØ ÓÅÂÑ, Ñ×ÌÑÅÔÓÑ ÌÉ ×ÎÏÓÉÍÏÅ × ÐÏÒÔ ÉÚÍÅÎÅÎÉÅ ÔÁËÉÍ, ÞÔÏ ÏÔ ÎÅÇÏ ×ÙÉÇÒÁÀÔ ×ÓÅ (× ×ÉÄÅ ÕÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÉÑ, ÉÓÐÒÁ×ÌÅÎÉÑ ÉÌÉ ÂÌÁÇÏÄÁÒÑ ÔÏÍÕ, ÞÔÏ ÎÏ×ÙÊ - ÐÁËÁÄÖ ÂÕÄÅÔ ×ÏÏÂÝÅ ÒÁÂÏÔÏÓÐÏÓÏÂÎÙÍ), É ÐÒÉÍÉÔÅ ×Ï ×ÎÉÍÁÎÉÅ ÔÏÔ + ÐÁËÅÔ ÂÕÄÅÔ ×ÏÏÂÝÅ ÒÁÂÏÔÏÓÐÏÓÏÂÎÙÍ), É ÐÒÉÍÉÔÅ ×Ï ×ÎÉÍÁÎÉÅ ÔÏÔ ÆÁËÔ, ÞÔÏ ÐÒÉ ÜÔÏÍ ×ÓÅ, ËÔÏ ÒÅÇÕÌÑÒÎÏ ÏÂÎÏ×ÌÑÀÔ Ó×Ï£ ÄÅÒÅ×Ï ÐÏÒÔÏ×, ÂÕÄÕÔ ÏÂÑÚÁÎÙ ÜÔÏ ÓÄÅÌÁÔØ. åÓÌÉ ÜÔÏ ÔÁË, ÔÏ ÐÅÒÅÍÅÎÎÁÑ PORTREVISION ÄÏÌÖÎÁ ÂÙÔØ Õ×ÅÌÉÞÅÎÁ. @@ -882,17 +917,17 @@ ÷ ÓÉÔÕÁÃÉÑÈ, ÐÏÄÏÂÎÙÈ ÜÔÏÊ, ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ ÚÎÁÞÅÎÉÅ PORTEPOCH. åÓÌÉ ÚÎÁÞÅÎÉÅ PORTEPOCH ÎÅ ÒÁ×ÎÏ ÎÕÌÀ, ÔÏ ÏÎÏ ÄÏÂÁ×ÌÑÅÔÓÑ Ë - ÉÍÅÎÉ ÐÁËÁÄÖÁ, ËÁË ÏÐÉÓÁÎÏ × ÒÁÚÄÅÌÅ ×ÙÛÅ. úÎÁÞÅÎÉÅ + ÉÍÅÎÉ ÐÁËÅÔÁ, ËÁË ÏÐÉÓÁÎÏ × ÒÁÚÄÅÌÅ ×ÙÛÅ. úÎÁÞÅÎÉÅ PORTEPOCH ÎÉËÏÇÄÁ ÎÅ ÄÏÌÖÎÏ ÕÍÅÎØÛÁÔØÓÑ ÉÌÉ ÓÂÒÁÓÙ×ÁÔØÓÑ × ÎÏÌØ, ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÐÒÉ×ÅÄ£Ô Ë ÏÛÉÂËÅ ÓÒÁ×ÎÅÎÉÑ Ó - ÐÁËÁÄÖÅÍ Ó ÍÅÎØÛÉÍ ÎÏÍÅÒÏÍ ÜÐÏÈÉ (ÔÏ ÅÓÔØ ÔÏ, ÞÔÏ ÐÁËÁÄÖ ÕÓÔÁÒÅÌ, + ÐÁËÅÔÏÍ Ó ÍÅÎØÛÉÍ ÎÏÍÅÒÏÍ ÜÐÏÈÉ (ÔÏ ÅÓÔØ ÔÏ, ÞÔÏ ÐÁËÅÔ ÕÓÔÁÒÅÌ, ÏÂÎÁÒÕÖÅÎÏ ÎÅ ÂÕÄÅÔ): ÎÏÍÅÒ ÎÏ×ÏÊ ×ÅÒÓÉÉ (ÎÁÐÒÉÍÅÒ, 1.0,1 × ÐÒÉÍÅÒÅ ×ÙÛÅ) ÏÓÔÁÎÅÔÓÑ ÍÅÎØÛÅ, ÞÅÍ ÎÏÍÅÒ ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ (20000801), ÏÄÎÁËÏ ÓÕÆÆÉËÓ ,1 ÉÎÔÅÒÐÒÅÔÉÒÕÅÔÓÑ ÒÁÚÌÉÞÎÙÍÉ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÙÍÉ ÕÔÉÌÉÔÁÍÉ ÏÓÏÂÙÍ ÏÂÒÁÚÏÍ, É ÏËÁÖÅÔÓÑ ÂÏÌØÛÅ, ÞÅÍ ÐÒÅÄÐÏÌÁÇÁÅÍÙÊ ÓÕÆÆÉËÓ ,0 ÂÏÌÅÅ ÒÁÎÎÅÇÏ - ÐÁËÁÄÖÁ). + ÐÁËÅÔÁ). îÅËÏÒÒÅËÔÎÏÅ ÕÍÅÎØÛÅÎÉÅ ÉÌÉ ÓÂÒÏÓ PORTEPOCH ÐÒÉ×ÏÄÉÔ Ë ÐÅÞÁÌØÎÙÍ ÐÏÓÌÅÄÓÔ×ÉÑÍ; ÅÓÌÉ ×Ù ÎÅ ÐÏÎÑÌÉ, Ï Þ£Í ÛÌÁ @@ -952,7 +987,7 @@ ÍÌÁÄÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ 2 ÐÏ ÚÎÁÞÅÎÉÀ ÍÅÎØÛÅ, ÞÅÍ ÎÏÍÅÒ ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ 10, ÔÏ ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ ÚÎÁÞÅÎÉÅ PORTEPOCH ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ - ÚÁÓÔÁ×ÉÔØ ÒÁÓÐÏÚÎÁ×ÁÔØ ×ÎÏ×Ø ÓÏÚÄÁ×ÁÅÍÙÊ ÐÁËÁÄÖ ËÁË ÂÏÌÅÅ + ÚÁÓÔÁ×ÉÔØ ÒÁÓÐÏÚÎÁ×ÁÔØ ×ÎÏ×Ø ÓÏÚÄÁ×ÁÅÍÙÊ ÐÁËÅÔ ËÁË ÂÏÌÅÅ ÎÏ×ÙÊ. ôÁË ËÁË ÜÔÏ ÎÏ×ÙÊ ÒÅÌÉÚ ÐÒÏÇÒÁÍÍÙ, ÔÏ PORTREVISION ÏÂÎÕÌÑÅÔÓÑ (ÉÌÉ ÕÄÁÌÑÅÔÓÑ ÉÚ ÆÁÊÌÁ Makefile). @@ -978,8 +1013,8 @@ åÓÌÉ ÚÎÁÞÅÎÉÅ PORTEPOCH ÜÔÉÍ ÏÂÎÏ×ÌÅÎÉÅÍ ÂÙÌÏ ÂÙ ÓÂÒÏÛÅÎÏ × 0, ÔÏ ËÔÏ-ÎÉÂÕÄØ, ÉÍÅÀÝÉÊ - ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÁËÁÄÖ gtkmumble-0.10_1, ÎÅ - ÓÍÏÇ ÂÙ ÏÐÏÚÎÁÔØ ÐÁËÁÄÖ gtkmumble-0.3 ËÁË + ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÁËÅÔ gtkmumble-0.10_1, ÎÅ + ÓÍÏÇ ÂÙ ÏÐÏÚÎÁÔØ ÐÁËÅÔ gtkmumble-0.3 ËÁË ÂÏÌÅÅ ÎÏ×ÙÊ, ÔÁË ËÁË 3 ÂÙÌÏ ÂÙ ÍÅÎØÛÅ, ÞÅÍ 10. ðÏÍÎÉÔÅ, ÞÔÏ × ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÜÔÏ ËÁÓÁÅÔÓÑ PORTEPOCH. @@ -999,10 +1034,10 @@ ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}. äÏÂÅÊÔÅÓØ ÔÏÇÏ, ÞÔÏÂÙ ÜÔÏ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÌÏ ÎÁÛÉÍ ÒÅËÏÍÅÎÄÁÃÉÑÍ ÐÏ ÐÒÁ×ÉÌØÎÏÍÕ ×ÙÂÏÒÕ - ÎÁÚ×ÁÎÉÊ ÄÌÑ ÐÁËÁÄÖÅÊ. ÷ ÞÁÓÔÎÏÓÔÉ, × ÐÅÒÅÍÅÎÎÏÊ + ÎÁÚ×ÁÎÉÊ ÄÌÑ ÐÁËÅÔÏ×. ÷ ÞÁÓÔÎÏÓÔÉ, × ÐÅÒÅÍÅÎÎÏÊ PORTVERSION ÎÅ ÒÁÚÒÅÛÁÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÄÅÆÉÓÁ (-). ëÒÏÍÅ ÔÏÇÏ, ÅÓÌÉ × - ÉÍÅÎÉ ÐÁËÁÄÖÁ ÐÒÉÓÕÔÓÔ×ÕÅÔ ÞÁÓÔØ language- + ÉÍÅÎÉ ÐÁËÅÔÁ ÐÒÉÓÕÔÓÔ×ÕÅÔ ÞÁÓÔØ language- ÉÌÉ -compiled.specifics (ÓÍÏÔÒÉÔÅ ÎÉÖÅ), ÔÏ ÉÓÐÏÌØÚÕÊÔÅ ÐÅÒÅÍÅÎÎÙÅ PKGNAMEPREFIX É PKGNAMESUFFIX, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ. îÅ ÄÅÌÁÊÔÅ ÉÈ @@ -1010,18 +1045,18 @@ - óÏÇÌÁÛÅÎÉÑ ÐÏ ÉÍÅÎÏ×ÁÎÉÀ ÐÁËÁÄÖÅÊ + óÏÇÌÁÛÅÎÉÑ ÐÏ ÉÍÅÎÏ×ÁÎÉÀ ÐÁËÅÔÏ× äÁÌÅÅ ÏÐÉÓÁÎÙ ÎÅËÏÔÏÒÙÅ ÓÏÇÌÁÛÅÎÉÑ, ËÏÔÏÒÙÍ ×Ù ÄÏÌÖÎÙ ÓÌÅÄÏ×ÁÔØ - × ÉÍÅÎÏ×ÁÎÉÉ ×ÁÛÉÈ ÐÁËÁÄÖÅÊ. ïÎÉ ÂÙÌÉ ÒÁÚÒÁÂÏÔÁÎÙ ÄÌÑ ÏÂÌÅÇÞÅÎÉÑ - ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ, ÔÁË ËÁË ÉÍÅÅÔÓÑ ÕÖÅ ÔÙÓÑÞÉ ÐÁËÁÄÖÅÊ, Á + × ÉÍÅÎÏ×ÁÎÉÉ ×ÁÛÉÈ ÐÁËÅÔÏ×. ïÎÉ ÂÙÌÉ ÒÁÚÒÁÂÏÔÁÎÙ ÄÌÑ ÏÂÌÅÇÞÅÎÉÑ + ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ, ÔÁË ËÁË ÉÍÅÅÔÓÑ ÕÖÅ ÔÙÓÑÞÉ ÐÁËÅÔÏ×, Á ÐÏÌØÚÏ×ÁÔÅÌÉ ÏÔ×ÅÒÎÕÔÓÑ ÏÔ ÎÁÓ, ÅÓÌÉ ÓÐÉÓÏË ÎÅ ÐÏÎÒÁ×ÉÔÓÑ ÉÈ ×ÚÏÒÕ! - éÍÑ ÐÁËÁÄÖÁ ÄÏÌÖÎÏ ÉÍÅÔØ ×ÉÄ + éÍÑ ÐÁËÅÔÁ ÄÏÌÖÎÏ ÉÍÅÔØ ×ÉÄ language_region-name-compiled.specifics-version.numbers. - éÍÑ ÐÁËÁÄÖÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ËÁË + éÍÑ ÐÁËÅÔÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ËÁË ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}. ÷Ù ÄÏÌÖÎÙ ÚÁÄÁ×ÁÔØ ÚÎÁÞÅÎÉÑ ÐÅÒÅÍÅÎÎÙÈ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÜÔÉÍ ÆÏÒÍÁÔÏÍ. @@ -1104,7 +1139,7 @@ ÷ÏÔ ÎÅÓËÏÌØËÏ (ÒÅÁÌØÎÙÈ) ÐÒÉÍÅÒÏ× ÔÏÇÏ, ËÁË ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÍÑ ÉÚ ÏÒÉÇÉÎÁÌØÎÏÇÏ, ÐÒÉÄÕÍÁÎÎÏÇÏ Á×ÔÏÒÁÍÉ, Ë ÐÏÄÈÏÄÑÝÅÍÕ ÄÌÑ ÉÍÅÎÉ - ÐÁËÁÄÖÁ: + ÐÁËÅÔÁ: @@ -1233,7 +1268,7 @@ -letter 1.13 òÁÚÍÅÒ ÂÕÍÁÇÉ ÚÁÄÁÅÔÓÑ ÓÔÁÔÉÞÅÓËÉ ×Ï ×ÒÅÍÑ ÐÏÓÔÒÏÅÎÉÑ - ÐÁËÁÄÖÁ + ÐÁËÅÔÁ @@ -1242,7 +1277,7 @@ pkfonts 300 1.0 - ðÁËÁÄÖ ÄÌÑ ÛÒÉÆÔÏ× 300dpi + ÐÁËÅÔ ÄÌÑ ÛÒÉÆÔÏ× 300dpi @@ -1264,13 +1299,13 @@ <makevar>CATEGORIES</makevar> - ÷ ÐÒÏÃÅÓÓÅ ÓÏÚÄÁÎÉÑ ÐÁËÁÄÖÁ ÏÎ ÐÏÍÅÝÁÅÔÓÑ × ËÁÔÁÌÏÇ + ÷ ÐÒÏÃÅÓÓÅ ÓÏÚÄÁÎÉÑ ÐÁËÅÔÁ ÏÎ ÐÏÍÅÝÁÅÔÓÑ × ËÁÔÁÌÏÇ /usr/ports/packages/All, Á × ÏÄÎÏÍ ÉÌÉ ÂÏÌÅÅ ÐÏÄËÁÔÁÌÏÇÏ× ÉÚ /usr/ports/packages ÓÏÚÄÁÀÔÓÑ ÎÁ ÎÅÇÏ ÓÓÙÌËÉ. éÍÅÎÁ ÜÔÉÈ ÐÏÄËÁÔÁÌÏÇÏ× ÏÐÒÅÄÅÌÑÀÔÓÑ ÐÅÒÅÍÅÎÎÏÊ CATEGORIES. ôÁËÁÑ ÓÈÅÍÁ ÎÕÖÎÁ ÄÌÑ ÏÂÌÅÇÞÅÎÉÑ ÖÉÚÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ, ËÏÇÄÁ ÏÎ ÓÔÁÌËÉ×ÁÅÔÓÑ Ó ÍÁÓÓÏÊ - ÐÁËÁÄÖÅÊ ÎÁ FTP-ÓÅÒ×ÅÒÅ ÉÌÉ ËÏÍÐÁËÔ-ÄÉÓËÅ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÍÏÔÒÉÔÅ ÎÁ + ÐÁËÅÔÏ× ÎÁ FTP-ÓÅÒ×ÅÒÅ ÉÌÉ ËÏÍÐÁËÔ-ÄÉÓËÅ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÍÏÔÒÉÔÅ ÎÁ ÓÐÉÓÏË ÓÕÝÅÓÔ×ÕÀÝÉÈ ËÁÔÅÇÏÒÉÊ É ×ÙÂÅÒÉÔÅ ÔÅ ÉÚ ÎÉÈ, ËÏÔÏÒÙÅ ÂÏÌÅÅ ×ÓÅÇÏ ÐÏÄÈÏÄÑÔ Ë ×ÁÛÅÍÕ ÐÏÒÔÕ. @@ -3013,19 +3048,19 @@ url="../developers-handbook/policies.html#POLICIES-MAINTAINER"> MAINTAINER × Makefiles. - åÓÌÉ ÍÜÊÎÔÅÊÎÅÒ ÐÏÒÔÁ ÎÅ ÏÔ×ÅÔÉÌ ÎÁ ÚÁÐÒÏÓ ÐÏÌØÚÏ×ÁÔÅÌÑ Ï + åÓÌÉ ÍÅÊÎÔÅÊÎÅÒ ÐÏÒÔÁ ÎÅ ÏÔ×ÅÔÉÌ ÎÁ ÚÁÐÒÏÓ ÐÏÌØÚÏ×ÁÔÅÌÑ Ï ÏÂÎÏ×ÌÅÎÉÉ × ÔÅÞÅÎÉÅ Ä×ÕÈ ÎÅÄÅÌØ (ÉÓËÌÀÞÁÑ ÂÏÌØÛÉÅ ÐÒÁÚÄÎÉËÉ), - ÔÏ ÜÔÏ ÍÏÖÎÏ ÓÞÉÔÁÔØ ÔÁÊÍ-ÁÕÔÏÍ ÏÔ ÍÜÊÎÔÅÊÎÅÒÁ, É ÏÂÎÏ×ÌÅÎÉÅ ÍÏÖÅÔ - ÂÙÔØ ×ÙÐÏÌÎÅÎÏ ÂÅÚ Ñ×ÎÏÇÏ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÏÔ ÍÜÊÎÔÅÊÎÅÒÁ. åÓÌÉ - ÍÜÊÎÔÅÊÎÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ × ÔÅÞÅÎÉÅ ÔÒ£È ÍÅÓÑÃÅ×, ÔÏ ÓÞÉÔÁÅÔÓÑ, ÞÔÏ - ÏÎ ÏÔÓÕÔÓÔ×ÕÅÔ, É ËÁË ÍÜÊÎÔÅÊÎÅÒ ÐÏÒÔÁ, Ï ËÏÔÏÒÏÍ ÉÄ£Ô ÒÅÞØ, ÍÏÖÅÔ + ÔÏ ÜÔÏ ÍÏÖÎÏ ÓÞÉÔÁÔØ ÔÁÊÍ-ÁÕÔÏÍ ÏÔ ÍÅÊÎÔÅÊÎÅÒÁ, É ÏÂÎÏ×ÌÅÎÉÅ ÍÏÖÅÔ + ÂÙÔØ ×ÙÐÏÌÎÅÎÏ ÂÅÚ Ñ×ÎÏÇÏ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÏÔ ÍÅÊÎÔÅÊÎÅÒÁ. åÓÌÉ + ÍÅÊÎÔÅÊÎÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ × ÔÅÞÅÎÉÅ ÔÒ£È ÍÅÓÑÃÅ×, ÔÏ ÓÞÉÔÁÅÔÓÑ, ÞÔÏ + ÏÎ ÏÔÓÕÔÓÔ×ÕÅÔ, É ËÁË ÍÅÊÎÔÅÊÎÅÒ ÐÏÒÔÁ, Ï ËÏÔÏÒÏÍ ÉÄ£Ô ÒÅÞØ, ÍÏÖÅÔ ÂÙÔØ ÚÁÍÅΣÎ. éÓËÌÀÞÅÎÉÑÍÉ ÉÚ ÜÔÏÇÏ ÐÒÁ×ÉÌÁ Ñ×ÌÑÅÔÓÑ ×Ó£, ÞÔÏ ÓÏÐÒÏ×ÏÖÄÁÅÔ &a.portmgr; ÉÌÉ &a.security-officer;. úÁÐÒÅÝÅÎÏ ÄÅÌÁÔØ ÌÀÂÙÅ ÎÅÓÁÎËÃÉÏÎÉÒÏ×ÁÎÎÙÅ ÉÚÍÅÎÅÎÉÑ × ÐÏÒÔÁÈ, ËÏÔÏÒÙÅ ×ÅÄÕÔ ÜÔÉ ÇÒÕÐÐÙ. úÁ &a.portmgr; ÏÓÔÁ×ÌÑÅÔÓÑ ÐÒÁ×Ï ÓÎÑÔØ ÉÌÉ ÎÁÚÎÁÞÉÔØ ËÏÇÏ-ÌÉÂÏ - ÍÜÊÎÔÅÊÎÅÒÏÍ, ÐÏ ÌÀÂÏÊ ÐÒÉÞÉÎÅ, Á ÚÁ the &a.security-officer; + ÍÅÊÎÔÅÊÎÅÒÏÍ, ÐÏ ÌÀÂÏÊ ÐÒÉÞÉÎÅ, Á ÚÁ the &a.security-officer; ÏÓÔÁ×ÌÑÅÔÓÑ ÐÒÁ×Ï ÌÉÛÁÔØ ÉÌÉ ÎÁÚÎÁÞÁÔØ ÐÒÁ×Á ÎÁ ÓÏÐÒÏ×ÏÖÄÅÎÉÅ ÐÏÒÔÁ ÐÏ ÓÏÏÂÒÁÖÅÎÉÑÍ ÉÎÆÏÒÍÁÃÉÏÎÎÏÊ ÂÅÚÏÐÁÓÎÏÓÔÉ. @@ -3034,7 +3069,7 @@ <makevar>COMMENT</makevar> üÔÏ ÏÄÎÏÓÔÒÏÞÎÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ. ðÏÖÁÌÕÊÓÔÁ, - ÎÅ ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÁÄÖÁ (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ + ÎÅ ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÅÔÁ (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ). ëÏÍÍÅÎÔÁÒÉÊ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù É ÎÅ ÚÁËÁÎÞÉ×ÁÔØÓÑ ÔÏÞËÏÊ. ÷ÏÔ ÐÒÉÍÅÒ: @@ -3086,7 +3121,7 @@ úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ extract, Á ÚÁÔÅÍ ÉÚ ÃÅÌÉ install. ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ - ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÁÄÖ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ + ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÅÇÏ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÉÓÔÅÍÅ. @@ -3133,7 +3168,7 @@ úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ ×ÎÕÔÒÉ ÃÅÌÉ install. ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ - ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÁÄÖ, ÔÁË ÞÔÏ ÐÒÏÇÒÁÍÍÁ &man.pkg.add.1; + ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ ÐÒÏÇÒÁÍÍÁ &man.pkg.add.1; ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÏÎ ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎ × ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÉÓÔÅÍÅ. þÁÓÔØ target ÍÏÖÅÔ ÂÙÔØ ÏÐÕÝÅÎÁ, ÅÓÌÉ ÏÎÁ @@ -3421,7 +3456,7 @@ ÄÒÕÇÏÊ ÓÐÏÓÏ ÐÏÌÕÞÉÔØ ÔÒÅÂÕÅÍÙÊ ÒÅÚÕÌØÔÁÔ. üÔÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÔÏÍÕ, ÞÔÏ ËÁËÏÊ-ÔÏ ÄÒÕÇÏÊ ÐÏÒÔ ×ÓÅÇÄÁ ÂÕÄÅÔ ÓÔÒÏÉÔØÓÑ (É ÐÏ ÕÍÏÌÞÁÎÉÀ ÕÓÔÁÎÁ×ÌÉ×ÁÔØÓÑ). É ÔÁËÁÑ ÚÁ×ÉÓÉÍÏÓÔØ ÏÔÒÁÚÉÔÓÑ É ÎÁ - ÐÁËÁÄÖÅ. åÓÌÉ ÜÔÏ ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×ÁÍ ÎÕÖÎÏ, ÔÏ ×ÁÍ, ÎÁ×ÅÒÎÏÅ, + ÐÁËÅÔÅ. åÓÌÉ ÜÔÏ ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×ÁÍ ÎÕÖÎÏ, ÔÏ ×ÁÍ, ÎÁ×ÅÒÎÏÅ, ÓÌÅÄÕÅÔ ÏÐÉÓÙ×ÁÔØ ÜÔÏ ÞÅÒÅÚ BUILD_DEPENDS É RUN_DEPENDS—ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÓÍÙÓÌ ÂÕÄÅÔ ÂÏÌÅÅ ÐÏÎÑÔÅÎ. @@ -3531,14 +3566,14 @@ <makevar>CONFLICTS</makevar> - åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ Ó ÄÒÕÇÉÍÉ + åÓÌÉ ×ÁÛ ÐÁËÅÔ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ Ó ÄÒÕÇÉÍÉ (ÉÚ-ÚÁ ËÏÎÆÌÉËÔÏ× ÆÁÊÌÏ×, ÎÅÓÏ×ÍÅÓÔÉÍÏÓÔÉ ×Ï ×ÒÅÍÑ ×ÙÐÏÌÎÅÎÉÑ É ÔÁË - ÄÁÌÅÅ), ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÁÄÖÅÊ × ÐÅÒÅÍÅÎÎÏÊ + ÄÁÌÅÅ), ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÅÔÏ× × ÐÅÒÅÍÅÎÎÏÊ CONFLICTS. úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÛÁÂÌÏÎÙ ËÏÍÁÎÄÎÏÇÏ ÐÒÏÃÅÓÓÏÒÁ ÔÉÐÁ * É - ?. éÍÅÎÁ ÐÁËÁÄÖÅÊ ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ, ËÁË + ?. éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ, ËÁË × /var/db/pkg. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ - CONFLICTS ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÁÄÖ ÓÁÍÏÇÏ ÜÔÏÇÏ ÐÏÒÔÁ + CONFLICTS ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÅÔ ÓÁÍÏÇÏ ÜÔÏÇÏ ÐÏÒÔÁ ÉÌÉ ÅÝÅ, ÞÔÏ ÕÓÔÁÎÏ×ËÁ Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÏÊ FORCE_PKG_REGISTER ÂÏÌØÛÅ ÎÅ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ. @@ -3546,10 +3581,10 @@ íÅÈÁÎÉÚÍÙ ÐÏÓÔÒÏÅÎÉÑ - åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ GNU-×ÅÒÓÉÀ ÕÔÉÌÉÔÙ + åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ GNU-×ÅÒÓÉÀ ÕÔÉÌÉÔÙ make, ÚÁÄÁÊÔÅ USE_GMAKE=yes. - åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ configure, ÚÁÄÁÊÔÅ - HAS_CONFIGURE=yes. åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ + åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ configure, ÚÁÄÁÊÔÅ + HAS_CONFIGURE=yes. åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ GNU-×ÅÒÓÉÀ configure, ÚÁÄÁÊÔÅ GNU_CONFIGURE=yes (ÜÔÏ ÔÁËÖÅ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ HAS_CONFIGURE). åÓÌÉ ×Ù ÈÏÔÉÔÅ ÐÅÒÅÄÁÔØ @@ -3558,7 +3593,7 @@ --prefix=${PREFIX} ÄÌÑ GNU configure É ÐÕÓÔÕÀ ÓÔÒÏËÕ ÄÌÑ ÎÅ-GNU configure), ÕËÁÖÉÔÅ ÜÔÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁÒÁÍÅÔÒÙ × - CONFIGURE_ARGS. åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ + CONFIGURE_ARGS. åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ GNU-×ÅÒÓÉÀ autoconf, ÚÁÄÁÊÔÅ USE_AUTOCONF_VER=213. üÔÏ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ GNU_CONFIGURE, É ÐÒÉ×ÅÄÅÔ Ë ×ÙÚÏ×Õ @@ -3580,7 +3615,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - åÓÌÉ ×ÁÛ ÐÁËÁÄÖ Ñ×ÌÑÅÔÓÑ ÐÒÉÌÏÖÅÎÉÅÍ ÄÌÑ X, ËÏÔÏÒÏÅ ÓÏÚÄÁÅÔ + åÓÌÉ ×ÁÛ ÐÁËÅÔ Ñ×ÌÑÅÔÓÑ ÐÒÉÌÏÖÅÎÉÅÍ ÄÌÑ X, ËÏÔÏÒÏÅ ÓÏÚÄÁÅÔ ÆÁÊÌÙ Makefile ÉÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ ÆÁÊÌÏ× Imakefile ÐÒÉ ÐÏÍÏÝÉ ÕÔÉÌÉÔÙ imake, ÔÏ ÚÁÄÁÊÔÅ USE_IMAKE=yes. @@ -3625,8 +3660,8 @@ @exec /sbin/ldconfig -m É @unexec /sbin/ldconfig -R × ×ÁÛ ÆÁÊÌ pkg-plist, ÔÁË ÞÔÏ ÐÏÌØÚÏ×ÁÔÅÌØ, ÕÓÔÁÎÁ×ÌÉ×ÁÀÝÉÊ - ÐÁËÁÄÖ, ÓÍÏÖÅÔ ÓÒÁÚÕ ÖÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÉÎÁÍÉÞÅÓËÕÀ ÂÉÂÌÉÏÔÅËÕ, Á - ÕÄÁÌÅÎÉÅ ÐÁËÁÄÖÁ ÎÅ ÐÒÉ×ÅÄ£Ô Ë ÔÏÍÕ, ÞÔÏ ÓÉÓÔÅÍÁ ÂÕÄÅÔ ÐÒÅÄÐÏÌÁÇÁÔØ, + ÐÁËÅÔ, ÓÍÏÖÅÔ ÓÒÁÚÕ ÖÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÉÎÁÍÉÞÅÓËÕÀ ÂÉÂÌÉÏÔÅËÕ, Á + ÕÄÁÌÅÎÉÅ ÐÁËÅÔÁ ÎÅ ÐÒÉ×ÅÄ£Ô Ë ÔÏÍÕ, ÞÔÏ ÓÉÓÔÅÍÁ ÂÕÄÅÔ ÐÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ ÂÉÂÌÉÏÔÅËÁ ×Ó£ ÅÝ£ ÉÍÅÅÔÓÑ × ÎÁÌÉÞÉÉ. åÓÌÉ ÎÕÖÎÏ, ×Ù ÍÏÖÅÔÅ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ ËÁÔÁÌÏÇ, × ËÏÔÏÒÙÊ ÐÏ @@ -3675,7 +3710,7 @@ <makevar>NO_PACKAGE</makevar> üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÕËÁÚÙ×ÁÅÔ, ÞÔÏ ÍÙ ÎÅ ÍÏÖÅÍ ÓÏÚÄÁ×ÁÔØ ÄÌÑ - ÐÒÉÌÏÖÅÎÉÑ Ä×ÏÉÞÎÙÊ ÐÁËÁÄÖ. ë ÐÒÉÍÅÒÕ, ÌÉÃÅÎÚÉÑ ÎÅ ÐÏÚ×ÏÌÑÅÔ + ÐÒÉÌÏÖÅÎÉÑ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ. ë ÐÒÉÍÅÒÕ, ÌÉÃÅÎÚÉÑ ÎÅ ÐÏÚ×ÏÌÑÅÔ ÂÉÎÁÒÎÏÅ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ ÉÌÉ ÏÎÁ ÍÏÖÅÔ ÚÁÐÒÅÝÁÔØ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ ÐÁËÅÔÏ×, ÓÏÚÄÁÎÎÙÈ ÉÚ ÉÚÍÅΣÎÎÙÈ ÉÓÈÏÄÎÉËÏ×. @@ -3685,14 +3720,14 @@ ÐÅÒÅÍÅÎÎÁÑ NO_CDROM. NO_PACKAGE ÄÏÌÖÎÁ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ, ÅÓÌÉ - Ä×ÏÉÞÎÙÊ ÐÁËÁÄÖ, ËÁË ÐÒÁ×ÉÌÏ, ÂÅÓÐÏÌÅÚÅÎ, Á ÐÒÉÌÏÖÅÎÉÅ ÄÏÌÖÎÏ ×ÓÅÇÄÁ + Ä×ÏÉÞÎÙÊ ÐÁËÅÔ, ËÁË ÐÒÁ×ÉÌÏ, ÂÅÓÐÏÌÅÚÅÎ, Á ÐÒÉÌÏÖÅÎÉÅ ÄÏÌÖÎÏ ×ÓÅÇÄÁ ËÏÍÐÉÌÉÒÏ×ÁÔØÓÑ ÉÚ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ. ë ÐÒÉÍÅÒÕ, ÅÓÌÉ × ÐÒÉÌÏÖÅÎÉÅ ×Ï ×ÒÅÍÑ ËÏÍÐÉÌÑÃÉÉ Ö£ÓÔËÏ ×ËÌÀÞÁÅÔÓÑ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÁÑ ÉÎÆÏÒÍÁÃÉÑ, ÐÒÉ×ÑÚÁÎÎÁÑ Ë ËÏÎËÒÅÔÎÏÊ ÓÉÓÔÅÍÅ, ÔÏ ÚÁÄÁÊÔÅ ÐÅÒÅÍÅÎÎÕÀ NO_PACKAGE. úÎÁÞÅÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ NO_PACKAGE ÄÏÌÖÎÁ ÂÙÔØ - ÓÔÒÏËÁ, ÏÐÉÓÙ×ÁÀÝÁÑ ÐÒÉÞÉÎÕ, ÐÏ ËÏÔÏÒÏÊ ÐÁËÁÄÖ ÎÅ ÄÏÌÖÅÎ + ÓÔÒÏËÁ, ÏÐÉÓÙ×ÁÀÝÁÑ ÐÒÉÞÉÎÕ, ÐÏ ËÏÔÏÒÏÊ ÐÁËÅÔ ÎÅ ÄÏÌÖÅÎ ÓÏÚÄÁ×ÁÔØÓÑ. @@ -3702,7 +3737,7 @@ üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÕËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ, ÈÏÔÑ ÍÙ ÉÍÅÅÍ ÐÒÁ×Ï ÓÏÚÄÁ×ÁÔØ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ, ÍÙ ÎÅ ÍÏÖÅÍ ÐÏÍÅÝÁÔØ ÜÔÉ ÐÁËÅÔÙ ÉÌÉ ÆÁÊÌÙ DISTFILES ÐÏÒÔÁ ÎÁ CD-ROM (ÉÌÉ ÎÁ ÐÏÈÏÖÉÅ ÎÏÓÉÔÅÌÉ) ÄÌÑ - ÐÅÒÅÐÒÏÄÁÖÉ. ïÄÎÁËÏ ÂÉÎÁÒÎÙÅ ÐÁËÁÄÖÉ É ÆÁÊÌÙ + ÐÅÒÅÐÒÏÄÁÖÉ. ïÄÎÁËÏ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ É ÆÁÊÌÙ DISTFILES ÐÏÒÔÁ ÂÕÄÕÔ ÏÓÔÁ×ÁÔØÓÑ ÄÏÓÔÕÐÎÙÍÉ ÐÏÓÒÅÄÓÔ×ÏÍ FTP/HTTP. @@ -3723,7 +3758,7 @@ úÁÄÁÊÔÅ ÜÔÕ ÐÅÒÅÍÅÎÎÕÀ, ÅÓÌÉ ÌÉÃÅÎÚÉÑ ÎÁ ÐÒÉÌÏÖÅÎÉÅ ÎÅ ÐÏÚ×ÏÌÑÅÔ ÎÉ ÚÅÒËÁÌÉÒÏ×ÁÔØ ÆÁÊÌÙ DISTFILES, ÎÉ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ - ÂÉÎÁÒÎÙÊ ÐÁËÁÄÖ ÞÅÒÅÚ FTP/HTTP ÉÌÉ ÎÁ CD-ROM. + ÂÉÎÁÒÎÙÊ ÐÁËÅÔ ÞÅÒÅÚ FTP/HTTP ÉÌÉ ÎÁ CD-ROM. îÉ NO_CDROM, ÎÉ NO_PACKAGE ÎÅ ÓÔÏÉÔ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ×ÍÅÓÔÅ Ó RESTRICTED, ÔÁË @@ -3861,7 +3896,7 @@ SITE_PERL éÍÑ ËÁÔÁÌÏÇÁ, ËÕÄÁ ÐÏÍÅÝÁÀÔÓÑ ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÓÁÊÔÁ - ÐÁËÁÄÖÉ perl. üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë + ÐÁËÅÔÙ perl. üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë PLIST_SUB. @@ -4551,13 +4586,11 @@ JDK, ÔÁËÉÍ ÏÂÒÁÚÏÍ ÓÔÁÎÏ×ÉÔÓÑ ÐÒÏÂÌÅÍÁÔÉÞÎÙÍ ÏÐÒÅÄÅÌÉÔØ ÓÐÉÓÏË ÆÁÊÌÏ× ÄÌÑ ÕÐÁËÏ×ËÉ (pkg-plist). üÔÏ ÏÄÎÁ ÉÚ ÐÒÉÞÉÎ, ÐÏ ËÏÔÏÒÏÊ ÓÏÚÄÁÔÅÌÑÍ ÐÏÒÔÏ× ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ - ÍÁËÒÏÓ PORTDOCS. üÔÁ ÆÕÎËÃÉÀ ÅÝ£ ÐÒÅÄÓÔÏÉÔ ÈÏÒÏÛÏ - ÄÏËÕÍÅÎÔÉÒÏ×ÁÔØ, ÐÏÜÔÏÍÕ ×Ù ÄÏÌÖÎÙ ÏÂÒÁÔÉÔØÓÑ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ Ë ÆÁÊÌÕ - bsd.port.mk ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÌÎÏÊ - ÉÎÆÏÒÍÁÃÉÉ. âÏÌÅÅ ÔÏÇÏ, ÄÁÖÅ ÅÓÌÉ ×Ù ÓÍÏÖÅÔÅ ÕÇÁÄÁÔØ ÎÁÂÏÒ ÆÁÊÌÏ×, - ËÏÔÏÒÙÊ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÎ ÕÔÉÌÉÔÏÊ javadoc, - ÒÁÚÍÅÒ ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÆÁÊÌÁ pkg-plist ÇÏÌÏÓÕÅÔ ÚÁ - ÉÓÐÏÌØÚÏ×ÁÎÉÅ PORTDOCS. + ÍÁËÒÏÓ PORTDOCS. âÏÌÅÅ ÔÏÇÏ, ÄÁÖÅ ÅÓÌÉ ×Ù ÓÍÏÖÅÔÅ + ÕÇÁÄÁÔØ ÎÁÂÏÒ ÆÁÊÌÏ×, ËÏÔÏÒÙÊ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÎ ÕÔÉÌÉÔÏÊ + javadoc, ÒÁÚÍÅÒ ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÆÁÊÌÁ + pkg-plist ÇÏÌÏÓÕÅÔ ÚÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ + PORTDOCS. úÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÐÅÒÅÍÅÎÎÏÊ DATADIR Ñ×ÌÑÅÔÓÑ ${PREFIX}/share/${PORTNAME}. èÏÒÏÛÅÊ @@ -4761,7 +4794,7 @@ æÏÒÍÁÔ - ðÁËÁÄÖÉ × ÄÅÒÅ×Å ÐÏÒÔÏ× ÂÕÄÕÔ ÓÔÒÏÉÔØÓÑ × ÔÏÍ ÆÏÒÍÁÔÅ, × ËÏÔÏÒÏÍ + ÐÁËÅÔÙ × ÄÅÒÅ×Å ÐÏÒÔÏ× ÂÕÄÕÔ ÓÔÒÏÉÔØÓÑ × ÔÏÍ ÆÏÒÍÁÔÅ, × ËÏÔÏÒÏÍ ÒÁÂÏÔÁÅÔ ÍÁÛÉÎÁ. üÔÏ ÏÚÎÁÞÁÅÔ ÆÏÒÍÁÔ a.out ÄÌÑ 2.2 É a.out ÉÌÉ ELF ÄÌÑ 3.0 × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÒÅÚÕÌØÔÁÔÁ ÒÁÂÏÔÙ ËÏÍÁÎÄÙ `objformat`. ëÒÏÍÅ ÔÏÇÏ, ËÁË ÔÏÌØËÏ ÐÏÌØÚÏ×ÁÔÅÌØ @@ -4902,7 +4935,7 @@ üÔÏ ÎÕÖÎÏ ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÕÔÉÌÉÔÁ ldconfig - ÂÙÌÁ ×ÙÚ×ÁÎÁ ÐÒÁ×ÉÌØÎÏ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÆÏÒÍÁÔÁ ÐÁËÁÄÖÁ, Á ÎÅ + ÂÙÌÁ ×ÙÚ×ÁÎÁ ÐÒÁ×ÉÌØÎÏ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÆÏÒÍÁÔÁ ÐÁËÅÔÁ, Á ÎÅ ÆÏÒÍÁÔÁ, ÉÓÐÏÌØÚÕÅÍÏÇÏ × ÓÉÓÔÅÍÅ ÐÏ ÕÍÏÌÞÁÎÉÀ. @@ -4913,10 +4946,10 @@ <makevar>MASTERDIR</makevar> åÓÌÉ ×ÁÛÅÍÕ ÐÏÒÔÕ ÔÒÅÂÕÅÔÓÑ ÐÏÓÔÒÏÅÎÉÅ ÄÏ×ÏÌØÎÏ ÒÁÚÌÉÞÁÀÝÉÈÓÑ - ×ÅÒÓÉÊ ÐÁËÁÄÖÅÊ ÞÅÒÅÚ ÐÅÒÅÍÅÎÎÕÀ (ÚÁÄÁÀÝÕÀ, ÎÁÐÒÉÍÅÒ, ÒÁÚÒÅÛÅÎÉÅ, + ×ÅÒÓÉÊ ÐÁËÅÔÏ× ÞÅÒÅÚ ÐÅÒÅÍÅÎÎÕÀ (ÚÁÄÁÀÝÕÀ, ÎÁÐÒÉÍÅÒ, ÒÁÚÒÅÛÅÎÉÅ, ÉÌÉ ÒÁÚÍÅÒ ÂÕÍÁÇÉ), ËÏÔÏÒÁÑ ÐÒÉÎÉÍÁÅÔ ÒÁÚÌÉÞÎÙÅ ÚÎÁÞÅÎÉÑ, ÓÏÚÄÁÊÔÅ ÄÌÑ - ËÁÖÄÏÇÏ ÐÁËÁÄÖÁ ÏÔÄÅÌØÎÙÊ ÐÏÄËÁÔÁÌÏÇ, ÞÔÏÂÙ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÂÙÌÏ ÌÅÇÞÅ - ÏÐÒÅÄÅÌÉÔØ, ËÁËÉÍ ÐÁËÁÄÖÅÍ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ, ÎÏ ÐÏÐÒÏÂÕÊÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ + ËÁÖÄÏÇÏ ÐÁËÅÔÁ ÏÔÄÅÌØÎÙÊ ÐÏÄËÁÔÁÌÏÇ, ÞÔÏÂÙ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÂÙÌÏ ÌÅÇÞÅ + ÏÐÒÅÄÅÌÉÔØ, ËÁËÉÍ ÐÁËÅÔÏÍ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ, ÎÏ ÐÏÐÒÏÂÕÊÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÏ×ÍÅÓÔÎÏ ÍÅÖÄÕ ÐÏÒÔÁÍÉ ËÁË ÍÏÖÎÏ ÂÏÌØÛÅ ÆÁÊÌÏ×. ÷ ÔÉÐÉÞÎÏÍ ÓÌÕÞÁÅ ×ÁÍ ÐÏÔÒÅÂÕÀÔÓÑ ÔÏÌØËÏ ÏÞÅÎØ ËÏÒÏÔËÉÅ ÆÁÊÌÙ Makefile ×Ï ×ÓÅÈ ËÁÔÁÌÏÇÁÈ, ËÒÏÍÅ ÏÄÎÏÇÏ, ÅÓÌÉ ×Ù ÂÕÄÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÅÒÅÍÅÎÎÙÅ @@ -4925,7 +4958,7 @@ ËÁÔÁÌÏÇÁ, × ËÏÔÏÒÏÍ ÎÁÈÏÄÑÔÓÑ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÆÁÊÌÙ. ôÁËÖÅ ÉÓÐÏÌØÚÕÊÔÅ ÐÅÒÅÍÅÎÎÕÀ ËÁË ÞÁÓÔØ PKGNAMESUFFIX, ÞÔÏÂÙ - ÐÁËÁÄÖÉ ÉÍÅÌÉ ÒÁÚÎÙÅ ÉÍÅÎÁ. + ÐÁËÅÔÙ ÉÍÅÌÉ ÒÁÚÎÙÅ ÉÍÅÎÁ. ðÒÏÄÅÍÏÎÓÔÒÉÒÕÅÍ ÜÔÏ ÎÁ ÐÒÉÍÅÒÅ. ÷ÏÔ ÞÁÓÔØ ÆÁÊÌÁ japanese/xdvi300/Makefile: @@ -4947,7 +4980,7 @@ ðÏÒÔ japanese/xdvi300 ÓÏÄÅÒÖÉÔ - ÔÁËÖÅ ×ÓÅ ÏÂÙÞÎÙÅ ÐÁÔÞÉ, ÆÁÊÌÙ ÄÌÑ ÐÁËÁÄÖÁ É ÔÁË ÄÁÌÅÅ. åÓÌÉ ×Ù ××ÅÄÅÔÅ + ÔÁËÖÅ ×ÓÅ ÏÂÙÞÎÙÅ ÐÁÔÞÉ, ÆÁÊÌÙ ÄÌÑ ÐÁËÅÔÁ É ÔÁË ÄÁÌÅÅ. åÓÌÉ ×Ù ××ÅÄÅÔÅ ÚÄÅÓØ ËÏÍÁÎÄÕ make, ÏÎÁ ×ÏÚØÍÅÔ × ËÁÞÅÓÔ×Å ÒÁÚÒÅÛÅÎÉÑ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ (300) É ÐÏÓÔÒÏÉÔ ÐÏÒÔ ÏÂÙÞÎÙÍ ÏÂÒÁÚÏÍ. @@ -5113,7 +5146,7 @@ ÎÁ ÒÁÂÏÔÕ Ó ÐÏÒÔÁÍÉ, ËÏÔÏÒÙÍ ÔÒÅÂÕÅÔÓÑ Motif, ÔÁË ÞÔÏÂÙ ÍÙ ÍÏÇÌÉ ÌÅÇËÏ ÓÏÚÄÁ×ÁÔØ ÂÉÎÁÒÎÙÅ ÆÁÊÌÙ, ÓËÏÍÐÏÎÏ×ÁÎÎÙÅ ËÁË ÄÉÎÁÍÉÞÅÓËÉ (ÄÌÑ ÔÅÈ, ËÔÏ ÓÔÒÏÉÔ ÐÒÉÌÏÖÅÎÉÅ ÉÚ ÐÏÒÔÁ), ÔÁË É ÓÔÁÔÉÞÅÓËÉ (ÄÌÑ ÔÅÈ, ËÔÏ - ÂÕÄÅÔ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÐÒÉÌÏÖÅÎÉÑ × ×ÉÄÅ ÐÁËÁÄÖÅÊ). + ÂÕÄÅÔ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÐÒÉÌÏÖÅÎÉÑ × ×ÉÄÅ ÐÁËÅÔÏ×). <makevar>USE_MOTIF</makevar> @@ -5176,9 +5209,9 @@ æÁÊÌÙ × ÆÏÒÍÁÔÅ info - åÓÌÉ × ×ÁÛÅÍ ÐÁËÁÄÖÅ ÎÕÖÎÁ ÕÓÔÁÎÏ×ËÁ ÆÁÊÌÏ× GNU info, ÏÎÉ ÄÏÌÖÎÙ + åÓÌÉ × ×ÁÛÅÍ ÐÁËÅÔÅ ÎÕÖÎÁ ÕÓÔÁÎÏ×ËÁ ÆÁÊÌÏ× GNU info, ÏÎÉ ÄÏÌÖÎÙ ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÏÊ INFO (ÂÅÚ ÏËÏÎÞÁÎÉÑ - .info), É ÔÏÇÄÁ ÐÅÒÅÄ ÒÅÇÉÓÔÒÁÃÉÉ ÐÁËÁÄÖÁ ×Ï + .info), É ÔÏÇÄÁ ÐÅÒÅÄ ÒÅÇÉÓÔÒÁÃÉÉ ÐÁËÅÔÁ ×Ï ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ pkg-plist ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÄÏÂÁ×ÌÅÎ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ËÏÄ ÕÓÔÁÎÏ×ËÉ/ÕÄÁÌÅÎÉÑ. @@ -5203,7 +5236,7 @@ æÁÊÌ pkg-message ÎÅ ÎÕÖÎÏ ÄÏÂÁ×ÌÑÔØ × pkg-plist. é ÏÎ ÎÅ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ - ×Ù×ÏÄÉÔØÓÑ, ÅÓÌÉ ÐÏÌØÚÏ×ÁÔÅÌØ ÉÓÐÏÌØÚÕÅÔ ÐÏÒÔ, Á ÎÅ ÐÁËÁÄÖ, ÔÁË ÞÔÏ + ×Ù×ÏÄÉÔØÓÑ, ÅÓÌÉ ÐÏÌØÚÏ×ÁÔÅÌØ ÉÓÐÏÌØÚÕÅÔ ÐÏÒÔ, Á ÎÅ ÐÁËÅÔ, ÔÁË ÞÔÏ ×Ù ÄÏÌÖÎÙ ÂÕÄÅÔÅ ÓÁÍÉ ×Ù×ÏÄÉÔØ ÅÇÏ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÃÅÌÉ post-install. @@ -5212,11 +5245,11 @@ <filename>pkg-install</filename> - åÓÌÉ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÂÉÎÁÒÎÏÇÏ ÐÁËÁÄÖÁ ÐÏ ËÏÍÁÎÄÅ + åÓÌÉ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÂÉÎÁÒÎÏÇÏ ÐÁËÅÔÁ ÐÏ ËÏÍÁÎÄÅ &man.pkg.add.1; ×ÁÛÅÍÕ ÐÏÒÔÕ ÎÕÖÎÏ ×ÙÐÏÌÎÉÔØ ËÁËÉÅ-ÔÏ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÄÅÊÓÔ×ÉÑ ÉÌÉ ËÏÍÁÎÄÙ, ÔÏ ×Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ Ó ÐÏÍÏÝØÀ ÓËÒÉÐÔÁ pkg-install. üÔÏÔ ÓËÒÉÐÔ ÂÕÄÅÔ - Á×ÔÏÍÁÔÉÞÅÓËÉ ÄÏÂÁ×ÌÅÎ Ë ÐÁËÁÄÖÕ, É ÂÕÄÅÔ Ä×ÁÖÄÙ ÚÁÐÕÓËÁÔØÓÑ ÐÏ + Á×ÔÏÍÁÔÉÞÅÓËÉ ÄÏÂÁ×ÌÅÎ Ë ÐÁËÅÔÕ, É ÂÕÄÅÔ Ä×ÁÖÄÙ ÚÁÐÕÓËÁÔØÓÑ ÐÏ ËÏÍÁÎÄÅ &man.pkg.add.1;: ÐÅÒ×ÙÊ ÒÁÚ × ×ÉÄÅ ${SH} pkg-install ${PKGNAME} PRE-INSTALL, Á ×ÔÏÒÏÊ ÒÁÚ ËÁË ${SH} {PKGNAME} @@ -5224,7 +5257,7 @@ äÌÑ ÒÁÓÐÏÚÎÁ×ÁÎÉÑ ÔÏÇÏ, × ËÁËÏÍ ÒÅÖÉÍÅ ÚÁÐÕÝÅÎ ÓËÒÉÐÔ, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒ $2. ðÅÒÅÍÅÎÎÁÑ ÏËÒÕÖÅÎÉÑ PKG_PREFIX ÂÕÄÅÔ ÐÒÉÎÉÍÁÔØ ÚÎÁÞÅÎÉÅ, - ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ËÁÔÁÌÏÇÕ, × ËÏÔÏÒÙÊ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÁÄÖ. + ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ËÁÔÁÌÏÇÕ, × ËÏÔÏÒÙÊ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÅÔ. äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ óÐÒÁ×ÏÞÎÉËÁ Ï ËÏÍÁÎÄÅ &man.pkg.add.1;. @@ -5239,7 +5272,7 @@ <filename>pkg-deinstall</filename> - üÔÏÔ ÓËÒÉÐÔ ×ÙÚÙ×ÁÅÔÓÑ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÁÄÖÁ. + üÔÏÔ ÓËÒÉÐÔ ×ÙÚÙ×ÁÅÔÓÑ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ. üÔÏÔ ÓËÒÉÐÔ ÕÔÉÌÉÔÏÊ &man.pkg.delete.1; ÂÕÄÅÔ ÚÁÐÕÓËÁÔØÓÑ Ä×ÁÖÄÙ. ðÅÒ×ÙÊ ÒÁÚ ËÁË ${SH} pkg-install @@ -5316,6 +5349,24 @@ ÔÒÅÂÕÅÔÓÑ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ÐÏÌÕÞÁÀÝÉÊÓÑ ÆÁÊÌ, ÄÅÌÁÊÔÅ ÜÔÏ × ÃÅÌÉ post-install ÉÚÍÅÎÅÎÉÅÍ ÆÁÊÌÁ TMPPLIST. + + äÒÕÇÏÊ ÓÐÏÓÏ ÉÚÍÅÎÅÎÉÑ ÓÐÉÓËÁ ÓÂÏÒËÉ ÐÏÒÔÁ ÏÓÎÏ×ÁÎ ÎÁ + ÏÐÒÅÄÅÌÅÎÉÉ ÚÎÁÞÅÎÉÊ ÐÅÒÅÍÅÎÎÙÈ PLIST_FILES É + PLIST_DIRS. ëÁÖÄÏÅ ÉÚ ÎÉÈ ÒÁÓÓÍÁÔÒÉ×ÁÅÔÓÑ ËÁË + ÐÅÒÅÞÅÎØ ÐÕÔÅÊ ÄÌÑ ÚÁÐÉÓÉ × + TMPPLIST ÓÏÄÅÒÖÉÍÏÇÏ + PLIST. éÍÅÎÁ, ÐÅÒÅÞÉÓÌÅÎÎÙÅ + × PLIST_FILES É PLIST_DIRS, + ÐÏÄ×ÅÒÇÁÀÔÓÑ ÐÏÄÓÔÁÎÏ×ËÅ %%VAR%%, ËÁË ÏÐÉÓÁÎÏ + ×ÙÛÅ. úÁ ÉÓËÌÀÞÅÎÉÅÍ ÜÔÏÇÏ, ÉÍÅÎÁ ÉÚ PLIST_FILES + ÂÕÄÕÔ ÐÏÑ×ÌÑÔØÓÑ × ÏËÏÎÞÁÔÅÌØÎÏÍ ×ÁÒÉÁÎÔÅ ÐÅÒÅÞÎÑ ÓÂÏÒËÉ ÂÅÚ + ÉÚÍÅÎÅÎÉÊ, ËÏÇÄÁ ËÁË @dirrm ÂÕÄÅÔ ÐÒÅÄÛÅÓÔ×Ï×ÁÔØ + ÉÍÅÎÁÍ ÉÚ PLIST_DIRS. äÌÑ ÔÏÇÏ, ÞÔÏÂÙ ×ÏÚÙÍÅÔØ + ÄÅÊÓÔ×ÉÅ, PLIST_FILES É + PLIST_DIRS ÄÏÌÖÎÙ ÚÁÄÁ×ÁÔØÓÑ ÄÏ ÔÏÇÏ, ËÁË ÂÕÄÅÔ + ÚÁÐÉÓÙ×ÁÔØÓÑ TMPPLIST, ÔÏ + ÅÓÔØ × ÃÅÌÉ pre-install ÉÌÉ ÅÝ£ + ÒÁÎØÛÅ. @@ -5495,7 +5546,7 @@ &prompt.root; make clean; make package PREFIX=/var/tmp/port-name åÓÌÉ ÞÔÏ-ÔÏ ÂÙÌÏ ÕÓÔÁÎÏ×ÌÅÎÏ ÚÁ ÐÒÅÄÅÌÁÍÉ - PREFIX, ÔÏ ÐÒÏÃÅÓÓ ÓÏÚÄÁÎÉÑ ÐÁËÁÄÖÁ ÓÏÏÂÝÉÔ Ï + PREFIX, ÔÏ ÐÒÏÃÅÓÓ ÓÏÚÄÁÎÉÑ ÐÁËÅÔÁ ÓÏÏÂÝÉÔ Ï ÏÔÓÕÔÓÔ×ÉÉ ÆÁÊÌÏ×. @@ -5580,13 +5631,13 @@ ÐÒÉÞÉÎÕ ÎÅ ÏÂÎÏ×ÌÑÔØ ÐÏÒÔ ÐÒÑÍÏ ÓÅÊÞÁÓ (ÎÁÐÒÉÍÅÒ, ÉÚ-ÚÁ ÐÒÏÂÌÅÍ ÓÏ ÓÔÁÂÉÌØÎÏÓÔØÀ ÆÕÎËÃÉÏÎÉÒÏ×ÁÎÉÑ ÎÏ×ÏÊ ×ÅÒÓÉÉ); ×ÁÍ ÎÅÔ ÎÕÖÄÙ ÄÕÂÌÉÒÏ×ÁÔØ ÉÈ ÒÁÂÏÔÕ. úÁÍÅÔØÔÅ, ÞÔÏ ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ - ÐÏÒÔÙ ÐÅÒÅÞÉÓÌÑÀÔÓÑ Ó ÁÄÒÅÓÏÍ ÍÜÊÎÔÅÊÎÅÒÁ + ÐÏÒÔÙ ÐÅÒÅÞÉÓÌÑÀÔÓÑ Ó ÁÄÒÅÓÏÍ ÍÅÊÎÔÅÊÎÅÒÁ ports@FreeBSD.org, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ×ÓÅÇÏ ÌÉÛØ ÁÄÒÅÓÏÍ ÏÂÝÅÇÏ ÓÐÉÓËÁ ÒÁÓÓÙÌËÉ, ÔÁË ÞÔÏ ÏÔÐÒÁ×ËÁ ÔÕÄÁ ÓÏÏÂÝÅÎÉÊ, ÓËÏÒÅÅ ×ÓÅÇÏ, × ÄÁÎÎÏÍ ÓÌÕÞÁÅ ÎÅ ÐÏÍÏÖÅÔ. - åÓÌÉ ÍÜÊÎÔÅÊÎÅÒ ÐÒÏÓÉÔ ×ÁÓ ×ÙÐÏÌÎÉÔØ ÏÂÎÏ×ÌÅÎÉÅ, ÌÉÂÏ - ÉÌÉ ÍÜÊÎÔÅÊÎÅÒ ÏÔÓÕÔÓÔ×ÕÅÔ, ÔÏ Õ ×ÁÓ ÐÏÑ×ÌÑÅÔÓÑ ÛÁÎÓ ÐÏÍÏÞØ &os;, + åÓÌÉ ÍÅÊÎÔÅÊÎÅÒ ÐÒÏÓÉÔ ×ÁÓ ×ÙÐÏÌÎÉÔØ ÏÂÎÏ×ÌÅÎÉÅ, ÌÉÂÏ + ÉÌÉ ÍÅÊÎÔÅÊÎÅÒ ÏÔÓÕÔÓÔ×ÕÅÔ, ÔÏ Õ ×ÁÓ ÐÏÑ×ÌÑÅÔÓÑ ÛÁÎÓ ÐÏÍÏÞØ &os;, ÐÒÉÇÏÔÏ×É× ÏÂÎÏ×ÌÅÎÉÅ ÓÁÍÉÍ! ðÏÖÁÌÕÊÓÔÁ, ×ÎÅÓÉÔÅ ÉÚÍÅÎÅÎÉÑ É ÓÏÈÒÁÎÉÔÅ ÒÅÚÕÌØÔÁÔ ÒÅËÕÒÓÉ×ÎÏÇÏ diff ÍÅÖÄÕ ÎÏ×ÙÍ É ÓÔÁÒÙÍ ËÁÔÁÌÏÇÁÍÉ ÐÏÒÔÁ (ÎÁÐÒÉÍÅÒ, ÅÓÌÉ ËÁÔÁÌÏÇ Ó @@ -5608,9 +5659,9 @@ åÓÌÉ ÐÏÒÔ ÎÉËÅÍ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ, Á ×Ù ÁËÔÉ×ÎÏ ÅÇÏ ÉÓÐÏÌØÚÕÅÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ ÎÁÄ ÔÅÍ, ÞÔÏÂÙ ÄÏÂÒÏ×ÏÌØÎÏ ÓÔÁÔØ ÅÇÏ - ÍÜÊÎÔÜÊÎÅÒÏÍ. ÷Ï &os; ÉÍÅÅÔÓÑ ÂÏÌÅÅ 2000 ÐÏÒÔÏ× ÂÅÚ ÐÏÄÄÅÒÖËÉ, É ÜÔÏ + ÍÅÊÎÔÅÊÎÅÒÏÍ. ÷Ï &os; ÉÍÅÅÔÓÑ ÂÏÌÅÅ 2000 ÐÏÒÔÏ× ÂÅÚ ÐÏÄÄÅÒÖËÉ, É ÜÔÏ ËÁË ÒÁÚ ÔÁ ÏÂÌÁÓÔØ, ÇÄÅ ×ÓÅÇÄÁ ÎÕÖÎÙ ÄÏÂÒÏ×ÏÌØÃÙ. (äÅÔÁÌØÎÏÅ ÏÐÉÓÁÎÉÅ - ÏÂÑÚÁÎÎÏÓÔÅÊ ÍÜÊÎÔÜÊÎÅÒÏ× ÍÏÖÎÏ ÎÁÊÔÉ × ÒÁÚÄÅÌÅ MAINTAINER × Make-ÆÁÊÌÁÈ.) @@ -5623,7 +5674,7 @@ ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ × ÐÏÌÅ Class ×ÁÛÅÇÏ PR ÄÏÌÖÎÏ ÂÙÔØ ÕËÁÚÁÎÏ change-request. âÕÄØÔÅ ÄÏÂÒÙ, × ÓÏÏÂÝÅÎÉÉ ÏÔÍÅÔØÔÅ ×ÓÅ ÄÏÂÁ×ÌÅÎÎÙÅ ÉÌÉ ÕÄÁÌ£ÎÎÙÅ ÆÁÊÌÙ, ÔÁË ËÁË ÏÎÉ ÂÕÄÕÔ - ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÕËÁÚÁÎÙ &man.cvs.1; ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÔÁ. + ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÕËÁÚÁÎÙ &man.cvs.1; ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÁ. åÓÌÉ diff-ÆÁÊÌ ÉÍÅÅÔ ÒÁÚÍÅÒ, ÐÒÅ×ÙÛÁÀÝÉÊ 20ëâ, ÓÏÖÍÉÔÅ ÅÇÏ É ÏÂÒÁÂÏÔÁÊÔÅ ÕÔÉÌÉÔÏÊ uuencode; × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÐÒÏÓÔÏ ×ËÌÀÞÉÔÅ ÅÇÏ ËÁË ÅÓÔØ × PR. @@ -5638,7 +5689,7 @@ åÓÌÉ ×ÁÛÅ ÏÂÎÏ×ÌÅÎÉÅ ×ÙÚ×ÁÎÏ ÓÏÏÂÒÁÖÅÎÉÑÍÉ ÉÎÆÏÒÍÁÃÉÏÎÎÏÊ ÂÅÚÏÐÁÓÎÏÓÔÉ ÉÌÉ ÎÁÌÉÞÉÅÍ ÓÅÒØ£ÚÎÙÈ ÏÛÉÂÏË × ÉÍÅÀÝÅÍÓÑ ÐÏÒÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÏÐÏ×ÅÓÔÉÔÅ &a.portmgr; Ï ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÎÅÍÅÄÌÅÎÎÏÇÏ - ÐÅÒÅÐÏÓÔÒÏÅÎÉÑ É ÐÏ×ÔÏÒÎÏÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÐÁËÁÄÖÁ ×ÁÛÅÇÏ ÐÏÒÔÁ. + ÐÅÒÅÐÏÓÔÒÏÅÎÉÑ É ÐÏ×ÔÏÒÎÏÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÐÁËÅÔÁ ×ÁÛÅÇÏ ÐÏÒÔÁ. ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÎÉÞÅÇÏ ÎÅ ÐÏÄÏÚÒÅ×ÁÀÝÉÅ ÐÏÌØÚÏ×ÁÔÅÌÉ &man.pkg.add.1; ÂÕÄÕÔ ÐÒÏÄÏÌÖÁÔØ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÏ ËÏÍÁÎÄÅ pkg_add -r × ÔÅÞÅÎÉÅ ÅÝ£ ÎÅÓËÏÌØËÉÈ ÎÅÄÅÌØ. @@ -6457,7 +6508,7 @@ 4.5-STABLE ÐÏÓÌÅ ÐÅÒÅËÌÀÞÅÎÉÑ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏ - ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÁËÁÄÖÅÊ XFree86 4. + ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÁËÅÔÏ× XFree86 4. 450005 @@ -6694,7 +6745,7 @@ - 5.0-CURRENT ÐÏÓÌÅ ÐÅÒ×ÏÇÏ ËÏÍÍÉÔÔÁ SMPng. + 5.0-CURRENT ÐÏÓÌÅ ÐÅÒ×ÏÇÏ ËÏÍÍÉÔÁ SMPng. 500013 @@ -6786,7 +6837,7 @@ 5.0-CURRENT ÐÏÓÌÅ ÐÅÒÅÈÏÄÁ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ - XFree86 4 ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÁÄÖÅÊ É ÐÏÓÌÅ ÄÏÂÁ×ÌÅÎÉÑ × + XFree86 4 ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÏ× É ÐÏÓÌÅ ÄÏÂÁ×ÌÅÎÉÑ × ÂÉÂÌÉÏÔÅËÕ libc ÎÏ×ÏÊ ÆÕÎËÃÉÉ strnstr(). 500026 @@ -6887,7 +6938,7 @@ 5.0-CURRENT ÐÏÓÌÅ ÔÏÇÏ, ËÁË × ÆÁÊÌÁÈ ÚÁÇÏÌÏ×ËÏ× ÂÙÌÏ ÐÒÅËÒÁÝÅÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ _BSD_FOO_T_ É ÎÁÞÁÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ _FOO_T_DECLARED. üÔÏ ÚÎÁÞÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÎÏ - ËÁË ÐÒÉÍÅÒÎÁÑ ÔÏÞËÁ ÎÁÞÁÌÁ ÐÏÄÄÅÒÖËÉ ÐÁËÁÄÖÅÊ × ÆÏÒÍÁÔÅ + ËÁË ÐÒÉÍÅÒÎÁÑ ÔÏÞËÁ ÎÁÞÁÌÁ ÐÏÄÄÅÒÖËÉ ÐÁËÅÔÏ× × ÆÏÒÍÁÔÅ &man.bzip2.1;. 500039 @@ -7453,26 +7504,35 @@ ${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR} .endif - ÷ÏÔ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ É ÔÏ, ËÁË ÏÎÉ ÐÒÅÏÂÒÁÚÕÀÔÓÑ ÐÒÉ - ÉÓÐÏÌØÚÏ×ÁÎÉÉ × Makefile: + ÷ÏÔ ÎÅÓËÏÌØËÏ ÐÏÌÅÚÎÙÈ ÐÅÒÅÍÅÎÎÙÈ É ÔÏ, ËÁË ÏÎÉ ÐÒÅÏÂÒÁÚÕÀÔÓÑ ÐÏ + ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ × Makefile: - ${DATADIR} ÐÒÅÏÂÒÁÚÕÅÔÓÑ × - ${PREFIX}/share/${PORTNAME}. + DATADIR ÐÒÅÏÂÒÁÚÕÅÔÓÑ × + PREFIX/share/PORTNAME. - ${DOCSDIR} ÐÒÅÏÂÒÁÚÕÅÔÓÑ × - ${PREFIX}/share/doc/${PORTNAME}. + DOCSDIR ÐÒÅÏÂÒÁÚÕÅÔÓÑ × + PREFIX/share/doc/PORTNAME. - ${EXAMPLESDIR} ÐÒÅÏÂÒÁÚÕÅÔÓÑ × - ${PREFIX}/share/examples/${PORTNAME}. + EXAMPLESDIR ÐÒÅÏÂÒÁÚÕÅÔÓÑ × + PREFIX/share/examples/PORTNAME. + üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÜËÓÐÏÒÔÉÒÕÀÔÓÑ × PLIST_SUB. + éÈ ÚÎÁÞÅÎÉÑ ÐÏÑ×ÑÔÓÑ ÔÁÍ × ×ÉÄÅ ÉͣΠÐÕÔÅÊ ÏÔÎÏÓÉÔÅÌØÎÏ + PREFIX, ÅÓÌÉ ÜÔÏ ×ÏÚÍÏÖÎÏ. + ôÏ ÅÓÔØ share/doc/PORTNAME + × ÓÐÉÓËÅ ÓÂÏÒËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ ÂÕÄÅÔ ÚÁÍÅÎÅÎ ÎÁ + %%DOCSDIR%%, É ÔÁË ÄÁÌÅÅ. (äÏÐÏÌÎÉÔÅÌØÎÕÀ + ÉÎÆÏÒÍÁÃÉÀ Ï ÐÏÄÓÔÁÎÏ×ËÅ × pkg-plist ÍÏÖÎÏ + ÎÁÊÔÉ ÚÄÅÓØ.) + ÷ÓÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÙÅ ÆÁÊÌÙ Ó ÄÏËÕÍÅÎÔÁÃÉÅÊ É ËÁÔÁÌÏÇÉ ÄÏÌÖÎÙ ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ × ÆÁÊÌÅ pkg-plist Ó ÐÒÅÆÉËÓÏÍ %%PORTDOCS%%, ÎÁÐÒÉÍÅÒ: @@ -7491,6 +7551,27 @@ æÁÊÌ pkg-message ÎÅ ÎÕÖÎÏ ÄÏÂÁ×ÌÑÔØ × pkg-plist. + + ÷ ËÁÞÅÓÔ×Å ÁÌØÔÅÒÎÁÔÉ×Ù ÐÅÒÅÞÉÓÌÅÎÉÀ ÆÁÊÌÏ× ÄÏËÕÍÅÎÔÁÃÉÉ × ÆÁÊÌÅ + pkg-plist, ÐÏÒÔ ÍÏÖÅÔ ÕËÁÚÁÔØ × ÐÅÒÅÍÅÎÎÏÊ + PORTDOCS ÓÐÉÓÏË ÉͣΠÆÁÊÌÏ× É ÇÌÏÂÁÌØÎÙÈ ÛÁÂÌÏÎÏ× + ËÏÍÁÎÄÎÏÇÏ ÐÒÏÃÅÓÓÏÒÁ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ × ÏËÏÎÞÁÔÅÌØÎÙÊ ÓÐÉÓÏË ÓÂÏÒËÉ. + éÍÅÎÁ ÂÕÄÕÔ ÚÁÄÁ×ÁÔØÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ DOCSDIR. + ôÁËÉÍ ÏÂÒÁÚÏÍ, ÐÏÒÔ, ÉÓÐÏÌØÚÕÀÝÉÊ PORTDOCS É + ÎÅÓÔÁÎÄÁÒÔÎÏÅ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ ÄÏËÕÍÅÎÔÁÃÉÉ, ÄÏÌÖÅÎ ÚÁÄÁ×ÁÔØ + ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÏÂÒÁÚÏÍ É DOCSDIR. åÓÌÉ ËÁÔÁÌÏÇ + ÕËÁÚÁÎ × PORTDOCS ÉÌÉ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÛÁÂÌÏÎÕ ÄÌÑ + ÜÔÏÊ ÐÅÒÅÍÅÎÎÏÊ, ÔÏ ÐÏÌÎÏÅ ÐÏÄÄÅÒÅ×Ï Ó ×ÈÏÄÑÝÉÍÉ × ÎÅÇÏ ÆÁÊÌÁÍÉ É + ËÁÔÁÌÏÇÁÍÉ ÂÕÄÅÔ ÒÅÇÉÓÔÒÉÒÏ×ÁÔØÓÑ × ÏËÏÎÞÁÔÅÌØÎÏÍ ÓÐÉÓËÅ ÓÂÏÒËÉ. + PORTDOCS ÎÅ ÄÏÌÖÎÁ ÚÁÄÁ×ÁÔØÓÑ, ÅÓÌÉ ÏÐÒÅÄÅÌÅÎÁ + ÐÅÒÅÍÅÎÎÁÑ NOPORTDOCS. õÓÔÁÎÏ×ËÁ ÄÏËÕÍÅÎÔÁÃÉÉ × + PORTDOCS, ËÁË ÜÔÏ ÐÏËÁÚÁÎÏ ×ÙÛÅ, ÏÓÔÁ£ÔÓÑ ÚÁ + ÓÁÍÉÍ ÐÏÒÔÏÍ. ôÉÐÉÞÎÙÊ ÐÒÉÍÅÒ ÉÓÐÏÌØÚÏ×ÁÎÉÑ + PORTDOCS ×ÙÇÌÑÄÉÔ ÓÌÅÄÕÀÝÉÍ ÏÂÒÁÚÏÍ: + + .if !defined(NOPORTDOCS) + PORTDOCS= * +.endif @@ -7556,7 +7637,7 @@ éÄÅÎÔÉÆÉËÁÔÏÒÙ UID - åÓÌÉ ×ÁÛÅÍÕ ÐÏÒÔÙ ÔÒÅÂÕÅÔÓÑ ÎÁÌÉÞÉÅ ÎÅËÏÔÏÒÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ × + åÓÌÉ ×ÁÛÅÍÕ ÐÏÒÔÕ ÔÒÅÂÕÅÔÓÑ ÎÁÌÉÞÉÅ ÎÅËÏÔÏÒÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ × ÓÉÓÔÅÍÅ, ÎÁ ËÏÔÏÒÕÀ ÏÎ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ, ÐÕÓÔØ ÓËÒÉÐÔ pkg-install ×ÙÚÏ×ÅÔ ËÏÍÁÎÄÕ pw ÄÌÑ ÅÇÏ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÓÏÚÄÁÎÉÑ. ðÏÓÍÏÔÒÉÔÅ @@ -7564,7 +7645,7 @@ åÓÌÉ ×ÁÛ ÐÏÒÔ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÔ ÖÅ ÓÁÍÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ - ÐÏÌØÚÏ×ÁÔÅÌÑ ÉÌÉ ÇÒÕÐÐÙ ÐÒÉ ÕÓÔÁÎÏ×ËÅ Ä×ÏÉÞÎÏÇÏ ÐÁËÁÄÖÁ, ËÏÔÏÒÙÊ ÂÙÌ + ÐÏÌØÚÏ×ÁÔÅÌÑ ÉÌÉ ÇÒÕÐÐÙ ÐÒÉ ÕÓÔÁÎÏ×ËÅ Ä×ÏÉÞÎÏÇÏ ÐÁËÅÔÁ, ËÏÔÏÒÙÊ ÂÙÌ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ, ÔÏ ×Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ Ó×ÏÂÏÄÎÙÊ UID × ÄÉÁÐÁÚÏÎÅ ÏÔ 50 ÄÏ 999 É ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÅÇÏ ÎÉÖÅ. ÷ÚÇÌÑÎÉÔÅ ÄÌÑ ÐÒÉÍÅÒÁ ÎÁ japanese/Wnn6. @@ -7942,7 +8023,7 @@ # # $FreeBSD$ [ ^^^^^^^^^ üÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÚÁÍÅÎÅÎÁ ÓÏ ÓÔÒÏÞËÏÊ RCS ID -ÓÉÓÔÅÍÏÊ CVS ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÔÁ × ÎÁÛÅ ÈÒÁÎÉÌÉÝÅ. ðÒÉ +ÓÉÓÔÅÍÏÊ CVS ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÁ × ÎÁÛÅ ÈÒÁÎÉÌÉÝÅ. ðÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÐÏÒÔÁ ÎÅ ÐÒÉ×ÏÄÉÔÅ ÜÔÕ ÓÔÒÏËÕ ÏÂÒÁÔÎÏ Ë ×ÉÄÕ "$FreeBSD$". CVS ÓÄÅÌÁÅÔ ×ÓÅ Á×ÔÏÍÁÔÉÞÅÓËÉ.] # @@ -7971,7 +8052,7 @@ PATCHFILES= xdvi-18.patch1.gz xdvi-18.patch2.gz [ÓÏÐÒÏ×ÏÖÄÁÀÝÉÊ; *ÏÂÑÚÁÔÅÌØÎÏÅ ÐÏÌÅ*! üÔÏ ÞÅÌÏ×ÅË (ÐÒÅÄÐÏÞÔÉÔÅÌØÎÏ Ó - ÐÒÉ×ÉÌÅÇÉÑÍÉ ÎÁ ÏÐÅÒÁÃÉÀ ËÏÍÍÉÔÔÁ), Ó ËÏÔÏÒÙÍ ÍÏÖÅÔ Ó×ÑÚÁÔØÓÑ ÐÏÌØÚÏ×ÁÔÅÌØ + ÐÒÉ×ÉÌÅÇÉÑÍÉ ÎÁ ÏÐÅÒÁÃÉÀ ËÏÍÍÉÔÁ), Ó ËÏÔÏÒÙÍ ÍÏÖÅÔ Ó×ÑÚÁÔØÓÑ ÐÏÌØÚÏ×ÁÔÅÌØ ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÏÔ×ÅÔÏ× ÎÁ ×ÏÐÒÏÓÙ É ÐÏÓÙÌËÉ ÓÏÏÂÝÅÎÉÊ Ï ÏÛÉÂËÁÈ - ÜÔÏÔ ÞÅÌÏ×ÅË ÄÏÌÖÅÎ ÂÙÔØ ÓÏÚÄÁÔÅÌÅÍ ÐÏÒÔÁ ÉÌÉ ËÅÍ-ÔÏ, ËÔÏ ÍÏÖÅÔ ÐÅÒÅÄÁÔØ ×ÏÐÒÏÓÙ ÓÏÚÄÁÔÅÌÀ ÐÏÒÔÁ. åÓÌÉ ×Ù ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÎÅ ÈÏÔÉÔÅ ÕËÁÚÙ×ÁÔØ ÚÄÅÓØ @@ -8093,7 +8174,7 @@ óÁÍÙÍ ÐÒÏÓÔÙÍ ÓÐÏÓÏÂÏÍ ÏÔÓÌÅÖÉ×ÁÔØ ÕÖÅ ÐÒÏÉÚÏÛÅÄÛÉÅ ÏÂÎÏ×ÌÅÎÉÑ Ñ×ÌÑÅÔÓÑ ÐÏÄÐÉÓËÁ ÎÁ FreshPorts. äÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ×Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÎÅÓËÏÌØËÏ - ÐÏÒÔÏ×. íÜÊÎÔÜÊÎÅÒÁÍ ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÐÏÄÐÉÓÁÔØÓÑ ÚÄÅÓØ, + ÐÏÒÔÏ×. íÅÊÎÔÅÊÎÅÒÁÍ ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÐÏÄÐÉÓÁÔØÓÑ ÚÄÅÓØ, ÐÏÔÏÍÕ ÞÔÏ ÏÎÉ ÂÕÄÕÔ ÐÏÌÕÞÁÔØ Õ×ÅÄÏÍÌÅÎÉÑ ÎÅ ÔÏÌØËÏ Ï ÓÏÂÓÔ×ÅÎÎÙÈ ÉÚÍÅÎÅÎÉÑÈ, ÎÏ É Ï ÉÚÍÅÎÅÎÉÑÈ, ÓÄÅÌÁÎÎÙÈ ÌÀÂÙÍ ÄÒÕÇÉÍ ËÏÍÍÉÔÔÅÒÏÍ &os;. (üÔÏ ÞÁÓÔÏ ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ Ó ÉÚÍÅÎÅÎÉÑÍÉ ÎÁ ÂÏÌÅÅ @@ -8152,7 +8233,7 @@ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÌÉÚÏ× ïó ÄÌÑ ËÁÖÄÏÊ ÁÒÈÉÔÅËÔÕÒÙ ÕÒÏ×ÎÑ ÐÏÄÄÅÒÖËÉ Tier-1 ×ÙÄÅÌÅÎ ÃÅÌÙÊ ËÌÁÓÔÅÒ ÍÁÛÉÎ. ÷Ù ÍÏÖÅÔÅ Õ×ÉÄÅÔØ ÒÅÚÕÌØÔÁÔÙ ÜÔÉÈ ÐÏÓÔÒÏÅÎÉÊ × ÐÒÏÔÏËÏÌÁÈ - ÐÏÓÔÒÏÅÎÉÑ ÐÁËÁÄÖÅÊ É ÏÂÎÁÒÕÖÅÎÎÙÈ ÏÛÉÂÏË. + ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÏ× É ÏÂÎÁÒÕÖÅÎÎÙÈ ÏÛÉÂÏË. @@ -8166,7 +8247,7 @@ ÉÎÓÐÅËÔÉÒÏ×ÁÎÉÑ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ× FreeBSD ÐÙÔÁÅÔÓÑ ÏÐÒÏÓÉÔØ ËÁÖÄÙÊ ÉÚ ÓÁÊÔÏ×, ÄÏÓÔÕÐÎÙÊ ÄÌÑ ÓÇÒÕÚËÉ ËÁÖÄÏÇÏ ÉÚ ÐÏÒÔÏ× >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 4 21:16:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 739D416A4E8; Fri, 4 Aug 2006 21:16:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 443A016A4E6 for ; Fri, 4 Aug 2006 21:16:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7C7743D6D for ; Fri, 4 Aug 2006 21:16:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74LG8lV051186 for ; Fri, 4 Aug 2006 21:16:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74LG8U5051183 for perforce@freebsd.org; Fri, 4 Aug 2006 21:16:08 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 21:16:08 GMT Message-Id: <200608042116.k74LG8U5051183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 21:16:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103193 Change 103193 by jb@jb_freebsd2 on 2006/08/04 21:15:26 Sync back to current, discarding bike_sched changes. Affected files ... .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#6 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#6 (text+ko) ==== @@ -728,6 +728,12 @@ mountflagsname ((int)*ip); ip++; narg--; + } else if (ktr->ktr_code == SYS_kse_thr_interrupt) { + print_number(ip,narg,c); + (void)putchar(','); + ksethrcmdname ((int)*ip); + ip++; + narg--; } else if (ktr->ktr_code == SYS_thr_create) { print_number(ip,narg,c); print_number(ip,narg,c); From owner-p4-projects@FreeBSD.ORG Fri Aug 4 22:08:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B47D216A4E1; Fri, 4 Aug 2006 22:08:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 910AF16A4DA for ; Fri, 4 Aug 2006 22:08:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 597C943D46 for ; Fri, 4 Aug 2006 22:08:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74M8Itv058513 for ; Fri, 4 Aug 2006 22:08:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74M8Irw058510 for perforce@freebsd.org; Fri, 4 Aug 2006 22:08:18 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Aug 2006 22:08:18 GMT Message-Id: <200608042208.k74M8Irw058510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 103202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 22:08:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=103202 Change 103202 by imp@imp_lighthouse on 2006/08/04 22:07:26 Ooops. This has been in my tree forever. We need 32-bit bus width for TSC board. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#6 (text) ==== @@ -42,7 +42,7 @@ #ifdef BOOT_TSC /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ #define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ -#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +#define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS typedef unsigned int sdram_size_t; #define OSC_MAIN_MULT 45 #endif From owner-p4-projects@FreeBSD.ORG Fri Aug 4 22:12:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B562016A4E1; Fri, 4 Aug 2006 22:12:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7933516A4DA for ; Fri, 4 Aug 2006 22:12:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2610143D46 for ; Fri, 4 Aug 2006 22:12:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74MCO8b058836 for ; Fri, 4 Aug 2006 22:12:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74MCOd4058833 for perforce@freebsd.org; Fri, 4 Aug 2006 22:12:24 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 22:12:24 GMT Message-Id: <200608042212.k74MCOd4058833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 22:12:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=103203 Change 103203 by jb@jb_freebsd2 on 2006/08/04 22:12:21 Fix an integration error which happened when bike_sched was integrated in sun4v_stable, but then was integrated into the dtrace tree. Oops. Affected files ... .. //depot/projects/dtrace/src/sys/vm/vm_pageq.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/vm/vm_pageq.c#5 (text+ko) ==== @@ -199,7 +199,6 @@ m->flags = 0; m->pc = (pa >> PAGE_SHIFT) & PQ_COLORMASK; pmap_page_init(m); - mtx_lock_spin(&vm_page_queue_free_mtx); if (!smp_started) { vm_pageq_enqueue(m->pc + PQ_FREE, m); } else { @@ -207,7 +206,6 @@ vm_pageq_enqueue(m->pc + PQ_FREE, m); mtx_unlock_spin(&vm_page_queue_free_mtx); } - mtx_unlock_spin(&vm_page_queue_free_mtx); return (m); } From owner-p4-projects@FreeBSD.ORG Fri Aug 4 22:19:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A11116A4E0; Fri, 4 Aug 2006 22:19:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 464ED16A4DD for ; Fri, 4 Aug 2006 22:19:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEA4343D45 for ; Fri, 4 Aug 2006 22:19:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74MJXFM059087 for ; Fri, 4 Aug 2006 22:19:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74MJXQJ059084 for perforce@freebsd.org; Fri, 4 Aug 2006 22:19:33 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 22:19:33 GMT Message-Id: <200608042219.k74MJXQJ059084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 22:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=103204 Change 103204 by jb@jb_freebsd2 on 2006/08/04 22:18:46 Sync to current. Affected files ... .. //depot/projects/dtrace/src/sys/vm/vm_meter.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/vm/vm_meter.c#7 (text+ko) ==== @@ -89,7 +89,7 @@ #endif return SYSCTL_OUT(req, &averunnable, sizeof(averunnable)); } -SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD | CTLFLAG_MPSAFE, +SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD, NULL, 0, sysctl_vm_loadavg, "S,loadavg", "Machine loadaverage history"); static int From owner-p4-projects@FreeBSD.ORG Fri Aug 4 22:20:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A9AF16A4DF; Fri, 4 Aug 2006 22:20:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1124216A4DA for ; Fri, 4 Aug 2006 22:20:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8DBC43D46 for ; Fri, 4 Aug 2006 22:20:35 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74MKZc3059240 for ; Fri, 4 Aug 2006 22:20:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74MKZ2T059237 for perforce@freebsd.org; Fri, 4 Aug 2006 22:20:35 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 22:20:35 GMT Message-Id: <200608042220.k74MKZ2T059237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 22:20:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=103205 Change 103205 by jb@jb_freebsd2 on 2006/08/04 22:20:09 Sync to current. Affected files ... .. //depot/projects/dtrace/src/sys/vm/vm_init.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/vm/vm_init.c#3 (text+ko) ==== @@ -116,6 +116,7 @@ */ vm_set_page_size(); virtual_avail = vm_page_startup(virtual_avail); + /* * Initialize other VM packages */ From owner-p4-projects@FreeBSD.ORG Fri Aug 4 22:32:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A76D16A4E2; Fri, 4 Aug 2006 22:32:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67EC316A4DA for ; Fri, 4 Aug 2006 22:32:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CED9043D45 for ; Fri, 4 Aug 2006 22:32:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74MWpkx059842 for ; Fri, 4 Aug 2006 22:32:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74MWp09059839 for perforce@freebsd.org; Fri, 4 Aug 2006 22:32:51 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 22:32:51 GMT Message-Id: <200608042232.k74MWp09059839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103206 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 22:32:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103206 Change 103206 by jb@jb_freebsd2 on 2006/08/04 22:32:24 Merge KSE support back in, but only if the KSE kernel option is defined. Affected files ... .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/vm/vm_glue.c#4 (text+ko) ==== @@ -682,8 +682,12 @@ ppri = INT_MIN; sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { - if (p->p_sflag & (PS_INMEM | PS_SWAPPINGOUT | PS_SWAPPINGIN)) +#ifdef KSE + struct ksegrp *kg; +#endif + if (p->p_sflag & (PS_INMEM | PS_SWAPPINGOUT | PS_SWAPPINGIN)) { continue; + } mtx_lock_spin(&sched_lock); FOREACH_THREAD_IN_PROC(p, td) { /* @@ -692,13 +696,18 @@ * */ if (td->td_inhibitors == TDI_SWAPPED) { +#ifdef KSE + kg = td->td_ksegrp; + pri = p->p_swtime + kg->kg_slptime; +#else pri = p->p_swtime + td->td_slptime; +#endif if ((p->p_sflag & PS_SWAPINREQ) == 0) { pri -= p->p_nice * 8; } /* - * if this thread is higher priority + * if this ksegrp/thread is higher priority * and there is enough space, then select * this process instead of the previous * selection. @@ -807,6 +816,9 @@ { struct proc *p; struct thread *td; +#ifdef KSE + struct ksegrp *kg; +#endif int didswap = 0; retry: @@ -880,15 +892,24 @@ * do not swapout a realtime process * Check all the thread groups.. */ +#ifdef KSE + FOREACH_KSEGRP_IN_PROC(p, kg) { + if (PRI_IS_REALTIME(kg->kg_pri_class)) +#else FOREACH_THREAD_IN_PROC(p, td) { if (PRI_IS_REALTIME(td->td_pri_class)) +#endif goto nextproc; /* * Guarantee swap_idle_threshold1 * time in memory. */ +#ifdef KSE + if (kg->kg_slptime < swap_idle_threshold1) +#else if (td->td_slptime < swap_idle_threshold1) +#endif goto nextproc; /* @@ -900,8 +921,16 @@ * This could be refined to support * swapping out a thread. */ +#ifdef KSE + FOREACH_THREAD_IN_GROUP(kg, td) { + if ((td->td_priority) < PSOCK || + !thread_safetoswapout(td)) + goto nextproc; + } +#else if ((td->td_priority) < PSOCK || !thread_safetoswapout(td)) goto nextproc; +#endif /* * If the system is under memory stress, * or if we are swapping @@ -910,11 +939,20 @@ */ if (((action & VM_SWAP_NORMAL) == 0) && (((action & VM_SWAP_IDLE) == 0) || +#ifdef KSE + (kg->kg_slptime < swap_idle_threshold2))) +#else (td->td_slptime < swap_idle_threshold2))) +#endif goto nextproc; +#ifdef KSE + if (minslptime > kg->kg_slptime) + minslptime = kg->kg_slptime; +#else if (minslptime > td->td_slptime) minslptime = td->td_slptime; +#endif } /* From owner-p4-projects@FreeBSD.ORG Fri Aug 4 22:44:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F40E16A4E1; Fri, 4 Aug 2006 22:44:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3341F16A4DF for ; Fri, 4 Aug 2006 22:44:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D33C843D45 for ; Fri, 4 Aug 2006 22:44:06 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74Mi6TK061808 for ; Fri, 4 Aug 2006 22:44:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74Mi6he061805 for perforce@freebsd.org; Fri, 4 Aug 2006 22:44:06 GMT (envelope-from marcel@freebsd.org) Date: Fri, 4 Aug 2006 22:44:06 GMT Message-Id: <200608042244.k74Mi6he061805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 22:44:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=103208 Change 103208 by marcel@marcel_nfs on 2006/08/04 22:43:44 Add PowerPC target for kgdb. Obtained from: grehan@ Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Aug 4 23:12:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C58D516A4EA; Fri, 4 Aug 2006 23:12:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3C9D16A4E8 for ; Fri, 4 Aug 2006 23:12:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FFD043D58 for ; Fri, 4 Aug 2006 23:12:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74NCicp068636 for ; Fri, 4 Aug 2006 23:12:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74NChHp068633 for perforce@freebsd.org; Fri, 4 Aug 2006 23:12:43 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Aug 2006 23:12:43 GMT Message-Id: <200608042312.k74NChHp068633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 103211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 23:12:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=103211 Change 103211 by imp@imp_lighthouse on 2006/08/04 23:12:17 Print download stats while we're downloading: update every 64k at end for each 'NAK' that we send to jumpstart the d/l Init the GPIO lines, etc when we set the MAC address Eliminate the lame state machine for tftp download. Even adding printing the stats, we save about 200 bytes. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#20 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#20 (text+ko) ==== @@ -35,8 +35,7 @@ static unsigned char localIPAddr[4], serverIPAddr[4]; static unsigned short serverPort, localPort; static int ackBlock; - -static unsigned lastAddress, lastSize; +static unsigned lastSize; static char *dlAddress; static unsigned transmitBuffer[1024 / sizeof(unsigned)]; @@ -184,7 +183,7 @@ char *cPtr, *ePtr, *mPtr; unsigned length; - tftpHeader.opcode = SWAP16(TFTP_RRQ_OPCODE); + tftpHeader.opcode = TFTP_RRQ_OPCODE; cPtr = (char*)&(tftpHeader.block_num); @@ -214,14 +213,16 @@ p_memcpy(dlAddress, data, len); dlAddress += len; lastSize += len; + if (ackBlock % 128 == 0) + printf("tftp: %u kB\r", lastSize / 1024); } - - tftpHeader.opcode = SWAP16(TFTP_ACK_OPCODE); - tftpHeader.block_num = SWAP16(block_num); + tftpHeader.opcode = TFTP_ACK_OPCODE; + tftpHeader.block_num = SWAP16(ackBlock); Send_TFTP_Packet((char*)&tftpHeader, 4); - - if (len < 512) + if (len < 512) { ackBlock = -2; + printf("tftp: %u byte\r\n", lastSize); + } } @@ -315,7 +316,7 @@ if (udpHdr->dst_port != localPort) break; - if (tftpHdr->opcode != SWAP16(TFTP_DATA_OPCODE)) + if (tftpHdr->opcode != TFTP_DATA_OPCODE) break; if (ackBlock == -1) { @@ -329,8 +330,8 @@ break; TFTP_ACK_Data(tftpHdr->data, - SWAP16(tftpHdr->block_num), - SWAP16(udpHdr->udp_len) - 12); + SWAP16(tftpHdr->block_num), + SWAP16(udpHdr->udp_len) - 12); } } p_rxBD[process].address &= ~0x01; @@ -516,6 +517,32 @@ // low_address & 0xff000000 = next // high_address & 0x000000ff = next // high_address & 0x0000ff00 = last byte in address + + if (!MAC_init) { + AT91C_BASE_PMC->PMC_PCER = 1u << AT91C_ID_EMAC; + AT91C_BASE_PIOA->PIO_ASR = + AT91C_PA14_ERXER | AT91C_PA12_ERX0 | AT91C_PA13_ERX1 | + AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | + AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | + AT91C_PA7_ETXCK_EREFCK; + AT91C_BASE_PIOA->PIO_PDR = + AT91C_PA14_ERXER | AT91C_PA12_ERX0 | AT91C_PA13_ERX1 | + AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | + AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | + AT91C_PA7_ETXCK_EREFCK; +#ifdef BOOT_KB9202 /* Really !RMII */ + AT91C_BASE_PIOB->PIO_BSR = + AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | + AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | + AT91C_PB18_ECOL | AT91C_PB19_ERXCK; + AT91C_BASE_PIOB->PIO_PDR = + AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | + AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | + AT91C_PB18_ECOL | AT91C_PB19_ERXCK; +#endif + MAC_init = 1; + } + } @@ -573,108 +600,41 @@ TFTP_Download(unsigned address, char *filename) { ip_header_t IpHeader; - unsigned thisSeconds, running, state; - int timeout, tickUpdate; - - if (!address) { - // report last transfer information - printf("\r\n -- Last tftp transfer info --\r\n" - " address: 0x%x\r\n" - " size: 0x%x\r\n", lastAddress, lastSize); - return ; - } + unsigned thisSeconds; + int timeout; if ((!localMACSet) || (!localIPSet) || (!serverIPSet)) return ; - if (!MAC_init) { - AT91C_BASE_PMC->PMC_PCER = 1u << AT91C_ID_EMAC; - AT91C_BASE_PIOA->PIO_ASR = - AT91C_PA14_ERXER | AT91C_PA12_ERX0 | AT91C_PA13_ERX1 | - AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | - AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | - AT91C_PA7_ETXCK_EREFCK; - AT91C_BASE_PIOA->PIO_PDR = - AT91C_PA14_ERXER | AT91C_PA12_ERX0 | AT91C_PA13_ERX1 | - AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | - AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | - AT91C_PA7_ETXCK_EREFCK; -#ifdef BOOT_KB9202 /* Really !RMII */ - AT91C_BASE_PIOB->PIO_BSR = - AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | - AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | - AT91C_PB18_ECOL | AT91C_PB19_ERXCK; - AT91C_BASE_PIOB->PIO_PDR = - AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | - AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | - AT91C_PB18_ECOL | AT91C_PB19_ERXCK; -#endif - MAC_init = 1; - } - AT91F_EmacEntry(); GetServerAddress(); - lastAddress = address; dlAddress = (char*)address; lastSize = 0; - running = 1; - state = TFTP_WAITING_SERVER_MAC; timeout = 10; thisSeconds = GetSeconds(); serverPort = SWAP16(69); ++localPort; ackBlock = -1; - while (running && timeout) { - int newpacket; - - newpacket = CheckForNewPacket(&IpHeader); - - tickUpdate = 0; - - if (!newpacket && thisSeconds != GetSeconds()) { - tickUpdate = 1; + while (timeout) { + if (CheckForNewPacket(&IpHeader)) { + if (ackBlock == -2) + break; + timeout = 10; + } else if (thisSeconds != GetSeconds()) { --timeout; thisSeconds = GetSeconds(); - } else if (newpacket) - timeout = 10; - - switch (state) { - - case TFTP_WAITING_SERVER_MAC: - if (serverMACSet) { - state = TFTP_SEND_REQUEST; - break; - } - - if (tickUpdate) - GetServerAddress(); - break; - - case TFTP_SEND_REQUEST: - // send request for file - if (ackBlock != -1) { - state = TFTP_GET_DATA; - break; - } - - if (tickUpdate) - TFTP_RequestFile(filename); - break; - - case TFTP_GET_DATA: - // receiving data - if (ackBlock == -2) { - state = TFTP_COMPLETE; - break; - } - break; - - case TFTP_COMPLETE: - default: - running = 0; - break; + if (!serverMACSet) + GetServerAddress(); + else if (ackBlock == -1) + TFTP_RequestFile(filename); + else { + // Be sure to send a NAK, which is done by + // ACKing the last block we got. + TFTP_ACK_Data(0, ackBlock, 512); + printf("\nNAK\r\n"); + } } } if (timeout == 0) @@ -697,7 +657,6 @@ localIPSet = 0; serverIPSet = 0; localPort = SWAP16(0x8002); - lastAddress = 0; lastSize = 0; MAC_init = 0; } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#5 (text+ko) ==== @@ -104,16 +104,12 @@ unsigned char data[512]; } __attribute__((__packed__)) tftp_header_t; -#define TFTP_RRQ_OPCODE 1 -#define TFTP_WRQ_OPCODE 2 -#define TFTP_DATA_OPCODE 3 -#define TFTP_ACK_OPCODE 4 -#define TFTP_ERROR_OPCODE 5 - -#define TFTP_WAITING_SERVER_MAC 1 -#define TFTP_SEND_REQUEST 2 -#define TFTP_GET_DATA 3 -#define TFTP_COMPLETE 4 +// Preswap bytes +#define TFTP_RRQ_OPCODE 0x0100 +#define TFTP_WRQ_OPCODE 0x0200 +#define TFTP_DATA_OPCODE 0x0300 +#define TFTP_ACK_OPCODE 0x0400 +#define TFTP_ERROR_OPCODE 0x0500 /* MII registers definition */ #define MII_STS_REG 0x01 From owner-p4-projects@FreeBSD.ORG Fri Aug 4 23:22:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A840A16A4E6; Fri, 4 Aug 2006 23:22:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8513A16A4E2 for ; Fri, 4 Aug 2006 23:22:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B32843D45 for ; Fri, 4 Aug 2006 23:22:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74NMv1p069139 for ; Fri, 4 Aug 2006 23:22:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74NMvbV069136 for perforce@freebsd.org; Fri, 4 Aug 2006 23:22:57 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Aug 2006 23:22:57 GMT Message-Id: <200608042322.k74NMvbV069136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 103212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 23:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103212 Change 103212 by imp@imp_lighthouse on 2006/08/04 23:22:07 Avoid spurious NAK when we cross a second boundary at the cost of a slightly longer timeout sometimes. Before we'd always send a NAK when we crossed a second boundary, even if we'd just received data. Now we reset the timeout when we get a TFTP packet for us. Not 100% sure this is right, but (a) my gut tells me it is and (b) a quick survey of many reboots suggests this is a lot more reliable. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#21 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#21 (text+ko) ==== @@ -612,7 +612,7 @@ dlAddress = (char*)address; lastSize = 0; timeout = 10; - thisSeconds = GetSeconds(); + thisSeconds = GetSeconds() + 1; serverPort = SWAP16(69); ++localPort; ackBlock = -1; @@ -622,9 +622,10 @@ if (ackBlock == -2) break; timeout = 10; - } else if (thisSeconds != GetSeconds()) { + thisSeconds = GetSeconds() + 1; + } else if (GetSeconds() > thisSeconds) { --timeout; - thisSeconds = GetSeconds(); + thisSeconds = GetSeconds() + 1; if (!serverMACSet) GetServerAddress(); else if (ackBlock == -1) @@ -633,7 +634,7 @@ // Be sure to send a NAK, which is done by // ACKing the last block we got. TFTP_ACK_Data(0, ackBlock, 512); - printf("\nNAK\r\n"); + printf("\nNAK %u\r\n", ackBlock); } } } From owner-p4-projects@FreeBSD.ORG Fri Aug 4 23:26:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E76B416A4DF; Fri, 4 Aug 2006 23:26:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C224416A4DD for ; Fri, 4 Aug 2006 23:26:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CC0943D45 for ; Fri, 4 Aug 2006 23:26:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74NQ2b7069260 for ; Fri, 4 Aug 2006 23:26:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74NQ1tS069257 for perforce@freebsd.org; Fri, 4 Aug 2006 23:26:01 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 23:26:01 GMT Message-Id: <200608042326.k74NQ1tS069257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 23:26:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=103213 Change 103213 by jb@jb_freebsd2 on 2006/08/04 23:25:29 IFC Affected files ... .. //depot/projects/dtrace/ports/CHANGES#5 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#8 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/dtrace/src/sys/net/if_faith.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_gif.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_gre.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_stf.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_var.h#3 integrate .. //depot/projects/dtrace/src/sys/net/net_osdep.h#4 delete .. //depot/projects/dtrace/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ah_core.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ah_output.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/esp_aesctr.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/esp_core.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/esp_input.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/esp_output.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/esp_rijndael.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ipcomp_core.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ipcomp_input.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/dtrace/src/sys/netkey/key.c#3 integrate .. //depot/projects/dtrace/src/sys/netkey/keydb.c#3 integrate .. //depot/projects/dtrace/src/sys/sys/time.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/types.h#4 integrate .. //depot/projects/dtrace/src/tools/regression/fsx/fsx.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/kldxref/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/kldxref/kldxref.c#4 integrate Differences ... ==== //depot/projects/dtrace/ports/CHANGES#5 (text+ko) ==== @@ -10,6 +10,33 @@ All ports committers are allowed to commit to this file. +20060805: +AUTHOR: sat@FreeBSD.org +The following functional changes were made to bsd.sites.mk: + + * MASTER_SITES variable can now contain special macros which are expanded into + traditional URL[:group] syntax and cause some convenient effects, e.g. set a + default M_S_SUBDIR. + + * A macro is any space-delimited word in MASTER_SITES without a forward slash. + + * If MASTER_SITE_ is defined, then the macro is expanded to its value. + + * Abbreviated macros are provided for extremely popular locations, e.g. CPAN + and SF. To avoid further obfuscation their unabbreviated equivalents should + be avoided. + + * Popular macros can trigger M_S_SUBDIR to default to a predefined value, e.g. + ${PORTNAME:L} for SF and ${PORTNAME:C/-.*//} for CPAN. + + * Abbreviations and M_S_SUBDIR defaults are defined by MASTER_SITES_ABBREVS + and MASTER_SITES_SUBDIRS, both set in bsd.sites.mk. + + * If a macro belongs to a group (e.g. SF:source1), all the sites it expands + into also belong to the same group. + + * Macros and traditional URL's can be mixed safely, their order stays intact. + 20060804: AUTHOR: gabor@FreeBSD.org The following functional changes were made to bsd.*.mk and to @@ -1149,4 +1176,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.57 2006/08/04 13:17:59 erwin Exp $ +$FreeBSD: ports/CHANGES,v 1.58 2006/08/04 20:44:18 sat Exp $ ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060704: KAME compat file net_osdep.h removed +OLD_FILES+=usr/include/net/net_osdep.h # 20060517: pcvt removed OLD_FILES+=usr/share/pcvt/README.FIRST OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german ==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.17 2005/08/09 10:19:41 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); #include #include @@ -104,7 +104,7 @@ */ IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) - if (TAILQ_FIRST(&ifp->if_addrhead) == NULL) + if (TAILQ_EMPTY(&ifp->if_addrhead)) ifnum++; else TAILQ_FOREACH(ifa, &ifp->if_addrhead, ==== //depot/projects/dtrace/src/sys/dev/isp/isp.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.123 2006/07/16 20:11:49 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.124 2006/08/04 20:14:52 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -226,6 +226,10 @@ isp->isp_rqstoutrp = BIU_REQOUTP; isp->isp_respinrp = BIU_RSPINP; isp->isp_respoutrp = BIU_RSPOUTP; + ISP_WRITE(isp, isp->isp_rqstinrp, 0); + ISP_WRITE(isp, isp->isp_rqstoutrp, 0); + ISP_WRITE(isp, isp->isp_respinrp, 0); + ISP_WRITE(isp, isp->isp_respoutrp, 0); } else { isp->isp_rqstinrp = INMAILBOX4; isp->isp_rqstoutrp = OUTMAILBOX4; @@ -1438,13 +1442,6 @@ icbp->icb_logintime = ICB_LOGIN_TOV; icbp->icb_lunetimeout = ICB_LUN_ENABLE_TOV; - if (IS_23XX(isp)) { - ISP_WRITE(isp, isp->isp_rqstinrp, 0); - ISP_WRITE(isp, isp->isp_rqstoutrp, 0); - ISP_WRITE(isp, isp->isp_respinrp, 0); - ISP_WRITE(isp, isp->isp_respoutrp, 0); - } - nwwn = ISP_NODEWWN(isp); pwwn = ISP_PORTWWN(isp); if (nwwn && pwwn) { ==== //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.120 2006/07/16 20:11:49 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.121 2006/08/04 20:13:27 mjacob Exp $"); #include #include #include @@ -562,29 +562,29 @@ loopid <<= 8; } switch (fct->action) { - case CLEAR_ACA: + case IPT_CLEAR_ACA: mbs.param[0] = MBOX_CLEAR_ACA; mbs.param[1] = loopid; mbs.param[2] = fct->lun; break; - case TARGET_RESET: + case IPT_TARGET_RESET: mbs.param[0] = MBOX_TARGET_RESET; mbs.param[1] = loopid; needmarker = 1; break; - case LUN_RESET: + case IPT_LUN_RESET: mbs.param[0] = MBOX_LUN_RESET; mbs.param[1] = loopid; mbs.param[2] = fct->lun; needmarker = 1; break; - case CLEAR_TASK_SET: + case IPT_CLEAR_TASK_SET: mbs.param[0] = MBOX_CLEAR_TASK_SET; mbs.param[1] = loopid; mbs.param[2] = fct->lun; needmarker = 1; break; - case ABORT_TASK_SET: + case IPT_ABORT_TASK_SET: mbs.param[0] = MBOX_ABORT_TASK_SET; mbs.param[1] = loopid; mbs.param[2] = fct->lun; ==== //depot/projects/dtrace/src/sys/dev/isp/isp_ioctl.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.16 2006/04/21 18:30:00 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.17 2006/08/04 20:14:03 mjacob Exp $ */ /*- * * Copyright (c) 1997-2006 by Matthew Jacob @@ -188,7 +188,11 @@ uint32_t loopid; /* 0..255 */ uint32_t lun; enum { - CLEAR_ACA, TARGET_RESET, LUN_RESET, CLEAR_TASK_SET, ABORT_TASK_SET + IPT_CLEAR_ACA, + IPT_TARGET_RESET, + IPT_LUN_RESET, + IPT_CLEAR_TASK_SET, + IPT_ABORT_TASK_SET } action; }; #define ISP_TSK_MGMT _IOWR(ISP_IOC, 97, struct isp_fc_tsk_mgmt) ==== //depot/projects/dtrace/src/sys/dev/isp/isp_library.c#5 (text) ==== @@ -32,7 +32,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.4 2006/07/16 20:11:49 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.5 2006/08/04 20:20:00 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -1648,9 +1648,9 @@ int i; isp_copy_out_hdr(isp, &nasrc->na_header, &nadst->na_header); ISP_IOXPUT_32(isp, nasrc->na_reserved, &nadst->na_reserved); - ISP_IOXPUT_8(isp, nasrc->na_lun, &nadst->na_lun); + ISP_IOXPUT_8(isp, nasrc->na_reserved1, &nadst->na_reserved1); ISP_IOXPUT_8(isp, nasrc->na_iid, &nadst->na_iid); - ISP_IOXPUT_16(isp, nasrc->na_scclun, &nadst->na_scclun); + ISP_IOXPUT_16(isp, nasrc->na_response, &nadst->na_response); ISP_IOXPUT_16(isp, nasrc->na_flags, &nadst->na_flags); ISP_IOXPUT_16(isp, nasrc->na_reserved2, &nadst->na_reserved2); ISP_IOXPUT_16(isp, nasrc->na_status, &nadst->na_status); @@ -1670,7 +1670,7 @@ isp_copy_out_hdr(isp, &nasrc->na_header, &nadst->na_header); ISP_IOXPUT_32(isp, nasrc->na_reserved, &nadst->na_reserved); ISP_IOXPUT_16(isp, nasrc->na_iid, &nadst->na_iid); - ISP_IOXPUT_16(isp, nasrc->na_scclun, &nadst->na_scclun); + ISP_IOXPUT_16(isp, nasrc->na_response, &nadst->na_response); ISP_IOXPUT_16(isp, nasrc->na_flags, &nadst->na_flags); ISP_IOXPUT_16(isp, nasrc->na_reserved2, &nadst->na_reserved2); ISP_IOXPUT_16(isp, nasrc->na_status, &nadst->na_status); @@ -1689,9 +1689,9 @@ int i; isp_copy_in_hdr(isp, &nasrc->na_header, &nadst->na_header); ISP_IOXGET_32(isp, &nasrc->na_reserved, nadst->na_reserved); - ISP_IOXGET_8(isp, &nasrc->na_lun, nadst->na_lun); + ISP_IOXGET_8(isp, &nasrc->na_reserved1, nadst->na_reserved1); ISP_IOXGET_8(isp, &nasrc->na_iid, nadst->na_iid); - ISP_IOXGET_16(isp, &nasrc->na_scclun, nadst->na_scclun); + ISP_IOXGET_16(isp, &nasrc->na_response, nadst->na_response); ISP_IOXGET_16(isp, &nasrc->na_flags, nadst->na_flags); ISP_IOXGET_16(isp, &nasrc->na_reserved2, nadst->na_reserved2); ISP_IOXGET_16(isp, &nasrc->na_status, nadst->na_status); @@ -1711,7 +1711,7 @@ isp_copy_in_hdr(isp, &nasrc->na_header, &nadst->na_header); ISP_IOXGET_32(isp, &nasrc->na_reserved, nadst->na_reserved); ISP_IOXGET_16(isp, &nasrc->na_iid, nadst->na_iid); - ISP_IOXGET_16(isp, &nasrc->na_scclun, nadst->na_scclun); + ISP_IOXGET_16(isp, &nasrc->na_response, nadst->na_response); ISP_IOXGET_16(isp, &nasrc->na_flags, nadst->na_flags); ISP_IOXGET_16(isp, &nasrc->na_reserved2, nadst->na_reserved2); ISP_IOXGET_16(isp, &nasrc->na_status, nadst->na_status); ==== //depot/projects/dtrace/src/sys/dev/isp/isp_target.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_target.c,v 1.38 2006/07/16 20:11:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_target.c,v 1.39 2006/08/04 20:20:00 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -195,10 +195,12 @@ bus = 0; if (IS_FC(isp)) { if (IS_2KLOGIN(isp)) { - isp_get_notify_fc_e(isp, inote_fcp, (in_fcentry_e_t *)local); - } else { - isp_get_notify_fc(isp, inot_fcp, (in_fcentry_t *)local); - } + isp_get_notify_fc_e(isp, inote_fcp, + (in_fcentry_e_t *)local); + } else { + isp_get_notify_fc(isp, inot_fcp, + (in_fcentry_t *)local); + } inot_fcp = (in_fcentry_t *) local; status = inot_fcp->in_status; seqid = inot_fcp->in_seqid; @@ -212,6 +214,7 @@ SET_BUS_VAL(inotp->in_iid, 0); } } + isp_prt(isp, ISP_LOGTDEBUG0, "Immediate Notify On Bus %d, status=0x%x seqid=0x%x", bus, status, seqid); @@ -676,18 +679,20 @@ isp_got_msg_fc(ispsoftc_t *isp, in_fcentry_t *inp) { tmd_notify_t nt; - static const char f1[] = "%s from iid 0x%08x%08x lun %d seq 0x%x"; + static const char f1[] = "%s from loop id %d lun %d seq 0x%x"; static const char f2[] = - "unknown %s 0x%x lun %d iid 0x%08x%08x task flags 0x%x seq 0x%x\n"; - uint16_t seqid; + "unknown %s 0x%x lun %d loop id %d task flags 0x%x seq 0x%x\n"; + uint16_t seqid, loopid; MEMZERO(&nt, sizeof (tmd_notify_t)); nt.nt_hba = isp; if (IS_2KLOGIN(isp)) { nt.nt_iid = ((in_fcentry_e_t *)inp)->in_iid; + loopid = ((in_fcentry_e_t *)inp)->in_iid; seqid = ((in_fcentry_e_t *)inp)->in_seqid; } else { nt.nt_iid = inp->in_iid; + loopid = inp->in_iid; seqid = inp->in_seqid; } /* nt_tgt set in outer layers */ @@ -701,36 +706,35 @@ if (inp->in_status != IN_MSG_RECEIVED) { isp_prt(isp, ISP_LOGINFO, f2, "immediate notify status", - inp->in_status, nt.nt_lun, (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, - inp->in_task_flags, inp->in_seqid); + inp->in_status, nt.nt_lun, loopid, inp->in_task_flags, + inp->in_seqid); isp_notify_ack(isp, inp); return; } if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK_SET) { isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK SET", - (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid); + loopid, nt.nt_lun, inp->in_seqid); nt.nt_ncode = NT_ABORT_TASK_SET; } else if (inp->in_task_flags & TASK_FLAGS_CLEAR_TASK_SET) { isp_prt(isp, ISP_LOGINFO, f1, "CLEAR TASK SET", - (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid); + loopid, nt.nt_lun, inp->in_seqid); nt.nt_ncode = NT_CLEAR_TASK_SET; } else if (inp->in_task_flags & TASK_FLAGS_LUN_RESET) { isp_prt(isp, ISP_LOGINFO, f1, "LUN RESET", - (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid); + loopid, nt.nt_lun, inp->in_seqid); nt.nt_ncode = NT_LUN_RESET; } else if (inp->in_task_flags & TASK_FLAGS_TARGET_RESET) { isp_prt(isp, ISP_LOGINFO, f1, "TARGET RESET", - (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid); + loopid, nt.nt_lun, inp->in_seqid); nt.nt_ncode = NT_TARGET_RESET; } else if (inp->in_task_flags & TASK_FLAGS_CLEAR_ACA) { isp_prt(isp, ISP_LOGINFO, f1, "CLEAR ACA", - (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, nt.nt_lun, inp->in_seqid); + loopid, nt.nt_lun, inp->in_seqid); nt.nt_ncode = NT_CLEAR_ACA; } else { - isp_prt(isp, ISP_LOGWARN, f2, "task flag", - inp->in_status, nt.nt_lun, (uint32_t) (nt.nt_iid >> 32), (uint32_t) nt.nt_iid, - inp->in_task_flags, inp->in_seqid); + isp_prt(isp, ISP_LOGWARN, f2, "task flag", inp->in_status, + nt.nt_lun, loopid, inp->in_task_flags, inp->in_seqid); isp_notify_ack(isp, inp); return; } @@ -754,36 +758,45 @@ if (IS_FC(isp)) { na_fcentry_t *na = (na_fcentry_t *) storage; + int iid = 0; + if (arg) { in_fcentry_t *inp = arg; MEMCPY(storage, arg, sizeof (isphdr_t)); if (IS_2KLOGIN(isp)) { - ((na_fcentry_e_t *)na)->na_iid = ((in_fcentry_e_t *)inp)->in_iid; + ((na_fcentry_e_t *)na)->na_iid = + ((in_fcentry_e_t *)inp)->in_iid; + iid = ((na_fcentry_e_t *)na)->na_iid; } else { na->na_iid = inp->in_iid; + iid = na->na_iid; } - if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { - na->na_lun = inp->in_scclun; - } else { - na->na_lun = inp->in_lun; - } - na->na_task_flags = inp->in_task_flags; + na->na_task_flags = + inp->in_task_flags & TASK_FLAGS_RESERVED_MASK; na->na_seqid = inp->in_seqid; na->na_flags = NAFC_RCOUNT; na->na_status = inp->in_status; if (inp->in_status == IN_RESET) { na->na_flags |= NAFC_RST_CLRD; } + if (inp->in_status == IN_MSG_RECEIVED) { + na->na_flags |= NAFC_TVALID; + na->na_response = 0; /* XXX SUCCEEDED XXX */ + } } else { na->na_flags = NAFC_RST_CLRD; } na->na_header.rqs_entry_type = RQSTYPE_NOTIFY_ACK; na->na_header.rqs_entry_count = 1; if (IS_2KLOGIN(isp)) { - isp_put_notify_ack_fc_e(isp, (na_fcentry_e_t *) na, (na_fcentry_e_t *)outp); + isp_put_notify_ack_fc_e(isp, (na_fcentry_e_t *) na, + (na_fcentry_e_t *)outp); } else { isp_put_notify_ack_fc(isp, na, (na_fcentry_t *)outp); } + isp_prt(isp, ISP_LOGTDEBUG0, "notify ack iid %u seqid %x flags " + "%x tflags %x response %x", iid, na->na_seqid, + na->na_flags, na->na_task_flags, na->na_response); } else { na_entry_t *na = (na_entry_t *) storage; if (arg) { @@ -802,6 +815,9 @@ na->na_header.rqs_entry_type = RQSTYPE_NOTIFY_ACK; na->na_header.rqs_entry_count = 1; isp_put_notify_ack(isp, na, (na_entry_t *)outp); + isp_prt(isp, ISP_LOGTDEBUG0, "notify ack iid %u lun %u tgt %u " + "seqid %x event %x", na->na_iid, na->na_lun, na->na_tgt, + na->na_seqid, na->na_event); } ISP_TDQE(isp, "isp_notify_ack", (int) optr, storage); ISP_ADD_REQUEST(isp, nxti); @@ -1192,7 +1208,8 @@ if (fmsg == NULL) fmsg = "ABORT Task Management Function Received"; - isp_prt(isp, ISP_LOGERR, "CTIO2 destroyed by %s: RX_ID=0x%x", fmsg, ct->ct_rxid); + isp_prt(isp, ISP_LOGERR, "CTIO2 destroyed by %s: RX_ID=0x%x", + fmsg, ct->ct_rxid); break; case CT_INVAL: ==== //depot/projects/dtrace/src/sys/dev/isp/isp_target.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.26 2006/04/21 18:30:01 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.27 2006/08/04 20:20:00 mjacob Exp $ */ /*- * Qlogic Target Mode Structure and Flag Definitions * @@ -148,6 +148,7 @@ /* * Values for the in_task_flags field- should only get one at a time! */ +#define TASK_FLAGS_RESERVED_MASK (0xe700) #define TASK_FLAGS_CLEAR_ACA (1<<14) #define TASK_FLAGS_TARGET_RESET (1<<13) #define TASK_FLAGS_LUN_RESET (1<<12) @@ -205,9 +206,9 @@ typedef struct { isphdr_t na_header; uint32_t na_reserved; - uint8_t na_lun; /* lun */ - uint8_t na_iid; /* initiator */ - uint16_t na_scclun; + uint8_t na_reserved1; + uint8_t na_iid; /* initiator loop id */ + uint16_t na_response; uint16_t na_flags; uint16_t na_reserved2; uint16_t na_status; @@ -219,8 +220,8 @@ typedef struct { isphdr_t na_header; uint32_t na_reserved; - uint16_t na_iid; /* initiator */ - uint16_t na_scclun; + uint16_t na_iid; /* initiator loop id */ + uint16_t na_response; /* response code */ uint16_t na_flags; uint16_t na_reserved2; uint16_t na_status; @@ -231,6 +232,8 @@ #define NAFC_RCOUNT 0x80 /* increment resource count */ #define NAFC_RST_CLRD 0x20 /* Clear LIP Reset */ +#define NAFC_TVALID 0x10 /* task mangement response code is valid */ + /* * Accept Target I/O Entry structure */ ==== //depot/projects/dtrace/src/sys/dev/isp/isp_tpublic.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.14 2006/05/22 06:47:42 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.15 2006/08/04 20:20:55 mjacob Exp $ */ /*- * Qlogic ISP Host Adapter Public Target Interface Structures && Routines * @@ -279,7 +279,7 @@ uint32_t longs[QCDS / sizeof (uint32_t)]; uint16_t shorts[QCDS / sizeof (uint16_t)]; uint8_t bytes[QCDS]; - } cd_lreserved[2], cd_hreserved[2]; + } cd_lreserved[3], cd_hreserved[3]; } tmd_cmd_t; /* defined tags */ ==== //depot/projects/dtrace/src/sys/net/if_faith.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_faith.c,v 1.41 2006/07/09 06:04:00 sam Exp $ + * $FreeBSD: src/sys/net/if_faith.c,v 1.42 2006/08/04 21:27:37 brooks Exp $ */ /* * derived from @@ -78,8 +78,6 @@ #include #endif -#include - #define FAITHNAME "faith" struct faith_softc { ==== //depot/projects/dtrace/src/sys/net/if_gif.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.64 2006/07/27 21:01:47 thompsa Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.65 2006/08/04 21:27:37 brooks Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /*- @@ -84,8 +84,6 @@ #include #include -#include - #define GIFNAME "gif" /* ==== //depot/projects/dtrace/src/sys/net/if_gre.c#5 (text+ko) ==== @@ -83,7 +83,6 @@ #include -#include #include /* ==== //depot/projects/dtrace/src/sys/net/if_stf.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_stf.c,v 1.57 2006/07/09 06:04:00 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_stf.c,v 1.58 2006/08/04 21:27:37 brooks Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /*- @@ -115,8 +115,6 @@ #include -#include - #include #define STFNAME "stf" ==== //depot/projects/dtrace/src/sys/net/if_var.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.107 2006/06/19 22:20:44 mlaier Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.108 2006/08/04 21:27:37 brooks Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -222,6 +222,7 @@ /* for compatibility with other BSDs */ #define if_addrlist if_addrhead #define if_list if_link +#define if_name(ifp) ((ifp)->if_xname) /* * Locks for address lists on the network interface. ==== //depot/projects/dtrace/src/sys/netinet/in_gif.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.34 2006/01/30 08:39:09 glebius Exp $ */ +/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.35 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */ /*- @@ -68,8 +68,6 @@ #include -#include - static int gif_validate4(const struct ip *, struct gif_softc *, struct ifnet *); ==== //depot/projects/dtrace/src/sys/netinet/ip_encap.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.21 2005/10/31 15:41:27 rwatson Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.22 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */ /*- @@ -87,8 +87,6 @@ #include -#include - #include #include static MALLOC_DEFINE(M_NETADDR, "encap_export_host", "Export host address structure"); ==== //depot/projects/dtrace/src/sys/netinet6/ah_aesxcbcmac.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.3 2005/07/27 08:41:17 cperciva Exp $ + * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.4 2006/08/04 21:27:38 brooks Exp $ */ #include @@ -52,8 +52,6 @@ #include -#include - #define AES_BLOCKSIZE 16 typedef struct { ==== //depot/projects/dtrace/src/sys/netinet6/ah_core.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.26 2005/07/25 12:31:42 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.27 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: ah_core.c,v 1.59 2003/07/25 10:17:14 itojun Exp $ */ /*- @@ -91,8 +91,6 @@ #include #define RIPEMD160_RESULTLEN 20 -#include - static int ah_sumsiz_1216 __P((struct secasvar *)); static int ah_sumsiz_zero __P((struct secasvar *)); static int ah_common_mature __P((struct secasvar *)); ==== //depot/projects/dtrace/src/sys/netinet6/ah_input.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ah_input.c,v 1.20 2005/01/07 02:30:34 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/ah_input.c,v 1.21 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: ah_input.c,v 1.67 2002/01/07 11:39:56 kjc Exp $ */ /*- @@ -90,8 +90,6 @@ #include -#include - #define IPLEN_FLIPPED #ifdef INET ==== //depot/projects/dtrace/src/sys/netinet6/ah_output.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ah_output.c,v 1.15 2005/01/07 02:30:34 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/ah_output.c,v 1.16 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: ah_output.c,v 1.38 2003/09/06 05:15:43 itojun Exp $ */ /*- @@ -74,8 +74,6 @@ #include #include -#include - #ifdef INET static struct in_addr *ah4_finaldst __P((struct mbuf *)); #endif ==== //depot/projects/dtrace/src/sys/netinet6/esp_aesctr.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet6/esp_aesctr.c,v 1.3 2005/10/12 09:13:48 ume Exp $ + * $FreeBSD: src/sys/netinet6/esp_aesctr.c,v 1.4 2006/08/04 21:27:38 brooks Exp $ */ #include @@ -51,8 +51,6 @@ #include -#include - #define AES_BLOCKSIZE 16 #define NONCESIZE 4 ==== //depot/projects/dtrace/src/sys/netinet6/esp_core.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/esp_core.c,v 1.23 2005/03/11 12:37:06 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/esp_core.c,v 1.24 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: esp_core.c,v 1.50 2000/11/02 12:27:38 itojun Exp $ */ /*- @@ -85,8 +85,6 @@ #define cast128_decrypt(key, inblock, outblock) \ cast_decrypt((key), (inblock), (outblock)) -#include - static int esp_null_mature __P((struct secasvar *)); static int esp_null_decrypt __P((struct mbuf *, size_t, struct secasvar *, const struct esp_algorithm *, int)); ==== //depot/projects/dtrace/src/sys/netinet6/esp_input.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.26 2005/01/07 02:30:34 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.27 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $ */ /*- @@ -89,8 +89,6 @@ #include -#include - #define IPLEN_FLIPPED #define ESPMAXLEN \ ==== //depot/projects/dtrace/src/sys/netinet6/esp_output.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/esp_output.c,v 1.13 2005/01/07 02:30:34 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/esp_output.c,v 1.14 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $ */ /*- @@ -77,8 +77,6 @@ #include #include -#include - static int esp_output __P((struct mbuf *, u_char *, struct mbuf *, struct ipsecrequest *, int)); ==== //depot/projects/dtrace/src/sys/netinet6/esp_rijndael.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/esp_rijndael.c,v 1.5 2005/01/07 02:30:34 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/esp_rijndael.c,v 1.6 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: esp_rijndael.c,v 1.14 2003/08/28 08:23:20 itojun Exp $ */ /*- @@ -45,8 +45,6 @@ #include -#include - size_t esp_rijndael_schedlen(algo) const struct esp_algorithm *algo; ==== //depot/projects/dtrace/src/sys/netinet6/frag6.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/frag6.c,v 1.28 2006/05/04 18:41:08 bz Exp $ */ +/* $FreeBSD: src/sys/netinet6/frag6.c,v 1.29 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $ */ /*- @@ -53,8 +53,6 @@ #include /* for ECN definitions */ #include /* for ECN definitions */ -#include - /* * Define it to get a correct behavior on per-interface statistics. * You will need to perform an extra routing table lookup, per fragment, ==== //depot/projects/dtrace/src/sys/netinet6/icmp6.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.70 2006/07/23 12:24:22 rwatson Exp $ */ +/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.71 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /*- @@ -109,8 +109,6 @@ #include #endif -#include - extern struct domain inet6domain; struct icmp6stat icmp6stat; ==== //depot/projects/dtrace/src/sys/netinet6/in6.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.c,v 1.62 2006/06/29 19:22:05 yar Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.c,v 1.63 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */ /*- @@ -97,8 +97,6 @@ #include #include -#include - MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address"); /* ==== //depot/projects/dtrace/src/sys/netinet6/in6_cksum.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.13 2006/06/30 18:25:07 yar Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.14 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $ */ /*- @@ -68,8 +68,6 @@ #include #include -#include - /* * Checksum routine for Internet Protocol family headers (Portable Version). * ==== //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.25 2006/02/05 09:52:40 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.26 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ /*- @@ -68,8 +68,6 @@ #include -#include - static int gif_validate6(const struct ip6_hdr *, struct gif_softc *, struct ifnet *); ==== //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.32 2006/04/23 15:06:15 rwatson Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.33 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $ */ /*- @@ -58,8 +58,6 @@ #include #include -#include - unsigned long in6_maxmtu = 0; #ifdef IP6_AUTO_LINKLOCAL ==== //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.37 2005/11/09 13:29:15 ru Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.38 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */ /*- @@ -138,8 +138,6 @@ #include -#include - /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. */ ==== //depot/projects/dtrace/src/sys/netinet6/in6_src.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.38 2006/05/23 00:32:22 tanimura Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.39 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: in6_src.c,v 1.132 2003/08/26 04:42:27 keiichi Exp $ */ /*- @@ -93,8 +93,6 @@ #include #include -#include - static struct mtx addrsel_lock; #define ADDRSEL_LOCK_INIT() mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF) #define ADDRSEL_LOCK() mtx_lock(&addrsel_lock) ==== //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.33 2006/05/12 20:39:23 mlaier Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.34 2006/08/04 21:27:38 brooks Exp $ */ /* $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */ /*- >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 4 23:33:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31C6416A4DE; Fri, 4 Aug 2006 23:33:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB2F516A4DA for ; Fri, 4 Aug 2006 23:33:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D1EF43D46 for ; Fri, 4 Aug 2006 23:33:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74NXBo3069907 for ; Fri, 4 Aug 2006 23:33:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74NXBJm069904 for perforce@freebsd.org; Fri, 4 Aug 2006 23:33:11 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 23:33:11 GMT Message-Id: <200608042333.k74NXBJm069904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 23:33:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=103214 Change 103214 by jb@jb_freebsd2 on 2006/08/04 23:33:05 Sync with curren. Affected files ... .. //depot/projects/dtrace/src/sys/sys/sysctl.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/sysctl.h#5 (text+ko) ==== @@ -84,7 +84,6 @@ #define CTLFLAG_SKIP 0x01000000 /* Skip this sysctl when listing */ #define CTLMASK_SECURE 0x00F00000 /* Secure level */ #define CTLFLAG_TUN 0x00080000 /* Tunable variable */ -#define CTLFLAG_MPSAFE 0x00040000 /* Handler is MP safe */ #define CTLFLAG_RDTUN (CTLFLAG_RD|CTLFLAG_TUN) /* From owner-p4-projects@FreeBSD.ORG Fri Aug 4 23:50:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C80AC16A4E5; Fri, 4 Aug 2006 23:50:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BEF116A4E1 for ; Fri, 4 Aug 2006 23:50:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B34043D45 for ; Fri, 4 Aug 2006 23:50:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74NoYgg073469 for ; Fri, 4 Aug 2006 23:50:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74NoXFH073466 for perforce@freebsd.org; Fri, 4 Aug 2006 23:50:33 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Aug 2006 23:50:33 GMT Message-Id: <200608042350.k74NoXFH073466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 23:50:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=103216 Change 103216 by jb@jb_freebsd2 on 2006/08/04 23:50:33 IFC Affected files ... .. //depot/projects/dtrace/src/sys/sys/systm.h#6 integrate Differences ... ==== //depot/projects/dtrace/src/sys/sys/systm.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.241 2006/07/09 21:42:58 scottl Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.242 2006/08/04 23:31:16 jb Exp $ */ #ifndef _SYS_SYSTM_H_ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 02:58:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1A2616A4E2; Sat, 5 Aug 2006 02:58:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D3DB16A4DA for ; Sat, 5 Aug 2006 02:58:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D76543D45 for ; Sat, 5 Aug 2006 02:58:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k752wVsb093205 for ; Sat, 5 Aug 2006 02:58:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k752wVjJ093202 for perforce@freebsd.org; Sat, 5 Aug 2006 02:58:31 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 02:58:31 GMT Message-Id: <200608050258.k752wVjJ093202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 02:58:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103220 Change 103220 by jb@jb_freebsd2 on 2006/08/05 02:57:43 Sync to current. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_descrip.c#6 (text+ko) ==== @@ -359,33 +359,41 @@ struct vnode *vp; u_int newmin; int error, flg, tmp; - int giant_locked = 0; + int giant_locked; + + /* + * XXXRW: Some fcntl() calls require Giant -- others don't. Try to + * avoid grabbing Giant for calls we know don't need it. + */ + switch (cmd) { + case F_DUPFD: + case F_GETFD: + case F_SETFD: + case F_GETFL: + giant_locked = 0; + break; + + default: + giant_locked = 1; + mtx_lock(&Giant); + } error = 0; flg = F_POSIX; p = td->td_proc; fdp = p->p_fd; - retry: FILEDESC_LOCK(fdp); if ((unsigned)fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[fd]) == NULL) { FILEDESC_UNLOCK(fdp); - if (giant_locked) - mtx_unlock(&Giant); error = EBADF; goto done2; } pop = &fdp->fd_ofileflags[fd]; - if ((giant_locked == 0) && ((fp->f_ops->fo_flags & DFLAG_MPSAFE) == 0)) { - FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - giant_locked = 1; - /* we may have lost a race */ - goto retry; - } switch (cmd) { case F_DUPFD: + /* mtx_assert(&Giant, MA_NOTOWNED); */ FILEDESC_UNLOCK(fdp); newmin = arg; PROC_LOCK(p); @@ -400,17 +408,20 @@ break; case F_GETFD: + /* mtx_assert(&Giant, MA_NOTOWNED); */ td->td_retval[0] = (*pop & UF_EXCLOSE) ? FD_CLOEXEC : 0; FILEDESC_UNLOCK(fdp); break; case F_SETFD: + /* mtx_assert(&Giant, MA_NOTOWNED); */ *pop = (*pop &~ UF_EXCLOSE) | (arg & FD_CLOEXEC ? UF_EXCLOSE : 0); FILEDESC_UNLOCK(fdp); break; case F_GETFL: + /* mtx_assert(&Giant, MA_NOTOWNED); */ FILE_LOCK(fp); td->td_retval[0] = OFLAGS(fp->f_flag); FILE_UNLOCK(fp); @@ -418,6 +429,7 @@ break; case F_SETFL: + mtx_assert(&Giant, MA_OWNED); FILE_LOCK(fp); fhold_locked(fp); fp->f_flag &= ~FCNTLFLAGS; @@ -445,6 +457,7 @@ break; case F_GETOWN: + mtx_assert(&Giant, MA_OWNED); fhold(fp); FILEDESC_UNLOCK(fdp); error = fo_ioctl(fp, FIOGETOWN, &tmp, td->td_ucred, td); @@ -454,6 +467,7 @@ break; case F_SETOWN: + mtx_assert(&Giant, MA_OWNED); fhold(fp); FILEDESC_UNLOCK(fdp); tmp = arg; @@ -462,10 +476,12 @@ break; case F_SETLKW: + mtx_assert(&Giant, MA_OWNED); flg |= F_WAIT; /* FALLTHROUGH F_SETLK */ case F_SETLK: + mtx_assert(&Giant, MA_OWNED); if (fp->f_type != DTYPE_VNODE) { FILEDESC_UNLOCK(fdp); error = EBADF; @@ -539,6 +555,7 @@ break; case F_GETLK: + mtx_assert(&Giant, MA_OWNED); if (fp->f_type != DTYPE_VNODE) { FILEDESC_UNLOCK(fdp); error = EBADF; @@ -2492,7 +2509,7 @@ return (error); } -SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD|CTLFLAG_MPSAFE, +SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD, 0, 0, sysctl_kern_file, "S,xfile", "Entire file table"); #ifdef DDB From owner-p4-projects@FreeBSD.ORG Sat Aug 5 03:14:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEF9D16A4E0; Sat, 5 Aug 2006 03:14:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFF6216A4DD for ; Sat, 5 Aug 2006 03:14:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B73343D45 for ; Sat, 5 Aug 2006 03:14:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k753ErPv095358 for ; Sat, 5 Aug 2006 03:14:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k753ErMm095355 for perforce@freebsd.org; Sat, 5 Aug 2006 03:14:53 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 03:14:53 GMT Message-Id: <200608050314.k753ErMm095355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 03:14:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=103221 Change 103221 by jb@jb_freebsd2 on 2006/08/05 03:14:16 Sync to current. (Not sure why the IFCs didn't pick these changes up.) Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#4 (text+ko) ==== @@ -1225,25 +1225,19 @@ if (error) return (error); - if ((oid->oid_kind & CTLFLAG_MPSAFE) == 0) - mtx_lock(&Giant); if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { /* * You can't call a sysctl when it's a node, but has * no handler. Inform the user that it's a node. * The indx may or may not be the same as namelen. */ - if (oid->oid_handler == NULL) { - error = EISDIR; - goto done; - } + if (oid->oid_handler == NULL) + return (EISDIR); } /* Is this sysctl writable? */ - if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) { - error = EPERM; - goto done; - } + if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) + return (EPERM); KASSERT(req->td != NULL, ("sysctl_root(): req->td == NULL")); @@ -1252,7 +1246,7 @@ lvl = (oid->oid_kind & CTLMASK_SECURE) >> CTLSHIFT_SECURE; error = securelevel_gt(req->td->td_ucred, lvl); if (error) - goto done; + return (error); } /* Is this sysctl writable by only privileged users? */ @@ -1265,13 +1259,11 @@ flags = 0; error = suser_cred(req->td->td_ucred, flags); if (error) - goto done; + return (error); } - if (!oid->oid_handler) { - error = EINVAL; - goto done; - } + if (!oid->oid_handler) + return (EINVAL); if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { arg1 = (int *)arg1 + indx; @@ -1284,12 +1276,10 @@ error = mac_check_system_sysctl(req->td->td_ucred, oid, arg1, arg2, req); if (error != 0) - goto done; + return (error); #endif error = oid->oid_handler(oid, arg1, arg2, req); -done: - if ((oid->oid_kind & CTLFLAG_MPSAFE) == 0) - mtx_unlock(&Giant); + return (error); } @@ -1320,6 +1310,8 @@ if (error) return (error); + mtx_lock(&Giant); + error = userland_sysctl(td, name, uap->namelen, uap->old, uap->oldlenp, 0, uap->new, uap->newlen, &j, 0); @@ -1331,6 +1323,7 @@ error = i; } done2: + mtx_unlock(&Giant); return (error); } From owner-p4-projects@FreeBSD.ORG Sat Aug 5 03:30:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD0316A4E6; Sat, 5 Aug 2006 03:30:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 162EA16A4DF for ; Sat, 5 Aug 2006 03:30:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17D8E43D53 for ; Sat, 5 Aug 2006 03:30:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k753UC5w096231 for ; Sat, 5 Aug 2006 03:30:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k753UCsO096228 for perforce@freebsd.org; Sat, 5 Aug 2006 03:30:12 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 03:30:12 GMT Message-Id: <200608050330.k753UCsO096228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 03:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=103222 Change 103222 by jb@jb_freebsd2 on 2006/08/05 03:29:11 IFC (In search of missed integrations. Very strange.) Affected files ... .. //depot/projects/dtrace/src/sys/sys/stat.h#4 integrate Differences ... ==== //depot/projects/dtrace/src/sys/sys/stat.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)stat.h 8.12 (Berkeley) 6/16/95 - * $FreeBSD: src/sys/sys/stat.h,v 1.41 2005/03/22 01:19:18 das Exp $ + * $FreeBSD: src/sys/sys/stat.h,v 1.42 2006/08/04 23:47:30 jb Exp $ */ #ifndef _SYS_STAT_H_ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 04:18:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B47A16A4E1; Sat, 5 Aug 2006 04:18:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E9A9816A4DA for ; Sat, 5 Aug 2006 04:18:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8141F43D45 for ; Sat, 5 Aug 2006 04:18:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k754IDd4000718 for ; Sat, 5 Aug 2006 04:18:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k754IDOk000711 for perforce@freebsd.org; Sat, 5 Aug 2006 04:18:13 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 04:18:13 GMT Message-Id: <200608050418.k754IDOk000711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 04:18:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=103223 Change 103223 by jb@jb_freebsd2 on 2006/08/05 04:18:03 Merge the MPSAFE changes from current. Merge KSE support back in under the kernel option KSE. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#3 (text+ko) ==== @@ -142,6 +142,9 @@ { struct proc *p; struct thread *td; +#if defined(INVARIANTS) && defined(KSE) + struct ksegrp *kg; +#endif /* INVARIANTS checks go here */ p = (struct proc *)mem; @@ -149,7 +152,14 @@ #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), ("bad number of threads in exiting process")); +#ifdef KSE + KASSERT((p->p_numksegrps == 1), ("free proc with > 1 ksegrp")); +#endif KASSERT((td != NULL), ("proc_dtor: bad thread pointer")); +#ifdef KSE + kg = FIRST_KSEGRP_IN_PROC(p); + KASSERT((kg != NULL), ("proc_dtor: bad kg pointer")); +#endif KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr")); #endif @@ -172,14 +182,25 @@ { struct proc *p; struct thread *td; +#ifdef KSE + struct ksegrp *kg; +#endif p = (struct proc *)mem; p->p_sched = (struct p_sched *)&p[1]; td = thread_alloc(); +#ifdef KSE + kg = ksegrp_alloc(); +#endif bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); p->p_stats = pstats_alloc(); +#ifdef KSE + proc_linkup(p, kg, td); + sched_newproc(p, kg, td); +#else proc_linkup(p, td); +#endif return (0); } @@ -195,6 +216,9 @@ p = (struct proc *)mem; pstats_free(p->p_stats); +#ifdef KSE + ksegrp_free(FIRST_KSEGRP_IN_PROC(p)); +#endif thread_free(FIRST_THREAD_IN_PROC(p)); mtx_destroy(&p->p_mtx); if (p->p_ksi != NULL) @@ -750,6 +774,9 @@ static void fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp) { +#ifdef KSE + struct ksegrp *kg; +#endif struct proc *p; p = td->td_proc; @@ -789,6 +816,15 @@ kp->ki_stat = SIDL; } +#ifdef KSE + kg = td->td_ksegrp; + + /* things in the KSE GROUP */ + kp->ki_estcpu = kg->kg_estcpu; + kp->ki_slptime = kg->kg_slptime; + kp->ki_pri.pri_user = kg->kg_user_pri; + kp->ki_pri.pri_class = kg->kg_pri_class; +#endif /* Things in the thread */ kp->ki_wchan = td->td_wchan; kp->ki_pri.pri_level = td->td_priority; @@ -801,10 +837,12 @@ kp->ki_pcb = td->td_pcb; kp->ki_kstack = (void *)td->td_kstack; kp->ki_pctcpu = sched_pctcpu(td); +#ifndef KSE kp->ki_estcpu = td->td_estcpu; kp->ki_slptime = td->td_slptime; kp->ki_pri.pri_class = td->td_pri_class; kp->ki_pri.pri_user = td->td_user_pri; +#endif /* We can't get this anymore but ps etc never used it anyway. */ kp->ki_rqindex = 0; @@ -1268,44 +1306,38 @@ static SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, "Process table"); -SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, - CTLFLAG_RD|CTLTYPE_STRUCT|CTLFLAG_MPSAFE, +SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT, 0, 0, sysctl_kern_proc, "S,proc", "Return entire process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, - CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, - CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, - CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, - CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, - CTLFLAG_RD|CTLFLAG_MPSAFE, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, CTLFLAG_RD, sysctl_kern_proc, "Return process table, no threads"); static SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args, - CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, + CTLFLAG_RW | CTLFLAG_ANYBODY, sysctl_kern_proc_args, "Process argument list"); static SYSCTL_NODE(_kern_proc, KERN_PROC_PATHNAME, pathname, CTLFLAG_RD, @@ -1315,29 +1347,28 @@ sysctl_kern_proc_sv_name, "Process syscall vector name (ABI type)"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_GID | KERN_PROC_INC_THREAD), gid_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PGRP | KERN_PROC_INC_THREAD), pgrp_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_RGID | KERN_PROC_INC_THREAD), rgid_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_SESSION | KERN_PROC_INC_THREAD), - sid_td, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + sid_td, CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_TTY | KERN_PROC_INC_THREAD), tty_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_UID | KERN_PROC_INC_THREAD), uid_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_RUID | KERN_PROC_INC_THREAD), ruid_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PID | KERN_PROC_INC_THREAD), pid_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); + CTLFLAG_RD, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PROC | KERN_PROC_INC_THREAD), proc_td, - CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, - "Return process table, no threads"); + CTLFLAG_RD, sysctl_kern_proc, "Return process table, no threads"); From owner-p4-projects@FreeBSD.ORG Sat Aug 5 08:41:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE9B316A4E1; Sat, 5 Aug 2006 08:41:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B962816A4DD for ; Sat, 5 Aug 2006 08:41:49 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BFEE43D46 for ; Sat, 5 Aug 2006 08:41:49 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k758fntX032155 for ; Sat, 5 Aug 2006 08:41:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k758fnOK032152 for perforce@freebsd.org; Sat, 5 Aug 2006 08:41:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 5 Aug 2006 08:41:49 GMT Message-Id: <200608050841.k758fnOK032152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 08:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=103233 Change 103233 by rdivacky@rdivacky_witten on 2006/08/05 08:41:12 Remove the atomic_* handling of refcount and extend the FUTEX_LOCK() coverage in futex_put. Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#16 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#16 (text+ko) ==== @@ -274,7 +274,7 @@ FUTEX_LOCK; LIST_FOREACH(f, &futex_list, f_list) { if (f->f_uaddr == uaddr) { - atomic_add_int(&f->f_refcount, 1); + f->f_refcount++; FUTEX_UNLOCK; return f; } @@ -297,12 +297,13 @@ futex_put(f) struct futex *f; { - if (atomic_fetchadd_int(&f->f_refcount, -1) == 1) { - FUTEX_LOCK; + FUTEX_LOCK; + f->f_refcount--; + if (f->f_refcount == 0) { LIST_REMOVE(f, f_list); - FUTEX_UNLOCK; free(f, M_LINUX); } + FUTEX_UNLOCK; return; } From owner-p4-projects@FreeBSD.ORG Sat Aug 5 09:09:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C06016A4E1; Sat, 5 Aug 2006 09:09:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FACA16A4DA for ; Sat, 5 Aug 2006 09:09:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE68843D49 for ; Sat, 5 Aug 2006 09:09:23 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7599NUK042531 for ; Sat, 5 Aug 2006 09:09:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7599NIR042528 for perforce@freebsd.org; Sat, 5 Aug 2006 09:09:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 5 Aug 2006 09:09:23 GMT Message-Id: <200608050909.k7599NIR042528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 09:09:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103234 Change 103234 by rdivacky@rdivacky_witten on 2006/08/05 09:09:22 Fix the deadlock in futex_wake() which holds FUTEX_LOCK and calls futex_get() which wants to acquire FUTEX_LOCK as well. So I add flag which indicates wheter the lock should be acquired. I prefer this over a recursive mutex. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#17 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#17 (text+ko) ==== @@ -73,7 +73,10 @@ #define FUTEX_LOCK mtx_lock(&futex_mtx) #define FUTEX_UNLOCK mtx_unlock(&futex_mtx) -static struct futex *futex_get(void *); +#define FUTEX_LOCKED 1 +#define FUTEX_UNLOCKED 0 + +static struct futex *futex_get(void *, int); static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); static int futex_wake(struct futex *, int, struct futex *); @@ -144,7 +147,7 @@ timeout_hz = 1; - f = futex_get(args->uaddr); + f = futex_get(args->uaddr, FUTEX_UNLOCKED); ret = futex_sleep(f, td, timeout_hz); futex_put(f); @@ -191,7 +194,7 @@ printf("FUTEX_WAKE %d: uaddr = %p, val = %d\n", td->td_proc->p_pid, args->uaddr, args->val); #endif - f = futex_get(args->uaddr); + f = futex_get(args->uaddr, FUTEX_UNLOCKED); td->td_retval[0] = futex_wake(f, args->val, NULL); futex_put(f); break; @@ -206,8 +209,8 @@ /* FALLTHROUGH */ case LINUX_FUTEX_REQUEUE: - f = futex_get(args->uaddr); - newf = futex_get(args->uaddr2); + f = futex_get(args->uaddr, FUTEX_UNLOCKED); + newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); td->td_retval[0] = futex_wake(f, args->val, newf); futex_put(f); futex_put(newf); @@ -225,8 +228,8 @@ printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n", td->td_proc->p_pid, args->uaddr, args->op, args->val, args->uaddr2, args->val3); #endif - f = futex_get(args->uaddr); - f2 = futex_get(args->uaddr2); + f = futex_get(args->uaddr, FUTEX_UNLOCKED); + f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED); op_ret = futex_atomic_op(td, args->val3, args->uaddr2); if (op_ret < 0) { @@ -267,28 +270,33 @@ } static struct futex * -futex_get(void *uaddr) +futex_get(void *uaddr, int locked) { struct futex *f; - FUTEX_LOCK; + if (locked == FUTEX_UNLOCKED) + FUTEX_LOCK; LIST_FOREACH(f, &futex_list, f_list) { if (f->f_uaddr == uaddr) { f->f_refcount++; - FUTEX_UNLOCK; + if (locked == FUTEX_UNLOCKED) + FUTEX_UNLOCK; return f; } } - FUTEX_UNLOCK; + if (locked == FUTEX_UNLOCKED) + FUTEX_UNLOCK; /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); f->f_uaddr = uaddr; f->f_refcount = 1; TAILQ_INIT(&f->f_waiting_proc); - FUTEX_LOCK; + if (locked == FUTEX_UNLOCKED) + FUTEX_LOCK; LIST_INSERT_HEAD(&futex_list, f, f_list); - FUTEX_UNLOCK; + if (locked == FUTEX_UNLOCKED) + FUTEX_UNLOCK; return f; } @@ -356,7 +364,7 @@ } else { if (newf != NULL) { /* futex_put called after tsleep */ - wp->wp_new_futex = futex_get(newf->f_uaddr); + wp->wp_new_futex = futex_get(newf->f_uaddr, FUTEX_LOCKED); wakeup(wp); } } From owner-p4-projects@FreeBSD.ORG Sat Aug 5 09:52:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEFD016A4E1; Sat, 5 Aug 2006 09:52:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90E5C16A4DF for ; Sat, 5 Aug 2006 09:52:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05C9443D49 for ; Sat, 5 Aug 2006 09:52:19 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k759qI9I044470 for ; Sat, 5 Aug 2006 09:52:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k759qI1B044467 for perforce@freebsd.org; Sat, 5 Aug 2006 09:52:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 5 Aug 2006 09:52:18 GMT Message-Id: <200608050952.k759qI1B044467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 09:52:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=103235 Change 103235 by hselasky@hselasky_mini_itx on 2006/08/05 09:51:40 Finished reworking if_aue. Lots of changes again. Please test. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#3 add Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#4 (text+ko) ==== @@ -1,0 +1,1669 @@ +/*- + * Copyright (c) 1997, 1998, 1999, 2000 + * Bill Paul . All rights reserved. + * + * Copyright (c) 2006 + * Hans Petter Selasky. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Bill Paul. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD + * 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. + * + */ + +/* + * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. + * Datasheet is available from http://www.admtek.com.tw. + * + * Written by Bill Paul + * Electrical Engineering Department + * Columbia University, New York City + */ + +/* + * The Pegasus chip uses four USB "endpoints" to provide 10/100 ethernet + * support: the control endpoint for reading/writing registers, burst + * read endpoint for packet reception, burst write for packet transmission + * and one for "interrupts." The chip uses the same RX filter scheme + * as the other ADMtek ethernet parts: one perfect filter entry for the + * the station address and a 64-bit multicast hash table. The chip supports + * both MII and HomePNA attachments. + * + * Since the maximum data transfer speed of USB is supposed to be 12Mbps, + * you're never really going to get 100Mbps speeds from this device. I + * think the idea is to allow the device to connect to 10 or 100Mbps + * networks, not necessarily to provide 100Mbps performance. Also, since + * the controller uses an external PHY chip, it's possible that board + * designers might simply choose a 10Mbps PHY. + * + * Registers are accessed using usbd_do_request(). Packet transfers are + * done using usbd_transfer() and friends. + */ + +/* + * NOTE: all function names beginning like "aue_cfg_" can only + * be called from within the config thread function ! + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +#define usbd_config_td_cc aue_config_copy +#define usbd_config_td_softc aue_softc + +#include +#include +#include + +#include "usbdevs.h" + +#include +#include + +#include + +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.96 2006/02/14 12:44:55 glebius Exp $"); + +MODULE_DEPEND(aue, usb, 1, 1, 1); +MODULE_DEPEND(aue, ether, 1, 1, 1); +MODULE_DEPEND(aue, miibus, 1, 1, 1); + +#ifdef USB_DEBUG +#define DPRINTF(sc,n,fmt,...) \ + do { if (aue_debug > (n)) { \ + printf("%s:%s: " fmt, (sc)->sc_name, \ + __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int aue_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); +SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0, + "aue debug level"); +#else +#define DPRINTF(...) +#endif + +/* "device miibus" required. See GENERIC if you get errors here. */ +#include "miibus_if.h" + +/* + * Various supported device vendors/products. + */ +struct aue_type { + struct usb_devno aue_dev; + u_int16_t aue_flags; +}; + +Static const struct aue_type aue_devs[] = { + {{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, AUE_FLAG_PII }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, AUE_FLAG_PNA|AUE_FLAG_PII }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, AUE_FLAG_PII }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4}, AUE_FLAG_PNA }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5}, AUE_FLAG_PNA }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6}, AUE_FLAG_PII }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7}, AUE_FLAG_PII }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8}, AUE_FLAG_PII }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9}, AUE_FLAG_PNA }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10}, 0 }, + {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA}, 0 }, + {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC}, 0 }, + {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001}, AUE_FLAG_PII }, + {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS}, AUE_FLAG_PNA }, + {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, AUE_FLAG_PII }, + {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2}, AUE_FLAG_PII }, + {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, AUE_FLAG_PII }, + {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, + {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, AUE_FLAG_PNA }, + {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100}, 0 }, + {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100}, AUE_FLAG_PII }, + {{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX}, 0 }, + {{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS},AUE_FLAG_PII }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4}, AUE_FLAG_LSYS|AUE_FLAG_PII }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA}, AUE_FLAG_PNA }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3}, AUE_FLAG_LSYS|AUE_FLAG_PII }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2}, AUE_FLAG_LSYS|AUE_FLAG_PII }, + {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0}, 0 }, + {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2}, 0 }, + {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, AUE_FLAG_PII }, + {{ USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0 }, + {{ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, AUE_FLAG_PII }, + {{ USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, AUE_FLAG_PII }, + {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 }, + {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS}, AUE_FLAG_PII }, + {{ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX}, 0 }, + {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1}, AUE_FLAG_LSYS|AUE_FLAG_PII }, + {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1}, AUE_FLAG_LSYS|AUE_FLAG_PNA }, + {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA}, AUE_FLAG_LSYS }, + {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2}, AUE_FLAG_LSYS|AUE_FLAG_PII }, + {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, AUE_FLAG_PII }, + {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0 }, + {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0 }, + {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, AUE_FLAG_PII }, + {{ USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, AUE_FLAG_PII }, + {{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC},AUE_FLAG_PII }, + {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0 }, + {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB}, AUE_FLAG_PII }, + {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0 }, +}; +#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) + +/* prototypes */ + +static device_probe_t aue_probe; +static device_attach_t aue_attach; +static device_detach_t aue_detach; +static device_shutdown_t aue_shutdown; + +static void +aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, + void *data); +static u_int8_t +aue_cfg_csr_read_1(struct aue_softc *sc, u_int16_t reg); + +static u_int16_t +aue_cfg_csr_read_2(struct aue_softc *sc, u_int16_t reg); + +static void +aue_cfg_csr_write_1(struct aue_softc *sc, u_int16_t reg, u_int8_t val); + +static void +aue_cfg_csr_write_2(struct aue_softc *sc, u_int16_t reg, u_int16_t val); + +static void +aue_cfg_eeprom_getword(struct aue_softc *sc, u_int8_t addr, + u_int8_t *dest); +static void +aue_cfg_read_eeprom(struct aue_softc *sc, u_int8_t *dest, + u_int16_t off, u_int16_t len); +static int +aue_cfg_miibus_readreg(device_t dev, int phy, int reg); + +static int +aue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); + +static void +aue_cfg_miibus_statchg(device_t dev); + +static void +aue_cfg_setmulti(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static void +aue_cfg_reset_pegasus_II(struct aue_softc *sc); + +static void +aue_cfg_reset(struct aue_softc *sc); + +static void +aue_cfg_first_time_setup(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static void +aue_intr_clear_stall_callback(struct usbd_xfer *xfer); + +static void +aue_intr_callback(struct usbd_xfer *xfer); + +static void +aue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); + +static void +aue_bulk_read_callback(struct usbd_xfer *xfer); + +static void +aue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +aue_bulk_write_callback(struct usbd_xfer *xfer); + +static void +aue_config_copy(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static void +aue_cfg_tick(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static void +aue_start_cb(struct ifnet *ifp); + +static void +aue_init_cb(void *arg); + +static void +aue_start_transfers(struct aue_softc *sc); + +static void +aue_cfg_init(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static void +aue_cfg_promisc_upd(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static int +aue_ifmedia_upd_cb(struct ifnet *ifp); + +static void +aue_cfg_ifmedia_upd(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); +static void +aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); + +static int +aue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); + +static void +aue_watchdog(void *arg); + +static void +aue_cfg_stop(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount); + +static const struct usbd_config aue_config[AUE_ENDPT_MAX] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = (MCLBYTES + 2), + .flags = (USBD_USE_DMA|USBD_FORCE_SHORT_XFER), + .callback = &aue_bulk_write_callback, + .timeout = 10000, /* 10 seconds */ + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN), + .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .callback = &aue_bulk_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &aue_bulk_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &aue_bulk_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [4] = { + .type = UE_INTERRUPT, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .flags = USBD_SHORT_XFER_OK, + .bufsize = 0, /* use wMaxPacketSize */ + .callback = &aue_intr_callback, + }, + + [5] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &aue_intr_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static device_method_t aue_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, aue_probe), + DEVMETHOD(device_attach, aue_attach), + DEVMETHOD(device_detach, aue_detach), + DEVMETHOD(device_shutdown, aue_shutdown), + + /* bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(bus_driver_added, bus_generic_driver_added), + + /* MII interface */ + DEVMETHOD(miibus_readreg, aue_cfg_miibus_readreg), + DEVMETHOD(miibus_writereg, aue_cfg_miibus_writereg), + DEVMETHOD(miibus_statchg, aue_cfg_miibus_statchg), + + { 0, 0 } +}; + +static driver_t aue_driver = { + "aue", + aue_methods, + sizeof(struct aue_softc) +}; + +static devclass_t aue_devclass; + +DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0); +DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0); + +static void +aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, + void *data) +{ + u_int16_t length; + usbd_status err; + + if (usbd_config_td_is_gone(&(sc->sc_config_td))) { + goto error; + } + + err = usbd_do_request_flags_mtx(sc->sc_udev, &(sc->sc_mtx), req, + data, 0, NULL, 1000); + + if (err) { + + DPRINTF(sc, 0, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); + + error: + length = UGETW(req->wLength); + + if ((req->bmRequestType & UT_READ) && length) { + bzero(data, length); + } + } + return; +} + +#define AUE_CFG_SETBIT(sc, reg, x) \ + aue_cfg_csr_write_1(sc, reg, aue_cfg_csr_read_1(sc, reg) | (x)) + +#define AUE_CFG_CLRBIT(sc, reg, x) \ + aue_cfg_csr_write_1(sc, reg, aue_cfg_csr_read_1(sc, reg) & ~(x)) + +static u_int8_t +aue_cfg_csr_read_1(struct aue_softc *sc, u_int16_t reg) +{ + usb_device_request_t req; + u_int8_t val; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = AUE_UR_READREG; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, 1); + + aue_cfg_do_request(sc, &req, &val); + return val; +} + +static u_int16_t +aue_cfg_csr_read_2(struct aue_softc *sc, u_int16_t reg) +{ + usb_device_request_t req; + u_int16_t val; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = AUE_UR_READREG; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, 2); + + aue_cfg_do_request(sc, &req, &val); + return le16toh(val); +} + +static void +aue_cfg_csr_write_1(struct aue_softc *sc, u_int16_t reg, u_int8_t val) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = AUE_UR_WRITEREG; + req.wValue[0] = val; + req.wValue[1] = 0; + USETW(req.wIndex, reg); + USETW(req.wLength, 1); + + aue_cfg_do_request(sc, &req, &val); + return; +} + +static void +aue_cfg_csr_write_2(struct aue_softc *sc, u_int16_t reg, u_int16_t val) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = AUE_UR_WRITEREG; + USETW(req.wValue, val); + USETW(req.wIndex, reg); + USETW(req.wLength, 2); + + val = htole16(val); + + aue_cfg_do_request(sc, &req, &val); + return; +} + +/* + * Read a word of data stored in the EEPROM at address 'addr.' + */ +static void +aue_cfg_eeprom_getword(struct aue_softc *sc, u_int8_t addr, + u_int8_t *dest) +{ + u_int16_t i; + + aue_cfg_csr_write_1(sc, AUE_EE_REG, addr); + aue_cfg_csr_write_1(sc, AUE_EE_CTL, AUE_EECTL_READ); + + for (i = 0; ; i++) { + + if (i < AUE_TIMEOUT) { + + if (aue_cfg_csr_read_1(sc, AUE_EE_CTL) & AUE_EECTL_DONE) { + break; + } + + if (usbd_config_td_sleep(&(sc->sc_config_td), hz/100)) { + break; + } + + } else { + DPRINTF(sc, 0, "EEPROM read timed out!\n"); + break; + } + } + + i = aue_cfg_csr_read_2(sc, AUE_EE_DATA); + + dest[0] = (i & 0xFF); + dest[1] = (i >> 8); + + return; +} + +/* + * Read a sequence of words from the EEPROM. + */ +static void +aue_cfg_read_eeprom(struct aue_softc *sc, u_int8_t *dest, + u_int16_t off, u_int16_t len) +{ + u_int16_t i; + + for (i = 0; i < len; i++) { + aue_cfg_eeprom_getword(sc, off + i, dest + (i * 2)); + } + return; +} + +static int +aue_cfg_miibus_readreg(device_t dev, int phy, int reg) +{ + struct aue_softc * sc = device_get_softc(dev); + u_int16_t i; + + /* + * The Am79C901 HomePNA PHY actually contains + * two transceivers: a 1Mbps HomePNA PHY and a + * 10Mbps full/half duplex ethernet PHY with + * NWAY autoneg. However in the ADMtek adapter, + * only the 1Mbps PHY is actually connected to + * anything, so we ignore the 10Mbps one. It + * happens to be configured for MII address 3, + * so we filter that out. + */ + if ((sc->sc_vendor == USB_VENDOR_ADMTEK) && + (sc->sc_product == USB_PRODUCT_ADMTEK_PEGASUS)) { + + if (phy == 3) { + return (0); + } + +#ifdef notdef + if (phy != 1) { + return (0); + } +#endif + } + + aue_cfg_csr_write_1(sc, AUE_PHY_ADDR, phy); + aue_cfg_csr_write_1(sc, AUE_PHY_CTL, reg | AUE_PHYCTL_READ); + + for (i = 0; ; i++) { + + if (i < AUE_TIMEOUT) { + + if (aue_cfg_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE) { + break; + } + + if (usbd_config_td_sleep(&(sc->sc_config_td), hz/100)) { + break; + } + } else { + DPRINTF(sc, 0, "MII read timed out\n"); + break; + } + } + + i = aue_cfg_csr_read_2(sc, AUE_PHY_DATA); + + return i; +} + +static int +aue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data) +{ + struct aue_softc * sc = device_get_softc(dev); + u_int16_t i; + + if (phy == 3) { + return (0); + } + + aue_cfg_csr_write_2(sc, AUE_PHY_DATA, data); + aue_cfg_csr_write_1(sc, AUE_PHY_ADDR, phy); + aue_cfg_csr_write_1(sc, AUE_PHY_CTL, reg | AUE_PHYCTL_WRITE); + + for (i = 0; ; i++) { + + if (i < AUE_TIMEOUT) { + if (aue_cfg_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE) { + break; + } + + if (usbd_config_td_sleep(&(sc->sc_config_td), hz/100)) { + break; + } + } else { + DPRINTF(sc, 0, "MII write timed out\n"); + break; + } + } + + return(0); +} + +static void +aue_cfg_miibus_statchg(device_t dev) +{ + struct aue_softc * sc = device_get_softc(dev); + struct mii_data * mii = GET_MII(sc); + + AUE_CFG_CLRBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB); + + if (IFM_SUBTYPE(mii->mii_media_active) == IFM_100_TX) { + AUE_CFG_SETBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL); + } else { + AUE_CFG_CLRBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL); + } + + if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) { + AUE_CFG_SETBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX); + } else { + AUE_CFG_CLRBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX); + } + + AUE_CFG_SETBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB); + + /* + * Set the LED modes on the LinkSys adapter. + * This turns on the 'dual link LED' bin in the auxmode + * register of the Broadcom PHY. + */ + if (sc->sc_flags & AUE_FLAG_LSYS) { + u_int16_t auxmode; + auxmode = aue_cfg_miibus_readreg(dev, 0, 0x1b); + aue_cfg_miibus_writereg(dev, 0, 0x1b, auxmode | 0x04); + } + + return; +} + +static void +aue_cfg_setmulti(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount) +{ + u_int16_t i; + + if (cc == NULL) { + /* nothing to do */ + return; + } + + if ((cc->if_flags & IFF_ALLMULTI) || + (cc->if_flags & IFF_PROMISC)) { + AUE_CFG_SETBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI); + return; + } + + AUE_CFG_CLRBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI); + + /* clear existing ones */ + for (i = 0; i < 8; i++) { + aue_cfg_csr_write_1(sc, AUE_MAR0 + i, 0); + } + + /* now program new ones */ + for (i = 0; i < 8; i++) { + aue_cfg_csr_write_1(sc, AUE_MAR0 + i, cc->if_hash[i]); + } + return; +} + +static void +aue_cfg_reset_pegasus_II(struct aue_softc *sc) +{ + /* Magic constants taken from Linux driver. */ + aue_cfg_csr_write_1(sc, AUE_REG_1D, 0); + aue_cfg_csr_write_1(sc, AUE_REG_7B, 2); +#if 0 + if ((sc->sc_flags & HAS_HOME_PNA) && mii_mode) + aue_cfg_csr_write_1(sc, AUE_REG_81, 6); + else +#endif + aue_cfg_csr_write_1(sc, AUE_REG_81, 2); + + return; +} + +static void +aue_cfg_reset(struct aue_softc *sc) +{ + u_int16_t i; + + AUE_CFG_SETBIT(sc, AUE_CTL1, AUE_CTL1_RESETMAC); + + for (i = 0; ; i++) { + + if (i < AUE_TIMEOUT) { + + if (!(aue_cfg_csr_read_1(sc, AUE_CTL1) & AUE_CTL1_RESETMAC)) { + break; + } + + if (usbd_config_td_sleep(&(sc->sc_config_td), hz/100)) { + break; + } + + } else { + DPRINTF(sc, 0, "reset timed out\n"); + break; + } + } + + /* + * The PHY(s) attached to the Pegasus chip may be held + * in reset until we flip on the GPIO outputs. Make sure + * to set the GPIO pins high so that the PHY(s) will + * be enabled. + * + * Note: We force all of the GPIO pins low first, *then* + * enable the ones we want. + */ + aue_cfg_csr_write_1(sc, AUE_GPIO0, (AUE_GPIO_OUT0|AUE_GPIO_SEL0)); + aue_cfg_csr_write_1(sc, AUE_GPIO0, (AUE_GPIO_OUT0|AUE_GPIO_SEL0| + AUE_GPIO_SEL1)); + + if (sc->sc_flags & AUE_FLAG_LSYS) { + /* Grrr. LinkSys has to be different from everyone else. */ + aue_cfg_csr_write_1(sc, AUE_GPIO0, + (AUE_GPIO_SEL0 | AUE_GPIO_SEL1)); + aue_cfg_csr_write_1(sc, AUE_GPIO0, + (AUE_GPIO_SEL0 | + AUE_GPIO_SEL1 | + AUE_GPIO_OUT0)); + } + + if (sc->sc_flags & AUE_FLAG_PII) { + aue_cfg_reset_pegasus_II(sc); + } + + /* wait a little while for the chip to get its brains in order: */ + usbd_config_td_sleep(&(sc->sc_config_td), hz/100); + + return; +} + +/* + * Probe for a Pegasus chip. + */ +static int +aue_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->iface != NULL) { + return UMATCH_NONE; + } + + return (aue_lookup(uaa->vendor, uaa->product) != NULL ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +/* + * Attach the interface. Allocate softc structures, do ifmedia + * setup and ethernet/BPF attach. + */ +static int +aue_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct aue_softc *sc = device_get_softc(dev); + int32_t error; + + if (sc == NULL) { + return ENOMEM; + } + + sc->sc_udev = uaa->device; + sc->sc_dev = dev; + sc->sc_unit = device_get_unit(dev); + sc->sc_flags = aue_lookup(uaa->vendor, uaa->product)->aue_flags; + sc->sc_product = uaa->product; + sc->sc_vendor = uaa->vendor; + + usbd_set_desc(dev, uaa->device); + + snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", + device_get_nameunit(dev)); + + mtx_init(&(sc->sc_mtx), "aue lock", NULL, MTX_DEF | MTX_RECURSE); + + __callout_init_mtx(&(sc->sc_watchdog), + &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); + + if (usbd_set_config_no(uaa->device, AUE_CONFIG_NO, 0)) { + device_printf(dev, "setting config " + "number failed!\n"); + goto detach; + } + + error = usbd_transfer_setup(uaa->device, AUE_IFACE_IDX, + sc->sc_xfer, aue_config, AUE_ENDPT_MAX, + sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + if (error) { + device_printf(dev, "allocating USB " + "transfers failed!\n"); + goto detach; + } + + error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), + &aue_config_copy, NULL, + sizeof(struct aue_config_copy), 16); + if (error) { + device_printf(dev, "could not setup config " + "thread!\n"); + goto detach; + } + + mtx_lock(&(sc->sc_mtx)); + + sc->sc_flags |= AUE_FLAG_WAIT_LINK; + + /* start setup */ + + usbd_config_td_queue_command + (&(sc->sc_config_td), &aue_cfg_first_time_setup, 0); + + /* start watchdog (will exit mutex) */ + + aue_watchdog(sc); + + return 0; /* success */ + + detach: + aue_detach(dev); + return ENXIO; /* failure */ +} + +static void +aue_cfg_first_time_setup(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount) +{ + struct ifnet * ifp; + u_int8_t eaddr[ETHER_ADDR_LEN]; + + /* reset the adapter */ + aue_cfg_reset(sc); + + /* get station address from the EEPROM */ + aue_cfg_read_eeprom(sc, eaddr, 0, 3); + + mtx_unlock(&(sc->sc_mtx)); + + ifp = if_alloc(IFT_ETHER); + + mtx_lock(&(sc->sc_mtx)); + + if (ifp == NULL) { + printf("%s: could not if_alloc()\n", + sc->sc_name); + goto done; + } + + ifp->if_softc = sc; + if_initname(ifp, "aue", sc->sc_unit); + ifp->if_mtu = ETHERMTU; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_ioctl = aue_ioctl_cb; + ifp->if_start = aue_start_cb; + ifp->if_watchdog = NULL; + ifp->if_init = aue_init_cb; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + + /* XXX: we need Giant when we + * clobber with the bus: + * + * FIXME: right here we are locking + * in the wrong order: + */ + + mtx_unlock(&(sc->sc_mtx)); + + mtx_lock(&Giant); + + mtx_lock(&(sc->sc_mtx)); + + /* + * Do MII setup. + * NOTE: Doing this causes child devices to be attached to us, + * which we would normally disconnect at in the detach routine + * using device_delete_child(). However the USB code is set up + * such that when this driver is removed, all children devices + * are removed as well. In effect, the USB code ends up detaching + * all of our children for us, so we don't have to do is ourselves + * in aue_detach(). It's important to point this out since if + * we *do* try to detach the child devices ourselves, we will + * end up getting the children deleted twice, which will crash + * the system. + */ + if (mii_phy_probe(sc->sc_dev, &(sc->sc_miibus), + &aue_ifmedia_upd_cb, + &aue_ifmedia_sts_cb)) { + printf("%s: MII without any PHY!\n", + sc->sc_name); + if_free(ifp); + mtx_unlock(&Giant); + goto done; + } + + mtx_unlock(&Giant); + + sc->sc_ifp = ifp; + + /* + * Call MI attach routine. + */ + ether_ifattach(ifp, eaddr); + + done: + return; +} + +static int +aue_detach(device_t dev) +{ + struct aue_softc * sc = device_get_softc(dev); + struct ifnet * ifp; + + mtx_lock(&(sc->sc_mtx)); + + usbd_config_td_stop(&(sc->sc_config_td)); + + __callout_stop(&sc->sc_watchdog); + + aue_cfg_stop(sc, NULL, 0); + + ifp = sc->sc_ifp; + + mtx_unlock(&(sc->sc_mtx)); + + /* get rid of any late children */ + bus_generic_detach(dev); + + if (ifp) { + ether_ifdetach(ifp); + if_free(ifp); + } + + usbd_transfer_unsetup(sc->sc_xfer, AUE_ENDPT_MAX); + + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); + + usbd_config_td_unsetup(&(sc->sc_config_td)); + + mtx_destroy(&(sc->sc_mtx)); + + return 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 5 12:24:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A54816A4DD; Sat, 5 Aug 2006 12:24:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C0C816A4E1 for ; Sat, 5 Aug 2006 12:24:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E91F43D5A for ; Sat, 5 Aug 2006 12:24:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75COY4v056201 for ; Sat, 5 Aug 2006 12:24:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75COXNw056198 for perforce@freebsd.org; Sat, 5 Aug 2006 12:24:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 12:24:33 GMT Message-Id: <200608051224.k75COXNw056198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 12:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=103240 Change 103240 by rwatson@rwatson_zoo on 2006/08/05 12:23:50 Renumber OpenBSM audit events to 43xxx in order to avoid collisions with future Solaris event numbers, which are approaching 301, the first event added to the Solaris list for Darwin. Provide compatibility entries for current Darwin event numbering, but these should be avoided and the new events used in place of them. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#20 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#20 (text+ko) ==== @@ -5,6 +5,11 @@ - Arguments to au_to_exec_args() and au_to_exec_env() no longer const. - Add kernel versions of au_to_exec_args() and au_to_exec_env(). - Fix exec argument type that is printed for env strings from 'arg' to 'env'. +- New OpenBSM token version number assigned, constants added for other + commonly seen version numbers. +- OpenBSM-specific events assigned numbers in the 43xxx range to avoid future + collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they + are now deprecated numberings. OpenBSM 1.0 alpha 7 @@ -183,4 +188,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#19 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#20 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -273,134 +273,200 @@ #define AUE_NTP_ADJTIME 288 /* - * Events not present in OpenSolaris BSM, generally derived from Apple Darwin - * BSM or added in OpenBSM. This start a little too close to the top end of - * the OpenSolaris event list for my comfort. + * Events added for Apple Darwin that potentially collide with future Solaris + * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in + * new trails. Systems generating these events should switch to the new + * identifiers that avoid colliding with the Solaris identifier space. */ -#define AUE_GETFSSTAT 301 -#define AUE_PTRACE 302 -#define AUE_CHFLAGS 303 -#define AUE_FCHFLAGS 304 -#define AUE_PROFILE 305 -#define AUE_KTRACE 306 -#define AUE_SETLOGIN 307 +#define AUE_DARWIN_GETFSSTAT 301 +#define AUE_DARWIN_PTRACE 302 +#define AUE_DARWIN_CHFLAGS 303 +#define AUE_DARWIN_FCHFLAGS 304 +#define AUE_DARWIN_PROFILE 305 +#define AUE_DARWIN_KTRACE 306 +#define AUE_DARWIN_SETLOGIN 307 #define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ -#define AUE_REVOKE 309 -#define AUE_UMASK 310 -#define AUE_MPROTECT 311 +#define AUE_DARWIN_REVOKE 309 +#define AUE_DARWIN_UMASK 310 +#define AUE_DARWIN_MPROTECT 311 #define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ #define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ #define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ -#define AUE_MKFIFO 315 -#define AUE_POLL 316 +#define AUE_DARWIN_MKFIFO 315 +#define AUE_DARWIN_POLL 316 #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ -#define AUE_FUTIMES 318 -#define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_FUTIMES 318 +#define AUE_DARWIN_SETSID 319 +#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin-specific. */ -#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ -#define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 326 -#define AUE_FPATHCONF 327 -#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_DARWIN_FSTAT 326 +#define AUE_DARWIN_FPATHCONF 327 +#define AUE_DARWIN_GETDIRENTRIES 328 #define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ #define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ -#define AUE_SYSCTL 331 -#define AUE_MLOCK 332 -#define AUE_MUNLOCK 333 -#define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin-specific. */ -#define AUE_SETATTRLIST 336 /* Darwin-specific. */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ -#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ -#define AUE_SEARCHFS 339 /* Darwin-specific. */ -#define AUE_MINHERIT 340 -#define AUE_SEMCONFIG 341 -#define AUE_SEMOPEN 342 -#define AUE_SEMCLOSE 343 -#define AUE_SEMUNLINK 344 -#define AUE_SHMOPEN 345 -#define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin-specific. */ -#define AUE_RESETSHFILE 348 /* Darwin-specific. */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ -#define AUE_PTHREADKILL 350 /* Darwin-specific. */ -#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ -#define AUE_AUDITCTL 352 -#define AUE_RFORK 353 -#define AUE_LCHMOD 354 -#define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin-specific. */ -#define AUE_MAPFD 357 /* Darwin-specific. */ -#define AUE_TASKFORPID 358 /* Darwin-specific. */ -#define AUE_PIDFORTASK 359 /* Darwin-specific. */ -#define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin-specific. */ -#define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ -#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ -#define AUE_USELIB 365 /* Linux-specific. */ -#define AUE_GETRESUID 366 -#define AUE_SETRESUID 367 -#define AUE_GETRESGID 368 -#define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD-specific. */ -#define AUE_LGETFH 371 /* FreeBSD-specific. */ -#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ -#define AUE_FHOPEN 373 /* FreeBSD-specific. */ -#define AUE_FHSTAT 374 /* FreeBSD-specific. */ -#define AUE_JAIL 375 /* FreeBSD-specific. */ -#define AUE_EACCESS 376 /* FreeBSD-specific. */ -#define AUE_KQUEUE 377 /* FreeBSD-specific. */ -#define AUE_KEVENT 378 /* FreeBSD-specific. */ -#define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ -#define AUE_BDFLUSH 381 /* Linux-specific. */ -#define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_SETFSGID 383 /* Linux-specific. */ -#define AUE_PERSONALITY 384 /* Linux-specific. */ -#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ -#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ -#define AUE_PRCTL 387 /* Linux-specific. */ -#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ -#define AUE_CAPGET 389 /* Linux-specific. */ -#define AUE_CAPSET 390 /* Linux-specific. */ -#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ -#define AUE_RTPRIO 392 /* FreeBSD-specific. */ -#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ -#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ -#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ -#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ -#define AUE_ACL_GET_FD 400 /* FreeBSD. */ -#define AUE_ACL_SET_FD 401 /* FreeBSD. */ -#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ -#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ -#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ -#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ -#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ -#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ -#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ -#define AUE_SYSARCH 410 /* FreeBSD. */ -#define AUE_EXTATTRCTL 411 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ -#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ -#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ +#define AUE_DARWIN_SYSCTL 331 +#define AUE_DARWIN_MLOCK 332 +#define AUE_DARWIN_MUNLOCK 333 +#define AUE_DARWIN_UNDELETE 334 +#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_DARWIN_MINHERIT 340 +#define AUE_DARWIN_SEMCONFIG 341 +#define AUE_DARWIN_SEMOPEN 342 +#define AUE_DARWIN_SEMCLOSE 343 +#define AUE_DARWIN_SEMUNLINK 344 +#define AUE_DARWIN_SHMOPEN 345 +#define AUE_DARWIN_SHMUNLINK 346 +#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_DARWIN_AUDITCTL 352 +#define AUE_DARWIN_RFORK 353 +#define AUE_DARWIN_LCHMOD 354 +#define AUE_DARWIN_SWAPOFF 355 +#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */ +#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_DARWIN_SYSCTL_NONADMIN 360 +#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ + +/* + * Audit event identifiers added as part of OpenBSM, generally corresponding + * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. + * These often duplicate events added to the Solaris set by Darwin, but use + * event identifiers in a higher range in order to avoid colliding with + * future Solaris additions. + */ +#define AUE_GETFSSTAT 43001 +#define AUE_PTRACE 43002 +#define AUE_CHFLAGS 43003 +#define AUE_FCHFLAGS 43004 +#define AUE_PROFILE 43005 +#define AUE_KTRACE 43006 +#define AUE_SETLOGIN 43007 +#define AUE_REVOKE 43008 +#define AUE_UMASK 43009 +#define AUE_MPROTECT 43010 +#define AUE_MKFIFO 43011 +#define AUE_POLL 43012 +#define AUE_FUTIMES 43013 +#define AUE_SETSID 43014 +#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */ +#define AUE_ADDPROFILE 43016 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 43018 +#define AUE_FPATHCONF 43019 +#define AUE_GETDIRENTRIES 43020 +#define AUE_SYSCTL 43021 +#define AUE_MLOCK 43022 +#define AUE_MUNLOCK 43023 +#define AUE_UNDELETE 43024 +#define AUE_GETATTRLIST 43025 /* Darwin-specific. */ +#define AUE_SETATTRLIST 43026 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */ +#define AUE_SEARCHFS 43029 /* Darwin-specific. */ +#define AUE_MINHERIT 43030 +#define AUE_SEMCONFIG 43031 +#define AUE_SEMOPEN 43032 +#define AUE_SEMCLOSE 43033 +#define AUE_SEMUNLINK 43034 +#define AUE_SHMOPEN 43035 +#define AUE_SHMUNLINK 43036 +#define AUE_LOADSHFILE 43037 /* Darwin-specific. */ +#define AUE_RESETSHFILE 43038 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */ +#define AUE_PTHREADKILL 43040 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */ +#define AUE_AUDITCTL 43042 +#define AUE_RFORK 43043 +#define AUE_LCHMOD 43044 +#define AUE_SWAPOFF 43045 +#define AUE_INITPROCESS 43046 /* Darwin-specific. */ +#define AUE_MAPFD 43047 /* Darwin-specific. */ +#define AUE_TASKFORPID 43048 /* Darwin-specific. */ +#define AUE_PIDFORTASK 43049 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 43050 +#define AUE_COPYFILE 43051 /* Darwin-specific. */ + +/* + * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin + * in the future. + */ +#define AUE_LUTIMES 43052 +#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */ +#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */ +#define AUE_USELIB 43055 /* Linux-specific. */ +#define AUE_GETRESUID 43056 +#define AUE_SETRESUID 43057 +#define AUE_GETRESGID 43058 +#define AUE_SETRESGID 43059 +#define AUE_WAIT4 43060 /* FreeBSD-specific. */ +#define AUE_LGETFH 43061 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */ +#define AUE_FHOPEN 43063 /* FreeBSD-specific. */ +#define AUE_FHSTAT 43064 /* FreeBSD-specific. */ +#define AUE_JAIL 43065 /* FreeBSD-specific. */ +#define AUE_EACCESS 43066 /* FreeBSD-specific. */ +#define AUE_KQUEUE 43067 /* FreeBSD-specific. */ +#define AUE_KEVENT 43068 /* FreeBSD-specific. */ +#define AUE_FSYNC 43069 +#define AUE_NMOUNT 43070 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 43071 /* Linux-specific. */ +#define AUE_SETFSUID 43072 /* Linux-specific. */ +#define AUE_SETFSGID 43073 /* Linux-specific. */ +#define AUE_PERSONALITY 43074 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */ +#define AUE_PRCTL 43077 /* Linux-specific. */ +#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 43079 /* Linux-specific. */ +#define AUE_CAPSET 43080 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */ +#define AUE_RTPRIO 43082 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */ +#define AUE_ACL_GET_FD 43090 /* FreeBSD. */ +#define AUE_ACL_SET_FD 43091 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */ +#define AUE_SYSARCH 43100 /* FreeBSD. */ +#define AUE_EXTATTRCTL 43101 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#11 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#12 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -234,129 +234,190 @@ 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad 268:AUE_CLOCK_SETTIME:clock_settime(2):ad 269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad -301:AUE_GETFSSTAT:getfsstat(2):fa -302:AUE_PTRACE:ptrace(2):pc -303:AUE_CHFLAGS:chflags(2):fm -304:AUE_FCHFLAGS:fchflags(2):fm -305:AUE_PROFILE:profil(2):pc -306:AUE_KTRACE:ktrace(2):pc -307:AUE_SETLOGIN:setlogin(2):pc +# +# What follows are deprecated Darwin event numbers that may someday conflict +# with Solaris events. +# +301:AUE_DARWIN_GETFSSTAT:getfsstat(2):fa +302:AUE_DARWIN_PTRACE:ptrace(2):pc +303:AUE_DARWIN_CHFLAGS:chflags(2):fm +304:AUE_DARWIN_FCHFLAGS:fchflags(2):fm +305:AUE_DARWIN_PROFILE:profil(2):pc +306:AUE_DARWIN_KTRACE:ktrace(2):pc +307:AUE_DARWIN_SETLOGIN:setlogin(2):pc 308:AUE_DARWIN_REBOOT:reboot(2):ad -309:AUE_REVOKE:revoke(2):cl -310:AUE_UMASK:umask(2):pc -311:AUE_MPROTECT:mprotect(2):fm +309:AUE_DARWIN_REVOKE:revoke(2):cl +310:AUE_DARWIN_UMASK:umask(2):pc +311:AUE_DARWIN_MPROTECT:mprotect(2):fm 312:AUE_DARWIN_SETPRIORITY:setpriority(2):pc,ot 313:AUE_DARWIN_SETTIMEOFDAY:settimeofday(2):ad 314:AUE_DARWIN_FLOCK:flock(2):fm -315:AUE_MKFIFO:mkfifo(2):fc -316:AUE_POLL:poll(2):no +315:AUE_DARWIN_MKFIFO:mkfifo(2):fc +316:AUE_DARWIN_POLL:poll(2):no 317:AUE_DARWIN_SOCKETPAIR:socketpair(2):nt -318:AUE_FUTIMES:futimes(2):fm -319:AUE_SETSID:setsid(2):pc -320:AUE_SETPRIVEXEC:setprivexec(2):pc +318:AUE_DARWIN_FUTIMES:futimes(2):fm +319:AUE_DARWIN_SETSID:setsid(2):pc +320:AUE_DARWIN_SETPRIVEXEC:setprivexec(2):pc 321:AUE_DARWIN_NFSSVC:nfssvc(2):ad 322:AUE_DARWIN_GETFH:getfh(2):fa 323:AUE_DARWIN_QUOTACTL:quotactl(2):ad -324:AUE_ADDPROFILE:system call:pc -325:AUE_KDEBUGTRACE:system call:pc -326:AUE_FSTAT:fstat(2):fa -327:AUE_FPATHCONF:fpathconf(2):fa -328:AUE_GETDIRENTRIES:getdirentries(2):fr +324:AUE_DARWIN_ADDPROFILE:system call:pc +325:AUE_DARWIN_KDEBUGTRACE:system call:pc +326:AUE_DARWIN_FSTAT:fstat(2):fa +327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa +328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):fr 329:AUE_DARWIN_TRUNCATE:truncate(2):fw 330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw -331:AUE_SYSCTL:sysctl(3):ad -332:AUE_MLOCK:mlock(2):pc -333:AUE_MUNLOCK:munlock(2):pc -334:AUE_UNDELETE:undelete(2):fm -335:AUE_GETATTRLIST:getattrlist():fa -336:AUE_SETATTRLIST:setattrlist():fm -337:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa -338:AUE_EXCHANGEDATA:exchangedata():fw -339:AUE_SEARCHFS:searchfs():fa -340:AUE_MINHERIT:minherit(2):pc -341:AUE_SEMCONFIG:semconfig():ip -342:AUE_SEMOPEN:sem_open(2):ip -343:AUE_SEMCLOSE:sem_close(2):ip -344:AUE_SEMUNLINK:sem_unlink(2):ip -345:AUE_SHMOPEN:shm_open(2):ip -346:AUE_SHMUNLINK:shm_unlink(2):ip -347:AUE_LOADSHFILE:load_shared_file():fr -348:AUE_RESETSHFILE:reset_shared_file():ot -349:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot -350:AUE_PTHREADKILL:pthread_kill(2):pc -351:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc -352:AUE_AUDITCTL:auditctl(2):ad -353:AUE_RFORK:rfork(2):pc -354:AUE_LCHMOD:lchmod(2):fm -355:AUE_SWAPOFF:swapoff():ad -356:AUE_INITPROCESS:init_process():pc -357:AUE_MAPFD:map_fd():fa -358:AUE_TASKFORPID:task_for_pid():pc -359:AUE_PIDFORTASK:pid_for_task():pc -360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot -361:AUE_COPYFILE:copyfile():fr,fw -362:AUE_LUTIMES:lutimes(2):fm -363:AUE_LCHFLAGS:lchflags(2):fm -364:AUE_SENDFILE:sendfile(2):nt -365:AUE_USELIB:uselib(2):fa -366:AUE_GETRESUID:getresuid(2):pc -367:AUE_SETRESUID:setresuid(2):pc -368:AUE_GETRESGID:getresgid(2):pc -369:AUE_SETRESGID:setresgid(2):pc -370:AUE_WAIT4:wait4(2):pc -371:AUE_LGETFH:lgetfh(2):fa -372:AUE_FHSTATFS:fhstatfs(2):fa -373:AUE_FHOPEN:fhopen(2):fa -374:AUE_FHSTAT:fhstat(2):fa -375:AUE_JAIL:jail(2):pc -376:AUE_EACCESS:eaccess(2):fa -377:AUE_KQUEUE:kqueue(2):no -378:AUE_KEVENT:kevent(2):no -379:AUE_FSYNC:fsync(2):fm -380:AUE_NMOUNT:nmount(2):ad -381:AUE_BDFLUSH:bdflush(2):ad -382:AUE_SETFSUID:setfsuid(2):ot -383:AUE_SETFSGID:setfsgid(2):ot -384:AUE_PERSONALITY:personality(2):pc -385:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad -386:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad -387:AUE_PRCTL:prctl(2):pc -388:AUE_GETCWD:getcwd(2):pc -389:AUE_CAPGET:capget(2):pc -390:AUE_CAPSET:capset(2):pc -391:AUE_PIVOT_ROOT:pivot_root(2):pc -392:AUE_RTPRIO::rtprio(2):pc -393:AUE_SCHED_GETPARAM:sched_getparam(2):ad -394:AUE_SCHED_SETPARAM:sched_setparam(2):ad -395:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad -396:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad -397:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad -398:AUE_ACL_GET_FILE:acl_get_file(2):fa -399:AUE_ACL_SET_FILE:acl_set_file(2):fm -400:AUE_ACL_GET_FD:acl_get_fd(2):fa -401:AUE_ACL_SET_FD:acl_set_fd(2):fm -402:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm -403:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm -404:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa -405:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa -406:AUE_ACL_GET_LINK:acl_get_link(2):fa -407:AUE_ACL_SET_LINK:acl_set_link(2):fm -408:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm -409:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa -410:AUE_SYSARCH:sysarch(2):na -411:AUE_EXTATTRCTL:extattrctl(2):fm -412:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa -413:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm -414:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa -415:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm -416:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa -417:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm -418:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa -419:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm -420:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa -421:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm -422:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa -423:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +331:AUE_DARWIN_SYSCTL:sysctl(3):ad +332:AUE_DARWIN_MLOCK:mlock(2):pc +333:AUE_DARWIN_MUNLOCK:munlock(2):pc +334:AUE_DARWIN_UNDELETE:undelete(2):fm +335:AUE_DARWIN_GETATTRLIST:getattrlist():fa +336:AUE_DARWIN_SETATTRLIST:setattrlist():fm +337:AUE_DARWIN_GETDIRENTRIESATTR:getdirentriesattr():fa +338:AUE_DARWIN_EXCHANGEDATA:exchangedata():fw +339:AUE_DARWIN_SEARCHFS:searchfs():fa +340:AUE_DARWIN_MINHERIT:minherit(2):pc +341:AUE_DARWIN_SEMCONFIG:semconfig():ip +342:AUE_DARWIN_SEMOPEN:sem_open(2):ip +343:AUE_DARWIN_SEMCLOSE:sem_close(2):ip +344:AUE_DARWIN_SEMUNLINK:sem_unlink(2):ip +345:AUE_DARWIN_SHMOPEN:shm_open(2):ip +346:AUE_DARWIN_SHMUNLINK:shm_unlink(2):ip +347:AUE_DARWIN_LOADSHFILE:load_shared_file():fr +348:AUE_DARWIN_RESETSHFILE:reset_shared_file():ot +349:AUE_DARWIN_NEWSYSTEMSHREG:new_system_share_regions():ot +350:AUE_DARWIN_PTHREADKILL:pthread_kill(2):pc +351:AUE_DARWIN_PTHREADSIGMASK:pthread_sigmask(2):pc +352:AUE_DARWIN_AUDITCTL:auditctl(2):ad +353:AUE_DARWIN_RFORK:rfork(2):pc +354:AUE_DARWIN_LCHMOD:lchmod(2):fm +355:AUE_DARWIN_SWAPOFF:swapoff():ad +356:AUE_DARWIN_INITPROCESS:init_process():pc +357:AUE_DARWIN_MAPFD:map_fd():fa +358:AUE_DARWIN_TASKFORPID:task_for_pid():pc +359:AUE_DARWIN_PIDFORTASK:pid_for_task():pc +360:AUE_DARWIN_SYSCTL_NONADMIN:sysctl() - non-admin:ot +361:AUE_DARWIN_COPYFILE:copyfile():fr,fw +# +# OpenBSM-specific kernel events. +# +43001:AUE_GETFSSTAT:getfsstat(2):fa +43002:AUE_PTRACE:ptrace(2):pc +43003:AUE_CHFLAGS:chflags(2):fm +43004:AUE_FCHFLAGS:fchflags(2):fm +43005:AUE_PROFILE:profil(2):pc +43006:AUE_KTRACE:ktrace(2):pc +43007:AUE_SETLOGIN:setlogin(2):pc +43008:AUE_REVOKE:revoke(2):cl +43009:AUE_UMASK:umask(2):pc +43010:AUE_MPROTECT:mprotect(2):fm +43011:AUE_MKFIFO:mkfifo(2):fc +43012:AUE_POLL:poll(2):no +43013:AUE_FUTIMES:futimes(2):fm +43014:AUE_SETSID:setsid(2):pc +43015:AUE_SETPRIVEXEC:setprivexec(2):pc +43016:AUE_ADDPROFILE:system call:pc +43017:AUE_KDEBUGTRACE:system call:pc +43018:AUE_FSTAT:fstat(2):fa +43019:AUE_FPATHCONF:fpathconf(2):fa +43020:AUE_GETDIRENTRIES:getdirentries(2):fr +43021:AUE_SYSCTL:sysctl(3):ad +43022:AUE_MLOCK:mlock(2):pc +43023:AUE_MUNLOCK:munlock(2):pc +43024:AUE_UNDELETE:undelete(2):fm +43025:AUE_GETATTRLIST:getattrlist():fa +43026:AUE_SETATTRLIST:setattrlist():fm +43027:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa +43028:AUE_EXCHANGEDATA:exchangedata():fw +43029:AUE_SEARCHFS:searchfs():fa +43030:AUE_MINHERIT:minherit(2):pc +43031:AUE_SEMCONFIG:semconfig():ip +43032:AUE_SEMOPEN:sem_open(2):ip +43033:AUE_SEMCLOSE:sem_close(2):ip +43034:AUE_SEMUNLINK:sem_unlink(2):ip +43035:AUE_SHMOPEN:shm_open(2):ip +43036:AUE_SHMUNLINK:shm_unlink(2):ip +43037:AUE_LOADSHFILE:load_shared_file():fr +43038:AUE_RESETSHFILE:reset_shared_file():ot +43039:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot +43040:AUE_PTHREADKILL:pthread_kill(2):pc +43041:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc +43042:AUE_AUDITCTL:auditctl(2):ad +43043:AUE_RFORK:rfork(2):pc +43044:AUE_LCHMOD:lchmod(2):fm +43045:AUE_SWAPOFF:swapoff():ad +43046:AUE_INITPROCESS:init_process():pc +43047:AUE_MAPFD:map_fd():fa +43048:AUE_TASKFORPID:task_for_pid():pc +43049:AUE_PIDFORTASK:pid_for_task():pc +43050:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot +43051:AUE_COPYFILE:copyfile():fr,fw +43052:AUE_LUTIMES:lutimes(2):fm +43053:AUE_LCHFLAGS:lchflags(2):fm +43054:AUE_SENDFILE:sendfile(2):nt +43055:AUE_USELIB:uselib(2):fa +43056:AUE_GETRESUID:getresuid(2):pc +43057:AUE_SETRESUID:setresuid(2):pc +43058:AUE_GETRESGID:getresgid(2):pc +43059:AUE_SETRESGID:setresgid(2):pc +43060:AUE_WAIT4:wait4(2):pc +43061:AUE_LGETFH:lgetfh(2):fa +43062:AUE_FHSTATFS:fhstatfs(2):fa +43063:AUE_FHOPEN:fhopen(2):fa +43064:AUE_FHSTAT:fhstat(2):fa +43065:AUE_JAIL:jail(2):pc +43066:AUE_EACCESS:eaccess(2):fa +43067:AUE_KQUEUE:kqueue(2):no +43068:AUE_KEVENT:kevent(2):no +43069:AUE_FSYNC:fsync(2):fm +43070:AUE_NMOUNT:nmount(2):ad +43071:AUE_BDFLUSH:bdflush(2):ad +43072:AUE_SETFSUID:setfsuid(2):ot +43073:AUE_SETFSGID:setfsgid(2):ot +43074:AUE_PERSONALITY:personality(2):pc +43075:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad +43076:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad +43077:AUE_PRCTL:prctl(2):pc +43078:AUE_GETCWD:getcwd(2):pc +43079:AUE_CAPGET:capget(2):pc +43080:AUE_CAPSET:capset(2):pc +43081:AUE_PIVOT_ROOT:pivot_root(2):pc +43082:AUE_RTPRIO::rtprio(2):pc +43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad +43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad +43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad +43086:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad +43087:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad +43088:AUE_ACL_GET_FILE:acl_get_file(2):fa +43089:AUE_ACL_SET_FILE:acl_set_file(2):fm +43090:AUE_ACL_GET_FD:acl_get_fd(2):fa +43091:AUE_ACL_SET_FD:acl_set_fd(2):fm +43092:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm +43093:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm +43094:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa +43095:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa +43096:AUE_ACL_GET_LINK:acl_get_link(2):fa +43097:AUE_ACL_SET_LINK:acl_set_link(2):fm +43098:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm +43099:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa +43100:AUE_SYSARCH:sysarch(2):na +43101:AUE_EXTATTRCTL:extattrctl(2):fm +43102:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +43103:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +43104:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +43105:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +43106:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +43107:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +43108:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa +43109:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +43110:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +43111:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +43112:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +# +# User space system events. +# 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-p4-projects@FreeBSD.ORG Sat Aug 5 12:55:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 620E216A4E1; Sat, 5 Aug 2006 12:55:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3900116A4DA for ; Sat, 5 Aug 2006 12:55:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E526843D53 for ; Sat, 5 Aug 2006 12:55:12 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75CtCOK065720 for ; Sat, 5 Aug 2006 12:55:12 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75CtCXr065717 for perforce@freebsd.org; Sat, 5 Aug 2006 12:55:12 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 5 Aug 2006 12:55:12 GMT Message-Id: <200608051255.k75CtCXr065717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 12:55:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=103241 Change 103241 by rdivacky@rdivacky_witten on 2006/08/05 12:54:11 Copy out the pid as linux understands it, ie. group_pid in our world. This enables us to actually play a file in realplay. The realplay coredumps while playing thought. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#31 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#31 (text+ko) ==== @@ -432,7 +432,7 @@ EMUL_RUNLOCK(&emul_lock); return (EINVAL); } - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(td->td_proc->p_pid)); + error = copyout(&em->shared->group_pid, args->parent_tidptr, sizeof(td->td_proc->p_pid)); if (error) { EMUL_RUNLOCK(&emul_lock); return (error); From owner-p4-projects@FreeBSD.ORG Sat Aug 5 13:51:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BC8B16A4DF; Sat, 5 Aug 2006 13:51:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B147516A4DD for ; Sat, 5 Aug 2006 13:51:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3844B43D46 for ; Sat, 5 Aug 2006 13:51:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75DpOnJ070197 for ; Sat, 5 Aug 2006 13:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75DpNnM070194 for perforce@freebsd.org; Sat, 5 Aug 2006 13:51:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 13:51:23 GMT Message-Id: <200608051351.k75DpNnM070194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 13:51:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=103243 Change 103243 by rwatson@rwatson_fledge on 2006/08/05 13:51:01 De-google-ad, they appear not to be effective and certainly don't make the page prettier. Affected files ... .. //depot/projects/trustedbsd/www/sidebar.xml#7 edit Differences ... ==== //depot/projects/trustedbsd/www/sidebar.xml#7 (text+ko) ==== @@ -15,25 +15,6 @@
  • SEDarwin
  • UFS2
    • -



    -
    - - -
    @@ -51,63 +32,9 @@
  • SEDarwin
  • UFS2
    • -



    -
    - - - - -
    -



    -
    - - -
    @@ -115,57 +42,6 @@
  • Documentation
  • Implementation Papers
    • -



    -
    - - - - - - -
    @@ -173,63 +49,9 @@
  • TrustedBSD Mailing Lists
  • POSIX.1e Mailing Lists
    • -



    -
    - - -
    -



    -
    - - - - -
    From owner-p4-projects@FreeBSD.ORG Sat Aug 5 14:22:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1481616A4DF; Sat, 5 Aug 2006 14:22:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5C5C16A4DE for ; Sat, 5 Aug 2006 14:22:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 404B343D49 for ; Sat, 5 Aug 2006 14:22:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75EMnUR074026 for ; Sat, 5 Aug 2006 14:22:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75EM3je073355 for perforce@freebsd.org; Sat, 5 Aug 2006 14:22:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:22:03 GMT Message-Id: <200608051422.k75EM3je073355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 14:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=103245 Change 103245 by rwatson@rwatson_zoo on 2006/08/05 14:21:26 Integrate TrustedBSD base branch from FreeBSD CVS: - OpenSSL 0.9.8b update. - More de-alpha. - powermac nvram driver - libarchive optimization - resolver update - mac_is_present.3 rename - more thread scheduler apis - INET6 more conditionally buildable in userspace - non-mpsafe system calls eliminated, no more mpsafe system call flag - ia64 stack unwinder update - 802.11 raw frame send support - stge(4) - em(4), mpt(4), bridge(4) updates - kern_acl.c split into type-independent kern_acl.c and POSIX.1e-specific subr_acl_posix1e.c. - MTX_DESTROYED, per-thread lock counter, various other debugging things. - pru_close - sosend/soreceive/sopoll _generic versions, all consumers through the functions rather than function pointers - uipc_sockbuf.c - Loop back extattr auditing - bpf multi-descriptor timestamp optimization - inpcb locks init/destroy only when pcb moves in and out of zone cache, not every connection. - Loop back mpo_associate_nfsd_label - Beginning of dtrace hooks - No more debug.mpsafevm - firmware - spibus - much bsnmp Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#41 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#74 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#10 integrate .. //depot/projects/trustedbsd/base/UPDATING#68 integrate .. //depot/projects/trustedbsd/base/bin/dd/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/histedit.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#16 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#25 integrate .. //depot/projects/trustedbsd/base/bin/test/test.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/asn1pars.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ciphers.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/crl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#7 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dh.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dhparam.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsaparam.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/engine.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendh.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ocsp.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.cnf#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/passwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rand.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/req.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsautl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_apps.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_cb.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_server.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_socket.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_time.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/sess_id.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/smime.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/version.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/comm.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/comms.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/config#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cbc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cfb.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bitstr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bool.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bytes.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_d2i_fp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_digest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_dup.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_enum.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_gentm.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_i2d_fp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_int.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_mbstr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_object.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_octet.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_print.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_set.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_sign.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_type.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utctm.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_mac.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_par.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_moid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_pack.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_pr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_pu.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_pr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_pu.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/n_pkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbe.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbev2.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_crl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_pkey.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_req.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_spki.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_x509.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_crl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_long.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_name.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_pubkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509a.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_opts.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bfspeed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bftest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_dump.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_sock.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_nbio.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_acpt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_conn.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_fd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_file.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_log.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_sock.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/bn-586.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_add.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_asm.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_ctx.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_div.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_exp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_exp2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_gcd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lcl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mont.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mpi.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mul.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_prime.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_print.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_rand.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_recp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_shift.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_sqr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_word.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bntest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/expspeed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/exptest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buf_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buffer.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buffer.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast_lcl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast_spd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/castopts.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/casttest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/c_zlib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_mod.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cpt_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/crypto.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cversion.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/FILES0#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb64ede.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb_enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_opts.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/destest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb3_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ede_cbcm_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/fcrypt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/read2pwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/set_key.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/str2key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_check.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_gen.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_key.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dhtest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_gen.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_key.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_ossl.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_sign.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_vrf.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsatest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dlfcn.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ebcdic.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_smpl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_ctrl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_fat.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/engine.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cryptodev.c#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_prn.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/openssl.ec#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_b64.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_md.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_ok.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_alld.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/digest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_aes.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_bf.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cast.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des3.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_idea.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_null.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_xcbc_d.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/encode.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pbe.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_dss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_dss1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md4.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_mdc2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_null.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_ripemd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_sha.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_sha1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/names.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p5_crpt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p5_crpt2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_dec.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_open.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_seal.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ex_data.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmac.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmac.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_skey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea_spd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/ideatest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2test.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md32_common.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem_dbg.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/o_names.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.num#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.txt#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_ext.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_info.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_seal.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/cbc.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86asm.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86ms.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86nasm.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86unix.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_add.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_crpt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_crt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_decr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_init.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_kiss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_npas.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/pk12err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/pkcs12.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/bio_ber.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/example.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_attr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_mime.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_smime.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pkcs7.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pkcs7err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/md_rand.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_egd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_win.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/randfile.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/randtest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/rc5.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/rc5_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/rc5speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/ripemd.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmdtest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_chk.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_gen.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_null.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_oaep.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_saos.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_test.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha1-586.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/shatest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/safestack.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/symhacks.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/mttest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/th-lock.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/tmdiff.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/txt_db.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/txt_db.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/uid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_dir.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_file.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_att.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_cmp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_lu.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_req.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_trs.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_txt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_v3.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509spki.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509type.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/ext_dat.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_akey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_alt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_bitst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_conf.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_cpols.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_extku.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_info.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_int.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_prn.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_purp.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_skey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_sxnet.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_utl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/x509v3.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/CA.pl.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ca.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/config.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/enc.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/req.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_client.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_server.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BIO_f_base64.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_add_word.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_new.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_DigestInit.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_SealInit.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_SignInit.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_sign.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/blowfish.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/bn.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/bn_internal.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/des_modes.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/hmac.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/threads.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/openssl.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_error.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_session.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_shutdown.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_state_string.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/ssl.pod#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssleay.txt#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os2.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/bio_ssl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_clnt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_meth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_srvr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_enc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_meth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_srvr.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_both.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_enc.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_meth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_pkt.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl3.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_algs.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_asn1.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_cert.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_err.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_locl.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_rsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_txt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssltest.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_clnt.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 5 14:33:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C803B16A4E1; Sat, 5 Aug 2006 14:33:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8879916A4DF for ; Sat, 5 Aug 2006 14:33:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10ACC43D53 for ; Sat, 5 Aug 2006 14:33:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75EX1sK082623 for ; Sat, 5 Aug 2006 14:33:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75EX1O1082610 for perforce@freebsd.org; Sat, 5 Aug 2006 14:33:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:33:01 GMT Message-Id: <200608051433.k75EX1O1082610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 14:33:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=103246 Change 103246 by rwatson@rwatson_fledge on 2006/08/05 14:32:56 Combine UFS2/EA links into a single link, since they are a single section. Affected files ... .. //depot/projects/trustedbsd/www/components.page#6 edit .. //depot/projects/trustedbsd/www/sidebar.xml#8 edit Differences ... ==== //depot/projects/trustedbsd/www/components.page#6 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#5 $ + $P4: //depot/projects/trustedbsd/www/components.page#6 $ @@ -117,7 +117,6 @@ -

    Extended Attributes and UFS2

    ==== //depot/projects/trustedbsd/www/sidebar.xml#8 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,7 +21,7 @@ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 14:40:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8787D16A4E0; Sat, 5 Aug 2006 14:40:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6447E16A4DD for ; Sat, 5 Aug 2006 14:40:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B05943D4C for ; Sat, 5 Aug 2006 14:40:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75EeAvY088477 for ; Sat, 5 Aug 2006 14:40:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75EeAYd088474 for perforce@freebsd.org; Sat, 5 Aug 2006 14:40:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:40:10 GMT Message-Id: <200608051440.k75EeAYd088474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 14:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103247 Change 103247 by rwatson@rwatson_fledge on 2006/08/05 14:39:45 Update mailing list web page for new posix.1e mailing list and archive location, match formatting for other mailing lists. Affected files ... .. //depot/projects/trustedbsd/www/mailinglists.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/mailinglists.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/mailinglists.page#2 $ + $P4: //depot/projects/trustedbsd/www/mailinglists.page#3 $ @@ -123,18 +123,14 @@ href="http://wt.xpilot.org/publications/posix.1e">http://wt.xpilot.org/publications/posix.1e, where a draft may also be downloaded.

    -

    The mailing list can be subscribed to by sending email to posix1e-request@cyrus.watson.org - with a body of:

    +
    +
    posix1e
    -
    - 
    subscribe
    -
    +

    POSIX.1e mailing list, intended for discussion of the now + defunct POSIX.1e draft standard. Web mailing list archives are available.

    +
    +
    -

    Mailing list archives will be available in the near future; in the - mean time, they may be accessed via the web-based mailing list - archives at securityfocus.com.

    From owner-p4-projects@FreeBSD.ORG Sat Aug 5 15:00:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A1DC16A4E0; Sat, 5 Aug 2006 15:00:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F22F216A4DA for ; Sat, 5 Aug 2006 15:00:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6334843D45 for ; Sat, 5 Aug 2006 15:00:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75F0IDs090127 for ; Sat, 5 Aug 2006 15:00:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Exacu089525 for perforce@freebsd.org; Sat, 5 Aug 2006 14:59:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:59:36 GMT Message-Id: <200608051459.k75Exacu089525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:00:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103249 Change 103249 by rwatson@rwatson_zoo on 2006/08/05 14:59:29 Integrate TrustedBSD audit3 from TrustedBSD base branch. See change set @103245 for a complete description of merged changes. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#11 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#11 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#6 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#12 integrate .. //depot/projects/trustedbsd/audit3/bin/dd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/histedit.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/parser.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#8 integrate .. //depot/projects/trustedbsd/audit3/bin/test/test.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/CHANGES#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/Configure#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/FAQ#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/INSTALL#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/LICENSE#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/NEWS#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/README#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/der_chop#3 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/openssl.cnf#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/comm.txt#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/comms.txt#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/config#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_cfb.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_locl.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_div.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/FILES0#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_old.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cryptodev.c#3 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ubsec.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_aes.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_attr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_egd.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_win.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmd_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/stack.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_vfy.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BN_add_word.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BN_new.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_SealInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/RSA_sign.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/bn.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/hmac.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/threads.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/openssl.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_error.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_session.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_state_string.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/ssl.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/e_os.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/e_os2.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/bio_ssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_srvr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_both.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_algs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_sess.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_txt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssltest.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_clnt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_srvr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/tls1.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/CAss.cnf#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/P1ss.cnf#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/P2ss.cnf#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/Uss.cnf#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/bctest#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/evptests.txt#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tcrl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testca#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testenc#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testfipsssl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testgen#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testss#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testssl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testsslproxy#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tpkcs7#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tpkcs7d#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/treq#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/trsa#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tsid#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tx509#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/tools/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/ck_errf.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/copy.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/domd#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/extract-section.pl#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 5 15:09:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B2416A4E1; Sat, 5 Aug 2006 15:09:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA20716A4DD for ; Sat, 5 Aug 2006 15:09:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8DFD43D55 for ; Sat, 5 Aug 2006 15:09:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75F9UJA099121 for ; Sat, 5 Aug 2006 15:09:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75F9UQx099105 for perforce@freebsd.org; Sat, 5 Aug 2006 15:09:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:09:30 GMT Message-Id: <200608051509.k75F9UQx099105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103251 Change 103251 by rwatson@rwatson_zoo on 2006/08/05 15:09:00 Merge additional OpenBSM 1.0a8 to audit3 branch: new token version, audit event ID assignments. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 (text+ko) ==== @@ -5,6 +5,11 @@ - Arguments to au_to_exec_args() and au_to_exec_env() no longer const. - Add kernel versions of au_to_exec_args() and au_to_exec_env(). - Fix exec argument type that is printed for env strings from 'arg' to 'env'. +- New OpenBSM token version number assigned, constants added for other + commonly seen version numbers. +- OpenBSM-specific events assigned numbers in the 43xxx range to avoid future + collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they + are now deprecated numberings. OpenBSM 1.0 alpha 7 @@ -183,4 +188,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#7 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#11 $ */ #include @@ -88,7 +88,7 @@ * Free our local list of directory names. */ static void -free_dir_q() +free_dir_q(void) { struct dir_ent *dirent; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#22 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -273,134 +273,200 @@ #define AUE_NTP_ADJTIME 288 /* - * Events not present in OpenSolaris BSM, generally derived from Apple Darwin - * BSM or added in OpenBSM. This start a little too close to the top end of - * the OpenSolaris event list for my comfort. + * Events added for Apple Darwin that potentially collide with future Solaris + * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in + * new trails. Systems generating these events should switch to the new + * identifiers that avoid colliding with the Solaris identifier space. */ -#define AUE_GETFSSTAT 301 -#define AUE_PTRACE 302 -#define AUE_CHFLAGS 303 -#define AUE_FCHFLAGS 304 -#define AUE_PROFILE 305 -#define AUE_KTRACE 306 -#define AUE_SETLOGIN 307 +#define AUE_DARWIN_GETFSSTAT 301 +#define AUE_DARWIN_PTRACE 302 +#define AUE_DARWIN_CHFLAGS 303 +#define AUE_DARWIN_FCHFLAGS 304 +#define AUE_DARWIN_PROFILE 305 +#define AUE_DARWIN_KTRACE 306 +#define AUE_DARWIN_SETLOGIN 307 #define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ -#define AUE_REVOKE 309 -#define AUE_UMASK 310 -#define AUE_MPROTECT 311 +#define AUE_DARWIN_REVOKE 309 +#define AUE_DARWIN_UMASK 310 +#define AUE_DARWIN_MPROTECT 311 #define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ #define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ #define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ -#define AUE_MKFIFO 315 -#define AUE_POLL 316 +#define AUE_DARWIN_MKFIFO 315 +#define AUE_DARWIN_POLL 316 #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ -#define AUE_FUTIMES 318 -#define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_FUTIMES 318 +#define AUE_DARWIN_SETSID 319 +#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin-specific. */ -#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ -#define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 326 -#define AUE_FPATHCONF 327 -#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_DARWIN_FSTAT 326 +#define AUE_DARWIN_FPATHCONF 327 +#define AUE_DARWIN_GETDIRENTRIES 328 #define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ #define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ -#define AUE_SYSCTL 331 -#define AUE_MLOCK 332 -#define AUE_MUNLOCK 333 -#define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin-specific. */ -#define AUE_SETATTRLIST 336 /* Darwin-specific. */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ -#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ -#define AUE_SEARCHFS 339 /* Darwin-specific. */ -#define AUE_MINHERIT 340 -#define AUE_SEMCONFIG 341 -#define AUE_SEMOPEN 342 -#define AUE_SEMCLOSE 343 -#define AUE_SEMUNLINK 344 -#define AUE_SHMOPEN 345 -#define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin-specific. */ -#define AUE_RESETSHFILE 348 /* Darwin-specific. */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ -#define AUE_PTHREADKILL 350 /* Darwin-specific. */ -#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ -#define AUE_AUDITCTL 352 -#define AUE_RFORK 353 -#define AUE_LCHMOD 354 -#define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin-specific. */ -#define AUE_MAPFD 357 /* Darwin-specific. */ -#define AUE_TASKFORPID 358 /* Darwin-specific. */ -#define AUE_PIDFORTASK 359 /* Darwin-specific. */ -#define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin-specific. */ -#define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ -#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ -#define AUE_USELIB 365 /* Linux-specific. */ -#define AUE_GETRESUID 366 -#define AUE_SETRESUID 367 -#define AUE_GETRESGID 368 -#define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD-specific. */ -#define AUE_LGETFH 371 /* FreeBSD-specific. */ -#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ -#define AUE_FHOPEN 373 /* FreeBSD-specific. */ -#define AUE_FHSTAT 374 /* FreeBSD-specific. */ -#define AUE_JAIL 375 /* FreeBSD-specific. */ -#define AUE_EACCESS 376 /* FreeBSD-specific. */ -#define AUE_KQUEUE 377 /* FreeBSD-specific. */ -#define AUE_KEVENT 378 /* FreeBSD-specific. */ -#define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ -#define AUE_BDFLUSH 381 /* Linux-specific. */ -#define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_SETFSGID 383 /* Linux-specific. */ -#define AUE_PERSONALITY 384 /* Linux-specific. */ -#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ -#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ -#define AUE_PRCTL 387 /* Linux-specific. */ -#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ -#define AUE_CAPGET 389 /* Linux-specific. */ -#define AUE_CAPSET 390 /* Linux-specific. */ -#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ -#define AUE_RTPRIO 392 /* FreeBSD-specific. */ -#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ -#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ -#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ -#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ -#define AUE_ACL_GET_FD 400 /* FreeBSD. */ -#define AUE_ACL_SET_FD 401 /* FreeBSD. */ -#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ -#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ -#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ -#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ -#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ -#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ -#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ -#define AUE_SYSARCH 410 /* FreeBSD. */ -#define AUE_EXTATTRCTL 411 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ -#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ -#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ +#define AUE_DARWIN_SYSCTL 331 +#define AUE_DARWIN_MLOCK 332 +#define AUE_DARWIN_MUNLOCK 333 +#define AUE_DARWIN_UNDELETE 334 +#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_DARWIN_MINHERIT 340 +#define AUE_DARWIN_SEMCONFIG 341 +#define AUE_DARWIN_SEMOPEN 342 +#define AUE_DARWIN_SEMCLOSE 343 +#define AUE_DARWIN_SEMUNLINK 344 +#define AUE_DARWIN_SHMOPEN 345 +#define AUE_DARWIN_SHMUNLINK 346 +#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_DARWIN_AUDITCTL 352 +#define AUE_DARWIN_RFORK 353 +#define AUE_DARWIN_LCHMOD 354 +#define AUE_DARWIN_SWAPOFF 355 +#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */ +#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_DARWIN_SYSCTL_NONADMIN 360 +#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ + +/* + * Audit event identifiers added as part of OpenBSM, generally corresponding + * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. + * These often duplicate events added to the Solaris set by Darwin, but use + * event identifiers in a higher range in order to avoid colliding with + * future Solaris additions. + */ +#define AUE_GETFSSTAT 43001 +#define AUE_PTRACE 43002 +#define AUE_CHFLAGS 43003 +#define AUE_FCHFLAGS 43004 +#define AUE_PROFILE 43005 +#define AUE_KTRACE 43006 +#define AUE_SETLOGIN 43007 +#define AUE_REVOKE 43008 +#define AUE_UMASK 43009 +#define AUE_MPROTECT 43010 +#define AUE_MKFIFO 43011 +#define AUE_POLL 43012 +#define AUE_FUTIMES 43013 +#define AUE_SETSID 43014 +#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */ +#define AUE_ADDPROFILE 43016 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 43018 +#define AUE_FPATHCONF 43019 +#define AUE_GETDIRENTRIES 43020 +#define AUE_SYSCTL 43021 +#define AUE_MLOCK 43022 +#define AUE_MUNLOCK 43023 +#define AUE_UNDELETE 43024 +#define AUE_GETATTRLIST 43025 /* Darwin-specific. */ +#define AUE_SETATTRLIST 43026 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */ +#define AUE_SEARCHFS 43029 /* Darwin-specific. */ +#define AUE_MINHERIT 43030 +#define AUE_SEMCONFIG 43031 +#define AUE_SEMOPEN 43032 +#define AUE_SEMCLOSE 43033 +#define AUE_SEMUNLINK 43034 +#define AUE_SHMOPEN 43035 +#define AUE_SHMUNLINK 43036 +#define AUE_LOADSHFILE 43037 /* Darwin-specific. */ +#define AUE_RESETSHFILE 43038 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */ +#define AUE_PTHREADKILL 43040 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */ +#define AUE_AUDITCTL 43042 +#define AUE_RFORK 43043 +#define AUE_LCHMOD 43044 +#define AUE_SWAPOFF 43045 +#define AUE_INITPROCESS 43046 /* Darwin-specific. */ +#define AUE_MAPFD 43047 /* Darwin-specific. */ +#define AUE_TASKFORPID 43048 /* Darwin-specific. */ +#define AUE_PIDFORTASK 43049 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 43050 +#define AUE_COPYFILE 43051 /* Darwin-specific. */ + +/* + * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin + * in the future. + */ +#define AUE_LUTIMES 43052 +#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */ +#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */ +#define AUE_USELIB 43055 /* Linux-specific. */ +#define AUE_GETRESUID 43056 +#define AUE_SETRESUID 43057 +#define AUE_GETRESGID 43058 +#define AUE_SETRESGID 43059 +#define AUE_WAIT4 43060 /* FreeBSD-specific. */ +#define AUE_LGETFH 43061 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */ +#define AUE_FHOPEN 43063 /* FreeBSD-specific. */ +#define AUE_FHSTAT 43064 /* FreeBSD-specific. */ +#define AUE_JAIL 43065 /* FreeBSD-specific. */ +#define AUE_EACCESS 43066 /* FreeBSD-specific. */ +#define AUE_KQUEUE 43067 /* FreeBSD-specific. */ +#define AUE_KEVENT 43068 /* FreeBSD-specific. */ +#define AUE_FSYNC 43069 +#define AUE_NMOUNT 43070 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 43071 /* Linux-specific. */ +#define AUE_SETFSUID 43072 /* Linux-specific. */ +#define AUE_SETFSGID 43073 /* Linux-specific. */ +#define AUE_PERSONALITY 43074 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */ +#define AUE_PRCTL 43077 /* Linux-specific. */ +#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 43079 /* Linux-specific. */ +#define AUE_CAPSET 43080 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */ +#define AUE_RTPRIO 43082 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */ +#define AUE_ACL_GET_FD 43090 /* FreeBSD. */ +#define AUE_ACL_SET_FD 43091 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */ +#define AUE_SYSARCH 43100 /* FreeBSD. */ +#define AUE_EXTATTRCTL 43101 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,9 +199,19 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ +#define BSM_MAX_GROUPS 16 -#define BSM_MAX_GROUPS 16 -#define HEADER_VERSION 1 +/* + * A number of BSM versions are floating around and defined. Here are + * constants for them. OpenBSM uses the same token types, etc, used in the + * Solaris BSM version, but has a separate version number in order to + * identify a potentially different event identifier name space. + */ +#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define BSM_HEADER_VERSION_SOLARIS 2 +#define BSM_HEADER_VERSION_TSOL25 3 +#define BSM_HEADER_VERSION_TSOL 4 +#define BSM_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#13 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#14 $ # $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.3 2006/06/27 18:09:54 rwatson Exp $ # 0:AUE_NULL:indir system call:no @@ -235,129 +235,190 @@ 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad 268:AUE_CLOCK_SETTIME:clock_settime(2):ad 269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad -301:AUE_GETFSSTAT:getfsstat(2):fa -302:AUE_PTRACE:ptrace(2):pc -303:AUE_CHFLAGS:chflags(2):fm -304:AUE_FCHFLAGS:fchflags(2):fm -305:AUE_PROFILE:profil(2):pc -306:AUE_KTRACE:ktrace(2):pc -307:AUE_SETLOGIN:setlogin(2):pc +# +# What follows are deprecated Darwin event numbers that may someday conflict +# with Solaris events. +# +301:AUE_DARWIN_GETFSSTAT:getfsstat(2):fa +302:AUE_DARWIN_PTRACE:ptrace(2):pc +303:AUE_DARWIN_CHFLAGS:chflags(2):fm +304:AUE_DARWIN_FCHFLAGS:fchflags(2):fm +305:AUE_DARWIN_PROFILE:profil(2):pc +306:AUE_DARWIN_KTRACE:ktrace(2):pc +307:AUE_DARWIN_SETLOGIN:setlogin(2):pc 308:AUE_DARWIN_REBOOT:reboot(2):ad -309:AUE_REVOKE:revoke(2):cl -310:AUE_UMASK:umask(2):pc -311:AUE_MPROTECT:mprotect(2):fm +309:AUE_DARWIN_REVOKE:revoke(2):cl +310:AUE_DARWIN_UMASK:umask(2):pc +311:AUE_DARWIN_MPROTECT:mprotect(2):fm 312:AUE_DARWIN_SETPRIORITY:setpriority(2):pc,ot 313:AUE_DARWIN_SETTIMEOFDAY:settimeofday(2):ad 314:AUE_DARWIN_FLOCK:flock(2):fm -315:AUE_MKFIFO:mkfifo(2):fc -316:AUE_POLL:poll(2):no +315:AUE_DARWIN_MKFIFO:mkfifo(2):fc +316:AUE_DARWIN_POLL:poll(2):no 317:AUE_DARWIN_SOCKETPAIR:socketpair(2):nt -318:AUE_FUTIMES:futimes(2):fm -319:AUE_SETSID:setsid(2):pc -320:AUE_SETPRIVEXEC:setprivexec(2):pc +318:AUE_DARWIN_FUTIMES:futimes(2):fm +319:AUE_DARWIN_SETSID:setsid(2):pc +320:AUE_DARWIN_SETPRIVEXEC:setprivexec(2):pc 321:AUE_DARWIN_NFSSVC:nfssvc(2):ad 322:AUE_DARWIN_GETFH:getfh(2):fa 323:AUE_DARWIN_QUOTACTL:quotactl(2):ad -324:AUE_ADDPROFILE:system call:pc -325:AUE_KDEBUGTRACE:system call:pc -326:AUE_FSTAT:fstat(2):fa -327:AUE_FPATHCONF:fpathconf(2):fa -328:AUE_GETDIRENTRIES:getdirentries(2):fr +324:AUE_DARWIN_ADDPROFILE:system call:pc +325:AUE_DARWIN_KDEBUGTRACE:system call:pc +326:AUE_DARWIN_FSTAT:fstat(2):fa +327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa +328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):fr 329:AUE_DARWIN_TRUNCATE:truncate(2):fw 330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw -331:AUE_SYSCTL:sysctl(3):ad -332:AUE_MLOCK:mlock(2):pc -333:AUE_MUNLOCK:munlock(2):pc -334:AUE_UNDELETE:undelete(2):fm -335:AUE_GETATTRLIST:getattrlist():fa -336:AUE_SETATTRLIST:setattrlist():fm -337:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa -338:AUE_EXCHANGEDATA:exchangedata():fw -339:AUE_SEARCHFS:searchfs():fa -340:AUE_MINHERIT:minherit(2):pc -341:AUE_SEMCONFIG:semconfig():ip -342:AUE_SEMOPEN:sem_open(2):ip -343:AUE_SEMCLOSE:sem_close(2):ip -344:AUE_SEMUNLINK:sem_unlink(2):ip -345:AUE_SHMOPEN:shm_open(2):ip -346:AUE_SHMUNLINK:shm_unlink(2):ip -347:AUE_LOADSHFILE:load_shared_file():fr -348:AUE_RESETSHFILE:reset_shared_file():ot -349:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot -350:AUE_PTHREADKILL:pthread_kill(2):pc -351:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc -352:AUE_AUDITCTL:auditctl(2):ad -353:AUE_RFORK:rfork(2):pc -354:AUE_LCHMOD:lchmod(2):fm -355:AUE_SWAPOFF:swapoff():ad -356:AUE_INITPROCESS:init_process():pc -357:AUE_MAPFD:map_fd():fa -358:AUE_TASKFORPID:task_for_pid():pc -359:AUE_PIDFORTASK:pid_for_task():pc -360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot -361:AUE_COPYFILE:copyfile():fr,fw -362:AUE_LUTIMES:lutimes(2):fm -363:AUE_LCHFLAGS:lchflags(2):fm -364:AUE_SENDFILE:sendfile(2):nt -365:AUE_USELIB:uselib(2):fa -366:AUE_GETRESUID:getresuid(2):pc -367:AUE_SETRESUID:setresuid(2):pc -368:AUE_GETRESGID:getresgid(2):pc -369:AUE_SETRESGID:setresgid(2):pc -370:AUE_WAIT4:wait4(2):pc -371:AUE_LGETFH:lgetfh(2):fa -372:AUE_FHSTATFS:fhstatfs(2):fa -373:AUE_FHOPEN:fhopen(2):fa -374:AUE_FHSTAT:fhstat(2):fa -375:AUE_JAIL:jail(2):pc -376:AUE_EACCESS:eaccess(2):fa -377:AUE_KQUEUE:kqueue(2):no -378:AUE_KEVENT:kevent(2):no -379:AUE_FSYNC:fsync(2):fm -380:AUE_NMOUNT:nmount(2):ad -381:AUE_BDFLUSH:bdflush(2):ad -382:AUE_SETFSUID:setfsuid(2):ot -383:AUE_SETFSGID:setfsgid(2):ot -384:AUE_PERSONALITY:personality(2):pc -385:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad -386:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad -387:AUE_PRCTL:prctl(2):pc -388:AUE_GETCWD:getcwd(2):pc -389:AUE_CAPGET:capget(2):pc -390:AUE_CAPSET:capset(2):pc -391:AUE_PIVOT_ROOT:pivot_root(2):pc -392:AUE_RTPRIO::rtprio(2):pc -393:AUE_SCHED_GETPARAM:sched_getparam(2):ad -394:AUE_SCHED_SETPARAM:sched_setparam(2):ad -395:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad -396:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad -397:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad -398:AUE_ACL_GET_FILE:acl_get_file(2):fa -399:AUE_ACL_SET_FILE:acl_set_file(2):fm -400:AUE_ACL_GET_FD:acl_get_fd(2):fa -401:AUE_ACL_SET_FD:acl_set_fd(2):fm -402:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm -403:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm -404:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa -405:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa -406:AUE_ACL_GET_LINK:acl_get_link(2):fa -407:AUE_ACL_SET_LINK:acl_set_link(2):fm -408:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm -409:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa -410:AUE_SYSARCH:sysarch(2):na -411:AUE_EXTATTRCTL:extattrctl(2):fm -412:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa -413:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm -414:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa -415:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm -416:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa -417:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm -418:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa -419:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm -420:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa -421:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm -422:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa -423:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +331:AUE_DARWIN_SYSCTL:sysctl(3):ad +332:AUE_DARWIN_MLOCK:mlock(2):pc +333:AUE_DARWIN_MUNLOCK:munlock(2):pc +334:AUE_DARWIN_UNDELETE:undelete(2):fm +335:AUE_DARWIN_GETATTRLIST:getattrlist():fa +336:AUE_DARWIN_SETATTRLIST:setattrlist():fm +337:AUE_DARWIN_GETDIRENTRIESATTR:getdirentriesattr():fa +338:AUE_DARWIN_EXCHANGEDATA:exchangedata():fw +339:AUE_DARWIN_SEARCHFS:searchfs():fa +340:AUE_DARWIN_MINHERIT:minherit(2):pc +341:AUE_DARWIN_SEMCONFIG:semconfig():ip +342:AUE_DARWIN_SEMOPEN:sem_open(2):ip +343:AUE_DARWIN_SEMCLOSE:sem_close(2):ip +344:AUE_DARWIN_SEMUNLINK:sem_unlink(2):ip +345:AUE_DARWIN_SHMOPEN:shm_open(2):ip +346:AUE_DARWIN_SHMUNLINK:shm_unlink(2):ip +347:AUE_DARWIN_LOADSHFILE:load_shared_file():fr +348:AUE_DARWIN_RESETSHFILE:reset_shared_file():ot +349:AUE_DARWIN_NEWSYSTEMSHREG:new_system_share_regions():ot +350:AUE_DARWIN_PTHREADKILL:pthread_kill(2):pc +351:AUE_DARWIN_PTHREADSIGMASK:pthread_sigmask(2):pc +352:AUE_DARWIN_AUDITCTL:auditctl(2):ad +353:AUE_DARWIN_RFORK:rfork(2):pc +354:AUE_DARWIN_LCHMOD:lchmod(2):fm +355:AUE_DARWIN_SWAPOFF:swapoff():ad +356:AUE_DARWIN_INITPROCESS:init_process():pc +357:AUE_DARWIN_MAPFD:map_fd():fa +358:AUE_DARWIN_TASKFORPID:task_for_pid():pc +359:AUE_DARWIN_PIDFORTASK:pid_for_task():pc +360:AUE_DARWIN_SYSCTL_NONADMIN:sysctl() - non-admin:ot +361:AUE_DARWIN_COPYFILE:copyfile():fr,fw +# +# OpenBSM-specific kernel events. +# +43001:AUE_GETFSSTAT:getfsstat(2):fa +43002:AUE_PTRACE:ptrace(2):pc +43003:AUE_CHFLAGS:chflags(2):fm +43004:AUE_FCHFLAGS:fchflags(2):fm +43005:AUE_PROFILE:profil(2):pc +43006:AUE_KTRACE:ktrace(2):pc +43007:AUE_SETLOGIN:setlogin(2):pc +43008:AUE_REVOKE:revoke(2):cl +43009:AUE_UMASK:umask(2):pc +43010:AUE_MPROTECT:mprotect(2):fm +43011:AUE_MKFIFO:mkfifo(2):fc +43012:AUE_POLL:poll(2):no +43013:AUE_FUTIMES:futimes(2):fm +43014:AUE_SETSID:setsid(2):pc +43015:AUE_SETPRIVEXEC:setprivexec(2):pc +43016:AUE_ADDPROFILE:system call:pc +43017:AUE_KDEBUGTRACE:system call:pc +43018:AUE_FSTAT:fstat(2):fa +43019:AUE_FPATHCONF:fpathconf(2):fa +43020:AUE_GETDIRENTRIES:getdirentries(2):fr +43021:AUE_SYSCTL:sysctl(3):ad +43022:AUE_MLOCK:mlock(2):pc +43023:AUE_MUNLOCK:munlock(2):pc +43024:AUE_UNDELETE:undelete(2):fm +43025:AUE_GETATTRLIST:getattrlist():fa +43026:AUE_SETATTRLIST:setattrlist():fm +43027:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa +43028:AUE_EXCHANGEDATA:exchangedata():fw +43029:AUE_SEARCHFS:searchfs():fa +43030:AUE_MINHERIT:minherit(2):pc +43031:AUE_SEMCONFIG:semconfig():ip +43032:AUE_SEMOPEN:sem_open(2):ip +43033:AUE_SEMCLOSE:sem_close(2):ip +43034:AUE_SEMUNLINK:sem_unlink(2):ip +43035:AUE_SHMOPEN:shm_open(2):ip +43036:AUE_SHMUNLINK:shm_unlink(2):ip +43037:AUE_LOADSHFILE:load_shared_file():fr +43038:AUE_RESETSHFILE:reset_shared_file():ot +43039:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot +43040:AUE_PTHREADKILL:pthread_kill(2):pc +43041:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc +43042:AUE_AUDITCTL:auditctl(2):ad +43043:AUE_RFORK:rfork(2):pc +43044:AUE_LCHMOD:lchmod(2):fm +43045:AUE_SWAPOFF:swapoff():ad +43046:AUE_INITPROCESS:init_process():pc +43047:AUE_MAPFD:map_fd():fa +43048:AUE_TASKFORPID:task_for_pid():pc +43049:AUE_PIDFORTASK:pid_for_task():pc +43050:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot +43051:AUE_COPYFILE:copyfile():fr,fw +43052:AUE_LUTIMES:lutimes(2):fm +43053:AUE_LCHFLAGS:lchflags(2):fm +43054:AUE_SENDFILE:sendfile(2):nt +43055:AUE_USELIB:uselib(2):fa +43056:AUE_GETRESUID:getresuid(2):pc +43057:AUE_SETRESUID:setresuid(2):pc +43058:AUE_GETRESGID:getresgid(2):pc +43059:AUE_SETRESGID:setresgid(2):pc +43060:AUE_WAIT4:wait4(2):pc +43061:AUE_LGETFH:lgetfh(2):fa +43062:AUE_FHSTATFS:fhstatfs(2):fa +43063:AUE_FHOPEN:fhopen(2):fa +43064:AUE_FHSTAT:fhstat(2):fa +43065:AUE_JAIL:jail(2):pc +43066:AUE_EACCESS:eaccess(2):fa +43067:AUE_KQUEUE:kqueue(2):no +43068:AUE_KEVENT:kevent(2):no +43069:AUE_FSYNC:fsync(2):fm +43070:AUE_NMOUNT:nmount(2):ad +43071:AUE_BDFLUSH:bdflush(2):ad +43072:AUE_SETFSUID:setfsuid(2):ot +43073:AUE_SETFSGID:setfsgid(2):ot +43074:AUE_PERSONALITY:personality(2):pc +43075:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad +43076:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad +43077:AUE_PRCTL:prctl(2):pc +43078:AUE_GETCWD:getcwd(2):pc +43079:AUE_CAPGET:capget(2):pc +43080:AUE_CAPSET:capset(2):pc +43081:AUE_PIVOT_ROOT:pivot_root(2):pc +43082:AUE_RTPRIO::rtprio(2):pc +43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad +43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad +43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad +43086:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad +43087:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad +43088:AUE_ACL_GET_FILE:acl_get_file(2):fa +43089:AUE_ACL_SET_FILE:acl_set_file(2):fm +43090:AUE_ACL_GET_FD:acl_get_fd(2):fa +43091:AUE_ACL_SET_FD:acl_set_fd(2):fm +43092:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm +43093:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm +43094:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa +43095:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa +43096:AUE_ACL_GET_LINK:acl_get_link(2):fa +43097:AUE_ACL_SET_LINK:acl_set_link(2):fm +43098:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm +43099:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa +43100:AUE_SYSARCH:sysarch(2):na +43101:AUE_EXTATTRCTL:extattrctl(2):fm +43102:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +43103:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +43104:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +43105:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +43106:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +43107:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +43108:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa +43109:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +43110:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +43111:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +43112:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +# +# User space system events. +# 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#18 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 $ */ #include @@ -1155,7 +1155,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-p4-projects@FreeBSD.ORG Sat Aug 5 15:10:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09A8116A4E1; Sat, 5 Aug 2006 15:10:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB58916A4DD for ; Sat, 5 Aug 2006 15:10:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B7E843D46 for ; Sat, 5 Aug 2006 15:10:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75FAWS3000474 for ; Sat, 5 Aug 2006 15:10:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75FAWqM000470 for perforce@freebsd.org; Sat, 5 Aug 2006 15:10:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:10:32 GMT Message-Id: <200608051510.k75FAWqM000470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:10:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103252 Change 103252 by rwatson@rwatson_zoo on 2006/08/05 15:09:50 Merge OpenBSM 1.0a8 changes from user space to kernel in audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ @@ -164,6 +164,7 @@ /* * Audit policy controls. */ +#ifdef OLD_WORLD_ORDER #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -175,6 +176,22 @@ #define AUDIT_GROUP 0x0100 #define AUDIT_TRAIL 0x0200 #define AUDIT_PATH 0x0400 +#else /* !OLD_WORLD_ORDER */ +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_SEQ 0x0010 +#define AUDIT_WINDATA 0x0020 +#define AUDIT_USER 0x0040 +#define AUDIT_GROUP 0x0080 +#define AUDIT_TRAIL 0x0100 +#define AUDIT_PATH 0x0200 +#define AUDIT_SCNT 0x0400 +#define AUDIT_PUBLIC 0x0800 +#define AUDIT_ZONENAME 0x1000 +#define AUDIT_PERZONE 0x2000 +#endif /* !OLD_WORLD_ORDER */ /* * Audit queue control parameters ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#24 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.6 2006/07/03 14:45:43 rwatson Exp $ */ @@ -274,134 +274,200 @@ #define AUE_NTP_ADJTIME 288 /* - * Events not present in OpenSolaris BSM, generally derived from Apple Darwin - * BSM or added in OpenBSM. This start a little too close to the top end of - * the OpenSolaris event list for my comfort. + * Events added for Apple Darwin that potentially collide with future Solaris + * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in + * new trails. Systems generating these events should switch to the new + * identifiers that avoid colliding with the Solaris identifier space. */ -#define AUE_GETFSSTAT 301 -#define AUE_PTRACE 302 -#define AUE_CHFLAGS 303 -#define AUE_FCHFLAGS 304 -#define AUE_PROFILE 305 -#define AUE_KTRACE 306 -#define AUE_SETLOGIN 307 +#define AUE_DARWIN_GETFSSTAT 301 +#define AUE_DARWIN_PTRACE 302 +#define AUE_DARWIN_CHFLAGS 303 +#define AUE_DARWIN_FCHFLAGS 304 +#define AUE_DARWIN_PROFILE 305 +#define AUE_DARWIN_KTRACE 306 +#define AUE_DARWIN_SETLOGIN 307 #define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ -#define AUE_REVOKE 309 -#define AUE_UMASK 310 -#define AUE_MPROTECT 311 +#define AUE_DARWIN_REVOKE 309 +#define AUE_DARWIN_UMASK 310 +#define AUE_DARWIN_MPROTECT 311 #define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ #define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ #define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ -#define AUE_MKFIFO 315 -#define AUE_POLL 316 +#define AUE_DARWIN_MKFIFO 315 +#define AUE_DARWIN_POLL 316 #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ -#define AUE_FUTIMES 318 -#define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_FUTIMES 318 +#define AUE_DARWIN_SETSID 319 +#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin-specific. */ -#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ -#define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 326 -#define AUE_FPATHCONF 327 -#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_DARWIN_FSTAT 326 +#define AUE_DARWIN_FPATHCONF 327 +#define AUE_DARWIN_GETDIRENTRIES 328 #define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ #define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ -#define AUE_SYSCTL 331 -#define AUE_MLOCK 332 -#define AUE_MUNLOCK 333 -#define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin-specific. */ -#define AUE_SETATTRLIST 336 /* Darwin-specific. */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ -#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ -#define AUE_SEARCHFS 339 /* Darwin-specific. */ -#define AUE_MINHERIT 340 -#define AUE_SEMCONFIG 341 -#define AUE_SEMOPEN 342 -#define AUE_SEMCLOSE 343 -#define AUE_SEMUNLINK 344 -#define AUE_SHMOPEN 345 -#define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin-specific. */ -#define AUE_RESETSHFILE 348 /* Darwin-specific. */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ -#define AUE_PTHREADKILL 350 /* Darwin-specific. */ -#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ -#define AUE_AUDITCTL 352 -#define AUE_RFORK 353 -#define AUE_LCHMOD 354 -#define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin-specific. */ -#define AUE_MAPFD 357 /* Darwin-specific. */ -#define AUE_TASKFORPID 358 /* Darwin-specific. */ -#define AUE_PIDFORTASK 359 /* Darwin-specific. */ -#define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin-specific. */ -#define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ -#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ -#define AUE_USELIB 365 /* Linux-specific. */ -#define AUE_GETRESUID 366 -#define AUE_SETRESUID 367 -#define AUE_GETRESGID 368 -#define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD-specific. */ -#define AUE_LGETFH 371 /* FreeBSD-specific. */ -#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ -#define AUE_FHOPEN 373 /* FreeBSD-specific. */ -#define AUE_FHSTAT 374 /* FreeBSD-specific. */ -#define AUE_JAIL 375 /* FreeBSD-specific. */ -#define AUE_EACCESS 376 /* FreeBSD-specific. */ -#define AUE_KQUEUE 377 /* FreeBSD-specific. */ -#define AUE_KEVENT 378 /* FreeBSD-specific. */ -#define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ -#define AUE_BDFLUSH 381 /* Linux-specific. */ -#define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_SETFSGID 383 /* Linux-specific. */ -#define AUE_PERSONALITY 384 /* Linux-specific. */ -#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ -#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ -#define AUE_PRCTL 387 /* Linux-specific. */ -#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ -#define AUE_CAPGET 389 /* Linux-specific. */ -#define AUE_CAPSET 390 /* Linux-specific. */ -#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ -#define AUE_RTPRIO 392 /* FreeBSD-specific. */ -#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ -#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ -#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ -#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ -#define AUE_ACL_GET_FD 400 /* FreeBSD. */ -#define AUE_ACL_SET_FD 401 /* FreeBSD. */ -#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ -#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ -#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ -#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ -#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ -#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ -#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ -#define AUE_SYSARCH 410 /* FreeBSD. */ -#define AUE_EXTATTRCTL 411 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ -#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ -#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ +#define AUE_DARWIN_SYSCTL 331 +#define AUE_DARWIN_MLOCK 332 +#define AUE_DARWIN_MUNLOCK 333 +#define AUE_DARWIN_UNDELETE 334 +#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_DARWIN_MINHERIT 340 +#define AUE_DARWIN_SEMCONFIG 341 +#define AUE_DARWIN_SEMOPEN 342 +#define AUE_DARWIN_SEMCLOSE 343 +#define AUE_DARWIN_SEMUNLINK 344 +#define AUE_DARWIN_SHMOPEN 345 +#define AUE_DARWIN_SHMUNLINK 346 +#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_DARWIN_AUDITCTL 352 +#define AUE_DARWIN_RFORK 353 +#define AUE_DARWIN_LCHMOD 354 +#define AUE_DARWIN_SWAPOFF 355 +#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */ +#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_DARWIN_SYSCTL_NONADMIN 360 +#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ + +/* + * Audit event identifiers added as part of OpenBSM, generally corresponding + * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. + * These often duplicate events added to the Solaris set by Darwin, but use + * event identifiers in a higher range in order to avoid colliding with + * future Solaris additions. + */ +#define AUE_GETFSSTAT 43001 +#define AUE_PTRACE 43002 +#define AUE_CHFLAGS 43003 +#define AUE_FCHFLAGS 43004 +#define AUE_PROFILE 43005 +#define AUE_KTRACE 43006 +#define AUE_SETLOGIN 43007 +#define AUE_REVOKE 43008 +#define AUE_UMASK 43009 +#define AUE_MPROTECT 43010 +#define AUE_MKFIFO 43011 +#define AUE_POLL 43012 +#define AUE_FUTIMES 43013 +#define AUE_SETSID 43014 +#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */ +#define AUE_ADDPROFILE 43016 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 43018 +#define AUE_FPATHCONF 43019 +#define AUE_GETDIRENTRIES 43020 +#define AUE_SYSCTL 43021 +#define AUE_MLOCK 43022 +#define AUE_MUNLOCK 43023 +#define AUE_UNDELETE 43024 +#define AUE_GETATTRLIST 43025 /* Darwin-specific. */ +#define AUE_SETATTRLIST 43026 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */ +#define AUE_SEARCHFS 43029 /* Darwin-specific. */ +#define AUE_MINHERIT 43030 +#define AUE_SEMCONFIG 43031 +#define AUE_SEMOPEN 43032 +#define AUE_SEMCLOSE 43033 +#define AUE_SEMUNLINK 43034 +#define AUE_SHMOPEN 43035 +#define AUE_SHMUNLINK 43036 +#define AUE_LOADSHFILE 43037 /* Darwin-specific. */ +#define AUE_RESETSHFILE 43038 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */ +#define AUE_PTHREADKILL 43040 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */ +#define AUE_AUDITCTL 43042 +#define AUE_RFORK 43043 +#define AUE_LCHMOD 43044 +#define AUE_SWAPOFF 43045 +#define AUE_INITPROCESS 43046 /* Darwin-specific. */ +#define AUE_MAPFD 43047 /* Darwin-specific. */ +#define AUE_TASKFORPID 43048 /* Darwin-specific. */ +#define AUE_PIDFORTASK 43049 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 43050 +#define AUE_COPYFILE 43051 /* Darwin-specific. */ + +/* + * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin + * in the future. + */ +#define AUE_LUTIMES 43052 +#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */ +#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */ +#define AUE_USELIB 43055 /* Linux-specific. */ +#define AUE_GETRESUID 43056 +#define AUE_SETRESUID 43057 +#define AUE_GETRESGID 43058 +#define AUE_SETRESGID 43059 +#define AUE_WAIT4 43060 /* FreeBSD-specific. */ +#define AUE_LGETFH 43061 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */ +#define AUE_FHOPEN 43063 /* FreeBSD-specific. */ +#define AUE_FHSTAT 43064 /* FreeBSD-specific. */ +#define AUE_JAIL 43065 /* FreeBSD-specific. */ +#define AUE_EACCESS 43066 /* FreeBSD-specific. */ +#define AUE_KQUEUE 43067 /* FreeBSD-specific. */ +#define AUE_KEVENT 43068 /* FreeBSD-specific. */ +#define AUE_FSYNC 43069 +#define AUE_NMOUNT 43070 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 43071 /* Linux-specific. */ +#define AUE_SETFSUID 43072 /* Linux-specific. */ +#define AUE_SETFSGID 43073 /* Linux-specific. */ +#define AUE_PERSONALITY 43074 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */ +#define AUE_PRCTL 43077 /* Linux-specific. */ +#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 43079 /* Linux-specific. */ +#define AUE_CAPSET 43080 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */ +#define AUE_RTPRIO 43082 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */ +#define AUE_ACL_GET_FD 43090 /* FreeBSD. */ +#define AUE_ACL_SET_FD 43091 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */ +#define AUE_SYSARCH 43100 /* FreeBSD. */ +#define AUE_EXTATTRCTL 43101 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ @@ -200,9 +200,19 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ +#define BSM_MAX_GROUPS 16 -#define BSM_MAX_GROUPS 16 -#define HEADER_VERSION 1 +/* + * A number of BSM versions are floating around and defined. Here are + * constants for them. OpenBSM uses the same token types, etc, used in the + * Solaris BSM version, but has a separate version number in order to + * identify a potentially different event identifier name space. + */ +#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define BSM_HEADER_VERSION_SOLARIS 2 +#define BSM_HEADER_VERSION_TSOL25 3 +#define BSM_HEADER_VERSION_TSOL 4 +#define BSM_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#21 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -1166,7 +1166,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-p4-projects@FreeBSD.ORG Sat Aug 5 15:51:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 810CB16A4E2; Sat, 5 Aug 2006 15:51:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5395F16A4E0 for ; Sat, 5 Aug 2006 15:51:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CEE343D5C for ; Sat, 5 Aug 2006 15:51:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75FpOxG009399 for ; Sat, 5 Aug 2006 15:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75FpO09009396 for perforce@freebsd.org; Sat, 5 Aug 2006 15:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:51:24 GMT Message-Id: <200608051551.k75FpO09009396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:51:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=103254 Change 103254 by rwatson@rwatson_zoo on 2006/08/05 15:50:28 Also back up/remove new systrace argument file, as with other .c files. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/Makefile#3 (text+ko) ==== @@ -15,6 +15,7 @@ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak From owner-p4-projects@FreeBSD.ORG Sat Aug 5 15:56:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C709E16A4E1; Sat, 5 Aug 2006 15:56:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57DD716A4DA for ; Sat, 5 Aug 2006 15:56:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FA9843D60 for ; Sat, 5 Aug 2006 15:56:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75FuVqG009702 for ; Sat, 5 Aug 2006 15:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75FuVG2009699 for perforce@freebsd.org; Sat, 5 Aug 2006 15:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:56:31 GMT Message-Id: <200608051556.k75FuVG2009699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:56:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=103255 Change 103255 by rwatson@rwatson_zoo on 2006/08/05 15:55:50 Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#13 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#13 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.78 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.76 2006/07/28 19:05:27 jhb Exp */ @@ -11,10 +11,7 @@ #include #include -#include -#include #include - #include struct proc; ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.72 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.76 2006/07/28 19:05:27 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#17 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.79 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.76 2006/07/28 19:05:27 jhb Exp */ @@ -19,315 +19,315 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ - { AS(linux_fstat_args), (sy_call_t *)linux_fstat, AUE_FSTAT }, /* 28 = linux_fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ - { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 77 = getrusage */ - { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 78 = gettimeofday */ - { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 79 = settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ - { AS(linux_ioperm_args), (sy_call_t *)linux_ioperm, AUE_NULL }, /* 101 = linux_ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ - { 0, (sy_call_t *)linux_vm86old, AUE_NULL }, /* 113 = linux_vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ - { AS(linux_modify_ldt_args), (sy_call_t *)linux_modify_ldt, AUE_NULL }, /* 123 = linux_modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 125 = mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ - { AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 145 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 146 = writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = sched_rr_get_interval */ - { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 162 = nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)linux_vm86, AUE_NULL }, /* 166 = linux_vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ - { 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = linux_sendfile64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = linux_futex */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = linux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ - { 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ + { AS(linux_fstat_args), (sy_call_t *)linux_fstat, AUE_FSTAT, NULL, 0, 0 }, /* 28 = linux_fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ + { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ + { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = getrusage */ + { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = gettimeofday */ + { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB, NULL, 0, 0 }, /* 86 = linux_uselib */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ + { AS(linux_ioperm_args), (sy_call_t *)linux_ioperm, AUE_NULL, NULL, 0, 0 }, /* 101 = linux_ioperm */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ + { 0, (sy_call_t *)linux_vm86old, AUE_NULL, NULL, 0, 0 }, /* 113 = linux_vm86old */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ + { AS(linux_modify_ldt_args), (sy_call_t *)linux_modify_ldt, AUE_NULL, NULL, 0, 0 }, /* 123 = linux_modify_ldt */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ + { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0 }, /* 145 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ + { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = sched_rr_get_interval */ + { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ + { 0, (sy_call_t *)linux_vm86, AUE_NULL, NULL, 0, 0 }, /* 166 = linux_vm86 */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ + { 0, (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ + { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ + { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_futex */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = linux_io_submit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ + { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 252 = exit_group */ + { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ + { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ + { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ + { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ + { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ + { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ + { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ + { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ + { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ + { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ + { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ + { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ + { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ + { 0, (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ + { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ + { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ + { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)linux_openat, AUE_NULL, NULL, 0, 0 }, /* 295 = linux_openat */ + { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ }; From owner-p4-projects@FreeBSD.ORG Sat Aug 5 16:41:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54ED516A4E6; Sat, 5 Aug 2006 16:41:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 158D716A4E1 for ; Sat, 5 Aug 2006 16:41:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C21FC43D45 for ; Sat, 5 Aug 2006 16:41:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75GfSjI013241 for ; Sat, 5 Aug 2006 16:41:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75GfSop013238 for perforce@freebsd.org; Sat, 5 Aug 2006 16:41:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 16:41:28 GMT Message-Id: <200608051641.k75GfSop013238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 16:41:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=103256 Change 103256 by rwatson@rwatson_zoo on 2006/08/05 16:41:24 Fix one mis-numbering. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -466,7 +466,7 @@ #define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sat Aug 5 16:43:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46A2D16A4DE; Sat, 5 Aug 2006 16:43:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DD6116A4DA for ; Sat, 5 Aug 2006 16:43:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAB5243D55 for ; Sat, 5 Aug 2006 16:43:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75GhVMn013360 for ; Sat, 5 Aug 2006 16:43:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75GhVCP013357 for perforce@freebsd.org; Sat, 5 Aug 2006 16:43:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 16:43:31 GMT Message-Id: <200608051643.k75GhVCP013357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 16:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103257 Change 103257 by rwatson@rwatson_zoo on 2006/08/05 16:42:31 Merge event fix to audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#24 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#24 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#24 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -466,7 +466,7 @@ #define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sat Aug 5 17:07:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B7D216A4E1; Sat, 5 Aug 2006 17:07:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D479D16A4E0 for ; Sat, 5 Aug 2006 17:07:01 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8833643D45 for ; Sat, 5 Aug 2006 17:07:01 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75H71pu023498 for ; Sat, 5 Aug 2006 17:07:01 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75H712Z023495 for perforce@freebsd.org; Sat, 5 Aug 2006 17:07:01 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 5 Aug 2006 17:07:01 GMT Message-Id: <200608051707.k75H712Z023495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 17:07:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=103258 Change 103258 by gonzo@gonzo_hq on 2006/08/05 17:06:07 o Prevent td2 sp register from being overwritten by td1 one's during pcb copying. o Unmask IRQ5 (timer) in cpu_thread_setup. Otherwise we'll get hardclock switched off forever after cpu_throw. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#6 (text+ko) ==== @@ -67,10 +67,16 @@ cpu_fork(register struct thread *td, register struct proc *p2, struct thread *td2, int flags) { + register_t sp; + if ((flags & RFPROC) == 0) return; cpu_thread_setup(td2); + /* + * Preserve SP from beeing overwritten. + */ + sp = td2->td_pcb->pcb_regs[PCB_REG_SP]; /* Copy the pcb */ bcopy(td->td_pcb, td2->td_pcb, sizeof(struct pcb)); @@ -88,18 +94,24 @@ td2->td_pcb->pcb_regs[PCB_REG_S0] = (register_t)fork_return; td2->td_pcb->pcb_regs[PCB_REG_S1] = (register_t)td2; td2->td_pcb->pcb_regs[PCB_REG_S2] = (register_t)td2->td_frame; + /* + * Restore original stack. + */ + td2->td_pcb->pcb_regs[PCB_REG_SP] = sp; + + /* Setup to release sched_lock in fork_exit(). */ + td2->td_md.md_spinlock_count = 1; + td2->td_md.md_saved_sr = td2->td_pcb->pcb_regs[PCB_REG_SR]; /* * Now cpu_switch() can schedule the new process. */ - - /* Setup to release sched_lock in fork_exit(). */ - td2->td_md.md_spinlock_count = 1; } void cpu_switch(struct thread *old, struct thread *new) { + if (!savectx(old->td_pcb)) { pmap_deactivate(old); cpu_throw(old, new); @@ -171,7 +183,13 @@ td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)td->td_pcb - 1; - td->td_pcb->pcb_regs[PCB_REG_SR] = MIPS_SR_INT_IE; + + /* + * Enable interrupts and unmask timer interrupt (HW IRQ5) + */ + td->td_pcb->pcb_regs[PCB_REG_SR] = MIPS_SR_INT_IE | + (((1 << 5) << 8) << 2); + /* Stack pointer. */ td->td_pcb->pcb_regs[PCB_REG_SP] = (register_t)_ALIGN(td->td_frame - 1); } From owner-p4-projects@FreeBSD.ORG Sat Aug 5 17:09:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3715416A4E1; Sat, 5 Aug 2006 17:09:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF02316A4E0 for ; Sat, 5 Aug 2006 17:09:04 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C92843D4C for ; Sat, 5 Aug 2006 17:09:04 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75H94Xp023562 for ; Sat, 5 Aug 2006 17:09:04 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75H94iD023559 for perforce@freebsd.org; Sat, 5 Aug 2006 17:09:04 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 5 Aug 2006 17:09:04 GMT Message-Id: <200608051709.k75H94iD023559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 17:09:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103259 Change 103259 by gonzo@gonzo_hq on 2006/08/05 17:08:23 o Enable bus_space_write_X functions family. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/bus.h#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/bus.h#4 (text+ko) ==== @@ -469,36 +469,21 @@ bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value) { -#if 0 - if (tag == MIPS_BUS_SPACE_IO) - outb(bsh + offset, value); - else - *(volatile u_int8_t *)(bsh + offset) = value; -#endif + *(volatile u_int8_t *)(bsh + offset) = value; } static __inline void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value) { -#if 0 - if (tag == MIPS_BUS_SPACE_IO) - outw(bsh + offset, value); - else - *(volatile u_int16_t *)(bsh + offset) = value; -#endif + *(volatile u_int16_t *)(bsh + offset) = value; } static __inline void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value) { -#if 0 - if (tag == MIPS_BUS_SPACE_IO) - outl(bsh + offset, value); - else - *(volatile u_int32_t *)(bsh + offset) = value; -#endif + *(volatile u_int32_t *)(bsh + offset) = value; } #if 0 /* Cause a link error for bus_space_write_8 */ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 17:36:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16BB416A4DE; Sat, 5 Aug 2006 17:36:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E565716A4DA for ; Sat, 5 Aug 2006 17:36:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55A8343D79 for ; Sat, 5 Aug 2006 17:36:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75Haf7d026246 for ; Sat, 5 Aug 2006 17:36:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75HafPN026243 for perforce@freebsd.org; Sat, 5 Aug 2006 17:36:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 17:36:41 GMT Message-Id: <200608051736.k75HafPN026243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 17:36:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=103262 Change 103262 by rwatson@rwatson_zoo on 2006/08/05 17:36:14 Merge event renumbering to kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.6 2006/07/03 14:45:43 rwatson Exp $ */ @@ -467,7 +467,7 @@ #define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sat Aug 5 18:06:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB76C16A4E1; Sat, 5 Aug 2006 18:06:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A1B416A4DD for ; Sat, 5 Aug 2006 18:06:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BFBF43D45 for ; Sat, 5 Aug 2006 18:06:20 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75I6Kau028819 for ; Sat, 5 Aug 2006 18:06:20 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75I6J1p028816 for perforce@freebsd.org; Sat, 5 Aug 2006 18:06:19 GMT (envelope-from piso@freebsd.org) Date: Sat, 5 Aug 2006 18:06:19 GMT Message-Id: <200608051806.k75I6J1p028816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 18:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=103263 Change 103263 by piso@piso_newluxor on 2006/08/05 18:06:14 Convert xl to use a filter+ithread handler. Unfortunately, under heavy load (trying to transfer a big file from 2 boxes in a LAN) i get many 'watchdog timeout' errors: i'll try to fix it later. Affected files ... .. //depot/projects/soc2006/intr_filter/pci/if_xl.c#3 edit .. //depot/projects/soc2006/intr_filter/pci/if_xlreg.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/pci/if_xl.c#3 (text+ko) ==== @@ -233,11 +233,15 @@ static int xl_encap(struct xl_softc *, struct xl_chain *, struct mbuf *); static void xl_rxeof(struct xl_softc *); static void xl_rxeof_task(void *, int); -static int xl_rx_resync(struct xl_softc *); +__unused static int xl_rx_resync(struct xl_softc *); static void xl_txeof(struct xl_softc *); static void xl_txeof_90xB(struct xl_softc *); static void xl_txeoc(struct xl_softc *); static void xl_intr(void *); +static int xl_filter(void *); +static void xl_stat_tx_complete(void *, int); +static void xl_stat_adfail(void *, int); +static void xl_stat_statsoflow(void *, int); static void xl_start(struct ifnet *); static void xl_start_locked(struct ifnet *); static void xl_start_90xB_locked(struct ifnet *); @@ -1600,13 +1604,21 @@ CSR_WRITE_2(sc, XL_W0_MFG_ID, XL_NO_XCVR_PWR_MAGICBITS); } + sc->xl_tq = taskqueue_create("xl_taskq", M_NOWAIT, + taskqueue_thread_enqueue, &sc->xl_tq); + taskqueue_start_threads(&sc->xl_tq, 1, + PI_NET, "%s taskq", ifp->if_xname); + TASK_INIT(&sc->xl_stat_tx_complete, 0, xl_stat_tx_complete, sc); + TASK_INIT(&sc->xl_stat_adfail, 0, xl_stat_adfail, sc); + TASK_INIT(&sc->xl_stat_statsoflow, 0, xl_stat_statsoflow, sc); + /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); error = bus_setup_intr(dev, sc->xl_irq, INTR_TYPE_NET | INTR_MPSAFE, - NULL, xl_intr, sc, &sc->xl_intrhand); + xl_filter, xl_intr, sc, &sc->xl_intrhand); if (error) { device_printf(dev, "couldn't set up irq\n"); ether_ifdetach(ifp); @@ -1715,6 +1727,7 @@ callout_drain(&sc->xl_stat_callout); ether_ifdetach(ifp); } + taskqueue_free(sc->xl_tq); if (sc->xl_miibus) device_delete_child(dev, sc->xl_miibus); bus_generic_detach(dev); @@ -1751,7 +1764,6 @@ sc->xl_ldata.xl_tx_dmamap); bus_dma_tag_destroy(sc->xl_ldata.xl_tx_tag); } - mtx_destroy(&sc->xl_mtx); return (0); @@ -1925,7 +1937,7 @@ return (0); } -static int +__unused static int xl_rx_resync(struct xl_softc *sc) { struct xl_chain_onefrag *pos; @@ -2274,68 +2286,94 @@ } static void -xl_intr(void *arg) +xl_stat_tx_complete(void *_sc, int p __unused) { + struct xl_softc *sc = _sc; + struct ifnet *ifp = sc->xl_ifp; + + XL_LOCK(sc); + ifp->if_oerrors++; + xl_txeoc(sc); + XL_UNLOCK(sc); +} + +static void +xl_stat_adfail(void *_sc, int p __unused) { + struct xl_softc *sc = _sc; + + XL_LOCK(sc); + xl_reset(sc); + xl_init_locked(sc); + XL_UNLOCK(sc); +} + +static void +xl_stat_statsoflow(void *_sc, int p __unused) { + struct xl_softc *sc = _sc; + + XL_LOCK(sc); + sc->xl_stats_no_timeout = 1; + xl_stats_update_locked(sc); + sc->xl_stats_no_timeout = 0; + XL_UNLOCK(sc); +} + +static int +xl_filter(void *arg) { struct xl_softc *sc = arg; - struct ifnet *ifp = sc->xl_ifp; u_int16_t status; + int ret = FILTER_HANDLED; + + status = CSR_READ_2(sc, XL_STATUS); + status &= XL_INTRS; - XL_LOCK(sc); + if (status == 0xFFFF) + return (FILTER_STRAY); -#ifdef DEVICE_POLLING - if (ifp->if_capenable & IFCAP_POLLING) { - XL_UNLOCK(sc); - return; - } -#endif + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|(status & XL_INTRS)); + + if (status & XL_STAT_UP_COMPLETE) + ret |= FILTER_SCHEDULE_THREAD; - while ((status = CSR_READ_2(sc, XL_STATUS)) & XL_INTRS && - status != 0xFFFF) { - CSR_WRITE_2(sc, XL_COMMAND, - XL_CMD_INTR_ACK|(status & XL_INTRS)); + if (status & XL_STAT_DOWN_COMPLETE) + ret |= FILTER_SCHEDULE_THREAD; - if (status & XL_STAT_UP_COMPLETE) { - int curpkts; + if (status & XL_STAT_TX_COMPLETE) + taskqueue_enqueue(sc->xl_tq, &sc->xl_stat_tx_complete); - curpkts = ifp->if_ipackets; - xl_rxeof(sc); - if (curpkts == ifp->if_ipackets) { - while (xl_rx_resync(sc)) - xl_rxeof(sc); - } - } + if (status & XL_STAT_ADFAIL) + taskqueue_enqueue(sc->xl_tq, &sc->xl_stat_adfail); - if (status & XL_STAT_DOWN_COMPLETE) { - if (sc->xl_type == XL_TYPE_905B) - xl_txeof_90xB(sc); - else - xl_txeof(sc); - } + if (status & XL_STAT_STATSOFLOW) + taskqueue_enqueue(sc->xl_tq, &sc->xl_stat_statsoflow); - if (status & XL_STAT_TX_COMPLETE) { - ifp->if_oerrors++; - xl_txeoc(sc); - } + /* Disable interrupts */ + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ENB|0); - if (status & XL_STAT_ADFAIL) { - xl_reset(sc); - xl_init_locked(sc); - } + return (ret); +} - if (status & XL_STAT_STATSOFLOW) { - sc->xl_stats_no_timeout = 1; - xl_stats_update_locked(sc); - sc->xl_stats_no_timeout = 0; - } - } +static void +xl_intr(void *arg) { + struct xl_softc *sc = arg; + struct ifnet *ifp = sc->xl_ifp; + XL_LOCK(sc); + xl_rxeof(sc); + if (sc->xl_type == XL_TYPE_905B) + xl_txeof_90xB(sc); + else + xl_txeof(sc); + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { if (sc->xl_type == XL_TYPE_905B) xl_start_90xB_locked(ifp); else xl_start_locked(ifp); } - + /* Enable interrupts */ + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|0xFF); + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ENB|XL_INTRS); XL_UNLOCK(sc); } ==== //depot/projects/soc2006/intr_filter/pci/if_xlreg.h#2 (text+ko) ==== @@ -608,6 +608,10 @@ bus_space_tag_t xl_ftag; struct mtx xl_mtx; struct task xl_task; + struct taskqueue *xl_tq; + struct task xl_stat_tx_complete; + struct task xl_stat_adfail; + struct task xl_stat_statsoflow; #ifdef DEVICE_POLLING int rxcycles; #endif From owner-p4-projects@FreeBSD.ORG Sat Aug 5 19:29:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABB3316A4E0; Sat, 5 Aug 2006 19:29:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D2DD16A4DD for ; Sat, 5 Aug 2006 19:29:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C33543D45 for ; Sat, 5 Aug 2006 19:29:18 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75JTHdM034505 for ; Sat, 5 Aug 2006 19:29:17 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75JT765034484 for perforce@freebsd.org; Sat, 5 Aug 2006 19:29:07 GMT (envelope-from piso@freebsd.org) Date: Sat, 5 Aug 2006 19:29:07 GMT Message-Id: <200608051929.k75JT765034484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 19:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103272 Change 103272 by piso@piso_newluxor on 2006/08/05 19:29:03 IFC Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/pmap.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/arm/arm/in_cksum.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/trap.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_pio.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_rtc.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_spiio.h#2 delete .. //depot/projects/soc2006/intr_filter/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_twi.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/files.at91#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/std.at91#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/std.kb920x#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/KB920X#4 integrate .. //depot/projects/soc2006/intr_filter/arm/include/db_machdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/syscalls.master#3 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.arm#4 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#6 integrate .. //depot/projects/soc2006/intr_filter/conf/files#5 integrate .. //depot/projects/soc2006/intr_filter/conf/files.amd64#3 integrate .. //depot/projects/soc2006/intr_filter/conf/files.arm#2 integrate .. //depot/projects/soc2006/intr_filter/conf/files.i386#3 integrate .. //depot/projects/soc2006/intr_filter/conf/files.ia64#3 integrate .. //depot/projects/soc2006/intr_filter/conf/files.pc98#2 integrate .. //depot/projects/soc2006/intr_filter/conf/files.powerpc#2 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2006/intr_filter/conf/options#4 integrate .. //depot/projects/soc2006/intr_filter/conf/options.amd64#2 integrate .. //depot/projects/soc2006/intr_filter/conf/options.arm#2 integrate .. //depot/projects/soc2006/intr_filter/conf/options.i386#2 integrate .. //depot/projects/soc2006/intr_filter/conf/options.pc98#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/crypto/via/padlock.c#2 integrate .. //depot/projects/soc2006/intr_filter/crypto/via/padlock.h#1 branch .. //depot/projects/soc2006/intr_filter/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/soc2006/intr_filter/crypto/via/padlock_hash.c#1 branch .. //depot/projects/soc2006/intr_filter/ddb/db_command.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_output.h#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_ps.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_thread.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/ddb.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/amr/amr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/dcphy.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/pnphy.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/README#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em_hw.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em_hw.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/fe/if_fe.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iic.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iic.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_library.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/gentbi.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mii/ip1000phy.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/random/probe.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sio/sio.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_sk.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_skreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/driver.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/spibus/spi.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/spibus/spibus.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/spibus/spibus_if.m#1 branch .. //depot/projects/soc2006/intr_filter/dev/spibus/spibusvar.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/stge/if_stgereg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/streams/streams.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_ural.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uplcom.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/geom.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/soc2006/intr_filter/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/soc2006/intr_filter/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/soc2006/intr_filter/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#6 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/db_trace.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/initcpu.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/tsc.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/syscalls.xenix#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/md_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_proto.h#6 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/syscalls.master#6 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/init_sysent.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#14 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktr.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_lock.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mac.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sx.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_syscalls.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_tc.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thr.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_time.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/link_elf.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_prf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_rman.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_socket.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/syscalls.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/syscalls.master#4 integrate .. //depot/projects/soc2006/intr_filter/kern/systrace_args.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/sysv_sem.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_sockbuf.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket2.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#5 integrate .. //depot/projects/soc2006/intr_filter/modules/agp/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/asr/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/bridgestp/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/hwpmc/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/if_bridge/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/mii/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/osf1/Makefile#2 delete .. //depot/projects/soc2006/intr_filter/modules/padlock/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/sound/driver/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/stge/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/net/bpf.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.h#1 branch .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridgevar.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_enc.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_faith.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_gif.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_gre.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_spppsubr.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_stf.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_tap.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_vlan.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/net_osdep.h#2 delete .. //depot/projects/soc2006/intr_filter/net/raw_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/rtsock.c#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatm/atm_aal5.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatm/atm_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_socket.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_gif.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_encap.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/README#2 delete .. //depot/projects/soc2006/intr_filter/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ah_core.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ah_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ah_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/esp_core.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/esp_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/esp_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/frag6.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_cksum.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_pcb.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_src.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_forward.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ipsec.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/mld6.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/raw_ip6.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/udp6_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipsec/keysock.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/netkey/key.c#2 integrate .. //depot/projects/soc2006/intr_filter/netkey/keydb.c#2 integrate .. //depot/projects/soc2006/intr_filter/netkey/keysock.c#2 integrate .. //depot/projects/soc2006/intr_filter/netnatm/natm.c#2 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_conn.c#2 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs.h#2 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/NOTES#3 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/pci/ncr.c#2 integrate .. //depot/projects/soc2006/intr_filter/posix4/ksched.c#3 integrate .. //depot/projects/soc2006/intr_filter/posix4/p1003_1b.c#2 integrate .. //depot/projects/soc2006/intr_filter/posix4/posix4.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/md_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mmu_oea.c#6 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/soc2006/intr_filter/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/soc2006/intr_filter/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#5 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/pmap.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2006/intr_filter/sys/_label.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/bufobj.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/extattr.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/kernel.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/libkern.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/mbuf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/mutex.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/protosw.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/socket.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/socketvar.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/stat.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/syscall.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/syscall.mk#3 integrate .. //depot/projects/soc2006/intr_filter/sys/syscallsubr.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/sysctl.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/sysent.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/sysproto.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/thr.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/time.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/types.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/unpcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/pmap.h#3 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/uma_core.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_map.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_meter.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include #include @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -327,16 +327,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -947,17 +947,17 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); - /* - * If Maxmem has been increased beyond what the system has detected, - * extend the last memory segment to the new limit. - */ - if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); - /* call pmap initialization to make new kernel address space */ pmap_bootstrap(&first); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.565 2006/07/06 06:17:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,6 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -1627,6 +1626,7 @@ int idx, field, bit; mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; @@ -2015,8 +2015,8 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; pmap_unuse_pt(pmap, pv->pv_va, ptepde); + free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); - free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2971,8 +2971,8 @@ /* * Clear the write and modified bits in each of the given page's mappings. */ -static __inline void -pmap_clear_write(vm_page_t m) +void +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. ==== //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -145,9 +145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. @@ -780,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -814,17 +812,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - mtx_unlock(&Giant); - } else { - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - } + AUDIT_SYSCALL_ENTER(code, td); + error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { @@ -874,6 +864,19 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -894,9 +897,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/soc2006/intr_filter/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -328,7 +328,6 @@ td->td_frame->tf_rsp = ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; - td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)entry; /* ==== //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.58 2006/07/29 18:38:53 marcel Exp $ # # @@ -101,6 +101,44 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +# +# sio: serial ports (see sio(4)), including support for various +# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# +device sio +hint.sio.0.at="isa" +hint.sio.0.port="0x3F8" +hint.sio.0.flags="0x10" +hint.sio.0.irq="4" + +# `flags' specific to sio(4). +# 0x10 enable console support for this unit. Other console flags +# (if applicable) are ignored unless this is set. Enabling +# console support does not make the unit the preferred console. +# Boot with -h or set boot_serial=YES in the loader. For sio(4) +# specifically, the 0x20 flag can also be set (see above). +# Currently, at most one unit can have console support; the +# first one (in config file order) with this flag set is +# preferred. Setting this flag for sio0 gives the old behaviour. +# 0x20 force this unit to be the console (unless there is another +# higher priority console). This replaces the COMCONSOLE option. +# 0x40 reserve this unit for low level console operations. Do not +# access the device in any normal way. +# 0x80 use this port for serial line gdb support in ddb. Also known +# as debug port. +# PnP `flags' +# 0x1 disable probing of this device. Used to prevent your modem +# from being attached as a PnP modem. +# Other flags for sio that aren't documented in the man page. +# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for +# ST16650A-compatible UARTs. + +# Options for sio: +options COM_ESP # Code for Hayes ESP. +options COM_MULTIPORT # Code for some cards with shared IRQs. +options CONSPEED=115200 # Speed for serial console + # (default 9600). + device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" ==== //depot/projects/soc2006/intr_filter/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.11 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $"); /* * 386 Trap and System call handling @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -153,7 +154,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -171,12 +172,8 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, args64); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); if (error == 0) { td->td_retval[0] = 0; @@ -184,6 +181,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); AUDIT_SYSCALL_EXIT(error, td); @@ -220,12 +219,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { @@ -238,10 +231,25 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -253,11 +261,8 @@ * is not the case, this code will need to be revisited. */ STOPEVENT(p, S_SCX, code); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 5 19:39:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDD1E16A4E5; Sat, 5 Aug 2006 19:39:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B75E016A4E1 for ; Sat, 5 Aug 2006 19:39:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E14643D46 for ; Sat, 5 Aug 2006 19:39:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75JdVU5034965 for ; Sat, 5 Aug 2006 19:39:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75JdU65034962 for perforce@freebsd.org; Sat, 5 Aug 2006 19:39:30 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 19:39:30 GMT Message-Id: <200608051939.k75JdU65034962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 19:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103273 Change 103273 by jb@jb_freebsd2 on 2006/08/05 19:39:07 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#20 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/tools/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#6 integrate .. //depot/projects/dtrace/src/sbin/dump/optr.c#3 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wavelan_ieee.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wireg.h#3 integrate .. //depot/projects/dtrace/src/sys/kern/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#6 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/README#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/stumbler/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/stumbler/stumbler.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/Makefile.inc#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/README#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/ap/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/ap/ap.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/assoc/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/assoc/assoc.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/expand/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/expand/expand.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/libw00t/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/libw00t/w00t.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/libw00t/w00t.h#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/prga/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/prga/prga.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/redir/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/redir/buddy.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/w00t/redir/redir.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlaninject/Makefile#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlaninject/README#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlaninject/wlaninject.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/kldxref/kldxref.c#5 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq214.sgml#3 integrate .. //depot/projects/dtrace/www/en/projects/acpi/index.sgml#3 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#20 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -73,11 +73,9 @@ <filename class="directory">/usr/src</filename> ªº¬[ºc - - §¹¾ãªº FreeBSD ­ì©l½X³£¦b¤½¶}ªº CVS repository ¤¤¡C + §¹¾ãªº FreeBSD ­ì©l½X³£¦b¤½¶}ªº CVS repository ¤¤¡C ³q±` FreeBSD ­ì©l½X³£·|¸Ë¦b /usr/src¡A - ¦Ó¥B¥]§t¤U¦C¤l¥Ø¿ý¡G - + ¦Ó¥B¥]§t¤U¦C¤l¥Ø¿ý¡G ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/tools/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -23,94 +23,77 @@ µ{¦¡¶}µo¤u¨ã ·§±Ô - - ¥»³¹±N¤¶²Ð¦p¦ó¨Ï¥Î¤@¨Ç FreeBSD ©Ò´£¨Ñªºµ{¦¡¶}µo¤u¨ã(programing tools)¡A + ¥»³¹±N¤¶²Ð¦p¦ó¨Ï¥Î¤@¨Ç FreeBSD ©Ò´£¨Ñªºµ{¦¡¶}µo¤u¨ã(programing tools)¡A ¥»³¹©Ò¤¶²Ðªº¤u¨ãµ{¦¡¦b¨ä¥Lª©¥»ªº &unix; ¤W¤]¥i¨Ï¥Î¡A ¦b¦¹ ¨Ã¤£·| ¹Á¸Õ´y­z¼gµ{¦¡®Éªº¨C­Ó²Ó¸`¡A ¥»³¹¤j³¡¤À½g´T³£¬O°²³]§A¥H«e¨S¦³©Î¥u¦³¤Ö¼Æªº¼gµ{¦¡¸gÅç¡A - ¤£¹L¡AÁÙ¬O§Æ±æ¤j¦h¼Æªºµ{¦¡¶}µo¤H­û³£¯à±q¤¤­«·s±o¨ì¤@¨Ç±Òµo¡C - + ¤£¹L¡AÁÙ¬O§Æ±æ¤j¦h¼Æªºµ{¦¡¶}µo¤H­û³£¯à±q¤¤­«·s±o¨ì¤@¨Ç±Òµo¡C ²¤¶ - - FreeBSD ´£¨Ñ¤@­Ó«D±`´Îªº¶}µoÀô¹Ò¡A + FreeBSD ´£¨Ñ¤@­Ó«D±`´Îªº¶}µoÀô¹Ò¡A ¤ñ¦p»¡¹³¬O C¡BC++¡BFortran ©M assembler(²Õ¦X»y¨¥)ªº½sĶ¾¹(compiler), ¦b FreeBSD ¤¤³£¤w¸g¥]§t¦b°ò¥»ªº¨t²Î¤¤¤F §ó§O´£ Perl ©M¨ä¥L¼Ð·Ç &unix; ¤u¨ã¡A¹³¬Osed ¥H¤Î awk¡A ¦pªG§AÁÙ¬Oı±o¤£°÷¡AFreeBSD¦b Ports collection ¤¤ÁÙ´£¨Ñ¨ä¥Lªº½sĶ¾¹©Mª½Ä¶¾¹(interpreter), FreeBSD ¬Û®e³\¦h¼Ð·Ç¡A¹³¬O &posix; ©M ANSI C¡A ·íµMÁÙ¦³¥¦©ÒÄ~©Óªº BSD ¶Ç²Î¡C - ©Ò¥H¦b FreeBSD ¤W¼gªºµ{¦¡¤£»Ý­×§ï©Î³»¦hµy·L­×§ï¡A´N¥i¥H¦b³\¦h¥­¥x¤W½sĶ¡B°õ¦æ¡C - + ©Ò¥H¦b FreeBSD ¤W¼gªºµ{¦¡¤£»Ý­×§ï©Î³»¦hµy·L­×§ï¡A´N¥i¥H¦b³\¦h¥­¥x¤W½sĶ¡B°õ¦æ¡C - - µL½×¦p¦ó¡A´Nºâ§A±q¨Ó¨S¦b &unix; ¥­¥x¤W¼g¹Lµ{¦¡¡A¤]¥i¥H¹ý©³·P¨ü¨ìFreeBSD ¥O¤HµLªk§Ü©Úªº°g¤HÅ]¤O¡C + µL½×¦p¦ó¡A´Nºâ§A±q¨Ó¨S¦b &unix; ¥­¥x¤W¼g¹Lµ{¦¡¡A¤]¥i¥H¹ý©³·P¨ü¨ìFreeBSD ¥O¤HµLªk§Ü©Úªº°g¤HÅ]¤O¡C ¥»³¹ªº¥Ø¼Ð´N¬O¨ó§U§A§Ö³t¤W¤â¡A¦Ó¼È®É¤£»Ý²`¤J¤Ó¦h¶i¶¥¥DÃD¡A - ¨Ã¥BÁ¿¸Ñ¤@¨Ç°ò¦·§©À¡A¥HÅý§A¥i¥HÁA¸Ñ§Ú­Ì¦bÁ¿¨Ç¤°»ò¡C - + ¨Ã¥BÁ¿¸Ñ¤@¨Ç°ò¦·§©À¡A¥HÅý§A¥i¥HÁA¸Ñ§Ú­Ì¦bÁ¿¨Ç¤°»ò¡C - - ¥»³¹¤º®e¨Ã¤£­n¨D§A±o¦³µ{¦¡¶}µo¸gÅç¡A©ÎªÌ§A¥u¦³¤@ÂIÂIªº¸gÅç¦Ó¤w¡C + ¥»³¹¤º®e¨Ã¤£­n¨D§A±o¦³µ{¦¡¶}µo¸gÅç¡A©ÎªÌ§A¥u¦³¤@ÂIÂIªº¸gÅç¦Ó¤w¡C ¤£¹L¡A§Ú­Ì°²³]§A¤w¸g·| &unix; ¨t²Îªº°ò¥»¾Þ§@¡A - ¦Ó¥B§ó­«­nªº¬O¡A½Ð«O«ù¼Ö©ó¾Ç²ßªº¤ßºA¡I - + ¦Ó¥B§ó­«­nªº¬O¡A½Ð«O«ù¼Ö©ó¾Ç²ßªº¤ßºA¡I Programming ·§©À - - ²³æªº»¡¡Aµ{¦¡¥u¬O¤@°ï«ü¥Oªº¶°¦XÅé¡F¦Ó³o¨Ç«ü¥O¬O¥Î¨Ó§i¶D¹q¸£À³¸Ó­n§@¨º¨Ç¨Æ±¡¡C + ²³æªº»¡¡Aµ{¦¡¥u¬O¤@°ï«ü¥Oªº¶°¦XÅé¡F¦Ó³o¨Ç«ü¥O¬O¥Î¨Ó§i¶D¹q¸£À³¸Ó­n§@¨º¨Ç¨Æ±¡¡C ¦³®É­Ô¡A«ü¥Oªº°õ¦æ¨ú¨M©ó«e¤@­Ó«ü¥Oªºµ²ªG¦Ó©w¡C ¥»³¹±N·|§i¶D§A¦³ 2 ­Ó¥D­nªº¤èªk¡AÅý§A¥i¥H¹ï¹q¸£¤U¹F³o¨Ç«ü¥Ü(instruction) ©Î ©R¥O(commands)¡C ²Ä¤@­Ó¤èªk´N¬O ª½Ä¶¾¹(interpreter)¡A ¦Ó²Ä¤G­Ó¤èªk¬O ½sĶ¾¹(compiler)¡C ¥Ñ©ó¹ï©ó¹q¸£¦Ó¨¥¡A¤HÃþ»y¨¥ªº»y·N¹L©ó¼Ò½k¦Ó¤ÓÃø²z¸Ñ¡A - ¦]¦¹©R¥O(commands)´N±`·|¥H¤@ºØ(©Î¦hºØ)µ{¦¡»y¨¥¼g¦¨¡A¥Î¨Ó«ü¥Ü¹q¸£©Ò­n°õ¦æªº¯S©w°Ê§@¬°¦ó¡C - + ¦]¦¹©R¥O(commands)´N±`·|¥H¤@ºØ(©Î¦hºØ)µ{¦¡»y¨¥¼g¦¨¡A¥Î¨Ó«ü¥Ü¹q¸£©Ò­n°õ¦æªº¯S©w°Ê§@¬°¦ó¡C ª½Ä¶¾¹ - - ¨Ï¥Îª½Ä¶¾¹®É¡A©Ò¨Ï¥Îªºµ{¦¡»y¨¥´N¹³Åܦ¨¤@­Ó·|©M§A¤¬°ÊªºÀô¹Ò¡C + ¨Ï¥Îª½Ä¶¾¹®É¡A©Ò¨Ï¥Îªºµ{¦¡»y¨¥´N¹³Åܦ¨¤@­Ó·|©M§A¤¬°ÊªºÀô¹Ò¡C ·í¦b©R¥O´£¥Ü¦C¤W¥´¤W©R¥O®É¡Aª½Ä¶¾¹·|§Y®É°õ¦æ¸Ó©R¥O¡C ¦b¤ñ¸û½ÆÂøªºµ{¦¡¤¤¡A¥i¥H§â©Ò¦³·Q¤U¹Fªº©R¥O²Î²Î¿é¤J¨ì¬YÀɮ׸̭±¥h¡A µM«á©I¥sª½Ä¶¾¹¥hŪ¨ú¸ÓÀɮסA¨Ã¥B°õ¦æ§A¼g¦b³o­ÓÀɮפ¤ªº«ü¥O¡C ¦pªG©Ò¤Uªº«ü¥O¦³¿ù»~²£¥Í¡A¤j¦h¼Æªºª½Ä¶¾¹·|¶i¤J°»¿ù¼Ò¦¡(debugger)¡A - ¨Ã¥BÅã¥Ü¬ÛÃö¿ù»~°T®§¡A¥H«K¹ïµ{¦¡°£¿ù¡C - + ¨Ã¥BÅã¥Ü¬ÛÃö¿ù»~°T®§¡A¥H«K¹ïµ{¦¡°£¿ù¡C - - ³oºØ¤è¦¡¦n³B¦b©ó¡G¥i¥H¥ß¨è¬Ý¨ì«ü¥Oªº°õ¦æµ²ªG¡A¥H¤Î¿ù»~¤]¥i¨³³t­×¥¿¡C - ¬Û¹ïªº¡A³Ì¤jªºÃa³B«K¬O·í§A·Q§â§A¼gªºµ{¦¡¤À¨Éµ¹¨ä¥L¤H®É¡A³o¨Ç¤H¥²¶·­n¦³¸ò§A¤@¼Ëªºª½Ä¶¾¹¡C - ¦Ó¥B§O§Ñ¤F¡A¥L­Ì¤]­n·|¨Ï¥Îª½Ä¶¾¹ª½Ä¶µ{¦¡¤~¦æ¡C - ·íµM¨Ï¥ÎªÌ¤]¤£§Æ±æ¤£¤p¤ß«ö¿ùÁä¡A´N¶i¤J°»¿ù¼Ò¦¡¦Ó¤£ª¾©Ò±¹¡C - ´N°õ¦æ®Ä²v¦Ó¨¥¡Aª½Ä¶¾¹·|¨Ï¥Î¨ì«Ü¦hªº°O¾ÐÅé¡A - ¦Ó¥B³oÃþª½Ä¶¦¡µ{¦¡¡A³q±`¨Ã¤£·|¤ñ½sĶ¾¹©Ò½sĶªºµ{¦¡ªº§ó¦³®Ä²v¡C - + ³oºØ¤è¦¡¦n³B¦b©ó¡G¥i¥H¥ß¨è¬Ý¨ì«ü¥Oªº°õ¦æµ²ªG¡A¥H¤Î¿ù»~¤]¥i¨³³t­×¥¿¡C + ¬Û¹ïªº¡A³Ì¤jªºÃa³B«K¬O·í§A·Q§â§A¼gªºµ{¦¡¤À¨Éµ¹¨ä¥L¤H®É¡A³o¨Ç¤H¥²¶·­n¦³¸ò§A¤@¼Ëªºª½Ä¶¾¹¡C + ¦Ó¥B§O§Ñ¤F¡A¥L­Ì¤]­n·|¨Ï¥Îª½Ä¶¾¹ª½Ä¶µ{¦¡¤~¦æ¡C + ·íµM¨Ï¥ÎªÌ¤]¤£§Æ±æ¤£¤p¤ß«ö¿ùÁä¡A´N¶i¤J°»¿ù¼Ò¦¡¦Ó¤£ª¾©Ò±¹¡C + ´N°õ¦æ®Ä²v¦Ó¨¥¡Aª½Ä¶¾¹·|¨Ï¥Î¨ì«Ü¦hªº°O¾ÐÅé¡A + ¦Ó¥B³oÃþª½Ä¶¦¡µ{¦¡¡A³q±`¨Ã¤£·|¤ñ½sĶ¾¹©Ò½sĶªºµ{¦¡ªº§ó¦³®Ä²v¡C - - µ§ªÌ­Ó¤H»{¬°¡A¦pªG§A¤§«e¨S¦³¾Ç¹L¥ô¦óµ{¦¡»y¨¥¡A³Ì¦n¥ý¾Ç¾Ç²ßª½Ä¶¦¡»y¨¥(interpreted languages)¡A - ¹³¬O Lisp¡ASmalltalk¡APerl ©M Basic ³£¬O¡A&unix; ªº shell ¹³¬O sh ©M csh - ¥¦­Ì¥»¨­´N¬Oª½Ä¶¾¹¡A¨Æ¹ê¤W¡A«Ü¦h¤H³£¦b¥¦­Ì¦Û¤v¾÷¾¹¤W¼¶¼g¦U¦¡ªº shell script¡A - ¨Ó¶¶§Q§¹¦¨¦U¶µ housekeeping(ºûÅ@) ¥ô°È¡C - &unix; ¨Ï¥Î­õ¾Ç¤§¤@´N¬O´£¨Ñ¤j¶qªº¤p¤u¨ã¡A - ¨Ã¨Ï¥Î shell script ¨Ó²Õ¦X¹B¥Î³o¨Ç¤p¤u¨ã¡A¥H«K¤u§@§ó¦³®Ä²v¡C + µ§ªÌ­Ó¤H»{¬°¡A¦pªG§A¤§«e¨S¦³¾Ç¹L¥ô¦óµ{¦¡»y¨¥¡A³Ì¦n¥ý¾Ç¾Ç²ßª½Ä¶¦¡»y¨¥(interpreted languages)¡A + ¹³¬O Lisp¡ASmalltalk¡APerl ©M Basic ³£¬O¡A&unix; ªº shell ¹³¬O sh ©M csh + ¥¦­Ì¥»¨­´N¬Oª½Ä¶¾¹¡A¨Æ¹ê¤W¡A«Ü¦h¤H³£¦b¥¦­Ì¦Û¤v¾÷¾¹¤W¼¶¼g¦U¦¡ªº shell script¡A + ¨Ó¶¶§Q§¹¦¨¦U¶µ housekeeping(ºûÅ@) ¥ô°È¡C + &unix; ªº¨Ï¥Î­õ¾Ç¤§¤@´N¬O´£¨Ñ¤j¶qªº¤p¤u¨ã¡A + ¨Ã¨Ï¥Î shell script ¨Ó²Õ¦X¹B¥Î³o¨Ç¤p¤u¨ã¡A¥H«K¤u§@§ó¦³®Ä²v¡C FreeBSD ´£¨Ñªºª½Ä¶¾¹ - - ¤U­±³oÃ䦳¥÷ &os; Ports Collection ©Ò´£¨Ñªºª½Ä¶¾¹²M³æ¡AÁÙ¦³°Q½×¤@¨Ç¤ñ¸û¨üÅwªïªºª½Ä¶¦¡»y¨¥ + ¤U­±³oÃ䦳¥÷ &os; Ports Collection ©Ò´£¨Ñªºª½Ä¶¾¹²M³æ¡AÁÙ¦³°Q½×¤@¨Ç¤ñ¸û¨üÅwªïªºª½Ä¶¦¡»y¨¥ - - ¦Ü©ó¦p¦ó¨Ï¥Î Ports Collection ¦w¸Ëªº»¡©ú¡A¥i°Ñ¾\ FreeBSD Handbook ¤¤ªº + ¦Ü©ó¦p¦ó¨Ï¥Î Ports Collection ¦w¸Ëªº»¡©ú¡A¥i°Ñ¾\ FreeBSD Handbook ¤¤ªº Ports³¹¸`¡C @@ -146,8 +129,7 @@ ¡A¦¹¥~ CMUCL(¥]§t¤@­Ó¤w¸g³Ì¨Î¤Æªº½sĶ¾¹)¡A ¥H¤Î¨ä¥L²¤Æª©ªº LISP ª½Ä¶¾¹(¤ñ¦p¥H C »y¨¥¼gªº SLisp¡A¥u¥Î´X¦Ê¦æµ{¦¡½X´N¹ê§@¤j¦h¼Æ Common Lisp ªº¥\¯à) «h¬O¤À§O¦¬¿ý¦b lang/cmucl ¥H¤Î - lang/slisp¡C - + lang/slisp¡C @@ -169,8 +151,7 @@ Scheme ¬O LISP ªº¥t¤@¤À¤ä¡AScheme ªº¯SÂI´N¬O¤ñ Common LISP ÁÙ­n²¼ä¦³¤O¡C ¥Ñ©ó Scheme ²³æ¡A©Ò¥H«Ü¦h¤j¾Ç®³¨Ó·í§@²Ä¤@°óµ{¦¡»y¨¥±Ð¾Ç±Ð§÷¡C - ¦Ó¥B¹ï©ó¬ã¨s¤H­û¨Ó»¡¤]¥i¥H§Ö³tªº¶}µo¥L­Ì©Ò»Ý­nªºµ{¦¡¡C - + ¦Ó¥B¹ï©ó¬ã¨s¤H­û¨Ó»¡¤]¥i¥H§Ö³tªº¶}µo¥L­Ì©Ò»Ý­nªºµ{¦¡¡C Scheme ¦¬¿ý¦b lang/elk¡A Elk Scheme ª½Ä¶¾¹(¥Ñ³Â¬Ù²z¤u¾Ç°|©Òµo®iªº Scheme ª½Ä¶¾¹)¦¬¿ý¦b @@ -208,8 +189,7 @@ Python ¬Oª«¥ó¾É¦Vªºª½Ä¶¦¡»y¨¥¡A Python ªº¾ÖÅ@ªÌÁ`¬O«ÅºÙ Python ¬O³Ì¦n¤Jªùªºµ{¦¡»y¨¥¡C ÁöµM Python ¥i¥H«Ü²³æªº¶}©l¡A¦ý¬O¤£¥Nªí¥¦´N·|¿éµ¹¨ä¥Lª½Ä¶¦¡»y¨¥(¹³¬O Perl ©M Tcl)¡A - ¨Æ¹êÃÒ©ú Python ¤]¥i¥H®³¨Ó¶}µo¤j«¬¡B½ÆÂøªºÀ³¥Îµ{¦¡¡C - + ¨Æ¹êÃÒ©ú Python ¤]¥i¥H®³¨Ó¶}µo¤j«¬¡B½ÆÂøªºÀ³¥Îµ{¦¡¡C &os; Ports Collection ¦¬¿ý¦b lang/python¡C @@ -245,9 +225,9 @@ ½sĶ¾¹ ½sĶ¾¹©Mª½Ä¶¾¹¨âªÌ¬Û¤ñªº¸Ü¡A¦³¨Ç¤£¦P¡A­º¥ý´N¬O¥²¶·¥ý§âµ{¦¡½X²Î²Î¼g¤J¨ìÀɮ׸̭±¡A - µM«á¥²¶·°õ¦æ½sĶ¾¹¨Ó¸ÕµÛ½sĶµ{¦¡¡A¦pªG½sĶ¾¹¤£±µ¨ü©Ò¼gªºµ{¦¡¡A¨º´N¥²¶·¤@ª½­×§ïµ{¦¡¡A - ª½¨ì½sĶ¾¹±µ¨ü¥B§â§Aªºµ{¦¡½sĶ¦¨°õ¦æÀÉ¡C - ¦¹¥~¡A¤]¥i¥H¦b´£¥Ü©R¥O¦C¡A©Î¦b°£¿ù¾¹¤¤°õ¦æ§A½sĶ¦nªºµ{¦¡¬Ý¬Ý¥¦¬O§_¥i¥H¹B§@¡C + µM«á¥²¶·°õ¦æ½sĶ¾¹¨Ó¸ÕµÛ½sĶµ{¦¡¡A¦pªG½sĶ¾¹¤£±µ¨ü©Ò¼gªºµ{¦¡¡A¨º´N¥²¶·¤@ª½­×§ïµ{¦¡¡A + ª½¨ì½sĶ¾¹±µ¨ü¥B§â§Aªºµ{¦¡½sĶ¦¨°õ¦æÀÉ¡C + ¦¹¥~¡A¤]¥i¥H¦b´£¥Ü©R¥O¦C¡A©Î¦b°£¿ù¾¹¤¤°õ¦æ§A½sĶ¦nªºµ{¦¡¬Ý¬Ý¥¦¬O§_¥i¥H¹B§@¡C ¦pªG¦b´£¥Ü©R¥O¦C¤U°õ¦æ¡A¨º»ò¦³¥i¯à·|²£¥Í core dump¡C @@ -260,8 +240,7 @@ ¦Ó½sĶ¾¹»Pª½Ä¶¾¹³Ì¤jªº®t§O¦b©ó¡G·í§A·Q§â§A¼g¦nªºµ{¦¡®³¨ì¥t¥~¤@¥x¾÷¾¹¤W¶]®É¡A §A¥u­n±N½sĶ¾¹½sĶ¥X¨Óªº¥i°õ¦æÀÉ¡A®³¨ì·s¾÷¾¹¤W«K¥i¥H°õ¦æ¡A ¦Óª½Ä¶¾¹«h¥²¶·­n¨D·s¾÷¾¹¤W¡A¥²¶·­n¦³¸ò¥t¤@¥x¾÷¾¹¤W¬Û¦Pªºª½Ä¶¾¹¡A - ¤~¯à²ÕĶ°õ¦æ§Aªºµ{¦¡¡I - + ¤~¯à²ÕĶ°õ¦æ§Aªºµ{¦¡¡I ½sĶ¦¡ªºµ{¦¡»y¨¥¥]§t Pascal¡BC ©M C++¡A C ©M C++ ¤£¬O¤@­Ó¿Ë©M¤O¤Q¨¬ªº»y¨¥¡A¦ý¬O«Ü¾A¦X¨ã¦³¸gÅ窺 Programmer¡C @@ -271,8 +250,10 @@ lang/gpc ©M lang/fpc ¤¤§ä¨ì¡C ¦pªG§A¥Î¤£¦Pªºµ{¦¡¨Ó¼g½sĶ¦¡µ{¦¡¡A¨º»ò¤£Â_¦a½s¿è-½sĶ-°õ¦æ-°£¿ùªº³o­Ó´`ÀôªÖ©w·|«Ü·Ð¤H¡A - ¬°¤F§ó²¤Æ¡B¤è«Kµ{¦¡¶}µo¬yµ{¡A«Ü¦h°Ó·~½sĶ¾¹¼t°Ó¶}©lµo®i©Ò¿×ªº IDE(Integrated Development Environments) ¶}µoÀô¹Ò¡A - FreeBSD ¹w³]¨Ã¨S¦³§â IDE ¾ã¦X¶i base system ¤¤¡A¦ý¬O§A¥i³z¹L devel/kdevelop ¦w¸Ë kdevelop + ¬°¤F§ó²¤Æ¡B¤è«Kµ{¦¡¶}µo¬yµ{¡A«Ü¦h°Ó·~½sĶ¾¹¼t°Ó¶}©lµo®i©Ò¿×ªº IDE + (Integrated Development Environments) ¶}µoÀô¹Ò¡A + FreeBSD ¹w³]¨Ã¨S¦³§â IDE ¾ã¦X¶i base system ¤¤¡A + ¦ý¬O§A¥i³z¹L devel/kdevelop ¦w¸Ë kdevelop ©Î¨Ï¥Î Emacs ¨ÓÅéÅç IDE ¶}µoÀô¹Ò¡C ¦b«á­±ªº ±MÃD±N¤¶²Ð¡A¦p¦ó¥H Emacs ¨Ó§@¬° IDE ¶}µoÀô¹Ò¡C @@ -338,7 +319,7 @@ ©¯¹Bªº¬O¡A§A¥i¥H¤£¥Î²z·|¥H¤W²Ó¸`¡A½sĶ¾¹³£·|¦Û°Ê§¹¦¨¡C ¦]¬° cc ¥u¬O¬O­Ó«eºÝµ{¦¡(front end)¡A¥¦·|¨Ì·Ó¥¿½Tªº°Ñ¼Æ¨Ó©I¥s¬ÛÃöµ{¦¡À°§A³B²z¡C - ¥u»Ý¥´¡G + ¥u»Ý¥´¡G &prompt.user; cc foobar.c ¤W­z«ü¥O·|§â foobar.c ¶}©l½sĶ¡A¨Ã§¹¦¨¤W­z°Ê§@¡C @@ -362,7 +343,7 @@ ½sĶ«áªº°õ¦æÀÉÀɦW¡A¦pªG¨S¦³¨Ï¥Î³o¿ï¶µªº¸Ü¡A - ½sĶ¦nªºµ{¦¡¹w³]ÀɦW±N·|¬O a.out + ½sĶ¦nªºµ{¦¡¹w³]ÀɦW±N·|¬O a.out ¦Ü©ó ªº­ì¦]¡A«h¬O¤@¹Î¾ú¥v°gÃú¤F¡C @@ -398,8 +379,7 @@ - - ±N·|§â¤@¨Çµ¹ gdb ¥Îªº°£¿ù°T®§¥]¶i¥h°õ¦æÀɸ̭±¡A©Ò¿×ªº°£¿ù°T®§¨Ò¦p¡G + ±N·|§â¤@¨Çµ¹ gdb ¥Îªº°£¿ù°T®§¥]¶i¥h°õ¦æÀɸ̭±¡A©Ò¿×ªº°£¿ù°T®§¨Ò¦p¡G µ{¦¡¦b²Ä´X¦æ¥X¿ù¡B¨º­Óµ{¦¡²Ä´X¦æ°µ¤°»ò¨ç¦¡©I¥sµ¥µ¥¡C°£¿ù¸ê°T«D±`¦n¥Î¡C ¦ý¯ÊÂI´N¬O¡G¹ï©óµ{¦¡¨Ó»¡¡AÃB¥~ªº°£¿ù°T®§·|Åý½sĶ¥X¨Óªºµ{¦¡¤ñ¸ûªÎ¨Ç¡C ªº¾A¥Î®É¾÷¦b©ó¡G·íµ{¦¡ÁÙ¦b¶}µo®É¨Ï¥Î´N¦n¡A @@ -426,13 +406,12 @@ ·|²£¥Í³Ì¨Î¤Æªº°õ¦æÀÉ¡A - ½sĶ¾¹·|¨Ï¥Î¤@¨Ç§Þ¥©¡A¨ÓÅýµ{¦¡¥i¥H¶]ªº¤ñ¥¼¸g³Ì¨Î¤Æªºµ{¦¡ÁÙ§Ö¡A - §A¥i¥H¦b¤j¼g O «á­±¥[¤W¼Æ¦r¨Ó«ü©ú§A·Q­nªº³Ì¨Î¤Æ¼h¯Å¡C - ¦ý¬O³Ì¨Î¤ÆÁÙ¬O·|¦³¤@¨Ç¿ù»~¡AÁ|¨Ò¨Ó»¡¦b·í¦b FreeBSD 2.10 release ¤¤¨Ï¥Î cc - ¨Ã¥B«ü©w ®É¡A¦b¬Y¨Ç±¡§Î¤U·|²£¥Í¿ù»~ªº°õ¦æÀÉ¡C + ½sĶ¾¹·|¨Ï¥Î¤@¨Ç§Þ¥©¡A¨ÓÅýµ{¦¡¥i¥H¶]ªº¤ñ¥¼¸g³Ì¨Î¤Æªºµ{¦¡ÁÙ§Ö¡A + ¥i¥H¦b¤j¼g O «á­±¥[¤W¼Æ¦r¨Ó«ü©ú·Q­nªº³Ì¨Î¤Æ¼h¯Å¡C + ¦ý¬O³Ì¨Î¤ÆÁÙ¬O·|¦³¤@¨Ç¿ù»~¡AÁ|¨Ò¨Ó»¡¦b FreeBSD 2.10 release ¤¤¥Î cc + ¥B«ü©w ®É¡A¦b¬Y¨Ç±¡§Î¤U·|²£¥Í¿ù»~ªº°õ¦æÀÉ¡C - ¥u¦³·í­nÄÀ¥Xµo¦æª©¥»¡B©ÎªÌ¥[³tµ{¦¡®É¡A¤~»Ý­n¨Ï¥Î³Ì¨Î¤Æ¿ï¶µ¡C - + ¥u¦³·í­nÄÀ¥Xµo¦æª©¥»¡B©ÎªÌ¥[³tµ{¦¡®É¡A¤~»Ý­n¨Ï¥Î³Ì¨Î¤Æ¿ï¶µ¡C &prompt.user; cc -O -o foobar foobar.c @@ -444,11 +423,9 @@ - - ¥H¤U¤T­Ó°Ñ¼Æ±N·|±j­¢ cc ½T»{µ{¦¡½X¬O§_²Å¦X¤@¨Ç°ê»Ú¼Ð·Çªº³W½d¡A + ¥H¤U¤T­Ó°Ñ¼Æ±N·|±j­¢ cc ½T»{µ{¦¡½X¬O§_²Å¦X¤@¨Ç°ê»Ú¼Ð·Çªº³W½d¡A ¤]´N¬O³q±`»¡ªº ANSI ¼Ð·Ç¡A - ¦Ó ANSI ÄY®æ¨ÓÁ¿ÄÝ ISO ¼Ð·Ç¡C - + ¦Ó ANSI ÄY®æ¨ÓÁ¿ÄÝ ISO ¼Ð·Ç¡C @@ -501,15 +478,14 @@ §i¶D gcc ¦b³sµ²(linking)µ{¦¡®É§A»Ý­n¥Î¨ìªº¨ç¦¡®w¦WºÙ¡C ³Ì±`¨£ªº±¡ªp´N¬O¡A·í§A¦bµ{¦¡¤¤¨Ï¥Î¤F C ¼Æ¾Ç¨ç¦¡®w¡A - ¸ò¨ä¥L§@·~¥­¥x¤£¤@¼Ëªº¬O¡A³o¨Ç¼Æ¾Ç¨ç¦¡³£¤£¦b¼Ð·Ç¨ç¦¡®w(library)¤¤¡A + ¸ò¨ä¥L§@·~¥­¥x¤£¤@¼Ëªº¬O¡A³o¨ç¥Ü¾Ç¨ç¦¡³£¤£¦b¼Ð·Ç¨ç¦¡®w(library)¤¤¡A ¦]¦¹½sĶ¾¹¨Ã¤£ª¾¹D³o¨ç¦¡®w¦WºÙ¡A§A¥²¶·§i¶D½sĶ¾¹­n¥[¤W¥¦¤~¦æ¡C - ³o³W«h«Ü²³æ¡A¦pªG¦³­Ó¨ç¦¡®w¥s°µ libsomething/a¡A + ³W«h«Ü²³æ¡A¦pªG¦³­Ó¨ç¦¡®w¥s°µ libsomething.a¡A ´N¥²¶·¦b½sĶ®É¥[¤W°Ñ¼Æ ¤~¦æ¡C Á|¨Ò¨Ó»¡¡A¼Æ¾Ç¨ç¦¡®w¥s°µ libm.a¡A ©Ò¥H§A¥²¶·µ¹ cc ªº°Ñ¼Æ´N¬O ¡C - ¤@¯ë±¡ªp¤U¡A³q±`·|§â³o°Ñ¼Æ¥²¶·©ñ¦b«ü¥Oªº³Ì«á¡C - + ¤@¯ë±¡ªp¤U¡A³q±`·|§â³o°Ñ¼Æ¥²¶·©ñ¦b«ü¥Oªº³Ì«á¡C &prompt.user; cc -o foobar foobar.c -lm @@ -522,42 +498,34 @@ ¡C ¦pªG§Aªº FreeBSD ¬O 2.2(§t)¥H«áª©¥»¡A §A¥i¥H¥Î«ü¥O c++ ¨Ó¨ú¥N cc¡C - ¦b FreeBSD ¤W c++ ¤]¥i¥H¥Î g++ ¨ú¥N¡C - + ¦b FreeBSD ¤W c++ ¤]¥i¥H¥Î g++ ¨ú¥N¡C - &prompt.user; cc -o foobar foobar.cc -lg++ For FreeBSD 2.1.6 and earlier -&prompt.user; cc -o foobar foobar.cc -lstdc++ For FreeBSD 2.2 and later + &prompt.user; cc -o foobar foobar.cc -lg++ ¾A¥Î FreeBSD 2.1.6 ©Î§ó¦­´Áªºª©¥» +&prompt.user; cc -o foobar foobar.cc -lstdc++ ¾A¥Î FreeBSD 2.2 ¤Î¤§«áªºª©¥» &prompt.user; c++ -o foobar foobar.cc - Each of these will both produce an executable - foobar from the C++ source file - foobar.cc. Note that, on &unix; - systems, C++ source files traditionally end in - .C, .cxx or - .cc, rather than the - &ms-dos; style - .cpp (which was already used for - something else). gcc used to rely on - this to work out what kind of compiler to use on the - source file; however, this restriction no longer applies, - so you may now call your C++ files - .cpp with impunity! + ¤W­z«ü¥O³£·|±q­ì©lÀÉ foobar.cc ½sĶ²£¥Í¦W¬° fooboar ªº°õ¦æÀÉ¡C + ³oÃä­n´£¿ôªº¬O¦b &unix; ¨t²Î¤¤ C++ µ{¦¡¶Ç²Î³£¥H .C¡B + .cxx ©ÎªÌ¬O .cc §@¬°°ÆÀɦW¡A + ¦Ó«D &ms-dos; ¨ººØ¥H .cpp §@¬°°ÆÀɦWªº©R¦W¤è¦¡(¤£¹L¤]¶V¨Ó¶V´¶¹M¤F)¡C + gcc ·|¨Ì°ÆÀɦW¨Ó¨M©w¥Î­þ¤@ºØ½sĶ¾¹½sĶ¡A + µM¦Ó¡A²{¦b¤w¸g¤£¦A­­¨î°ÆÀɦW¤F¡A + ©Ò¥H¥i¥H¦Û¥Ñªº¨Ï¥Î .cpp §@¬° C++ µ{¦¡½Xªº°ÆÀɦW¡I - Common <command>cc</command> Queries and Problems + ±`¨£ªº <command>cc</command> °ÝÃD - I am trying to write a program which uses the - sin() function and I get an error - like this. What does it mean? + §Ú¥Î sin() ¨ç¥Ü¼¶¼g§Úªºµ{¦¡¡A + ¦ý¬O¦³­Ó¿ù»~°T®§(¦p¤U)¡A³o¥NªíµÛ¡H /var/tmp/cc0143941.o: Undefined symbol `_sin' referenced from text segment @@ -566,10 +534,8 @@ - When using mathematical functions like - sin(), you have to tell - cc to link in the math library, like - so: + ·í¨Ï¥Î sin() ³oÃþªº¼Æ¾Ç¨ç¥Ü®É¡A + §A¥²¶·§i¶D cc ­n©M¼Æ¾Ç¨ç¦¡®w§@³sµ²(linking)¡A´N¹³³o¼Ë¡G &prompt.user; cc -o foobar foobar.c -lm @@ -580,9 +546,7 @@ - All right, I wrote this simple program to practice - using . All it does is raise 2.1 to - the power of 6. + ¦n§a¡A§Ú¸ÕµÛ¼g¨Ç²³æªºµ{¦¡¡A¨Ó½m²ß¨Ï¥Î -lm ¿ï¶µ(¸Óµ{¦¡·|¹Bºâ 2.1 ªº 6 ¦¸¤è) #include <stdio.h> @@ -597,15 +561,14 @@ - and I compiled it as: + µM«á¶i¦æ½sĶ¡G &prompt.user; cc temp.c -lm - like you said I should, but I get this when I run - it: + ½sĶ«á°õ¦æµ{¦¡¡A±o¨ì¤U­±³oµ²ªG¡G &prompt.user; ./a.out @@ -613,30 +576,24 @@ - This is not the right answer! - What is going on? + «Ü©úÅ㪺¡Aµ{¦¡µ²ªG¤£¬O¥¿½Tµª®×¡A¨ì©³¬O­þÃä¥X¿ù¡H - When the compiler sees you call a function, it - checks if it has already seen a prototype for it. If it - has not, it assumes the function returns an - int, which is definitely not what you want - here. + ·í½sĶ¾¹µo²{§A©I¥s¤@­Ó¨ç¥Ü®É¡A¥¦·|½T»{¸Ó¨ç¥Üªº¦^¶Ç­ÈÃþ«¬(prototype)¡A + ¦pªG¨S¦³¯S§O«ü©ú¡A«h¹w³]ªº¦^¶Ç­ÈÃþ«¬¬° int(¾ã¼Æ)¡C + «Ü©úÅ㪺¡A§Aªºµ{¦¡©Ò»Ý­nªº¨Ã¤£¬O¦^¶Ç­ÈÃþ§O¬° int¡C - So how do I fix this? + ¨º¦p¦ó¤~¥i¥H­×¥¿­è©Ò»¡ªº°ÝÃD¡H - The prototypes for the mathematical functions are in - math.h. If you include this file, - the compiler will be able to find the prototype and it - will stop doing strange things to your - calculation! + ¼Æ¾Ç¨ç¥Üªº¦^¶Ç­ÈÃþ«¬(prototype)·|©w¸q¦b math.h¡A + ¦pªG§A¦³ include ³oÀÉ¡A½sĶ¾¹´N·|ª¾¹D¸Ó¨ç¥Üªº¦^¶Ç­ÈÃþ«¬¡A¦p¦¹¤@¨Ó¸Ó¹Bºâ´N·|±o¨ì¥¿½Tªºµ²ªG¡I #include <math.h> @@ -647,8 +604,7 @@ - After recompiling it as you did before, run - it: + ¥[¤F¤W­z¤º®e¤§«á¡A¦A­«·s½sĶ¡A³Ì«á°õ¦æ¡G &prompt.user; ./a.out @@ -656,27 +612,21 @@ - If you are using any of the mathematical functions, - always include - math.h and remember to link in the - math library. + ¦pªG¦³¥Î¨ì¼Æ¾Ç¨ç¦¡¡A½Ð½T©w­n¦³ include math.h ³oÀÉ¡A + ¦Ó¥B°O±o­n©M¼Æ¾Ç¨ç¦¡®w§@³sµ²¡C - I compiled a file called - foobar.c and I cannot find an - executable called foobar. Where has - it gone? + ¤w¸g½sĶ¦n foobar.c¡A + ¦ý¬O½sĶ«á§ä¤£¨ì foobar °õ¦æÀÉ¡C ¸Ó¥h­þÃä§ä©O¡H - Remember, cc will call the - executable a.out unless you tell it - differently. Use the - - option: + °O±o¡A°£«D¦³«ü©w½sĶµ²ªGªº°õ¦æÀÉÀɦW¡A§_«h¹w³]ªº°õ¦æÀÉÀɦW¬O a.out¡C + ¥Î °Ñ¼Æ¡A + ´N¥i¥H¹F¨ì©Ò·Q­nªºµ²ªG¡A¤ñ¦p¡G &prompt.user; cc -o foobar foobar.c @@ -687,108 +637,88 @@ - OK, I have an executable called - foobar, I can see it when I run - ls, but when I type in - foobar at the command prompt it tells - me there is no such file. Why can it not find - it? + ¦n¡A¦³­Ó½sĶ¦nªºµ{¦¡¥s°µ foobar¡A + ¥Î ls «ü¥O®É¥i¥H¬Ý¨ì¡A + ¦ý°õ¦æ®É¡A°T®§«o»¡«o¨S¦³³oÀɮסC¬°¤°»ò¡H - Unlike &ms-dos;, &unix; does not - look in the current directory when it is trying to find - out which executable you want it to run, unless you tell - it to. Either type ./foobar, which - means run the file called - foobar in the current - directory, or change your PATH - environment - variable so that it looks something like + »P &ms-dos; ¤£¦Pªº¬O¡A°£«D¦³«ü©w°õ¦æÀɪº¸ô®|¡A + §_«h &unix; ¨t²Î¨Ã¤£·|¦b¥Ø«eªº¥Ø¿ý¤U´M§ä§A·Q°õ¦æªºÀɮסC + ¦b«ü¥O¦C¤U¥´ ./foobar ¥Nªí + °õ¦æ¦b³o­Ó¥Ø¿ý©³¤U¦W¬° foobar ªºµ{¦¡¡A + ©ÎªÌ¤]¥i¥H§ó§ï PATH Àô¹ÒÅܼƳ]©w¦p¤U¡A¥H¹F¦¨Ãþ¦ü®ÄªG¡G bin:/usr/bin:/usr/local/bin:. - The dot at the end means look in the current - directory if it is not in any of the - others. + ¤W¤@¦æ³Ì«áªº "." ¥Nªí¦pªG¦b«e­±¼gªº¨ä¥L¥Ø¿ý§ä¤£¨ì¡A´N§ä¥Ø«eªº¥Ø¿ý¡C - I called my executable test, - but nothing happens when I run it. What is going - on? + ¸ÕµÛ°õ¦æ test °õ¦æÀÉ¡A + ¦ý¬O«o¨S¦³¥ô¦ó¨Æµo¥Í¡A¨ì©³¬O­þ¸Ì¥X¿ù¤F¡H - Most &unix; systems have a program called - test in /usr/bin - and the shell is picking that one up before it gets to - checking the current directory. Either type: + ¤j¦h¼Æªº &unix; ¨t²Î³£·|¦b¸ô®| /usr/bin Â\©ñ°õ¦æÀÉ¡C + °£«D¦³«ü©w¨Ï¥Î¦b¥Ø«e¥Ø¿ý¤ºªº test¡A§_«h shell ·|Àu¥ý¿ï¾Ü¦ì¦b + /usr/bin ªº test¡A + ­n«ü©wÀɦWªº¸Ü¡A§@ªkÃþ¦ü¡G &prompt.user; ./test - or choose a better name for your program! + ¬°¤FÁקK¤W­z§xÂZ¡A½Ð¬°§Aªºµ{¦¡¨ú§ó¦nªº¦WºÙ§a¡I - I compiled my program and it seemed to run all right - at first, then there was an error and it said something - about core dumped. What does that - mean? + ·í°õ¦æ§Ú¼gªºµ{¦¡®É­è¶}©l¥¿±`¡A + ±µ¤U¨Ó«o¥X²{ core dumped ¿ù»~°T®§¡C³o¿ù»~°T®§¨ì©³¥Nªí¤°»ò¡H - The name core dump dates back - to the very early days of &unix;, when the machines used - core memory for storing data. Basically, if the program - failed under certain conditions, the system would write - the contents of core memory to disk in a file called - core, which the programmer could - then pore over to find out what went wrong. + Ãö©ó core dumped ³o­Ó¦WºÙªº¥Ñ¨Ó¡A + ¥i¥H°l·¹¨ì¦­´Áªº &unix; ¨t²Î¶}©l¨Ï¥Î core memory ¹ï¸ê®Æ±Æ§Ç®É¡C + °ò¥»¤W·íµ{¦¡¦b«Ü¦h±¡ªp¤Uµo¥Í¿ù»~«á¡A + §@·~¨t²Î·|§â core memory ¤¤ªº¸ê°T¼g¤J core ³oÀɮפ¤¡A + ¥H«KÅý programmer ª¾¹Dµ{¦¡¨ì©³¬O¬°¦ó¥X¿ù¡C - Fascinating stuff, but what I am supposed to do - now? + ¯u¬O¤Ó¯«©_¤F¡Iµ{¦¡©~µMµo¥Í core dumped ¤F¡A¸Ó«ç»ò¿ì¡H - Use gdb to analyze the core (see - ). + ½Ð¥Î gdb ¨Ó¤ÀªR core µ²ªG(¸Ô±¡½Ð°Ñ¦Ò )¡C - When my program dumped core, it said something about - a segmentation fault. What is - that? + ·íµ{¦¡¤w¸g§â core memory ¸ê®Æ dump ¥X¨Ó«á¡A + ¦P®É¤]¥X²{¥t¤@­Ó¿ù»~ segmentation fault ³o·N«ä¬O¡H - This basically means that your program tried to - perform some sort of illegal operation on memory; &unix; - is designed to protect the operating system and other - programs from rogue programs. + °ò¥»¤W¡A³o­Ó¿ù»~ªí¥Ü§Aªºµ{¦¡¦b°O¾ÐÅ餤¸ÕµÛ°µ¤@­ÓÄY­«ªº«Dªk¹B§@(illegal operation)¡A + &unix; ´N¬O³Q³]­p¨Ó«OÅ@¾ã­Ó§@·~¨t²Î§K©ó³Q´c½èªºµ{¦¡¯}Ãa¡A©Ò¥H¤~·|§i¶D§A³o­Ó°T®§¡C - Common causes for this are: + ³Ì±`³y¦¨segmentation faultªº­ì¦]³q±`¬°¡G - Trying to write to a NULL - pointer, eg + ¸ÕµÛ¹ï¤@­Ó NULL ªº«ü¼Ð(pointer)§@¼g¤Jªº°Ê§@¡A¦p char *foo = NULL; strcpy(foo, "bang!"); @@ -796,25 +726,21 @@ - Using a pointer that has not been initialized, - eg + ¨Ï¥Î¤@­Ó©|¥¼ªì©l¤Æ(initialized)ªº«ü¼Ð¡A¦p¡G char *foo; strcpy(foo, "bang!"); - The pointer will have some random value that, - with luck, will point into an area of memory that - is not available to your program and the kernel will - kill your program before it can do any damage. If - you are unlucky, it will point somewhere inside your - own program and corrupt one of your data structures, - causing the program to fail mysteriously. + ©|¥¼ªì©l¤Æªº«ü¼Ðªºªì©l­È±N·|¬OÀH¾÷ªº¡A¦pªG§A°÷©¯¹Bªº¸Ü¡A + ³o­Ó«ü¼Ðªºªì©l­È·|«ü¦V kernel ¤w¸g¥Î¨ìªº°O¾ÐÅé¦ì¸m¡A + kernel ·|µ²§ô±¼³o­Óµ{¦¡¥H½T«O¨t²Î¹B§@¥¿±`¡C¦pªG§A¤£°÷©¯¹B¡A + ªì©l«ü¨ìªº°O¾ÐÅé¦ì¸m¬O§Aµ{¦¡¥²¶·­n¥Î¨ìªº¸ê®Æµ²ºc(data structures)ªº¦ì¸m¡A + ·í³o­Ó±¡§Îµo¥Í®Éµ{¦¡±N·|·íªº¤£ª¾¨ä©Ò¥HµM¡C - Trying to access past the end of an array, - eg + ¸ÕµÛ¼g¤J¶W¹L°}¦C(array)¤¸¯À­Ó¼Æ¡A¦p¡G int bar[20]; bar[27] = 6; @@ -822,8 +748,7 @@ - Trying to store something in read-only memory, - eg + ¸ÕµÛŪ¼g¦b°ßŪ°O¾ÐÅé(read-only memory)¤¤ªº¸ê®Æ¡A¦p¡G char *foo = "My string"; strcpy(foo, "bang!"); ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml#3 (text+ko) ==== @@ -27,23 +27,21 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml,v 1.3 2006/07/19 15:21:42 vanilla Exp $ + $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml,v 1.4 2006/08/05 05:10:18 vanilla Exp $ Original revision: 1.45 --> SGML Primer - The majority of FDP documentation is written in applications of - SGML. This chapter explains exactly what that means, how to read - and understand the source to the documentation, and the sort of SGML - tricks you will see used in the documentation. + FDP ¤å¥ó´X¥G³£¬O¥H SGML ¬ÛÃöµ{¦¡¼gªº¡C¥»³¹·|¤¶²Ð SGML ¬O¤°»ò¡B + ¦p¦ó¾\Ū¡B²z¸Ñ³o¨Ç SGML ­ì½Z¡A¥H¤Î¥»¤å¥ó¤¤©Ò¹B¥Îªº¦U¶µ SGML §Þ¥©¡C - Portions of this section were inspired by Mark Galassi's Get Going With DocBook. + ¥»¸`³¡¤ÀÆF·P±Òµo¨Ó¦Û Mark Galassi ªº³o½g Get Going With DocBook¡C - Overview + ²¤¶ Way back when, electronic text was simple to deal with. Admittedly, you had to know which character set your document was written in (ASCII, ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/book.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -126,14 +126,14 @@ FreeBSD &rel.current;-RELEASE ªº¦w¸Ë©M¤é±`¨Ï¥Î¡C ³o¥÷¨Ï¥Î¤â¥U¬O«Ü¦h¤Hªº¶°Åé³Ð§@¡A¦Ó¥B¤´µM¡y«ùÄò¤£Â_¡zªº¶i¦æ¤¤¡C ³\¦h³¹¸`¤´¥¼§¹¦¨¡A¤w§¹¦¨ªº³¡¥÷¤]¦³¨Ç»Ý­n§ó·s¡C - ¦pªG±z¹ï¨ó§U¥»­pµeªº¶i¦æ¦³¿³½ìªº¸Ü¡A½Ð±H e-mail ¨ì &a.doc;¡C + ¦pªG±z¦³¿³½ì¨ó§U¥»­pµeªº¸Ü¡A½Ð±H e-mail ¨ì &a.doc;¡C ¦b FreeBSD ºô¯¸ ¥i¥H§ä¨ì³o¥÷¤å¥óªº³Ì·sª©¥»(ª©¤å¥ó¥i±q ¨ú±o)¡A¤]¥i¥H±q FreeBSD FTP ¦øªA¾¹ ©Î¬O²³¦h mirror ¯¸»O - ¤U¸ü¤£¦P®æ¦¡¤Î¤£¦PÀ£ÁY¿ï¶µªº¸ê®Æ¡C - ¦pªG¤ñ¸û°¾¦n¾Ö¦³¹êÅé®Ñ­±¸ê®Æ¡A¨º¥i¥H¦b + ¤U¸ü¤£¦P®æ¦¡ªº¸ê®Æ¡C + ¦pªG¤ñ¸û°¾¦n¹êÅé®Ñ­±¸ê®Æ¡A¨º¥i¥H¦b FreeBSD Mall ÁʶR¡C ¦¹¥~¡A¤]¥i¥H¦b ¨Ï¥Î¤â¥U ¤¤·j´M¸ê®Æ¡C ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -28,101 +28,85 @@ - Linux Binary Compatibility + »P Linux Binary ªº¬Û®e¤è­± - Synopsis + ·§­z Linux binary compatibility binary compatibility Linux - FreeBSD provides binary compatibility with several other - &unix; like operating systems, including Linux. At this point, - you may be asking yourself why exactly, does - FreeBSD need to be able to run Linux binaries? The answer to that - question is quite simple. Many companies and developers develop - only for Linux, since it is the latest hot thing in - the computing world. That leaves the rest of us FreeBSD users - bugging these same companies and developers to put out native - FreeBSD versions of their applications. The problem is, that most - of these companies do not really realize how many people would use - their product if there were FreeBSD versions too, and most continue - to only develop for Linux. So what is a FreeBSD user to do? This - is where the Linux binary compatibility of FreeBSD comes into - play. + FreeBSD ¦³´£¨Ñ¨ä¥L´XºØ &unix; like §@·~¨t²Îªº binary ¬Û®e©Ê¡A¨ä¤¤¥]¬A¤F Linux¡C + §A¥i¯à·|¯Ç´e¡G¬°¤°»ò FreeBSD »Ý­n¯à°÷°õ¦æ Linux ±M¥Î°õ¦æÀÉ(binary)©O¡Hµª®×«Ü²³æ¡A + ³\¦h¤½¥q¡B¶}µoªÌ¥u·| Linux ¶}µoµ{¦¡¡A¦]¬°³o¬O¥Ø«e¸ê°T¬É ³Ì¼öªù ªºª±·N¡C + ³o¹G±o³\¦h FreeBSD ¨Ï¥ÎªÌ¤£±o¤£¥hÄU»¡³o¨Ç¤H¬O§_´£¨Ñ¥iª½±µ¦b FreeBSD ¤W°õ¦æªºª©¥»¡C + ¦ý°ÝÃD¬O¡A¤j¦h¼Æ¤½¥q¨Ã¤£ÁA¸Ñ·|¦³¦h¤Ö¤H·|¥Î FreeBSD ª©¡A¦]¦¹¥L­Ì¤´¥u¶}µo Linux ª©¡C + ¨º»ò FreeBSD ¨Ï¥ÎªÌ¸Ó«ç»ò¿ì©O¡Hµª®×´N¬O¥Î FreeBSD ©Ò´£¨Ñªº Linux binary ¬Û®e¡C - In a nutshell, the compatibility allows FreeBSD users to run - about 90% of all Linux applications without modification. This - includes applications such as &staroffice;, - the Linux version of &netscape;, - &adobe; &acrobat;, - RealPlayer, - VMware, - &oracle;, - WordPerfect, Doom, - Quake, and more. It is also reported - that in some situations, Linux binaries perform better on FreeBSD - than they do under Linux. + ²³æ¨ÓÁ¿¡A³oºØ¬Û®e©Ê¥iÅý FreeBSD ¨Ï¥ÎªÌª½±µ°õ¦æ¬ù 90% ªº Linux µ{¦¡¡A¦Ó¤£¥²°µ¥ô¦ó­×§ï¡C + ³o¨Ç¥]¬A¤F¡G &staroffice;¡B + &netscape; ªº Linux ª©¡B + &adobe; &acrobat;¡B + RealPlayer¡B + VMware¡B + &oracle;¡B + WordPerfect¡BDoom¡B + Quake µ¥µ¥¡C¦¹¥~¡A¤]¦³¤H¦^³ø»¡¦b¬Y¨Ç±¡ªp¤U¡A + ³o¨Ç¦b FreeBSD ¤W°õ¦æªº Linux µ{¦¡¡A¬Æ¦Ü¤ñ­ì¥»¦b Linux °õ¦æ±o§ó¦n¡C - There are, however, some Linux-specific operating system - features that are not supported under FreeBSD. Linux binaries will - not work on FreeBSD if they overly use &i386; specific - calls, such as enabling virtual 8086 mode. + µM¦Ó©O¡AÁÙ¬O¦³¨Ç¥u­­ Linux ¯S©wªº§@·~¨t²Î¥\¯à¡A¦b FreeBSD ¤W¨Ã¥¼¤ä´©¡C + ¦pªG Linux µ{¦¡¹L©óÀݥΥu¦³ &i386; ¬[ºc¤W¤~¯à¥Îªº¥\¯à¡A¤ñ¦p¡GµêÀÀ 8086 ¼Ò¦¡¡A + «h¥i¯àµLªk¦b FreeBSD ¹B§@¥¿±`¡C - After reading this chapter, you will know: + Ū§¹³o³¹¡A±z±N¤F¸Ñ¡G - How to enable Linux binary compatibility on your system. + ¦p¦ó±Ò¥Î Linux ¬Û®e¼Ò¦¡¡C - How to install additional Linux shared - libraries. + ¦p¦ó¦w¸ËÃB¥~ªº Linux share libraries¡C - How to install Linux applications on your FreeBSD system. + ¦p¦ó¦b FreeBSD ¤W¦w¸Ë Linux µ{¦¡¡C - The implementation details of Linux compatibility in FreeBSD. + FreeBSD ¤Wªº Linux ¬Û®e¼Ò¦¡ªº¹ê§@²Ó¸`¡C - Before reading this chapter, you should: + ¦b¾\Ū³o³¹¤§«e¡A±zÀ³·í¤F¸Ñ¡G - Know how to install additional third-party - software (). + ª¾¹D¦p¦ó³z¹L port ¾÷¨î¨Ó¦w¸Ë³nÅé()¡C - Installation + ¦w¸Ë KLD (kernel loadable object) - Linux binary compatibility is not turned on by default. The - easiest way to enable this functionality is to load the + ¹w³]¨Ã¤£·|¥´¶} Linux ¬Û®e¼Ò¦¡¡A³Ì²³æªº±Ò¥Î¤è¦¡¡A´N¬O¸ü¤J linux KLD object (Kernel LoaDable - object). You can load this module by typing the - following as root: + object)¡C ¸ü¤J¤è¦¡¡A½Ð¤Á¬° root + Åv­­¡AµM«á¥´¤U¦C«ü¥O¡G &prompt.root; kldload linux - If you would like Linux compatibility to always be enabled, - then you should add the following line to - /etc/rc.conf: + ­Y­n¨C¦¸¶}¾÷³£±Ò¥Îªº¸Ü¡A½Ð§â¤U¦C¤º®e¥[¨ì + /etc/rc.conf ÀÉ¡G linux_enable="YES" - The &man.kldstat.8; command can be used to verify that the - KLD is loaded: + ¥t¥~¥i¥H¥Î &man.kldstat.8; «ü¥O¡A¨Ó½T»{¦³­þ¨Ç KLD ¦³¸ü¤J¡G &prompt.user; kldstat Id Refs Address Size Name @@ -130,7 +114,7 @@ 7 1 0xc24db000 d000 linux.ko kernel options - LINUX + COMPAT_LINUX If for some reason you do not want to or cannot load the KLD, @@ -160,7 +144,7 @@ from the Ports Collection. Simply do the following: - &prompt.root; cd /usr/ports/emulators/linux_base + &prompt.root; cd /usr/ports/emulators/linux_base-fc4 &prompt.root; make install distclean You should now have working Linux binary compatibility. @@ -1563,8 +1547,7 @@ Installation of FreeBSD First you have to install FreeBSD. There are several ways to do - this (FreeBSD 4.3 was installed via FTP, FreeBSD 4.5 directly from - the RELEASE CD) for more information read the . @@ -2066,7 +2049,7 @@ and &oracle;, therefore choose a larger number of shared memory pages. - With the default installation of FreeBSD 4.5 on &i386;, + With the default installation of FreeBSD on &i386;, leave MAXDSIZ and DFLDSIZ at 1 GB maximum. Otherwise, strange errors like ORA-27102: out of memory and Linux Error: 12: Cannot allocate memory @@ -3037,7 +3020,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 5 20:05:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FB1816A4DE; Sat, 5 Aug 2006 20:05:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A0AB16A4DA for ; Sat, 5 Aug 2006 20:05:05 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAE4F43D46 for ; Sat, 5 Aug 2006 20:05:04 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75K542C037690 for ; Sat, 5 Aug 2006 20:05:04 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75K54b7037686 for perforce@freebsd.org; Sat, 5 Aug 2006 20:05:04 GMT (envelope-from piso@freebsd.org) Date: Sat, 5 Aug 2006 20:05:04 GMT Message-Id: <200608052005.k75K54b7037686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 20:05:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103274 Change 103274 by piso@piso_newluxor on 2006/08/05 20:04:47 compilation Affected files ... .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#10 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#10 (text+ko) ==== @@ -1229,9 +1229,9 @@ * It should be possible to run the tx clean loop without the lock. */ if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - em_rxeof(sc, sc->rx_process_limit); - EM_LOCK(sc); - em_txeof(sc); + em_rxeof(adapter, adapter->rx_process_limit); + EM_LOCK(adapter); + em_txeof(adapter); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) em_start_locked(ifp); @@ -1279,7 +1279,7 @@ * cheap, just assume that it is needed. This also works around the * MSI message reordering errata on certain systems. */ - em_disable_intr(sc); + em_disable_intr(adapter); /* Link status change */ if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) @@ -2040,8 +2040,8 @@ E1000_WRITE_REG(&adapter->hw, IMC, 0xffffffff); #ifdef DEVICE_POLLING - if (sc->int_handler_tag == NULL && (error = bus_setup_intr(dev, - sc->res_interrupt, INTR_TYPE_NET | INTR_MPSAFE, NULL, em_intr, + if (adapter->int_handler_tag == NULL && (error = bus_setup_intr(dev, + adapter->res_interrupt, INTR_TYPE_NET | INTR_MPSAFE, NULL, em_intr, adapter, &adapter->int_handler_tag)) != 0) { device_printf(dev, "Failed to register interrupt handler"); return (error); @@ -2052,9 +2052,9 @@ * processing contexts. */ TASK_INIT(&adapter->link_task, 0, em_handle_link, adapter); - if ((error = bus_setup_intr(dev, sc->res_interrupt, - INTR_TYPE_NET | INTR_MPSAFE, em_intr_fast, em_handle_rxtx, sc, - &sc->int_handler_tag)) != 0) { + if ((error = bus_setup_intr(dev, adapter->res_interrupt, + INTR_TYPE_NET | INTR_MPSAFE, em_intr_fast, em_handle_rxtx, adapter, + &adapter->int_handler_tag)) != 0) { device_printf(dev, "Failed to register fast interrupt " "handler: %d\n", error); return (error); ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#2 (text+ko) ==== @@ -2718,7 +2718,7 @@ i = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE); - if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, emu_intr, sc, &sc->ih)) { + if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) { device_printf(dev, "unable to map interrupt\n"); goto bad; } ==== //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#2 (text+ko) ==== @@ -809,7 +809,7 @@ * Hookup IRQ */ error = bus_setup_intr(dev, sc->sc_res[1], INTR_TYPE_NET | INTR_MPSAFE, - stge_intr, sc, &sc->sc_ih); + NULL, stge_intr, sc, &sc->sc_ih); if (error != 0) { ether_ifdetach(ifp); device_printf(sc->sc_dev, "couldn't set up IRQ\n"); From owner-p4-projects@FreeBSD.ORG Sat Aug 5 21:24:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D20E816A4DF; Sat, 5 Aug 2006 21:24:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D42C16A4DD for ; Sat, 5 Aug 2006 21:24:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D153343D5C for ; Sat, 5 Aug 2006 21:24:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75LOkso051693 for ; Sat, 5 Aug 2006 21:24:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75LOkYC051690 for perforce@freebsd.org; Sat, 5 Aug 2006 21:24:46 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 21:24:46 GMT Message-Id: <200608052124.k75LOkYC051690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 21:24:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=103278 Change 103278 by jb@jb_freebsd2 on 2006/08/05 21:24:41 IFC Affected files ... .. //depot/projects/dtrace/src/etc/defaults/rc.conf#13 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#9 integrate Differences ... ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#13 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -516,9 +516,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="LOW" # Online CPU idle state +performance_cx_lowest="HIGH" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="LOW" # Offline CPU idle state +economy_cx_lowest="HIGH" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot ==== //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.91 2006/04/29 07:13:49 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.92 2006/08/05 21:08:47 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ "Enables/Disables shared locks for path name translation"); /* - * Convert a pathname into a pointer to a locked inode. + * Convert a pathname into a pointer to a locked vnode. * * The FOLLOW flag is set when symbolic links are to be followed * when they occur at the end of the name translation process. @@ -607,7 +607,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ if (cnp->cn_flags & SAVESTART) { ndp->ni_startdir = ndp->ni_dvp; @@ -859,7 +859,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ return (0); } ==== //depot/projects/dtrace/src/sys/sys/param.h#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $ */ #ifndef _SYS_PARAM_H_ @@ -344,7 +344,7 @@ * FreeBSD headers provide to OpenSolaris code. Perhaps one day there * will be a really, really Single Unix Specification. */ -#define __OpenSolaris_version 20060508 +#define __OpenSolaris_version 20060731 #endif #endif /* _SYS_PARAM_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 21:31:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEEA216A4DE; Sat, 5 Aug 2006 21:31:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9379E16A4DA for ; Sat, 5 Aug 2006 21:31:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C2C643D5D for ; Sat, 5 Aug 2006 21:31:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75LVurD052127 for ; Sat, 5 Aug 2006 21:31:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75LVtSD052124 for perforce@freebsd.org; Sat, 5 Aug 2006 21:31:55 GMT (envelope-from marcel@freebsd.org) Date: Sat, 5 Aug 2006 21:31:55 GMT Message-Id: <200608052131.k75LVtSD052124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 103279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 21:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103279 Change 103279 by marcel@marcel_nfs on 2006/08/05 21:31:24 prfpregset_t is used by gcore(1), so let's keep it for now. Affected files ... .. //depot/projects/gdb/sys/sys/procfs.h#7 edit Differences ... ==== //depot/projects/gdb/sys/sys/procfs.h#7 (text+ko) ==== @@ -65,6 +65,8 @@ gregset_t pr_reg; /* General purpose registers (1) */ } prstatus_t; +typedef fpregset_t prfpregset_t; + #define PRFNAMESZ 16 /* Maximum command length saved */ #define PRARGSZ 80 /* Maximum argument bytes saved */ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:07:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9D7316A4E0; Sat, 5 Aug 2006 22:07:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 977E916A4DE for ; Sat, 5 Aug 2006 22:07:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 365B443D46 for ; Sat, 5 Aug 2006 22:07:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75M7gLp055146 for ; Sat, 5 Aug 2006 22:07:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75M7fZs055142 for perforce@freebsd.org; Sat, 5 Aug 2006 22:07:41 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:07:41 GMT Message-Id: <200608052207.k75M7fZs055142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:07:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=103283 Change 103283 by jb@jb_freebsd2 on 2006/08/05 22:06:59 Merge KSE back in, but only if the kernel option KSE is defined. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_idle.c#3 edit .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#6 edit .. //depot/projects/dtrace/src/sys/kern/kern_mib.c#3 edit .. //depot/projects/dtrace/src/sys/sys/proc.h#11 edit .. //depot/projects/dtrace/src/sys/sys/rtprio.h#3 edit .. //depot/projects/dtrace/src/sys/sys/sched.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_idle.c#3 (text+ko) ==== @@ -78,8 +78,13 @@ mtx_lock_spin(&sched_lock); td = FIRST_THREAD_IN_PROC(p); TD_SET_CAN_RUN(td); +#ifdef KSE + td->td_flags |= TDF_IDLETD; + sched_class(td->td_ksegrp, PRI_IDLE); +#else atomic_set_int(&td->td_flags, TDF_IDLETD); sched_class(td, PRI_IDLE); +#endif sched_prio(td, PRI_MAX_IDLE); mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); @@ -118,8 +123,12 @@ #ifdef SMP idle_cpus_mask &= ~mycpu; #endif +#ifdef KSE + mi_switch(SW_VOL, NULL); +#else if ((td = choosethread()) != curthread) sched_switch(curthread, td, SW_VOL); +#endif #ifdef SMP idle_cpus_mask |= mycpu; #endif ==== //depot/projects/dtrace/src/sys/kern/kern_intr.c#6 (text+ko) ==== @@ -296,7 +296,11 @@ panic("kthread_create() failed with %d", error); td = FIRST_THREAD_IN_PROC(p); /* XXXKSE */ mtx_lock_spin(&sched_lock); +#ifdef KSE + td->td_ksegrp->kg_pri_class = PRI_ITHD; +#else td->td_pri_class = PRI_ITHD; +#endif TD_SET_IWAIT(td); mtx_unlock_spin(&sched_lock); td->td_pflags |= TDP_ITHREAD; @@ -531,7 +535,11 @@ CTR3(KTR_INTR, "%s: schedule pid %d (%s)", __func__, p->p_pid, p->p_comm); TD_CLR_IWAIT(td); +#ifdef KSE + setrunqueue(td, SRQ_INTR); +#else sched_run_ithread(td); +#endif } else { CTR5(KTR_INTR, "%s: pid %d (%s): it_need %d, state %d", __func__, p->p_pid, p->p_comm, it->it_need, td->td_state); ==== //depot/projects/dtrace/src/sys/kern/kern_mib.c#3 (text+ko) ==== @@ -146,7 +146,7 @@ SYSCTL_INT(_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD, 0, BYTE_ORDER, "System byte order"); -SYSCTL_INT(_hw, HW_PAGESIZE, pagesize, CTLFLAG_RD | CTLFLAG_MPSAFE, +SYSCTL_INT(_hw, HW_PAGESIZE, pagesize, CTLFLAG_RD, 0, PAGE_SIZE, "System memory page size"); static int ==== //depot/projects/dtrace/src/sys/sys/proc.h#11 (text+ko) ==== @@ -152,23 +152,120 @@ */ struct auditinfo; struct kaudit_record; +#ifdef KSE +struct kg_sched; +#else struct td_sched; +#endif struct nlminfo; struct kaioinfo; struct p_sched; struct proc; struct sleepqueue; +#ifdef KSE +struct td_sched; +#else struct thread; +#endif struct trapframe; struct turnstile; struct mqueue_notifier; +#ifdef KSE +/* + * Here we define the three structures used for process information. + * + * The first is the thread. It might be thought of as a "Kernel + * Schedulable Entity Context". + * This structure contains all the information as to where a thread of + * execution is now, or was when it was suspended, why it was suspended, + * and anything else that will be needed to restart it when it is + * rescheduled. Always associated with a KSE when running, but can be + * reassigned to an equivalent KSE when being restarted for + * load balancing. Each of these is associated with a kernel stack + * and a pcb. + * + * It is important to remember that a particular thread structure may only + * exist as long as the system call or kernel entrance (e.g. by pagefault) + * which it is currently executing. It should therefore NEVER be referenced + * by pointers in long lived structures that live longer than a single + * request. If several threads complete their work at the same time, + * they will all rewind their stacks to the user boundary, report their + * completion state, and all but one will be freed. That last one will + * be kept to provide a kernel stack and pcb for the NEXT syscall or kernel + * entrance (basically to save freeing and then re-allocating it). The existing + * thread keeps a cached spare thread available to allow it to quickly + * get one when it needs a new one. There is also a system + * cache of free threads. Threads have priority and partake in priority + * inheritance schemes. + */ +struct thread; + +/* + * The KSEGRP is allocated resources across a number of CPUs. + * (Including a number of CPUxQUANTA. It parcels these QUANTA up among + * its threads, each of which should be running in a different CPU. + * BASE priority and total available quanta are properties of a KSEGRP. + * Multiple KSEGRPs in a single process compete against each other + * for total quanta in the same way that a forked child competes against + * it's parent process. + */ +struct ksegrp; + /* + * A process is the owner of all system resources allocated to a task + * except CPU quanta. + * All KSEGs under one process see, and have the same access to, these + * resources (e.g. files, memory, sockets, credential, kqueues). + * A process may compete for CPU cycles on the same basis as a + * forked process cluster by spawning several KSEGRPs. + */ +struct proc; + +/*************** + * In pictures: + With a single run queue used by all processors: + + RUNQ: --->KSE---KSE--... SLEEPQ:[]---THREAD---THREAD---THREAD + \ \ []---THREAD + KSEG---THREAD--THREAD--THREAD [] + []---THREAD---THREAD + + (processors run THREADs from the KSEG until they are exhausted or + the KSEG exhausts its quantum) + +With PER-CPU run queues: +KSEs on the separate run queues directly +They would be given priorities calculated from the KSEG. + + * + *****************/ +#endif + +#ifdef KSE +/* + * Kernel runnable context (thread). + * This is what is put to sleep and reactivated. + * The first KSE available in the correct group will run this thread. + * If several are available, use the one on the same CPU as last time. + * When waiting to be run, threads are hung off the KSEGRP in priority order. + * With N runnable and queued KSEs in the KSEGRP, the first N threads + * are linked to them. Other threads are not yet assigned. + */ +#else +/* * Thread context. Processes may have multiple threads. */ +#endif struct thread { struct proc *td_proc; /* (*) Associated process. */ +#ifdef KSE + struct ksegrp *td_ksegrp; /* (*) Associated KSEG. */ +#endif TAILQ_ENTRY(thread) td_plist; /* (*) All threads in this proc. */ +#ifdef KSE + TAILQ_ENTRY(thread) td_kglist; /* (*) All threads in this ksegrp. */ +#endif /* The two queues below should someday be merged. */ TAILQ_ENTRY(thread) td_slpq; /* (j) Sleep queue. */ @@ -202,9 +299,17 @@ struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */ int td_intr_nesting_level; /* (k) Interrupt recursion. */ int td_pinned; /* (k) Temporary cpu pin count. */ +#ifdef KSE + struct kse_thr_mailbox *td_mailbox; /* (*) Userland mailbox address. */ +#endif struct ucred *td_ucred; /* (k) Reference to credentials. */ +#ifdef KSE + struct thread *td_standin; /* (k + a) Use this for an upcall. */ + struct kse_upcall *td_upcall; /* (k + j) Upcall structure. */ +#else u_int td_estcpu; /* (j) Sum of the same field in KSEs. */ u_int td_slptime; /* (j) How long completely blocked. */ +#endif u_int td_pticks; /* (k) Statclock hits for profiling */ u_int td_sticks; /* (k) Statclock hits in system mode. */ u_int td_iticks; /* (k) Statclock hits in intr mode. */ @@ -216,6 +321,9 @@ sigset_t td_sigmask; /* (c) Current signal mask. */ volatile u_int td_generation; /* (k) For detection of preemption */ stack_t td_sigstk; /* (k) Stack ptr and on-stack flag. */ +#ifdef KSE + int td_kflags; /* (c) Flags for KSE threading. */ +#endif int td_xsig; /* (c) Signal for ptrace */ int td_xsig_why; /* (c) reason for ptrace signal PL_EVENT_* */ u_long td_profil_addr; /* (k) Temporary addr until AST. */ @@ -334,15 +442,27 @@ #define TDP_OLDMASK 0x00000001 /* Need to restore mask after suspend. */ #define TDP_INKTR 0x00000002 /* Thread is currently in KTR code. */ #define TDP_INKTRACE 0x00000004 /* Thread is currently in KTRACE code. */ +#ifdef KSE +#define TDP_UPCALLING 0x00000008 /* This thread is doing an upcall. */ +#else /* 0x00000008 */ +#endif #define TDP_COWINPROGRESS 0x00000010 /* Snapshot copy-on-write in progress. */ #define TDP_ALTSTACK 0x00000020 /* Have alternate signal stack. */ #define TDP_DEADLKTREAT 0x00000040 /* Lock aquisition - deadlock treatment. */ +#ifdef KSE +#define TDP_SA 0x00000080 /* A scheduler activation based thread. */ +#else /* 0x00000080 */ +#endif #define TDP_NOSLEEPING 0x00000100 /* Thread is not allowed to sleep on a sq. */ #define TDP_OWEUPC 0x00000200 /* Call addupc() at next AST. */ #define TDP_ITHREAD 0x00000400 /* Thread is an interrupt thread. */ +#ifdef KSE +#define TDP_CAN_UNBIND 0x00000800 /* Only temporarily bound. */ +#else /* 0x00000800 */ +#endif #define TDP_SCHED1 0x00001000 /* Reserved for scheduler private use */ #define TDP_SCHED2 0x00002000 /* Reserved for scheduler private use */ #define TDP_SCHED3 0x00004000 /* Reserved for scheduler private use */ @@ -363,6 +483,19 @@ #define TDI_LOCK 0x0008 /* Stopped on a lock. */ #define TDI_IWAIT 0x0010 /* Awaiting interrupt. */ +#ifdef KSE +/* + * flags (in kflags) related to M:N threading. + */ +#define TDK_KSEREL 0x0001 /* Blocked in msleep on kg->kg_completed. */ +#define TDK_KSERELSIG 0x0002 /* Blocked in msleep on p->p_siglist. */ +#define TDK_WAKEUP 0x0004 /* Thread has been woken by kse_wakeup. */ + +#define TD_CAN_UNBIND(td) \ + (((td)->td_pflags & TDP_CAN_UNBIND) && \ + ((td)->td_upcall != NULL)) +#endif + #define TD_IS_SLEEPING(td) ((td)->td_inhibitors & TDI_SLEEPING) #define TD_ON_SLEEPQ(td) ((td)->td_wchan != NULL) #define TD_IS_SUSPENDED(td) ((td)->td_inhibitors & TDI_SUSPENDED) @@ -408,7 +541,57 @@ #define TD_SET_RUNQ(td) (td)->td_state = TDS_RUNQ #define TD_SET_CAN_RUN(td) (td)->td_state = TDS_CAN_RUN +#ifdef KSE +/* + * An upcall is used when returning to userland. If a thread does not have + * an upcall on return to userland the thread exports its context and exits. + */ +struct kse_upcall { + TAILQ_ENTRY(kse_upcall) ku_link; /* List of upcalls in KSEG. */ + struct ksegrp *ku_ksegrp; /* Associated KSEG. */ + struct thread *ku_owner; /* Owning thread. */ + int ku_flags; /* KUF_* flags. */ + struct kse_mailbox *ku_mailbox; /* Userland mailbox address. */ + stack_t ku_stack; /* Userland upcall stack. */ + void *ku_func; /* Userland upcall function. */ + unsigned int ku_mflags; /* Cached upcall mbox flags. */ +}; + +#define KUF_DOUPCALL 0x00001 /* Do upcall now; don't wait. */ +#define KUF_EXITING 0x00002 /* Upcall structure is exiting. */ + /* + * Kernel-scheduled entity group (KSEG). The scheduler considers each KSEG to + * be an indivisible unit from a time-sharing perspective, though each KSEG may + * contain multiple KSEs. + */ +struct ksegrp { + struct proc *kg_proc; /* (*) Proc that contains this KSEG. */ + TAILQ_ENTRY(ksegrp) kg_ksegrp; /* (*) Queue of KSEGs in kg_proc. */ + TAILQ_HEAD(, thread) kg_threads;/* (td_kglist) All threads. */ + TAILQ_HEAD(, thread) kg_runq; /* (td_runq) waiting RUNNABLE threads */ + TAILQ_HEAD(, kse_upcall) kg_upcalls; /* All upcalls in the group. */ + +#define kg_startzero kg_estcpu + u_int kg_estcpu; /* (j) Sum of the same field in KSEs. */ + u_int kg_slptime; /* (j) How long completely blocked. */ + int kg_numupcalls; /* (j) Num upcalls. */ + int kg_upsleeps; /* (c) Num threads in kse_release(). */ + struct kse_thr_mailbox *kg_completed; /* (c) Completed thread mboxes. */ + int kg_nextupcall; /* (n) Next upcall time. */ + int kg_upquantum; /* (n) Quantum to schedule an upcall. */ +#define kg_endzero kg_pri_class + +#define kg_startcopy kg_endzero + u_char kg_pri_class; /* (j) Scheduling class. */ + u_char kg_user_pri; /* (j) User pri from estcpu and nice. */ +#define kg_endcopy kg_numthreads + int kg_numthreads; /* (j) Num threads in total. */ + struct kg_sched *kg_sched; /* (*) Scheduler-specific data. */ +}; +#endif + +/* * XXX: Does this belong in resource.h or resourcevar.h instead? * Resource usage extension. The times in rusage structs in the kernel are * never up to date. The actual times are kept as runtimes and tick counts @@ -434,6 +617,9 @@ */ struct proc { LIST_ENTRY(proc) p_list; /* (d) List of all processes. */ +#ifdef KSE + TAILQ_HEAD(, ksegrp) p_ksegrps; /* (c)(kg_ksegrp) All KSEGs. */ +#endif TAILQ_HEAD(, thread) p_threads; /* (j)(td_plist) Threads. (shortcut) */ TAILQ_HEAD(, thread) p_suspended; /* (td_runq) Suspended threads. */ struct ucred *p_ucred; /* (c) Process owner's identity. */ @@ -496,6 +682,9 @@ int p_suspcount; /* (c) Num threads in suspended mode. */ struct thread *p_xthread; /* (c) Trap thread */ int p_boundary_count;/* (c) Num threads at user boundary */ +#ifdef KSE + struct ksegrp *p_procscopegrp; +#endif int p_pendingcnt; /* how many signals are pending */ struct itimers *p_itimers; /* (c) POSIX interval timers. */ /* End area that is zeroed on creation. */ @@ -516,6 +705,9 @@ u_short p_xstat; /* (c) Exit status; also stop sig. */ struct knlist p_klist; /* (c) Knotes attached to this proc. */ int p_numthreads; /* (j) Number of threads. */ +#ifdef KSE + int p_numksegrps; /* (c) Number of ksegrps. */ +#endif struct mdproc p_md; /* Any machine-dependent fields. */ struct callout p_itcallout; /* (h + c) Interval timer callout. */ u_short p_acflag; /* (c) Accounting flags. */ @@ -627,11 +819,22 @@ #define FOREACH_PROC_IN_SYSTEM(p) \ LIST_FOREACH((p), &allproc, p_list) +#ifdef KSE +#define FOREACH_KSEGRP_IN_PROC(p, kg) \ + TAILQ_FOREACH((kg), &(p)->p_ksegrps, kg_ksegrp) +#define FOREACH_THREAD_IN_GROUP(kg, td) \ + TAILQ_FOREACH((td), &(kg)->kg_threads, td_kglist) +#define FOREACH_UPCALL_IN_GROUP(kg, ku) \ + TAILQ_FOREACH((ku), &(kg)->kg_upcalls, ku_link) +#endif #define FOREACH_THREAD_IN_PROC(p, td) \ TAILQ_FOREACH((td), &(p)->p_threads, td_plist) /* XXXKSE the following lines should probably only be used in 1:1 code: */ #define FIRST_THREAD_IN_PROC(p) TAILQ_FIRST(&(p)->p_threads) +#ifdef KSE +#define FIRST_KSEGRP_IN_PROC(p) TAILQ_FIRST(&(p)->p_ksegrps) +#endif /* * We use process IDs <= PID_MAX; PID_MAX + 1 must also fit in a pid_t, @@ -742,6 +945,9 @@ extern struct sx allproc_lock; extern struct sx proctree_lock; extern struct mtx ppeers_lock; +#ifdef KSE +extern struct ksegrp ksegrp0; /* Primary ksegrp in proc0. */ +#endif extern struct proc proc0; /* Process slot for swapper. */ extern struct thread thread0; /* Primary thread in proc0. */ extern struct vmspace vmspace0; /* VM space for proc0. */ @@ -792,7 +998,11 @@ void pargs_free(struct pargs *pa); void pargs_hold(struct pargs *pa); void procinit(void); +#ifdef KSE +void proc_linkup(struct proc *p, struct ksegrp *kg, struct thread *td); +#else void proc_linkup(struct proc *p, struct thread *td); +#endif void proc_reparent(struct proc *child, struct proc *newparent); struct pstats *pstats_alloc(void); void pstats_fork(struct pstats *src, struct pstats *dst); @@ -820,6 +1030,11 @@ void cpu_set_fork_handler(struct thread *, void (*)(void *), void *); /* New in KSE. */ +#ifdef KSE +struct ksegrp *ksegrp_alloc(void); +void ksegrp_free(struct ksegrp *kg); +void ksegrp_stash(struct ksegrp *kg); +#endif void kse_GC(void); void kseinit(void); void cpu_set_upcall(struct thread *td, struct thread *td0); @@ -830,13 +1045,24 @@ void cpu_thread_setup(struct thread *td); void cpu_thread_swapin(struct thread *); void cpu_thread_swapout(struct thread *); +#ifdef KSE +void ksegrp_link(struct ksegrp *kg, struct proc *p); +void ksegrp_unlink(struct ksegrp *kg); +#endif struct thread *thread_alloc(void); void thread_continued(struct proc *p); void thread_exit(void) __dead2; int thread_export_context(struct thread *td, int willexit); void thread_free(struct thread *td); +#ifdef KSE +void thread_link(struct thread *td, struct ksegrp *kg); +#else void thread_link(struct thread *td, struct proc *p); +#endif void thread_reap(void); +#ifdef KSE +struct thread *thread_schedule_upcall(struct thread *td, struct kse_upcall *ku); +#endif void thread_signal_add(struct thread *td, ksiginfo_t *); int thread_single(int how); void thread_single_end(void); @@ -854,9 +1080,21 @@ void thread_unsuspend(struct proc *p); void thread_unsuspend_one(struct thread *td); void thread_unthread(struct thread *td); +#ifdef KSE +int thread_userret(struct thread *td, struct trapframe *frame); +void thread_user_enter(struct thread *td); +#endif void thread_wait(struct proc *p); struct thread *thread_find(struct proc *p, lwpid_t tid); void thr_exit1(void); +#ifdef KSE +struct kse_upcall *upcall_alloc(void); +void upcall_free(struct kse_upcall *ku); +void upcall_link(struct kse_upcall *ku, struct ksegrp *kg); +void upcall_unlink(struct kse_upcall *ku); +void upcall_remove(struct thread *td); +void upcall_stash(struct kse_upcall *ke); +#endif #endif /* _KERNEL */ ==== //depot/projects/dtrace/src/sys/sys/rtprio.h#3 (text+ko) ==== @@ -75,11 +75,17 @@ }; #ifdef _KERNEL +#ifdef KSE +struct ksegrp; +int rtp_to_pri(struct rtprio *, struct ksegrp *); +void pri_to_rtp(struct ksegrp *, struct rtprio *); +#else struct thread; int rtp_to_pri(struct rtprio *, struct thread *); void pri_to_rtp(struct thread *, struct rtprio *); #endif #endif +#endif #ifndef _KERNEL #include ==== //depot/projects/dtrace/src/sys/sys/sched.h#4 (text+ko) ==== @@ -52,19 +52,32 @@ * KSE Groups contain scheduling priority information. They record the * behavior of groups of KSEs and threads. */ +#ifdef KSE +void sched_class(struct ksegrp *kg, int class); +void sched_exit_ksegrp(struct ksegrp *kg, struct thread *childtd); +void sched_fork_ksegrp(struct thread *td, struct ksegrp *child); +#else void sched_class(struct thread *td, int class); +#endif void sched_nice(struct proc *p, int nice); /* * Threads are switched in and out, block on resources, have temporary * priorities inherited from their ksegs, and use up cpu time. */ +#ifdef KSE +void sched_exit_thread(struct thread *td, struct thread *child); +void sched_fork_thread(struct thread *td, struct thread *child); +#endif fixpt_t sched_pctcpu(struct thread *td); void sched_prio(struct thread *td, u_char prio); void sched_lend_prio(struct thread *td, u_char prio); void sched_sleep(struct thread *td); void sched_switch(struct thread *td, struct thread *newtd, int flags); void sched_unlend_prio(struct thread *td, u_char prio); +#ifdef KSE +void sched_userret(struct thread *td); +#endif void sched_wakeup(struct thread *td); /* @@ -75,7 +88,9 @@ void sched_rem(struct thread *td); void sched_tick(void); void sched_relinquish(struct thread *td); +#ifndef KSE void sched_run_ithread(struct thread *td); +#endif /* * Binding makes cpu affinity permanent while pinning is used to temporarily @@ -91,6 +106,9 @@ * These procedures tell the process data structure allocation code how * many bytes to actually allocate. */ +#ifdef KSE +int sched_sizeof_ksegrp(void); +#endif int sched_sizeof_proc(void); int sched_sizeof_thread(void); @@ -108,7 +126,15 @@ /* temporarily here */ void schedinit(void); +#ifdef KSE +void sched_init_concurrency(struct ksegrp *kg); +void sched_set_concurrency(struct ksegrp *kg, int cuncurrency); +#endif void sched_schedinit(void); +#ifdef KSE +void sched_newproc(struct proc *p, struct ksegrp *kg, struct thread *td); +void sched_thread_exit(struct thread *td); +#endif void sched_newthread(struct thread *td); #endif /* !_SYS_SCHED_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:07:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 254FD16A557; Sat, 5 Aug 2006 22:07:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC20716A50D for ; Sat, 5 Aug 2006 22:07:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8993543D45 for ; Sat, 5 Aug 2006 22:07:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75M7gLO055154 for ; Sat, 5 Aug 2006 22:07:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75M7gsO055149 for perforce@freebsd.org; Sat, 5 Aug 2006 22:07:42 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:07:42 GMT Message-Id: <200608052207.k75M7gsO055149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:07:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=103284 Change 103284 by jb@jb_freebsd2 on 2006/08/05 22:07:37 Merge KSE back in, but only if the kernel option KSE is defined. Affected files ... .. //depot/projects/dtrace/src/sys/vm/vm_zeroidle.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/vm/vm_zeroidle.c#4 (text+ko) ==== @@ -182,7 +182,11 @@ PROC_UNLOCK(pagezero_proc); mtx_lock_spin(&sched_lock); td = FIRST_THREAD_IN_PROC(pagezero_proc); +#ifdef KSE + sched_class(td->td_ksegrp, PRI_IDLE); +#else sched_class(td, PRI_IDLE); +#endif sched_prio(td, PRI_MAX_IDLE); setrunqueue(td, SRQ_BORING); mtx_unlock_spin(&sched_lock); From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:09:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D590B16A4E1; Sat, 5 Aug 2006 22:09:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EF8F16A4DA for ; Sat, 5 Aug 2006 22:09:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3400B43D62 for ; Sat, 5 Aug 2006 22:08:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75M8p5i055230 for ; Sat, 5 Aug 2006 22:08:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75M8h7p055221 for perforce@freebsd.org; Sat, 5 Aug 2006 22:08:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 22:08:43 GMT Message-Id: <200608052208.k75M8h7p055221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:09:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=103285 Change 103285 by rwatson@rwatson_zoo on 2006/08/05 22:07:53 Integrate mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.at91#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.ia64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.pc98#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.powerpc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.amd64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.i386#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.pc98#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_output.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_ps.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/miidevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pci/pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/random/probe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/re/if_re.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sio/sio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/driver.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/doc/Doxyfile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/README#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/PAE#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/isa/isahint.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/bus_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/init_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_lock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_resource.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_tc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_thr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_bus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_hints.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_prf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_rman.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/sys_generic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/systrace_args.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/agp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/asr/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/mii/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/osf1/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/stge/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/net/if.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_bridge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_clone.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_clone.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_disc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_faith.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_gre.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_tap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_vlan.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/net_osdep.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/rtsock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_gif.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/README#2 delete .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/frag6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/mld6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipsec/keysock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/key.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/keydb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/keysock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netnatm/natm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/ncr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/ksched.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/posix4.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/_label.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/bus.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/extattr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/kernel.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/libkern.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mbuf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/protosw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/socket.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/socketvar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sockio.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/stat.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysent.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysproto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/systm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/thr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/time.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/types.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/unpcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/uma_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_map.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_meter.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include #include @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -338,16 +338,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -947,17 +947,17 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); - /* - * If Maxmem has been increased beyond what the system has detected, - * extend the last memory segment to the new limit. - */ - if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); - /* call pmap initialization to make new kernel address space */ pmap_bootstrap(&first); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.564 2006/07/05 07:04:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,6 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -1627,6 +1626,7 @@ int idx, field, bit; mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; @@ -2015,8 +2015,8 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; pmap_unuse_pt(pmap, pv->pv_va, ptepde); + free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); - free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2971,8 +2971,8 @@ /* * Clear the write and modified bits in each of the given page's mappings. */ -static __inline void -pmap_clear_write(vm_page_t m) +void +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. @@ -3050,14 +3033,12 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); - if (pte != NULL && (*pte & PG_A) != 0) { + if ((*pte & PG_A) != 0) { atomic_clear_long(pte, PG_A); pmap_invalidate_page(pmap, pv->pv_va); rtval++; - if (rtval > 4) { - PMAP_UNLOCK(pmap); - break; - } + if (rtval > 4) + pvn = NULL; } PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -145,9 +145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. @@ -780,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -814,17 +812,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - mtx_unlock(&Giant); - } else { - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - } + AUDIT_SYSCALL_ENTER(code, td); + error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { @@ -874,6 +864,19 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -894,9 +897,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -328,7 +328,6 @@ td->td_frame->tf_rsp = ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; - td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)entry; /* ==== //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC#2 (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/amd64/conf/GENERIC,v 1.463 2006/07/05 02:32:55 davidxu Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $ cpu HAMMER ident GENERIC @@ -251,6 +251,7 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! ==== //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:09:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B45416A4DD; Sat, 5 Aug 2006 22:09:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01E1816A4E1 for ; Sat, 5 Aug 2006 22:09:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F200343D46 for ; Sat, 5 Aug 2006 22:09:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75M9rl6055409 for ; Sat, 5 Aug 2006 22:09:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75M9rWP055403 for perforce@freebsd.org; Sat, 5 Aug 2006 22:09:53 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:09:53 GMT Message-Id: <200608052209.k75M9rWP055403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:09:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103286 Change 103286 by jb@jb_freebsd2 on 2006/08/05 22:08:52 Back out a change that isn't required. Affected files ... .. //depot/projects/dtrace/src/contrib/wpa_supplicant/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/wpa_supplicant/Makefile#4 (text+ko) ==== @@ -281,7 +281,8 @@ # PC/SC interface for smartcards (USIM, GSM SIM) CFLAGS += -DPCSC_FUNCS -I/usr/include/PCSC OBJS += pcsc_funcs.o -LIBS += -lpcsclite +# -lpthread may not be needed depending on how pcsc-lite was configured +LIBS += -lpcsclite -lpthread endif ifndef CONFIG_TLS From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:10:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF0016A4DD; Sat, 5 Aug 2006 22:10:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 166C716A4DF for ; Sat, 5 Aug 2006 22:10:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC26343D46 for ; Sat, 5 Aug 2006 22:10:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75MAtpT056349 for ; Sat, 5 Aug 2006 22:10:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75MAtar056300 for perforce@freebsd.org; Sat, 5 Aug 2006 22:10:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:10:55 GMT Message-Id: <200608052210.k75MAtar056300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=103287 Change 103287 by jb@jb_freebsd2 on 2006/08/05 22:10:10 Build changes to allow for threads being built into libc or not. Affected files ... .. //depot/projects/dtrace/src/tools/regression/lib/libc/resolv/Makefile#4 edit .. //depot/projects/dtrace/src/tools/regression/tls/ttls2/Makefile#4 edit .. //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#4 edit .. //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#4 edit .. //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#4 edit .. //depot/projects/dtrace/src/tools/tools/netrate/juggle/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/tools/regression/lib/libc/resolv/Makefile#4 (text+ko) ==== @@ -1,11 +1,17 @@ # $NetBSD: Makefile,v 1.1 2004/05/13 19:17:12 christos Exp $ # $FreeBSD: src/tools/regression/lib/libc/resolv/Makefile,v 1.4 2006/03/15 10:46:34 ru Exp $ +.include + PROG= resolv -NO_MAN= +MK_MAN= no # Note: this test relies on being dynamically linked. You will get a # spurious PASS for a statically linked test. +.if ${MK_LIBC_THREADS} == "no" +DPADD+= ${LIBPTHREAD} +LDADD+= -lpthread +.endif regress: ${PROG} ./${PROG} -r ${.CURDIR}/mach ==== //depot/projects/dtrace/src/tools/regression/tls/ttls2/Makefile#4 (text+ko) ==== @@ -3,7 +3,7 @@ .include PROG= ttls2 -NO_MAN= +MK_MAN= no DEBUG_FLAGS= -g .if ${MK_LIBC_THREADS} == "no" ==== //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#4 (text+ko) ==== @@ -3,7 +3,7 @@ .include PROG= ttls4 -NO_MAN= +MK_MAN= no DEBUG_FLAGS= -g .if ${MK_LIBC_THREADS} == "no" ==== //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ # $FreeBSD: src/tools/tools/netrate/http/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $ +.include + PROG= http WARNS= 3 -NO_MAN= -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} +MK_MAN= no + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include ==== //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ # $FreeBSD: src/tools/tools/netrate/httpd/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $ +.include + PROG= httpd WARNS= 3 -NO_MAN= -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} +MK_MAN= no + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include ==== //depot/projects/dtrace/src/tools/tools/netrate/juggle/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ # $FreeBSD: src/tools/tools/netrate/juggle/Makefile,v 1.2 2006/03/15 10:46:38 ru Exp $ +.include + PROG= juggle -NO_MAN= +MK_MAN= no WARNS= 3 -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} + +.if ${MK_LIBC_THREADS} == "no" +LDADD= -lpthread +DPADD= ${LIBPTHREAD} +.endif .include From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:11:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D23B016A4DF; Sat, 5 Aug 2006 22:11:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B12B616A4DD for ; Sat, 5 Aug 2006 22:11:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8116943D46 for ; Sat, 5 Aug 2006 22:11:57 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75MBvtb057365 for ; Sat, 5 Aug 2006 22:11:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75MBvXI057359 for perforce@freebsd.org; Sat, 5 Aug 2006 22:11:57 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:11:57 GMT Message-Id: <200608052211.k75MBvXI057359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:11:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103288 Change 103288 by jb@jb_freebsd2 on 2006/08/05 22:11:13 White-space changes to new definitions not in current yet. Affected files ... .. //depot/projects/dtrace/src/sys/sys/ptrace.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/ptrace.h#5 (text+ko) ==== @@ -89,19 +89,19 @@ struct ptrace_lwpinfo { lwpid_t pl_lwpid; /* LWP described. */ int pl_event; /* Event that stopped the LWP. */ -#define PL_EVENT_NONE 0 -#define PL_EVENT_SIGNAL 1 +#define PL_EVENT_NONE 0 +#define PL_EVENT_SIGNAL 1 #define PL_EVENT_SYSENTER 2 #define PL_EVENT_SYSEXIT 3 int pl_flags; /* LWP flags. */ -#define PL_FLAG_SA 0x01 /* M:N thread */ -#define PL_FLAG_BOUND 0x02 /* M:N bound thread */ +#define PL_FLAG_SA 0x01 /* M:N thread */ +#define PL_FLAG_BOUND 0x02 /* M:N bound thread */ sigset_t pl_sigmask; /* LWP signal mask */ sigset_t pl_siglist; /* LWP pending signal */ union { int _pl_signal; - }pl_data; + } pl_data; }; #define pl_signal pl_data._pl_signal From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:13:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76CAB16A4DF; Sat, 5 Aug 2006 22:13:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3031316A4DA for ; Sat, 5 Aug 2006 22:13:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDE8443D49 for ; Sat, 5 Aug 2006 22:12:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75MCxZA058174 for ; Sat, 5 Aug 2006 22:12:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75MCxAl058156 for perforce@freebsd.org; Sat, 5 Aug 2006 22:12:59 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:12:59 GMT Message-Id: <200608052212.k75MCxAl058156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:13:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103289 Change 103289 by jb@jb_freebsd2 on 2006/08/05 22:12:44 While sun4v isn't reliable, built without optimisationto make it easier to identify gerated asm code using objdump. Affected files ... .. //depot/projects/dtrace/src/sys/conf/kern.pre.mk#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/kern.pre.mk#7 (text+ko) ==== @@ -31,6 +31,8 @@ . endif . if ${MACHINE_ARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe +. elif ${MACHINE_ARCH} == "sparc64" +COPTFLAGS?=-pipe . else COPTFLAGS?=${_MINUS_O} -pipe . endif From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:13:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C6916A4E2; Sat, 5 Aug 2006 23:13:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BDB316A4DF for ; Sat, 5 Aug 2006 23:13:17 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CF1843D53 for ; Sat, 5 Aug 2006 23:13:17 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NDHth064620 for ; Sat, 5 Aug 2006 23:13:17 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NDGeH064617 for perforce@freebsd.org; Sat, 5 Aug 2006 23:13:16 GMT (envelope-from piso@freebsd.org) Date: Sat, 5 Aug 2006 23:13:16 GMT Message-Id: <200608052313.k75NDGeH064617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 103291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:13:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=103291 Change 103291 by piso@piso_newluxor on 2006/08/05 23:12:53 Use a simple filter function for now while i experiment with it: so far it works well, i was able to transfer some gigabytes from one box to another with no problem. Affected files ... .. //depot/projects/soc2006/intr_filter/pci/if_xl.c#4 edit .. //depot/projects/soc2006/intr_filter/pci/if_xlreg.h#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/pci/if_xl.c#4 (text+ko) ==== @@ -233,15 +233,12 @@ static int xl_encap(struct xl_softc *, struct xl_chain *, struct mbuf *); static void xl_rxeof(struct xl_softc *); static void xl_rxeof_task(void *, int); -__unused static int xl_rx_resync(struct xl_softc *); +static int xl_rx_resync(struct xl_softc *); static void xl_txeof(struct xl_softc *); static void xl_txeof_90xB(struct xl_softc *); static void xl_txeoc(struct xl_softc *); static void xl_intr(void *); static int xl_filter(void *); -static void xl_stat_tx_complete(void *, int); -static void xl_stat_adfail(void *, int); -static void xl_stat_statsoflow(void *, int); static void xl_start(struct ifnet *); static void xl_start_locked(struct ifnet *); static void xl_start_90xB_locked(struct ifnet *); @@ -1604,14 +1601,6 @@ CSR_WRITE_2(sc, XL_W0_MFG_ID, XL_NO_XCVR_PWR_MAGICBITS); } - sc->xl_tq = taskqueue_create("xl_taskq", M_NOWAIT, - taskqueue_thread_enqueue, &sc->xl_tq); - taskqueue_start_threads(&sc->xl_tq, 1, - PI_NET, "%s taskq", ifp->if_xname); - TASK_INIT(&sc->xl_stat_tx_complete, 0, xl_stat_tx_complete, sc); - TASK_INIT(&sc->xl_stat_adfail, 0, xl_stat_adfail, sc); - TASK_INIT(&sc->xl_stat_statsoflow, 0, xl_stat_statsoflow, sc); - /* * Call MI attach routine. */ @@ -1727,7 +1716,6 @@ callout_drain(&sc->xl_stat_callout); ether_ifdetach(ifp); } - taskqueue_free(sc->xl_tq); if (sc->xl_miibus) device_delete_child(dev, sc->xl_miibus); bus_generic_detach(dev); @@ -1764,6 +1752,7 @@ sc->xl_ldata.xl_tx_dmamap); bus_dma_tag_destroy(sc->xl_ldata.xl_tx_tag); } + mtx_destroy(&sc->xl_mtx); return (0); @@ -1937,7 +1926,7 @@ return (0); } -__unused static int +static int xl_rx_resync(struct xl_softc *sc) { struct xl_chain_onefrag *pos; @@ -2285,95 +2274,95 @@ } } -static void -xl_stat_tx_complete(void *_sc, int p __unused) { - struct xl_softc *sc = _sc; - struct ifnet *ifp = sc->xl_ifp; +static int +xl_filter(void *arg) +{ + struct xl_softc *sc = arg; + u_int16_t status; - XL_LOCK(sc); - ifp->if_oerrors++; - xl_txeoc(sc); - XL_UNLOCK(sc); -} + status = CSR_READ_2(sc, XL_STATUS); + if (status == 0xFFFF || !(status & XL_INTRS)) { + printf("xl stray intr\n"); + return (FILTER_STRAY); + } -static void -xl_stat_adfail(void *_sc, int p __unused) { - struct xl_softc *sc = _sc; +#if 0 + /* Disable interrupts */ + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ENB|0); +#endif - XL_LOCK(sc); - xl_reset(sc); - xl_init_locked(sc); - XL_UNLOCK(sc); + return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD); } static void -xl_stat_statsoflow(void *_sc, int p __unused) { - struct xl_softc *sc = _sc; - - XL_LOCK(sc); - sc->xl_stats_no_timeout = 1; - xl_stats_update_locked(sc); - sc->xl_stats_no_timeout = 0; - XL_UNLOCK(sc); -} - -static int -xl_filter(void *arg) +xl_intr(void *arg) { struct xl_softc *sc = arg; + struct ifnet *ifp = sc->xl_ifp; u_int16_t status; - int ret = FILTER_HANDLED; - status = CSR_READ_2(sc, XL_STATUS); - status &= XL_INTRS; + XL_LOCK(sc); - if (status == 0xFFFF) - return (FILTER_STRAY); +#ifdef DEVICE_POLLING + if (ifp->if_capenable & IFCAP_POLLING) { + XL_UNLOCK(sc); + return; + } +#endif - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|(status & XL_INTRS)); - - if (status & XL_STAT_UP_COMPLETE) - ret |= FILTER_SCHEDULE_THREAD; + while ((status = CSR_READ_2(sc, XL_STATUS)) & XL_INTRS && + status != 0xFFFF) { + CSR_WRITE_2(sc, XL_COMMAND, + XL_CMD_INTR_ACK|(status & XL_INTRS)); - if (status & XL_STAT_DOWN_COMPLETE) - ret |= FILTER_SCHEDULE_THREAD; + if (status & XL_STAT_UP_COMPLETE) { + int curpkts; - if (status & XL_STAT_TX_COMPLETE) - taskqueue_enqueue(sc->xl_tq, &sc->xl_stat_tx_complete); + curpkts = ifp->if_ipackets; + xl_rxeof(sc); + if (curpkts == ifp->if_ipackets) { + while (xl_rx_resync(sc)) + xl_rxeof(sc); + } + } - if (status & XL_STAT_ADFAIL) - taskqueue_enqueue(sc->xl_tq, &sc->xl_stat_adfail); + if (status & XL_STAT_DOWN_COMPLETE) { + if (sc->xl_type == XL_TYPE_905B) + xl_txeof_90xB(sc); + else + xl_txeof(sc); + } - if (status & XL_STAT_STATSOFLOW) - taskqueue_enqueue(sc->xl_tq, &sc->xl_stat_statsoflow); + if (status & XL_STAT_TX_COMPLETE) { + ifp->if_oerrors++; + xl_txeoc(sc); + } - /* Disable interrupts */ - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ENB|0); + if (status & XL_STAT_ADFAIL) { + xl_reset(sc); + xl_init_locked(sc); + } - return (ret); -} + if (status & XL_STAT_STATSOFLOW) { + sc->xl_stats_no_timeout = 1; + xl_stats_update_locked(sc); + sc->xl_stats_no_timeout = 0; + } + } -static void -xl_intr(void *arg) { - struct xl_softc *sc = arg; - struct ifnet *ifp = sc->xl_ifp; - - XL_LOCK(sc); - xl_rxeof(sc); - if (sc->xl_type == XL_TYPE_905B) - xl_txeof_90xB(sc); - else - xl_txeof(sc); - - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { +#if 0 + /* + * Enable interrupts. + */ + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|0xFF); + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_STAT_ENB|XL_INTRS); +#endif + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { if (sc->xl_type == XL_TYPE_905B) xl_start_90xB_locked(ifp); else xl_start_locked(ifp); } - /* Enable interrupts */ - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|0xFF); - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ENB|XL_INTRS); XL_UNLOCK(sc); } ==== //depot/projects/soc2006/intr_filter/pci/if_xlreg.h#3 (text+ko) ==== @@ -608,10 +608,6 @@ bus_space_tag_t xl_ftag; struct mtx xl_mtx; struct task xl_task; - struct taskqueue *xl_tq; - struct task xl_stat_tx_complete; - struct task xl_stat_adfail; - struct task xl_stat_statsoflow; #ifdef DEVICE_POLLING int rxcycles; #endif From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:30:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CB1116A4E0; Sat, 5 Aug 2006 23:30:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54D4F16A4DA for ; Sat, 5 Aug 2006 23:30:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C47143D45 for ; Sat, 5 Aug 2006 23:30:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NUfxK065426 for ; Sat, 5 Aug 2006 23:30:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NUff2065422 for perforce@freebsd.org; Sat, 5 Aug 2006 23:30:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:30:41 GMT Message-Id: <200608052330.k75NUff2065422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:30:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=103295 Change 103295 by rwatson@rwatson_zoo on 2006/08/05 23:30:23 opt_devfs.h no longer used. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ * mkdir: want it ? */ -#include "opt_devfs.h" #include "opt_mac.h" #include From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:40:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 785D416A4DF; Sat, 5 Aug 2006 23:40:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5367316A4DD for ; Sat, 5 Aug 2006 23:40:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07AA743D49 for ; Sat, 5 Aug 2006 23:40:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NeslQ067262 for ; Sat, 5 Aug 2006 23:40:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NesOP067259 for perforce@freebsd.org; Sat, 5 Aug 2006 23:40:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:40:54 GMT Message-Id: <200608052340.k75NesOP067259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:40:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=103296 Change 103296 by rwatson@rwatson_zoo on 2006/08/05 23:40:38 Add mac_audit.c from SEDarwin8 to TrustedBSD audit3 branch. Not yet hooked up to the build, made to build on FreeBSD, etc. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:41:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5171816A4DD; Sat, 5 Aug 2006 23:41:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17A5816A4DF for ; Sat, 5 Aug 2006 23:41:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C176043D49 for ; Sat, 5 Aug 2006 23:41:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NfuH7067353 for ; Sat, 5 Aug 2006 23:41:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Nfudo067350 for perforce@freebsd.org; Sat, 5 Aug 2006 23:41:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:41:56 GMT Message-Id: <200608052341.k75Nfudo067350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:41:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103297 Change 103297 by rwatson@rwatson_zoo on 2006/08/05 23:41:56 Update new instance of a MAC Framework invocation for mac2 world order. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#5 (text+ko) ==== @@ -623,7 +623,7 @@ if (error) goto fail; #ifdef MAC - error = mac_check_vnode_chroot(td->td_ucred, vp); + error = mac_vnode_check_chroot(td->td_ucred, vp); if (error) goto fail; #endif From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:48:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD60916A4E0; Sat, 5 Aug 2006 23:48:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA61516A4DD for ; Sat, 5 Aug 2006 23:48:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6611143D45 for ; Sat, 5 Aug 2006 23:48:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75Nm5ZF067641 for ; Sat, 5 Aug 2006 23:48:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Nm5Ej067638 for perforce@freebsd.org; Sat, 5 Aug 2006 23:48:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:48:05 GMT Message-Id: <200608052348.k75Nm5Ej067638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:48:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103298 Change 103298 by rwatson@rwatson_zoo on 2006/08/05 23:47:29 Restyle/etc for FreeBSD: - General white space, line wrap, etc, cleanup. - Avoid assignments in local variable declaration. - mac_audit.c is only built on FreeBSD if AUDIT is compiled in, so drop all the ifdefs for it. - Extend #if 0 section to cover policy submission of audit records, we're not ready for that yet. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin @@ -33,13 +32,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $FreeBSD$ */ #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -47,8 +47,6 @@ #include #include -#ifdef AUDIT - int mac_check_system_audit(struct ucred *cred, void *record, int length) { @@ -73,7 +71,9 @@ mac_check_system_auditctl(struct ucred *cred, struct vnode *vp) { int error; - struct label *vl = vp ? vp->v_label : NULL; + struct label *vl; + + vl = (vp != NULL) ? vp->v_label : NULL; MAC_CHECK(check_system_auditctl, cred, vp, vl); @@ -100,8 +100,8 @@ return (error); } -int -mac_check_proc_getaudit(struct ucred *cred) +int +mac_check_proc_getaudit(struct ucred *cred) { int error; @@ -122,11 +122,9 @@ #if 0 /* - * This is the framework entry point for MAC policies to use to add - * arbitrary data to the current audit record. - * (Currently not supported, as no existing audit viewers would - * display this format) - * + * This is the framework entry point for MAC policies to use to add arbitrary + * data to the current audit record. (Currently not supported, as no + * existing audit viewers display this format) */ int mac_audit_data(int len, u_char *data, struct mac_policy_conf *caller) @@ -143,11 +141,10 @@ bcopy(data, sanitized, len); return (audit_mac_data(MAC_AUDIT_DATA_TYPE, len, sanitized)); } -#endif /* - * This is the entry point a MAC policy will call to add NULL- - * terminated ASCII text to the current audit record. + * This is the entry point a MAC policy will call to add NULL-terminated + * ASCII text to the current audit record. */ int mac_audit_text(char *text, struct mac_policy_conf *caller) @@ -189,16 +186,16 @@ ret = MAC_AUDIT_DEFAULT; LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_preselect != NULL) { - error = mpc->mpc_ops->mpo_audit_preselect(cred, syscode, - args); + error = mpc->mpc_ops->mpo_audit_preselect(cred, + syscode, args); ret = (ret > error ? ret : error); } } if ((entrycount = mac_policy_list_conditional_busy()) != 0) { LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_preselect != NULL) { - error = mpc->mpc_ops->mpo_audit_preselect(cred, syscode, - args); + error = mpc->mpc_ops->mpo_audit_preselect( + cred, syscode, args); ret = (ret > error ? ret : error); } } @@ -225,16 +222,16 @@ ret = MAC_AUDIT_DEFAULT; LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_postselect != NULL) { - mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, syscode, - args, error, retval); + mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, + syscode, args, error, retval); ret = (ret > mac_error ? ret : mac_error); } } if ((entrycount = mac_policy_list_conditional_busy()) != 0) { LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_postselect != NULL) { - mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, syscode, - args, error, retval); + mac_error = mpc->mpc_ops->mpo_audit_postselect( + cred, syscode, args, error, retval); ret = (ret > mac_error ? ret : mac_error); } } @@ -243,82 +240,4 @@ return (ret); } - -#else /* AUDIT */ - -/* - * Function stubs for when AUDIT isn't defined. - */ - -int -mac_check_system_audit(struct ucred *cred, void *record, int length) -{ - - return (0); -} - -int -mac_check_system_auditon(struct ucred *cred, int cmd) -{ - - return (0); -} - -int -mac_check_system_auditctl(struct ucred *cred, struct vnode *vp) -{ - - return (0); -} - -int -mac_check_proc_getauid(struct ucred *cred) -{ - - return (0); -} - -int -mac_check_proc_setauid(struct ucred *cred, uid_t auid) -{ - - return (0); -} - -int -mac_check_proc_getaudit(struct ucred *cred) -{ - - return (0); -} - -int -mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) -{ - - return (0); -} - -int -mac_audit_preselect(struct ucred *cred, unsigned short syscode, - void *args) -{ - - return (MAC_AUDIT_DEFAULT); -} - -int -mac_audit_postselect(struct ucred *cred, unsigned short syscode, - void *args, int error, int retval, int mac_forced) -{ - - return (MAC_AUDIT_DEFAULT); -} - -int -mac_audit(int len, u_char *data) -{ - - return (0); -} -#endif /* !AUDIT */ +#endif From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:49:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BB8216A4DE; Sat, 5 Aug 2006 23:49:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6200516A4DA for ; Sat, 5 Aug 2006 23:49:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ED2B43D45 for ; Sat, 5 Aug 2006 23:49:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75Nn791067681 for ; Sat, 5 Aug 2006 23:49:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Nn6XS067678 for perforce@freebsd.org; Sat, 5 Aug 2006 23:49:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:49:06 GMT Message-Id: <200608052349.k75Nn6XS067678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:49:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=103299 Change 103299 by rwatson@rwatson_zoo on 2006/08/05 23:48:14 Optionally compile mac_audit.c into the kernel if both MAC and AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#24 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#24 (text+ko) ==== @@ -1906,6 +1906,7 @@ security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit security/audit/audit_worker.c optional audit +security/mac/mac_audit.c optional mac audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:51:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 935D216A4E0; Sat, 5 Aug 2006 23:51:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E3DE16A4DD for ; Sat, 5 Aug 2006 23:51:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A08543D46 for ; Sat, 5 Aug 2006 23:51:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NpAKk067894 for ; Sat, 5 Aug 2006 23:51:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Np9uK067891 for perforce@freebsd.org; Sat, 5 Aug 2006 23:51:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:51:09 GMT Message-Id: <200608052351.k75Np9uK067891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:51:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103300 Change 103300 by rwatson@rwatson_zoo on 2006/08/05 23:50:53 FreeBSD include files. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#3 (text+ko) ==== @@ -36,16 +36,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include + +#include int mac_check_system_audit(struct ucred *cred, void *record, int length) From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:59:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9A6316A4E1; Sat, 5 Aug 2006 23:59:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CEC316A4DD for ; Sat, 5 Aug 2006 23:59:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E82243D70 for ; Sat, 5 Aug 2006 23:59:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NxLAB068213 for ; Sat, 5 Aug 2006 23:59:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NxLPd068210 for perforce@freebsd.org; Sat, 5 Aug 2006 23:59:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:59:21 GMT Message-Id: <200608052359.k75NxLPd068210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:59:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103302 Change 103302 by rwatson@rwatson_zoo on 2006/08/05 23:59:01 One more include. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#4 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 5 23:59:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECB6116A4DD; Sat, 5 Aug 2006 23:59:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CA4916A4E0 for ; Sat, 5 Aug 2006 23:59:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CA8443D6E for ; Sat, 5 Aug 2006 23:59:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NxKeh068207 for ; Sat, 5 Aug 2006 23:59:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NxKEX068204 for perforce@freebsd.org; Sat, 5 Aug 2006 23:59:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:59:20 GMT Message-Id: <200608052359.k75NxKEX068204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103301 Change 103301 by rwatson@rwatson_zoo on 2006/08/05 23:58:51 Audit entry point prototypes and mpo field. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/sys/mac.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/sys/mac.h#7 (text+ko) ==== @@ -110,6 +110,7 @@ /* * Kernel functions to manage and evaluate labels. */ +struct auditinfo; struct bpf_d; struct cdev; struct componentname; @@ -466,6 +467,18 @@ void mac_associate_nfsd_label(struct ucred *cred); /* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +int mac_check_system_audit(struct ucred *cred, void *record, int length); +int mac_check_system_auditon(struct ucred *cred, int cmd); +int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); +int mac_check_proc_getauid(struct ucred *cred); +int mac_check_proc_setauid(struct ucred *cred, uid_t auid); +int mac_check_proc_getaudit(struct ucred *cred); +int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); + +/* * Calls to help various file systems implement labeling functionality * using their existing EA implementation. */ ==== //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#7 (text+ko) ==== @@ -591,6 +591,21 @@ struct label *label); typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); +/* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +typedef int (*mpo_check_system_audit_t)(struct ucred *cred, void *record, + int length); +typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); +typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, + struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_proc_getauid_t)(struct ucred *cred); +typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); +typedef int (*mpo_check_proc_getaudit_t)(struct ucred *cred); +typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, + struct auditinfo *ai); + struct mac_policy_ops { /* * Policy module operations. @@ -879,6 +894,18 @@ mpo_check_vnode_stat_t mpo_check_vnode_stat; mpo_check_vnode_write_t mpo_check_vnode_write; mpo_associate_nfsd_label_t mpo_associate_nfsd_label; + + /* + * XXXRW: Audit checks should be above, but list them here to make a + * more sensible diff for now. + */ + mpo_check_system_audit_t mpo_check_system_audit; + mpo_check_system_auditon_t mpo_check_system_auditon; + mpo_check_system_auditctl_t mpo_check_system_auditctl; + mpo_check_proc_getauid_t mpo_check_proc_getauid; + mpo_check_proc_setauid_t mpo_check_proc_setauid; + mpo_check_proc_getaudit_t mpo_check_proc_getaudit; + mpo_check_proc_setaudit_t mpo_check_proc_setaudit; }; /*