From owner-p4-projects@FreeBSD.ORG Sun Oct 15 13:31: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 D04CE16A54A; Sun, 15 Oct 2006 13:31: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 8C46616A494 for ; Sun, 15 Oct 2006 13:31:38 +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 ED13543D83 for ; Sun, 15 Oct 2006 13:31: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 k9FDVSZ4067374 for ; Sun, 15 Oct 2006 13:31:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FDVSiJ067371 for perforce@freebsd.org; Sun, 15 Oct 2006 13:31:28 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 15 Oct 2006 13:31:28 GMT Message-Id: <200610151331.k9FDVSiJ067371@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 107944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 13:31:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=107944 Change 107944 by rdivacky@rdivacky_witten on 2006/10/15 13:30:29 Minor style fixes for upcoming merge to cvs. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#8 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#8 (text+ko) ==== @@ -331,8 +331,7 @@ if (isuserland) { nerr = copyin(piocb, &localcb, sizeof(localcb)); pcb = &localcb; - } - else + } else pcb = piocb; DPPRINTF("Dump struct aiocb (%p, %s): %s", @@ -948,7 +947,7 @@ LINUX_AIO_REQ_FOREACH(pctx, preq) { copyout(&(preq->req_pbsd), &(u_aiocbp[j]), sizeof(preq->req_pbsd)); - j ++; + j++; } MPASS(j == pctx->ctx_nreq_cur); aiosusargs.aiocbp = u_aiocbp; @@ -1073,7 +1072,7 @@ LINUX_AIO_UNLOCK(p); /* XXX Interlaced, seamless */ for (i = 0; pctx->ctx_nreq_cur < pctx->ctx_nreq_max && i < args->nr; - i ++) { + i++) { /* Get user space Linux control block */ nerr = copyin(&(args->iocbpp[i]), &porig, sizeof(porig)); if (nerr != 0) From owner-p4-projects@FreeBSD.ORG Sun Oct 15 13:45: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 37C0816A416; Sun, 15 Oct 2006 13:45: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 118C016A40F for ; Sun, 15 Oct 2006 13:45:50 +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 9742743D49 for ; Sun, 15 Oct 2006 13:45: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 k9FDjn3X070038 for ; Sun, 15 Oct 2006 13:45:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FDjnLv070035 for perforce@freebsd.org; Sun, 15 Oct 2006 13:45:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 15 Oct 2006 13:45:49 GMT Message-Id: <200610151345.k9FDjnLv070035@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 107948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 13:45:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107948 Change 107948 by rdivacky@rdivacky_witten on 2006/10/15 13:45:42 Remove prototype of non-existant function. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#3 (text+ko) ==== @@ -73,7 +73,6 @@ void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -void linux_reparent(void *, struct proc *); extern struct sx emul_shared_lock; extern struct sx emul_lock; From owner-p4-projects@FreeBSD.ORG Sun Oct 15 13:52: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 61E7D16A5FE; Sun, 15 Oct 2006 13:52: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 3C5AE16A5E3 for ; Sun, 15 Oct 2006 13:52: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 DEC8843D7D for ; Sun, 15 Oct 2006 13:51:57 +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 k9FDpv0L070999 for ; Sun, 15 Oct 2006 13:51:57 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FDpvHY070996 for perforce@freebsd.org; Sun, 15 Oct 2006 13:51:57 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 15 Oct 2006 13:51:57 GMT Message-Id: <200610151351.k9FDpvHY070996@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 107949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 13:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107949 Change 107949 by rdivacky@rdivacky_witten on 2006/10/15 13:51:42 Backout 107882 and add comment why is RFLINUXTHPN needed. Affected files ... .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#4 edit .. //depot/projects/linuxolator/src/sys/sys/unistd.h#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/kern_fork.c#4 (text+ko) ==== @@ -527,7 +527,13 @@ sigacts_copy(newsigacts, p1->p_sigacts); p2->p_sigacts = newsigacts; } - p2->p_sigparent = SIGCHLD; + /* this flag is used by linuxthreads and is passed + * in via rfork() + */ + if (flags & RFLINUXTHPN) + p2->p_sigparent = SIGUSR1; + else + p2->p_sigparent = SIGCHLD; p2->p_textvp = p1->p_textvp; p2->p_fd = fd; ==== //depot/projects/linuxolator/src/sys/sys/unistd.h#3 (text+ko) ==== @@ -169,7 +169,7 @@ #define RFCFDG (1<<12) /* close all fds, zero fd table */ #define RFTHREAD (1<<13) /* enable kernel thread support */ #define RFSIGSHARE (1<<14) /* share signal handlers */ -#define RFUNUSED (1<<16) /* UNUSED */ +#define RFLINUXTHPN (1<<16) /* do linux clone exit parent notification */ #define RFSTOPPED (1<<17) /* leave child in a stopped state */ #define RFHIGHPID (1<<18) /* use a pid higher then 10 (idleproc) */ #define RFPPWAIT (1<<31) /* parent sleeps until child exits (vfork) */ From owner-p4-projects@FreeBSD.ORG Sun Oct 15 14:28: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 A1D9B16A415; Sun, 15 Oct 2006 14:28: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 615E216A407 for ; Sun, 15 Oct 2006 14:28:45 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5F0C43D5D for ; Sun, 15 Oct 2006 14:28:44 +0000 (GMT) (envelope-from netchild@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 k9FESi4m082385 for ; Sun, 15 Oct 2006 14:28:44 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FESiaL082382 for perforce@freebsd.org; Sun, 15 Oct 2006 14:28:44 GMT (envelope-from netchild@freebsd.org) Date: Sun, 15 Oct 2006 14:28:44 GMT Message-Id: <200610151428.k9FESiaL082382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 107952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 14:28:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107952 Change 107952 by netchild@netchild_magellan on 2006/10/15 14:28:15 style(9) fixes Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#6 edit .. //depot/projects/linuxolator/src/sys/conf/files.amd64#4 edit .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -405,7 +405,7 @@ struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity 242 AUE_NULL UNIMPL linux_sched_getaffinity -243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } +243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } 244 AUE_NULL UNIMPL linux_get_thread_area 245 AUE_NULL STD { int linux_io_setup(l_uint nr_reqs, linux_aio_context_t *ctxp); } 246 AUE_NULL STD { int linux_io_destroy(linux_aio_context_t ctx); } ==== //depot/projects/linuxolator/src/sys/conf/files.amd64#4 (text+ko) ==== @@ -241,7 +241,7 @@ amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 compat/linux/linux_aio.c optional compat_linux32 -compat/linux/linux_emul.c optional compat_linux32 +compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 compat/linux/linux_futex.c optional compat_linux32 compat/linux/linux_getcwd.c optional compat_linux32 ==== //depot/projects/linuxolator/src/sys/kern/kern_fork.c#5 (text+ko) ==== @@ -527,9 +527,7 @@ sigacts_copy(newsigacts, p1->p_sigacts); p2->p_sigacts = newsigacts; } - /* this flag is used by linuxthreads and is passed - * in via rfork() - */ + /* This flag is used by linuxthreads and is passed in via rfork(). */ if (flags & RFLINUXTHPN) p2->p_sigparent = SIGUSR1; else From owner-p4-projects@FreeBSD.ORG Sun Oct 15 15:06: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 D20E116A416; Sun, 15 Oct 2006 15:06: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 8036616A412 for ; Sun, 15 Oct 2006 15:06:37 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 353D743D5D for ; Sun, 15 Oct 2006 15:06:35 +0000 (GMT) (envelope-from netchild@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 k9FF6ZJ8091980 for ; Sun, 15 Oct 2006 15:06:35 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FF6X8s091972 for perforce@freebsd.org; Sun, 15 Oct 2006 15:06:33 GMT (envelope-from netchild@freebsd.org) Date: Sun, 15 Oct 2006 15:06:33 GMT Message-Id: <200610151506.k9FF6X8s091972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 107954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 15:06:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=107954 Change 107954 by netchild@netchild_magellan on 2006/10/15 15:05:38 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#5 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#5 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/linuxolator/src/sys/modules/aio/Makefile#4 integrate .. //depot/projects/linuxolator/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/pci/agp.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.5 2006/08/19 15:13:01 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.7 2006/10/15 14:22:12 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.22 2006/10/15 13:39:39 netchild Exp $"); #include #include @@ -549,7 +549,13 @@ ff |= RFMEM; if (args->flags & CLONE_SIGHAND) ff |= RFSIGSHARE; - if (!(args->flags & CLONE_FILES)) + /* + * XXX: in linux sharing of fs info (chroot/cwd/umask) + * and open files is independant. in fbsd its in one + * structure but in reality it doesnt make any problems + * because both this flags are set at once usually. + */ + if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; /* ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.59 2006/08/19 15:13:01 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.61 2006/10/15 14:34:03 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_signal.h,v 1.6 2002/03/20 05:42:02 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_signal.h,v 1.7 2006/10/15 12:51:43 netchild Exp $ */ #ifndef _LINUX_SIGNAL_H_ ==== //depot/projects/linuxolator/src/sys/conf/files.amd64#5 (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.94 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.95 2006/10/15 14:22:13 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/linuxolator/src/sys/conf/files.i386#4 (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.566 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.567 2006/10/15 14:22:13 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/linuxolator/src/sys/dev/sound/midi/sequencer.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.22 2006/09/29 09:28:22 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.23 2006/10/15 08:23:48 ariff Exp $"); #include #include @@ -613,7 +613,7 @@ int i; //SEQ_DEBUG(4,printf("seq_delunit: %d\n", unit)); - printf("seq_delunit: 1 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 1 \n")); mtx_lock(&scp->seq_lock); scp->playing = 0; @@ -621,46 +621,46 @@ cv_broadcast(&scp->out_cv); cv_broadcast(&scp->state_cv); cv_broadcast(&scp->reset_cv); - printf("seq_delunit: 2 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 2 \n")); cv_wait(&scp->th_cv, &scp->seq_lock); - printf("seq_delunit: 3.0 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 3.0 \n")); mtx_unlock(&scp->seq_lock); - printf("seq_delunit: 3.1 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 3.1 \n")); cv_destroy(&scp->state_cv); - printf("seq_delunit: 4 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 4 \n")); cv_destroy(&scp->empty_cv); - printf("seq_delunit: 5 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 5 \n")); cv_destroy(&scp->reset_cv); - printf("seq_delunit: 6 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 6 \n")); cv_destroy(&scp->out_cv); - printf("seq_delunit: 7 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 7 \n")); cv_destroy(&scp->in_cv); - printf("seq_delunit: 8 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 8 \n")); cv_destroy(&scp->th_cv); - printf("seq_delunit: 10 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 10 \n")); if (scp->seqdev) destroy_dev(scp->seqdev); - printf("seq_delunit: 11 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 11 \n")); if (scp->musicdev) destroy_dev(scp->musicdev); - printf("seq_delunit: 12 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 12 \n")); scp->seqdev = scp->musicdev = NULL; if (scp->midis != NULL) free(scp->midis, M_TEMP); - printf("seq_delunit: 13 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 13 \n")); if (scp->midi_flags != NULL) free(scp->midi_flags, M_TEMP); - printf("seq_delunit: 14 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 14 \n")); free(scp->out_q.b, M_TEMP); - printf("seq_delunit: 15 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 15 \n")); free(scp->in_q.b, M_TEMP); - printf("seq_delunit: 16 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 16 \n")); mtx_destroy(&scp->seq_lock); - printf("seq_delunit: 17 \n"); + SEQ_DEBUG(1, printf("seq_delunit: 17 \n")); free(scp, M_DEVBUF); mtx_lock(&seqinfo_mtx); @@ -1391,7 +1391,7 @@ struct seq_softc *scp = i_dev->si_drv1; SEQ_DEBUG(3, printf("seq_poll: unit %d.\n", scp->unit)); - printf("seq_poll: unit %d.\n", scp->unit); + SEQ_DEBUG(1, printf("seq_poll: unit %d.\n", scp->unit)); mtx_lock(&scp->seq_lock); @@ -1869,7 +1869,7 @@ SEQ_DEBUG(5,printf("seq_local: unit %d, cmd %d\n", scp->unit, event[1])); switch (event[1]) { default: - printf("seq_local event type %d not handled\n", event[1]); + SEQ_DEBUG(1, printf("seq_local event type %d not handled\n", event[1])); ret = 1; break; } ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux.h,v 1.68 2006/08/19 15:13:01 netchild Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.70 2006/10/15 14:22:13 netchild Exp $ */ #ifndef _I386_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.57 2006/09/20 19:27:11 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.62 2006/10/15 13:39:40 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp + * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.84 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.81 2006/10/15 14:22:13 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp + * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.78 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.81 2006/10/15 14:22:13 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp + * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.85 2006/10/15 14:24:10 netchild Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.81 2006/10/15 14:22:13 netchild Exp */ #include ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.81 2006/10/15 14:22:13 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/kern/sys_generic.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.150 2006/09/27 19:57:00 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.151 2006/10/14 19:01:55 ru Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -565,7 +565,8 @@ if (com & IOC_IN) { error = copyin(uap->data, data, (u_int)size); if (error) { - free(data, M_IOCTLOPS); + if (size > 0) + free(data, M_IOCTLOPS); return (error); } } else if (com & IOC_OUT) { ==== //depot/projects/linuxolator/src/sys/kern/sys_process.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.138 2006/08/20 10:29:08 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.139 2006/10/14 10:30:14 trhodes Exp $"); #include "opt_compat.h" @@ -980,7 +980,7 @@ error = copyout(buf, addr, tmp * sizeof(lwpid_t)); free(buf, M_TEMP); if (!error) - td->td_retval[0] = num; + td->td_retval[0] = tmp; PROC_LOCK(p); break; ==== //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#5 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.227 2006/09/24 04:47:47 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.228 2006/10/15 14:22:13 netchild Exp $"); #include #include @@ -313,12 +313,12 @@ static TAILQ_HEAD(,aiocblist) aio_jobs; /* (c) Async job list */ static struct unrhdr *aiod_unr; -void aio_init_aioinfo(struct proc *p); +void aio_init_aioinfo(struct proc *p); static void aio_onceonly(void); static int aio_free_entry(struct aiocblist *aiocbe); static void aio_process(struct aiocblist *aiocbe); static int aio_newproc(int *); -int aio_aqueue(struct thread *td, struct aiocb *job, +int aio_aqueue(struct thread *td, struct aiocb *job, struct aioliojob *lio, int type, int osigev); static void aio_physwakeup(struct buf *bp); static void aio_proc_rundown(void *arg, struct proc *p); ==== //depot/projects/linuxolator/src/sys/modules/aio/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/aio/Makefile,v 1.1 2001/12/29 07:13:47 alfred Exp $ +# $FreeBSD: src/sys/modules/aio/Makefile,v 1.2 2006/10/15 14:22:13 netchild Exp $ .PATH: ${.CURDIR}/../../kern ==== //depot/projects/linuxolator/src/sys/modules/linux/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/linux/Makefile,v 1.68 2006/08/15 13:01:36 netchild Exp $ +# $FreeBSD: src/sys/modules/linux/Makefile,v 1.69 2006/10/15 14:22:14 netchild Exp $ .if ${MACHINE_ARCH} == "amd64" SFX= 32 ==== //depot/projects/linuxolator/src/sys/pci/agp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.53 2006/08/11 19:16:50 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.54 2006/10/15 05:04:06 tanimura Exp $"); #include "opt_bus.h" @@ -180,7 +180,7 @@ free(gatt, M_AGP); } -static int agp_max[][2] = { +static u_int agp_max[][2] = { {0, 0}, {32, 4}, {64, 28}, @@ -197,7 +197,8 @@ agp_generic_attach(device_t dev) { struct agp_softc *sc = device_get_softc(dev); - int rid, memsize, i; + int rid, i; + u_int memsize; /* * Find and map the aperture. ==== //depot/projects/linuxolator/src/sys/vm/vnode_pager.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vnode_pager.c,v 1.230 2006/10/10 18:26:18 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vnode_pager.c,v 1.232 2006/10/14 23:21:48 alc Exp $"); #include #include @@ -75,8 +75,8 @@ #include #include -static daddr_t vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, - int *run); +static int vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, + daddr_t *rtaddress, int *run); static int vnode_pager_input_smlfs(vm_object_t object, vm_page_t m); static int vnode_pager_input_old(vm_object_t object, vm_page_t m); static void vnode_pager_dealloc(vm_object_t); @@ -437,15 +437,11 @@ * calculate the linear (byte) disk address of specified virtual * file address */ -static daddr_t -vnode_pager_addr(vp, address, run) - struct vnode *vp; - vm_ooffset_t address; - int *run; +static int +vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, + int *run) { - daddr_t rtaddress; int bsize; - daddr_t block; int err; daddr_t vblock; daddr_t voffset; @@ -460,12 +456,10 @@ vblock = address / bsize; voffset = address % bsize; - err = VOP_BMAP(vp, vblock, NULL, &block, run, NULL); - - if (err || (block == -1)) - rtaddress = -1; - else { - rtaddress = block + voffset / DEV_BSIZE; + err = VOP_BMAP(vp, vblock, NULL, rtaddress, run, NULL); + if (err == 0) { + if (*rtaddress != -1) + *rtaddress += voffset / DEV_BSIZE; if (run) { *run += 1; *run *= bsize/PAGE_SIZE; @@ -473,7 +467,7 @@ } } - return rtaddress; + return (err); } /* @@ -513,7 +507,9 @@ if (address >= object->un_pager.vnp.vnp_size) { fileaddr = -1; } else { - fileaddr = vnode_pager_addr(vp, address, NULL); + error = vnode_pager_addr(vp, address, &fileaddr, NULL); + if (error) + break; } if (fileaddr != -1) { bp = getpbuf(&vnode_pbuf_freecnt); @@ -804,8 +800,17 @@ * calculate the run that includes the required page */ for (first = 0, i = 0; i < count; i = runend) { - firstaddr = vnode_pager_addr(vp, - IDX_TO_OFF(m[i]->pindex), &runpg); + if (vnode_pager_addr(vp, IDX_TO_OFF(m[i]->pindex), &firstaddr, + &runpg) != 0) { + VM_OBJECT_LOCK(object); + vm_page_lock_queues(); + for (; i < count; i++) + if (i != reqpage) + vm_page_free(m[i]); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); + return (VM_PAGER_ERROR); + } if (firstaddr == -1) { VM_OBJECT_LOCK(object); if (i == reqpage && foff < object->un_pager.vnp.vnp_size) { @@ -852,9 +857,7 @@ * to be zero based... */ if (first != 0) { - for (i = first; i < count; i++) { - m[i - first] = m[i]; - } + m += first; count -= first; reqpage -= first; } From owner-p4-projects@FreeBSD.ORG Sun Oct 15 15:25: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 0C00F16A4C2; Sun, 15 Oct 2006 15:25: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 D656F16A4A7 for ; Sun, 15 Oct 2006 15:25:03 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E24F43DA0 for ; Sun, 15 Oct 2006 15:25:03 +0000 (GMT) (envelope-from netchild@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 k9FFOwH2094680 for ; Sun, 15 Oct 2006 15:24:58 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FFOw7D094676 for perforce@freebsd.org; Sun, 15 Oct 2006 15:24:58 GMT (envelope-from netchild@freebsd.org) Date: Sun, 15 Oct 2006 15:24:58 GMT Message-Id: <200610151524.k9FFOw7D094676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 107955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 15:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107955 Change 107955 by netchild@netchild_magellan on 2006/10/15 15:24:48 Merge some small changes by hand (the automatic resolve is not always ok...) and fix a small nit (whitespace in a string). Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#9 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#9 (text+ko) ==== @@ -23,7 +23,8 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/linuxaio/linux_aio.c,v 1.91 2006/09/25 19:12:31 admin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_aio.c,v 1.1 2006/10/15 14:22:13 +netchild Exp $"); #include "opt_compat.h" @@ -454,7 +455,7 @@ native_aio_module_handle = NULL; printf(LMSG("Unable to link to the native module \"" - NATIVE_AIO_MODULE_NAME "\" correctly.")); + NATIVE_AIO_MODULE_NAME "\".")); return (nerr); } @@ -464,8 +465,8 @@ #define LINK_TO_NATIVE_AIO_MODULE() \ if (link_to_native_aio_module(td)) { \ - printf(LMSG("Please load the correct module \"" \ - NATIVE_AIO_MODULE_NAME "\" correctly " \ + printf(LMSG("Please load the module \"" \ + NATIVE_AIO_MODULE_NAME "\" " \ "to provide FreeBSD " \ "native Asynchronous I/O support.")); \ return (ENOSYS); \ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/linuxaio/linux_aio.h,v 1.8 2006/09/25 19:12:31 admin Exp $ + * $FreeBSD: src/sys/compat/linux/linux_aio.h,v 1.1 2006/10/15 14:22:13 netchild Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Sun Oct 15 16:47:47 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 77E2C16A412; Sun, 15 Oct 2006 16:47:47 +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 F19B416A407 for ; Sun, 15 Oct 2006 16:47:46 +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 17B2E43D5E for ; Sun, 15 Oct 2006 16:47:45 +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 k9FGlitq022132 for ; Sun, 15 Oct 2006 16:47:44 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FGliie022129 for perforce@freebsd.org; Sun, 15 Oct 2006 16:47:44 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 15 Oct 2006 16:47:44 GMT Message-Id: <200610151647.k9FGliie022129@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 107957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Oct 2006 16:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107957 Change 107957 by rdivacky@rdivacky_witten on 2006/10/15 16:46:44 Unlock q in a case of "continue"... this way we dont leak the proc lock. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#11 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#11 (text+ko) ==== @@ -213,8 +213,10 @@ for (; q != NULL; q = nq) { nq = LIST_NEXT(q, p_sibling); PROC_LOCK(q); - if (q->p_flag & P_WEXIT) + if (q->p_flag & P_WEXIT) { + PROC_UNLOCK(q); continue; + } PROC_UNLOCK(q); if (__predict_false(q->p_sysent != &elf_linux_sysvec)) continue; From owner-p4-projects@FreeBSD.ORG Mon Oct 16 19:35: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 4977D16A524; Mon, 16 Oct 2006 19:35: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 0764D16A4F6 for ; Mon, 16 Oct 2006 19:35:15 +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 0CA8243E37 for ; Mon, 16 Oct 2006 19:33:11 +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 k9GJWveb058645 for ; Mon, 16 Oct 2006 19:32:57 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GJWtRu058632 for perforce@freebsd.org; Mon, 16 Oct 2006 19:32:55 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 19:32:55 GMT Message-Id: <200610161932.k9GJWtRu058632@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 107993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 19:35:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=107993 Change 107993 by piso@piso_newluxor on 2006/10/16 19:32:39 IFC@107992 Affected files ... .. //depot/projects/soc2005/libalias/bin/cp/cp.c#6 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#9 integrate .. //depot/projects/soc2005/libalias/etc/disktab#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#6 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/idmapd#1 branch .. //depot/projects/soc2005/libalias/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/grep/grep.1#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/basename.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/ffs.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/intro.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/read.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/stat.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_select.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_sig.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/i387/fenv.h#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/dump/main.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/idmapd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/idmapd/idmapd.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/kldload/kldload.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/restore/restore.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#6 integrate .. //depot/projects/soc2005/libalias/share/man/man1/builtin.1#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#6 integrate .. //depot/projects/soc2005/libalias/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/pcm.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sis.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/disktab.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/soc2005/libalias/share/man/man9/ktr.9#3 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/africa#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/asia#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/australasia#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/backward#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/europe#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/northamerica#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/southamerica#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/yearistype.sh#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/help.common#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/loader.8#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/support.4th#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#10 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.amd64#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.i386#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.pc98#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/kern.post.mk#3 integrate .. //depot/projects/soc2005/libalias/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/kmod.mk#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_debug.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_generic.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/aio/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/linux/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/soc2005/libalias/sys/pci/agp.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/conf/NOTES#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.holiday#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/expand/expand.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/systat/systat.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tput/tput.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tr/tr.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/unexpand/unexpand.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wicontrol/wicontrol.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wicontrol/wicontrol.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/bin/cp/cp.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); /* * Cp copies source files to target files. @@ -155,12 +155,9 @@ usage(); fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - if (rflag) { - if (Rflag) - errx(1, - "the -R and -r options may not be specified together."); - } - if (rflag && !Hflag && !Pflag) + if (Rflag && rflag) + errx(1, "the -R and -r options may not be specified together"); + if (rflag) Rflag = 1; if (Rflag) { if (Hflag) @@ -230,7 +227,7 @@ else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag)) + if (S_ISDIR(tmp_stat.st_mode) && Rflag) type = DIR_TO_DNE; else type = FILE_TO_FILE; ==== //depot/projects/soc2005/libalias/bin/ls/ls.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ .\" -.Dd March 24, 2006 +.Dd October 12, 2006 .Dt LS 1 .Os .Sh NAME @@ -68,7 +68,10 @@ The following options are available: .Bl -tag -width indent .It Fl A -List all entries except for +Include directory entries whose names begin with a +dot +.Pq Sq Pa \&. +except for .Pa \&. and .Pa .. . @@ -159,7 +162,7 @@ .It Fl a Include directory entries whose names begin with a dot -.Pq Pa \&. . +.Pq Sq Pa \&. . .It Fl b As .Fl B , @@ -364,6 +367,8 @@ follows: .Pp .Bl -tag -width 4n -offset indent -compact +.It Sy \- +Regular file. .It Sy b Block special file. .It Sy c @@ -372,12 +377,12 @@ Directory. .It Sy l Symbolic link. -.It Sy s -Socket link. .It Sy p .Tn FIFO . -.It Sy \- -Regular file. +.It Sy s +Socket. +.It Sy w +Whiteout. .El .Pp The next three fields ==== //depot/projects/soc2005/libalias/contrib/ncurses/man/MKterminfo.sh#2 (text+ko) ==== @@ -1,6 +1,10 @@ #!/bin/sh +# $Id: MKterminfo.sh,v 1.12 2003/01/11 21:42:12 tom Exp $ +# +# MKterminfo.sh -- generate terminfo.5 from Caps tabular data +# #*************************************************************************** -# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. * +# Copyright (c) 1998,2002,2003 Free Software Foundation, Inc. * # * # Permission is hereby granted, free of charge, to any person obtaining a * # copy of this software and associated documentation files (the * @@ -27,10 +31,6 @@ # authorization. * #*************************************************************************** # -# $Id: MKterminfo.sh,v 1.9 2001/09/01 23:06:18 tom Exp $ -# -# MKterminfo.sh -- generate terminfo.5 from Caps tabular data -# # This script takes terminfo.head and terminfo.tail and splices in between # them a table derived from the Caps data file. Besides avoiding having # the docs fall out of sync with the table, this also lets us set up tbl @@ -41,10 +41,13 @@ # had better be no s in the table source text. # # keep the order independent of locale: -LANGUAGE=C -LC_ALL=C -export LANGUAGE -export LC_ALL +if test "${LANGUAGE+set}" = set; then LANGUAGE=C; export LANGUAGE; fi +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi + # head=$1 caps=$2 @@ -66,11 +69,11 @@ sed -n <$caps "\ /%%-STOP-HERE-%%/q -/^#%/s///p +/^#%/s/#%//p /^#/d -s/[ ]\+/ /g +s/[ ][ ]*/ /g s/$/T}/ -s/ [A-Z0-9_()\-]\+ [0-9\-]\+ [Y\-][B\-][C\-][G\-][EK\-]\** / T{/ +s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]* [Y\-][B\-][C\-][G\-][EK\-]\** / T{/ s/ bool / /p s/ num / /p s/ str / /p ==== //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.8#2 (text+ko) ==== @@ -14,7 +14,7 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.14 2006/06/13 14:59:07 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ .\" .TH TRACEROUTE 8 "21 September 2000" .UC 6 @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-deFISdnrvx +.B \-dDeFISnrvx ] [ .B \-f .I first_ttl @@ -112,6 +112,18 @@ .B \-d Enable socket level debugging. .TP +.B \-D +When an ICMP response to our probe datagram is received, +print the differences between the transmitted packet and +the packet quoted by the ICMP response. +A key showing the location of fields within the transmitted packet is printed, +followed by the original packet in hex, +followed by the quoted packet in hex. +Bytes that are unchanged in the quoted packet are shown as underscores. +Note, +the IP checksum and the TTL of the quoted packet are not expected to match. +By default, only one probe per hop is sent with this option. +.TP .B \-g Specify a loose source route gateway (8 maximum). .TP @@ -163,7 +175,11 @@ to pick an unused port range. .TP .B \-q -Set the number of probes per hop (default is 3). +Set the number of probes per hop (default is 3, +unless +.B -D +is specified, +when it is 1). .TP .B \-r Bypass the normal routing tables and send directly to a host on an attached ==== //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.30 2006/06/13 14:59:07 dwmalone Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $"; #endif /* @@ -316,6 +316,9 @@ struct ip *outip; /* last output ip packet */ u_char *outp; /* last output inner protocol packet */ +struct ip *hip = NULL; /* Quoted IP header */ +int hiplen = 0; + /* loose source route gateway list (including room for final destination) */ u_int32_t gwlist[NGATEWAYS + 1]; @@ -337,7 +340,7 @@ char *device; static const char devnull[] = "/dev/null"; -int nprobes = 3; +int nprobes = -1; int max_ttl; int first_ttl = 1; u_short ident; @@ -354,6 +357,7 @@ #endif int optlen; /* length of ip options */ int fixedPort = 0; /* Use fixed destination port for TCP and UDP */ +int printdiff = 0; /* Print the difference between sent and quoted */ extern int optind; extern int opterr; @@ -380,6 +384,7 @@ void tvsub(struct timeval *, struct timeval *); void usage(void); int wait_for_reply(int, struct sockaddr_in *, const struct timeval *); +void pkt_compare(const u_char *, int, const u_char *, int); #ifndef HAVE_USLEEP int usleep(u_int); #endif @@ -398,6 +403,7 @@ /* Descriptor structure for each outgoing protocol we support */ struct outproto { char *name; /* name of protocol */ + const char *key; /* An ascii key for the bytes of the header */ u_char num; /* IP protocol number */ u_short hdrlen; /* max size of protocol header */ u_short port; /* default base protocol-specific "port" */ @@ -412,6 +418,7 @@ struct outproto protos[] = { { "udp", + "spt dpt len sum", IPPROTO_UDP, sizeof(struct udphdr), 32768 + 666, @@ -420,6 +427,7 @@ }, { "tcp", + "spt dpt seq ack xxflwin sum urp", IPPROTO_TCP, sizeof(struct tcphdr), 32768 + 666, @@ -428,6 +436,7 @@ }, { "gre", + "flg pro len clid", IPPROTO_GRE, sizeof(struct grehdr), GRE_PPTP_PROTO, @@ -436,6 +445,7 @@ }, { "icmp", + "typ cod sum ", IPPROTO_ICMP, sizeof(struct icmp), 0, @@ -444,6 +454,7 @@ }, { NULL, + NULL, 0, 2 * sizeof(u_short), 0, @@ -453,6 +464,8 @@ }; struct outproto *proto = &protos[0]; +const char *ip_hdr_key = "vhtslen id off tlprsum srcip dstip opts"; + int main(int argc, char **argv) { @@ -522,13 +535,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { case 'd': options |= SO_DEBUG; break; + case 'D': + printdiff = 1; + break; + case 'e': fixedPort = 1; break; @@ -628,6 +645,9 @@ /* Set requested port, if any, else default for this protocol */ port = (requestPort != -1) ? requestPort : proto->port; + if (nprobes == -1) + nprobes = printdiff ? 1 : 3; + if (first_ttl > max_ttl) { Fprintf(stderr, "%s: first ttl (%d) may not be greater than max ttl (%d)\n", @@ -968,6 +988,16 @@ #endif precis = 3; Printf(" %.*f ms", precis, T); + if (printdiff) { + Printf("\n"); + Printf("%*.*s%s\n", + -(outip->ip_hl << 3), + outip->ip_hl << 3, + ip_hdr_key, + proto->key); + pkt_compare((void *)outip, packlen, + (void *)hip, hiplen); + } if (i == -2) { #ifndef ARCHAIC ip = (struct ip *)packet; @@ -1275,10 +1305,10 @@ return -2; if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS) || type == ICMP_UNREACH) { - struct ip *hip; u_char *inner; hip = &icp->icmp_ip; + hiplen = ((u_char *)icp + cc) - (u_char *)hip; hlen = hip->ip_hl << 2; inner = (u_char *)((u_char *)hip + hlen); if (hlen + 12 <= cc @@ -1708,13 +1738,33 @@ } void +pkt_compare(const u_char *a, int la, const u_char *b, int lb) { + int l; + int i; + + for (i = 0; i < la; i++) + Printf("%02x", (unsigned int)a[i]); + Printf("\n"); + l = (la <= lb) ? la : lb; + for (i = 0; i < l; i++) + if (a[i] == b[i]) + Printf("__"); + else + Printf("%02x", (unsigned int)b[i]); + for (; i < lb; i++) + Printf("%02x", (unsigned int)b[i]); + Printf("\n"); +} + + +void usage(void) { extern char version[]; Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dFInrSvx] [-g gateway] [-i iface] [-f first_ttl]\n" + "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); exit(1); ==== //depot/projects/soc2005/libalias/etc/defaults/rc.conf#9 (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.298 2006/10/06 23:22:12 flz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.300 2006/10/15 15:55:00 ceri Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -242,6 +242,8 @@ nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled). +idmapd_enable="NO" # Run the NFS4 id mapper (YES/NO). +idmapd_flags="" # Additional flags for idmapd. mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. ==== //depot/projects/soc2005/libalias/etc/disktab#2 (text+ko) ==== @@ -1,33 +1,7 @@ -# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/disktab,v 1.26 2006/10/14 16:39:03 ru Exp $ # # Disk geometry and partition layout tables. -# Key: -# dt controller type -# ty type of disk (fixed, removeable, simulated) -# d[0-4] drive-type-dependent parameters -# ns #sectors/track -# nt #tracks/cylinder -# nc #cylinders/disk -# sc #sectors/cylinder, ns*nt default -# su #sectors/unit, sc*nc default -# se sector size, DEV_BSIZE default -# rm rpm, 3600 default -# sf supports bad144-style bad sector forwarding -# sk sector skew per track, default 0 -# cs sector skew per cylinder, default 0 -# hs headswitch time, default 0 -# ts one-cylinder seek time, default 0 -# il sector interleave (n:1), 1 default -# bs boot block size, default BBSIZE -# sb superblock size, default SBSIZE -# o[a-h] partition offsets in sectors -# p[a-h] partition sizes in sectors -# b[a-h] partition block sizes in bytes -# f[a-h] partition fragment sizes in bytes -# t[a-h] partition types (filesystem, swap, etc) -# -# All partition sizes reserve space for bad sector tables. -# (5 cylinders needed for maintenance + replacement sectors) +# See disktab(5) for format of this file. # # ==== //depot/projects/soc2005/libalias/etc/rc.d/Makefile#6 (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.77 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ .include @@ -15,7 +15,7 @@ gbde geli geli2 \ hcsecd \ hostapd hostname \ - inetd initrandom \ + idmapd inetd initrandom \ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ jail \ ==== //depot/projects/soc2005/libalias/etc/rc.d/auto_linklocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.1 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.2 2006/10/13 12:41:35 ume Exp $ # # PROVIDE: auto_linklocal @@ -10,9 +10,15 @@ . /etc/rc.subr name="auto_linklocal" -rcvar=`set_rcvar ipv6` -start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1" +start_cmd="auto_linklocal_start" stop_cmd=":" +auto_linklocal_start() +{ + if ! checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/soc2005/libalias/gnu/lib/libgcc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.55 2006/03/18 21:37:03 ru Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.56 2006/10/12 16:43:15 cognet Exp $ .include .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -98,7 +98,7 @@ # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func +LIB1ASMFUNCS = _dvmd_tls _bb_init_func OBJS+= dp-bit.o fp-bit.o # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. ==== //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.8 2005/07/28 15:59:52 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $ .Dd March 2, 2005 .Os .Dt KGDB 1 @@ -34,6 +34,7 @@ .Op Fl a | Fl f | Fl fullname .Op Fl q | Fl quiet .Op Fl v +.Op Fl w .Op Fl d Ar crashdir .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device .Op Ar kernel Op Ar core @@ -67,6 +68,13 @@ form is supported for compatibility as well. .It Fl v Increase verbosity. +.It Fl w +Opens kmem-based targets in read-write mode. +(This is identical to what +.Fl -wcore +used to do in previous +gdb versions for +.Fx . ) .It Fl d Ar crashdir Use .Ar crashdir ==== //depot/projects/soc2005/libalias/gnu/usr.bin/grep/grep.1#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.29 2006/10/10 01:57:25 trhodes Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.30 2006/10/11 09:52:32 trhodes Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -202,6 +202,12 @@ as a list of fixed strings, separated by newlines, any of which is to be matched. .TP +.BR \-P ", " \-\^\-perl-regexp +Interpret +.I PATTERN +as a Perl regular expression. +This option is not supported in FreeBSD. +.TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE Obtain patterns from .IR FILE , ==== //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/send-pr.1#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18 2005/06/16 19:27:12 ceri Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $ .nh -.TH SEND-PR 1 3.113 "February 1993" +.TH SEND-PR 1 3.113 "October 2006" .SH NAME send-pr \- send problem report (PR) to a central support site .SH SYNOPSIS @@ -230,6 +230,9 @@ .B standards Standards conformance issues. .TP +.B sun4v +Problems specific to the SPARC sun4v architecture and processors. +.TP .B threads Problems related to threading on FreeBSD. .TP @@ -295,12 +298,14 @@ instructions on submitting larger test cases and problematic source code. .SH FILES -.ta \w'/tmp/pbad$$ 'u -/tmp/p$$ copy of PR used in editing session +.ta \w'/tmp/pbad.XXXXXXXX 'u +/tmp/pf.XXXXXXXX copy of PR used in editing session +.br +/tmp/pf.XXXXXXXX copy of empty PR form, for testing purposes .br -/tmp/pf$$ copy of empty PR form, for testing purposes +/tmp/pr.XXXXXXXX copy of filled PR form, created on interrupt .br -/tmp/pbad$$ file for rejected PRs +/tmp/pbad.XXXXXXXX file for rejected PRs .SH EMACS USER INTERFACE An Emacs user interface for .B send-pr ==== //depot/projects/soc2005/libalias/lib/libc/gen/basename.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt BASENAME 3 .Os .Sh NAME @@ -58,6 +58,13 @@ is a null pointer or the empty string, a pointer to the string .Qq \&. is returned. +.Sh IMPLEMENTATION NOTES +The +.Fn basename +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. .Sh RETURN VALUES On successful completion, .Fn basename @@ -77,12 +84,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn basename -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/soc2005/libalias/lib/libc/gen/dirname.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt DIRNAME 3 .Os .Sh NAME @@ -58,6 +58,20 @@ returns a pointer to the string .Qq \&. , signifying the current directory. +.Sh IMPLEMENTATION NOTES +The +.Fn dirname +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. +.Pp +Other vendor implementations of +.Fn dirname +may modify the contents of the string passed to +.Fn dirname ; +this should be taken into account when writing code which calls this function +if portability is desired. .Sh RETURN VALUES On successful completion, .Fn dirname @@ -77,19 +91,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn dirname -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls (each function has its own separate storage). -.Pp -Other vendor implementations of -.Fn dirname -may modify the contents of the string passed to -.Fn dirname ; -this should be taken into account when writing code which calls this function -if portability is desired. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/soc2005/libalias/lib/libc/gen/msgsnd.3#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $ .\" -.Dd November 24, 1997 +.Dd October 12, 2006 .Dt MSGSND 3 .Os .Sh NAME @@ -65,8 +65,13 @@ is an integer greater than 0 that can be used for selecting messages (see .Xr msgrcv 3 ) , .Va mtext -is an array of bytes, with a size up to that of the system limit -.Pf ( Dv MSGMAX ) . +is an array of +.Fa msgsz +bytes. +The argument +.Fa msgsz +can range from 0 to a system-imposed maximum, +.Dv MSGMAX . .Pp If the number of bytes already on the message queue plus .Fa msgsz @@ -144,7 +149,7 @@ The .Fa msgsz argument -is less than 0, or greater than +is greater than .Va msg_qbytes . .Pp The ==== //depot/projects/soc2005/libalias/lib/libc/i386/sys/i386_get_ldt.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fork.2 6.5 (Berkeley) 3/10/91 -.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.21 2004/07/02 19:07:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.23 2006/10/13 20:34:44 ru Exp $ .\" -.Dd September 20, 1993 +.Dd October 14, 2006 .Dt I386_GET_LDT 2 .Os .Sh NAME @@ -52,24 +52,24 @@ The .Fn i386_get_ldt system call -will return the list of i386 descriptors that the process has in its +returns a list of the i386 descriptors in the current process' LDT. The .Fn i386_set_ldt system call -will set a list of i386 descriptors for the current process in its +sets a list of i386 descriptors in the current process' LDT. -Both routines accept a starting selector number -.Fa start_sel , -an array of memory that -will contain the descriptors to be set or returned -.Fa descs , -and the number of entries to set or return -.Fa num_sels . +For both routines, +.Fa start_sel +specifies the index of the selector in the LDT at which to begin and +.Fa descs +points to an array of +.Fa num_sels +descriptors to be set or returned. .Pp -The argument +Each entry in the .Fa descs -can be either segment_descriptor or gate_descriptor and are defined in +array can be either a segment_descriptor or gate_descriptor and are defined in .In i386/segments.h . These structures are defined by the architecture as disjoint bit-fields, so care must be taken in constructing them. @@ -113,9 +113,9 @@ The .Fn i386_set_ldt system call -returns the first selector set. -In the case when a descriptor is allocated by the kernel, its number will -be returned. +returns the first selector set on success. +If the kernel allocated a descriptor in the LDT, +the allocated index is returned. Otherwise, a value of -1 is returned and the global variable .Va errno ==== //depot/projects/soc2005/libalias/lib/libc/locale/wctype.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.6 2005/07/21 10:32:17 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.7 2006/10/13 16:11:12 ru Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 16 19:55: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 F22AC16A47B; Mon, 16 Oct 2006 19:55: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 C990D16A416 for ; Mon, 16 Oct 2006 19:55:27 +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 25BC943D81 for ; Mon, 16 Oct 2006 19:55:26 +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 k9GJtQTs062016 for ; Mon, 16 Oct 2006 19:55:26 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GJtP6c062013 for perforce@freebsd.org; Mon, 16 Oct 2006 19:55:25 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 19:55:25 GMT Message-Id: <200610161955.k9GJtP6c062013@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 107994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 19:55:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=107994 Change 107994 by piso@piso_newluxor on 2006/10/16 19:54:24 Axe some cruft left around when moved to queue(3). Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#6 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#6 (text+ko) ==== @@ -308,16 +308,6 @@ u_int32_t log_left; /* how many left to log */ } ipfw_insn_log; -/* - * "syntactic sugar for compiler": used in HOOK_REDIR|SPOOL in ip_fw2.c. - * - * WARNING: don't move the field "next" in the subsequent cfg_* structs, - * it has to be the first. - */ -struct _chain { - struct _chain *next; -}; - /* Server pool support (LSNAT). */ struct cfg_spool { LIST_ENTRY(cfg_spool) _next; /* chain of spool instances */ From owner-p4-projects@FreeBSD.ORG Mon Oct 16 19:57: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 7791F16A415; Mon, 16 Oct 2006 19:57: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 3A69B16A47B; Mon, 16 Oct 2006 19:57:03 +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 2311943D79; Mon, 16 Oct 2006 19:56:42 +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 k9GJuexl042287; Mon, 16 Oct 2006 15:56:40 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Mon, 16 Oct 2006 15:37:27 -0400 User-Agent: KMail/1.9.1 References: <200610141604.k9EG4x8o040869@repoman.freebsd.org> In-Reply-To: <200610141604.k9EG4x8o040869@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610161537.27772.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]); Mon, 16 Oct 2006 15:56:40 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2037/Mon Oct 16 12:41:42 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.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 19:57:03 -0000 On Saturday 14 October 2006 12:04, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=107903 > > Change 107903 by rdivacky@rdivacky_witten on 2006/10/14 16:04:47 > > A bunch of fixes that makes this not panic when killpg() is called. > > Affected files ... > > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#10 edit > > Differences ... > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#10 (text+ko) ==== > > @@ -212,8 +212,12 @@ > q = LIST_FIRST(&p->p_children); > for (; q != NULL; q = nq) { > nq = LIST_NEXT(q, p_sibling); > - if (__predict_true(q->p_sysent != &elf_linux_sysvec)) > - break; > + PROC_LOCK(q); > + if (q->p_flag & P_WEXIT) > + continue; > + PROC_UNLOCK(q); > + if (__predict_false(q->p_sysent != &elf_linux_sysvec)) > + continue; > em = em_find(q, EMUL_UNLOCKED); > KASSERT(em != NULL, ("linux_reparent: emuldata not found: %i\n", q->p_pid)); > if (em->pdeath_signal != 0) { Holding the proc lock doesn't buy you anything here. Probably you should hold an slock of the proctree_lock while you walk the list, and that should be good enough to test P_WEXIT. However, even if you didn't hold it, grabbing the lock just to do a read doesn't buy you anything as far as closing race conditions. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Oct 16 20:00: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 2C5FA16A518; Mon, 16 Oct 2006 20:00: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 A5CAF16A4EE for ; Mon, 16 Oct 2006 20:00: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 3E80543DB9 for ; Mon, 16 Oct 2006 20:00:33 +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 k9GK0Xxf062232 for ; Mon, 16 Oct 2006 20:00:33 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GK0W0S062229 for perforce@freebsd.org; Mon, 16 Oct 2006 20:00:32 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 20:00:32 GMT Message-Id: <200610162000.k9GK0W0S062229@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 107995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 20:00:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=107995 Change 107995 by piso@piso_newluxor on 2006/10/16 20:00:31 sys/types.h is not needed anymore. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#18 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#18 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Oct 16 20:14: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 9CCF316A4E6; Mon, 16 Oct 2006 20:13: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 6947516A4C2 for ; Mon, 16 Oct 2006 20:13:59 +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 8F1BF43D4C for ; Mon, 16 Oct 2006 20:13:51 +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 k9GKDpQ0066309 for ; Mon, 16 Oct 2006 20:13:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GKDpAs066306 for perforce@freebsd.org; Mon, 16 Oct 2006 20:13:51 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 20:13:51 GMT Message-Id: <200610162013.k9GKDpAs066306@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 107997 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 20:14:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107997 Change 107997 by piso@piso_newluxor on 2006/10/16 20:13:08 Move the helper function m_megapullup from ng_nat.c & ipfw2.c to alias.c and alias.h. Affected files ... .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#3 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#19 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#6 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#3 (text+ko) ==== @@ -56,8 +56,6 @@ static ng_rcvdata_t ng_nat_rcvdata; static ng_disconnect_t ng_nat_disconnect; -static struct mbuf * m_megapullup(struct mbuf *, int); - /* List of commands and how to convert arguments to/from ASCII. */ static const struct ng_cmdlist ng_nat_cmdlist[] = { { @@ -327,36 +325,3 @@ return (0); } -/* - * m_megapullup() function is a big hack. - * - * It allocates an mbuf with cluster and copies the whole - * chain into cluster, so that it is all contigous and the - * whole packet can be accessed via char pointer. - * - * This is required, because libalias doesn't have idea - * about mbufs. - */ -static struct mbuf * -m_megapullup(struct mbuf *m, int len) -{ - struct mbuf *mcl; - caddr_t cp; - - if (len > MCLBYTES) - goto bad; - - if ((mcl = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL) - goto bad; - - cp = mtod(mcl, caddr_t); - m_copydata(m, 0, len, cp); - m_move_pkthdr(mcl, m); - mcl->m_len = mcl->m_pkthdr.len; - m_freem(m); - - return (mcl); -bad: - m_freem(m); - return (NULL); -} ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#19 (text+ko) ==== @@ -2046,42 +2046,6 @@ return match; } -/* - * m_megapullup() function (from ng_nat.c) is a big hack. - * - * It allocates an mbuf with cluster and copies the whole - * chain into cluster, so that it is all contigous and the - * whole packet can be accessed via char pointer. - * This is required, because libalias doesn't have idea - * about mbufs. - * - * On success, m_megapullup returns an mbuf with cluster - * containing the input packet, on failure NULL. - * In both cases, the input packet is consumed. - */ -static struct mbuf * -m_megapullup(struct mbuf *m, int len) { - struct mbuf *mcl; - caddr_t cp; - - if (len > MCLBYTES) - goto bad; - - if ((mcl = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL) - goto bad; - - cp = mtod(mcl, caddr_t); - m_copydata(m, 0, len, cp); - m_move_pkthdr(mcl, m); - mcl->m_len = mcl->m_pkthdr.len; - m_freem(m); - - return (mcl); -bad: - m_freem(m); - return (NULL); -} - static void flush_nat_ptrs(const int i) { struct ip_fw *rule; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#16 (text+ko) ==== @@ -113,6 +113,8 @@ #ifdef _KERNEL #include +#include +#include #else #include #include @@ -1574,3 +1576,41 @@ } #endif + +#ifdef _KERNEL +/* + * m_megapullup() function is a big hack (only used in ng_nat and ipfw+nat). + * + * It allocates an mbuf with cluster and copies the whole + * chain into cluster, so that it is all contigous and the + * whole packet can be accessed via char pointer. + * This is required, because libalias doesn't have idea + * about mbufs. + * + * On success, m_megapullup returns an mbuf with cluster + * containing the input packet, on failure NULL. + * In both cases, the input packet is consumed. + */ +struct mbuf * +m_megapullup(struct mbuf *m, int len) { + struct mbuf *mcl; + caddr_t cp; + + if (len > MCLBYTES) + goto bad; + + if ((mcl = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL) + goto bad; + + cp = mtod(mcl, caddr_t); + m_copydata(m, 0, len, cp); + m_move_pkthdr(mcl, m); + mcl->m_len = mcl->m_pkthdr.len; + m_freem(m); + + return (mcl); +bad: + m_freem(m); + return (NULL); +} +#endif ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#6 (text+ko) ==== @@ -189,6 +189,9 @@ int LibAliasUnLoadAllModule(void); int LibAliasRefreshModules(void); +/* Mbuf helper function. */ +struct mbuf *m_megapullup(struct mbuf *, int); + /* * Mode flags and other constants. */ From owner-p4-projects@FreeBSD.ORG Mon Oct 16 21:15: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 B071816A492; Mon, 16 Oct 2006 21:15: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 6D07A16A47B for ; Mon, 16 Oct 2006 21:15:11 +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 198C343D46 for ; Mon, 16 Oct 2006 21:15:11 +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 k9GLFAh7084565 for ; Mon, 16 Oct 2006 21:15:10 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GLFAkg084562 for perforce@freebsd.org; Mon, 16 Oct 2006 21:15:10 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 21:15:10 GMT Message-Id: <200610162115.k9GLFAkg084562@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 107999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 21:15:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=107999 Change 107999 by piso@piso_newluxor on 2006/10/16 21:14:16 Start moving nat_chain under layer3_chain. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#20 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#20 (text+ko) ==== @@ -137,6 +137,7 @@ struct ip_fw_chain { struct ip_fw *rules; /* list of rules */ struct ip_fw *reap; /* list of rules to reap */ + LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ struct radix_node_head *tables[IPFW_TABLES_MAX]; struct rwlock rwmtx; }; @@ -305,7 +306,6 @@ MODULE_DEPEND(ipfw, libalias, 1, 1, 1); struct rwlock nat_chain_rwl; -LIST_HEAD(nat_chain, cfg_nat) nat_chain = LIST_HEAD_INITIALIZER(foo); #define NAT_LOCK_INIT(_chain) \ rw_init(_chain, "NAT instances") @@ -2066,7 +2066,7 @@ lookup_nat(const int i) { struct cfg_nat *ptr; - LIST_FOREACH(ptr, &nat_chain, _next) + LIST_FOREACH(ptr, &layer3_chain.nat, _next) if (ptr->id == i) return(ptr); return (NULL); @@ -4321,7 +4321,7 @@ NAT_WLOCK(&nat_chain_rwl); /* Check every nat entry... */ - LIST_FOREACH(ptr, &nat_chain, _next) { + LIST_FOREACH(ptr, &layer3_chain.nat, _next) { /* ...using nic 'ifp->if_xname' as dynamic alias address. */ if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) == 0) { mtx_lock(&ifp->if_addr_mtx); @@ -4624,7 +4624,7 @@ ptr); /* Add new entries. */ free(buf, M_IPFW); NAT_WLOCK(&nat_chain_rwl); - HOOK_NAT(&nat_chain, ptr); + HOOK_NAT(&layer3_chain.nat, ptr); NAT_WUNLOCK(&nat_chain_rwl); } break; @@ -4667,7 +4667,7 @@ return (ENOSPC); NAT_RLOCK(&nat_chain_rwl); /* Serialize all the data. */ - LIST_FOREACH(n, &nat_chain, _next) { + LIST_FOREACH(n, &layer3_chain.nat, _next) { nat_cnt++; if (off + sof_nat < NAT_BUF_LEN) { bcopy(n, &data[off], sof_nat); @@ -4710,7 +4710,7 @@ NAT_RLOCK(&nat_chain_rwl); size = i = 0; - LIST_FOREACH(ptr, &nat_chain, _next) { + LIST_FOREACH(ptr, &layer3_chain.nat, _next) { if (ptr->lib->logDesc == NULL) continue; cnt++; @@ -4903,6 +4903,7 @@ ip_fw_ctl_ptr = ipfw_ctl; ip_fw_chk_ptr = ipfw_chk; callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL); + LIST_INIT(&layer3_chain.nat); NAT_LOCK_INIT(&nat_chain_rwl); ifaddr_event_tag = EVENTHANDLER_REGISTER(ifaddr_event, ifaddr_change, NULL, EVENTHANDLER_PRI_ANY); @@ -4921,7 +4922,7 @@ IPFW_WLOCK(&layer3_chain); flush_tables(&layer3_chain); NAT_WLOCK(&nat_chain_rwl); - LIST_FOREACH_SAFE(ptr, &nat_chain, _next, ptr_temp) { + LIST_FOREACH_SAFE(ptr, &layer3_chain.nat, _next, ptr_temp) { LIST_REMOVE(ptr, _next); del_redir_spool_cfg(ptr, &ptr->redir_chain); LibAliasUninit(ptr->lib); From owner-p4-projects@FreeBSD.ORG Mon Oct 16 21:29: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 DE22B16A415; Mon, 16 Oct 2006 21:29: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 9FE6E16A40F for ; Mon, 16 Oct 2006 21:29: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 6AA2543D49 for ; Mon, 16 Oct 2006 21:29:30 +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 k9GLTTks086210 for ; Mon, 16 Oct 2006 21:29:29 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GLTTAF086207 for perforce@freebsd.org; Mon, 16 Oct 2006 21:29:29 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 21:29:29 GMT Message-Id: <200610162129.k9GLTTAF086207@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 108000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 21:29:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=108000 Change 108000 by piso@piso_newluxor on 2006/10/16 21:28:34 Move nat locking from private nat_chain_rwl to layer3_chain rwl. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#21 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#21 (text+ko) ==== @@ -305,20 +305,11 @@ MODULE_DEPEND(ipfw, libalias, 1, 1, 1); -struct rwlock nat_chain_rwl; - -#define NAT_LOCK_INIT(_chain) \ - rw_init(_chain, "NAT instances") -#define NAT_LOCK_DESTROY(_chain) rw_destroy(_chain) -#define NAT_WLOCK_ASSERT(_chain) do { \ - rw_assert(_chain, RA_WLOCKED); \ - NET_ASSERT_GIANT(); \ -} while (0) - -#define NAT_RLOCK(p) rw_rlock(p) -#define NAT_RUNLOCK(p) rw_runlock(p) -#define NAT_WLOCK(p) rw_wlock(p) -#define NAT_WUNLOCK(p) rw_wunlock(p) +#define NAT_WLOCK_ASSERT(_chain) IPFW_WLOCK_ASSERT(_chain) +#define NAT_RLOCK(p) IPFW_RLOCK(p) +#define NAT_RUNLOCK(p) IPFW_RUNLOCK(p) +#define NAT_WLOCK(p) IPFW_WLOCK(p) +#define NAT_WUNLOCK(p) IPFW_WUNLOCK(p) static eventhandler_tag ifaddr_event_tag; @@ -2073,12 +2064,12 @@ } #define HOOK_NAT(b, p) do { \ - NAT_WLOCK_ASSERT(&nat_chain_rwl); \ + NAT_WLOCK_ASSERT(&layer3_chain); \ LIST_INSERT_HEAD(b, p, _next); \ } while (0) #define UNHOOK_NAT(p) do { \ - NAT_WLOCK_ASSERT(&nat_chain_rwl); \ + NAT_WLOCK_ASSERT(&layer3_chain); \ LIST_REMOVE(p, _next); \ } while (0) @@ -3447,12 +3438,12 @@ args->rule = f; /* Report matching rule. */ retval = 0; t = ((ipfw_insn_nat *)cmd)->nat; - NAT_RLOCK(&nat_chain_rwl); + NAT_RLOCK(&layer3_chain); if (t == NULL) { t = lookup_nat(cmd->arg1); if (t == NULL) { retval = IP_FW_DENY; - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); goto done; } else ((ipfw_insn_nat *)cmd)->nat = t; @@ -3518,7 +3509,7 @@ /* XXX - should i add some logging? */ m_free(mcl); badnat: - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); args->m = NULL; retval = IP_FW_DENY; goto done; @@ -3584,7 +3575,7 @@ args->m = mcl; retval = IP_FW_NAT; - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); goto done; } @@ -4319,7 +4310,7 @@ struct cfg_nat *ptr; struct ifaddr *ifa; - NAT_WLOCK(&nat_chain_rwl); + NAT_WLOCK(&layer3_chain); /* Check every nat entry... */ LIST_FOREACH(ptr, &layer3_chain.nat, _next) { /* ...using nic 'ifp->if_xname' as dynamic alias address. */ @@ -4337,7 +4328,7 @@ mtx_unlock(&ifp->if_addr_mtx); } } - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); } /** @@ -4577,21 +4568,21 @@ /* * Find/create nat rule. */ - NAT_WLOCK(&nat_chain_rwl); + NAT_WLOCK(&layer3_chain); ptr = lookup_nat(ser_n->id); if (ptr == NULL) { /* New rule: allocate and init new instance. */ ptr = malloc(sizeof(struct cfg_nat), M_IPFW, M_NOWAIT | M_ZERO); if (ptr == NULL) { free(buf, M_IPFW); - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); return (ENOSPC); } ptr->lib = LibAliasInit(NULL); if (ptr->lib == NULL) { free(ptr, M_IPFW); free(buf, M_IPFW); - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); return(EINVAL); } LIST_INIT(&ptr->redir_chain); @@ -4599,7 +4590,7 @@ UNHOOK_NAT(ptr); flush_nat_ptrs(ser_n->id); } - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); /* * Basic nat configuration. @@ -4623,9 +4614,9 @@ add_redir_spool_cfg(&buf[(sizeof(struct cfg_nat))], ptr); /* Add new entries. */ free(buf, M_IPFW); - NAT_WLOCK(&nat_chain_rwl); + NAT_WLOCK(&layer3_chain); HOOK_NAT(&layer3_chain.nat, ptr); - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); } break; @@ -4635,15 +4626,15 @@ int i; error = sooptcopyin(sopt, &i, sizeof i, sizeof i); - NAT_WLOCK(&nat_chain_rwl); + NAT_WLOCK(&layer3_chain); ptr = lookup_nat(i); if (ptr == NULL) { error = EINVAL; - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); break; } UNHOOK_NAT(ptr); - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); flush_nat_ptrs(i); del_redir_spool_cfg(ptr, &ptr->redir_chain); LibAliasUninit(ptr->lib); @@ -4665,7 +4656,7 @@ data = malloc(NAT_BUF_LEN, M_IPFW, M_NOWAIT | M_ZERO); if (data == NULL) return (ENOSPC); - NAT_RLOCK(&nat_chain_rwl); + NAT_RLOCK(&layer3_chain); /* Serialize all the data. */ LIST_FOREACH(n, &layer3_chain.nat, _next) { nat_cnt++; @@ -4690,12 +4681,12 @@ goto nospace; } bcopy(&nat_cnt, data, sizeof(nat_cnt)); - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); error = sooptcopyout(sopt, data, NAT_BUF_LEN); free(data, M_IPFW); break; nospace: - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); printf("serialized data buffer not big enough: please increase NAT_BUF_LEN\n"); free(data, M_IPFW); } @@ -4708,7 +4699,7 @@ int sof = LIBALIAS_BUF_SIZE; int i, size, cnt = 0; - NAT_RLOCK(&nat_chain_rwl); + NAT_RLOCK(&layer3_chain); size = i = 0; LIST_FOREACH(ptr, &layer3_chain.nat, _next) { if (ptr->lib->logDesc == NULL) @@ -4717,7 +4708,7 @@ size = cnt * (sof + sizeof(int)); data = realloc(data, size, M_IPFW, M_NOWAIT | M_ZERO); if (data == NULL) { - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); return (ENOSPC); } bcopy(&ptr->id, &data[i], sizeof(int)); @@ -4725,7 +4716,7 @@ bcopy(ptr->lib->logDesc, &data[i], sof); i += sof; } - NAT_RUNLOCK(&nat_chain_rwl); + NAT_RUNLOCK(&layer3_chain); error = sooptcopyout(sopt, data, size); free(data, M_IPFW); } @@ -4904,7 +4895,6 @@ ip_fw_chk_ptr = ipfw_chk; callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL); LIST_INIT(&layer3_chain.nat); - NAT_LOCK_INIT(&nat_chain_rwl); ifaddr_event_tag = EVENTHANDLER_REGISTER(ifaddr_event, ifaddr_change, NULL, EVENTHANDLER_PRI_ANY); return (0); @@ -4921,16 +4911,15 @@ callout_drain(&ipfw_timeout); IPFW_WLOCK(&layer3_chain); flush_tables(&layer3_chain); - NAT_WLOCK(&nat_chain_rwl); + NAT_WLOCK(&layer3_chain); LIST_FOREACH_SAFE(ptr, &layer3_chain.nat, _next, ptr_temp) { LIST_REMOVE(ptr, _next); del_redir_spool_cfg(ptr, &ptr->redir_chain); LibAliasUninit(ptr->lib); free(ptr, M_IPFW); } - NAT_WUNLOCK(&nat_chain_rwl); + NAT_WUNLOCK(&layer3_chain); EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag); - NAT_LOCK_DESTROY(&nat_chain_rwl); layer3_chain.reap = NULL; free_chain(&layer3_chain, 1 /* kill default rule */); reap = layer3_chain.reap, layer3_chain.reap = NULL; From owner-p4-projects@FreeBSD.ORG Mon Oct 16 21:37: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 8B39516A415; Mon, 16 Oct 2006 21:37: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 4C93F16A412; Mon, 16 Oct 2006 21:37:27 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (cell.sick.ru [217.72.144.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AC7543D70; Mon, 16 Oct 2006 21:37:19 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (glebius@localhost [127.0.0.1]) by cell.sick.ru (8.13.4/8.13.3) with ESMTP id k9GLbInj031852 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 Oct 2006 01:37:18 +0400 (MSD) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.sick.ru (8.13.4/8.13.1/Submit) id k9GLbIuh031851; Tue, 17 Oct 2006 01:37:18 +0400 (MSD) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.sick.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 17 Oct 2006 01:37:18 +0400 From: Gleb Smirnoff To: Paolo Pisati Message-ID: <20061016213718.GS59833@FreeBSD.org> References: <200610162129.k9GLTTAF086207@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <200610162129.k9GLTTAF086207@repoman.freebsd.org> User-Agent: Mutt/1.5.6i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 108000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 21:37:27 -0000 On Mon, Oct 16, 2006 at 09:29:29PM +0000, Paolo Pisati wrote: P> Change 108000 by piso@piso_newluxor on 2006/10/16 21:28:34 P> P> Move nat locking from private nat_chain_rwl to layer3_chain rwl. P> +#define NAT_WLOCK_ASSERT(_chain) IPFW_WLOCK_ASSERT(_chain) P> +#define NAT_RLOCK(p) IPFW_RLOCK(p) P> +#define NAT_RUNLOCK(p) IPFW_RUNLOCK(p) P> +#define NAT_WLOCK(p) IPFW_WLOCK(p) P> +#define NAT_WUNLOCK(p) IPFW_WUNLOCK(p) It is an obfuscation of the code. Why do we need to have two words doing the same instead of one? -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE From owner-p4-projects@FreeBSD.ORG Mon Oct 16 21:51: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 AAA8016A47C; Mon, 16 Oct 2006 21:51: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 8351216A417 for ; Mon, 16 Oct 2006 21:51:03 +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 7561243D83 for ; Mon, 16 Oct 2006 21:51:02 +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 k9GLp2RI092323 for ; Mon, 16 Oct 2006 21:51:02 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9GLp2Fe092320 for perforce@freebsd.org; Mon, 16 Oct 2006 21:51:02 GMT (envelope-from piso@freebsd.org) Date: Mon, 16 Oct 2006 21:51:02 GMT Message-Id: <200610162151.k9GLp2Fe092320@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 108003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 21:51:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=108003 Change 108003 by piso@piso_newluxor on 2006/10/16 21:50:47 Complete movement of nat entries under ip_fw_chain: used IPFW_[RW]LOCK instead of NAT_[RW]LOCK, deleted nat_chain_rwl and reviewed some locking. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#22 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#22 (text+ko) ==== @@ -154,6 +154,8 @@ #define IPFW_WLOCK(p) rw_wlock(&(p)->rwmtx) #define IPFW_WUNLOCK(p) rw_wunlock(&(p)->rwmtx) +static eventhandler_tag ifaddr_event_tag; + /* * list of rules for layer 3 */ @@ -305,14 +307,6 @@ MODULE_DEPEND(ipfw, libalias, 1, 1, 1); -#define NAT_WLOCK_ASSERT(_chain) IPFW_WLOCK_ASSERT(_chain) -#define NAT_RLOCK(p) IPFW_RLOCK(p) -#define NAT_RUNLOCK(p) IPFW_RUNLOCK(p) -#define NAT_WLOCK(p) IPFW_WLOCK(p) -#define NAT_WUNLOCK(p) IPFW_WUNLOCK(p) - -static eventhandler_tag ifaddr_event_tag; - static int fw_deny_unknown_exthdrs = 1; /* @@ -2041,7 +2035,7 @@ flush_nat_ptrs(const int i) { struct ip_fw *rule; - IPFW_WLOCK(&layer3_chain); + IPFW_WLOCK_ASSERT(&layer3_chain); for (rule = layer3_chain.rules; rule; rule = rule->next) { ipfw_insn_nat *cmd = (ipfw_insn_nat *)ACTION_PTR(rule); @@ -2050,7 +2044,6 @@ if (cmd->nat != NULL && cmd->nat->id == i) cmd->nat = NULL; } - IPFW_WUNLOCK(&layer3_chain); } static struct cfg_nat * @@ -2064,12 +2057,12 @@ } #define HOOK_NAT(b, p) do { \ - NAT_WLOCK_ASSERT(&layer3_chain); \ + IPFW_WLOCK_ASSERT(&layer3_chain); \ LIST_INSERT_HEAD(b, p, _next); \ } while (0) #define UNHOOK_NAT(p) do { \ - NAT_WLOCK_ASSERT(&layer3_chain); \ + IPFW_WLOCK_ASSERT(&layer3_chain); \ LIST_REMOVE(p, _next); \ } while (0) @@ -3438,12 +3431,10 @@ args->rule = f; /* Report matching rule. */ retval = 0; t = ((ipfw_insn_nat *)cmd)->nat; - NAT_RLOCK(&layer3_chain); if (t == NULL) { t = lookup_nat(cmd->arg1); if (t == NULL) { retval = IP_FW_DENY; - NAT_RUNLOCK(&layer3_chain); goto done; } else ((ipfw_insn_nat *)cmd)->nat = t; @@ -3509,7 +3500,6 @@ /* XXX - should i add some logging? */ m_free(mcl); badnat: - NAT_RUNLOCK(&layer3_chain); args->m = NULL; retval = IP_FW_DENY; goto done; @@ -3575,7 +3565,6 @@ args->m = mcl; retval = IP_FW_NAT; - NAT_RUNLOCK(&layer3_chain); goto done; } @@ -4310,7 +4299,7 @@ struct cfg_nat *ptr; struct ifaddr *ifa; - NAT_WLOCK(&layer3_chain); + IPFW_WLOCK(&layer3_chain); /* Check every nat entry... */ LIST_FOREACH(ptr, &layer3_chain.nat, _next) { /* ...using nic 'ifp->if_xname' as dynamic alias address. */ @@ -4328,7 +4317,7 @@ mtx_unlock(&ifp->if_addr_mtx); } } - NAT_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&layer3_chain); } /** @@ -4568,21 +4557,21 @@ /* * Find/create nat rule. */ - NAT_WLOCK(&layer3_chain); + IPFW_WLOCK(&layer3_chain); ptr = lookup_nat(ser_n->id); if (ptr == NULL) { /* New rule: allocate and init new instance. */ ptr = malloc(sizeof(struct cfg_nat), M_IPFW, M_NOWAIT | M_ZERO); if (ptr == NULL) { free(buf, M_IPFW); - NAT_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&layer3_chain); return (ENOSPC); } ptr->lib = LibAliasInit(NULL); if (ptr->lib == NULL) { free(ptr, M_IPFW); free(buf, M_IPFW); - NAT_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&layer3_chain); return(EINVAL); } LIST_INIT(&ptr->redir_chain); @@ -4590,7 +4579,7 @@ UNHOOK_NAT(ptr); flush_nat_ptrs(ser_n->id); } - NAT_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&layer3_chain); /* * Basic nat configuration. @@ -4614,9 +4603,9 @@ add_redir_spool_cfg(&buf[(sizeof(struct cfg_nat))], ptr); /* Add new entries. */ free(buf, M_IPFW); - NAT_WLOCK(&layer3_chain); + IPFW_WLOCK(&layer3_chain); HOOK_NAT(&layer3_chain.nat, ptr); - NAT_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&layer3_chain); } break; @@ -4626,16 +4615,16 @@ int i; error = sooptcopyin(sopt, &i, sizeof i, sizeof i); - NAT_WLOCK(&layer3_chain); + IPFW_WLOCK(&layer3_chain); ptr = lookup_nat(i); if (ptr == NULL) { error = EINVAL; - NAT_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&layer3_chain); break; } UNHOOK_NAT(ptr); - NAT_WUNLOCK(&layer3_chain); flush_nat_ptrs(i); + IPFW_WUNLOCK(&layer3_chain); del_redir_spool_cfg(ptr, &ptr->redir_chain); LibAliasUninit(ptr->lib); free(ptr, M_IPFW); @@ -4656,7 +4645,7 @@ data = malloc(NAT_BUF_LEN, M_IPFW, M_NOWAIT | M_ZERO); if (data == NULL) return (ENOSPC); - NAT_RLOCK(&layer3_chain); + IPFW_RLOCK(&layer3_chain); /* Serialize all the data. */ LIST_FOREACH(n, &layer3_chain.nat, _next) { nat_cnt++; @@ -4681,12 +4670,12 @@ goto nospace; } bcopy(&nat_cnt, data, sizeof(nat_cnt)); - NAT_RUNLOCK(&layer3_chain); + IPFW_RUNLOCK(&layer3_chain); error = sooptcopyout(sopt, data, NAT_BUF_LEN); free(data, M_IPFW); break; nospace: - NAT_RUNLOCK(&layer3_chain); + IPFW_RUNLOCK(&layer3_chain); printf("serialized data buffer not big enough: please increase NAT_BUF_LEN\n"); free(data, M_IPFW); } @@ -4699,7 +4688,7 @@ int sof = LIBALIAS_BUF_SIZE; int i, size, cnt = 0; - NAT_RLOCK(&layer3_chain); + IPFW_RLOCK(&layer3_chain); size = i = 0; LIST_FOREACH(ptr, &layer3_chain.nat, _next) { if (ptr->lib->logDesc == NULL) @@ -4708,7 +4697,7 @@ size = cnt * (sof + sizeof(int)); data = realloc(data, size, M_IPFW, M_NOWAIT | M_ZERO); if (data == NULL) { - NAT_RUNLOCK(&layer3_chain); + IPFW_RUNLOCK(&layer3_chain); return (ENOSPC); } bcopy(&ptr->id, &data[i], sizeof(int)); @@ -4716,7 +4705,7 @@ bcopy(ptr->lib->logDesc, &data[i], sof); i += sof; } - NAT_RUNLOCK(&layer3_chain); + IPFW_RUNLOCK(&layer3_chain); error = sooptcopyout(sopt, data, size); free(data, M_IPFW); } @@ -4911,14 +4900,12 @@ callout_drain(&ipfw_timeout); IPFW_WLOCK(&layer3_chain); flush_tables(&layer3_chain); - NAT_WLOCK(&layer3_chain); LIST_FOREACH_SAFE(ptr, &layer3_chain.nat, _next, ptr_temp) { LIST_REMOVE(ptr, _next); del_redir_spool_cfg(ptr, &ptr->redir_chain); LibAliasUninit(ptr->lib); free(ptr, M_IPFW); } - NAT_WUNLOCK(&layer3_chain); EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag); layer3_chain.reap = NULL; free_chain(&layer3_chain, 1 /* kill default rule */); From owner-p4-projects@FreeBSD.ORG Mon Oct 16 22:27: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 778EB16A415; Mon, 16 Oct 2006 22:27: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 5102B16A407; Mon, 16 Oct 2006 22:27:42 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7DC443D6E; Mon, 16 Oct 2006 22:27:41 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k9GMQXr9044340; Mon, 16 Oct 2006 16:26:34 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 16 Oct 2006 16:25:45 -0600 (MDT) Message-Id: <20061016.162545.179961016.imp@bsdimp.com> To: gonzo@freebsd.org From: "M. Warner Losh" In-Reply-To: <200610131444.k9DEi74J035961@repoman.freebsd.org> References: <200610131444.k9DEi74J035961@repoman.freebsd.org> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Mon, 16 Oct 2006 16:26:34 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 107824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Oct 2006 22:27:42 -0000 In message: <200610131444.k9DEi74J035961@repoman.freebsd.org> Oleksandr Tymoshenko writes: : http://perforce.freebsd.org/chv.cgi?CH=107824 : : Change 107824 by gonzo@gonzo_hq on 2006/10/13 14:43:46 : : o Tweak exception handlers to conform new pmap model. Kernel map : works fine, userland still in action. Did this code come from the NetBSD code, or was it just the idea? Seems odd that these small changes would require adding a NetBSD license... Warner : Affected files ... : : .. //depot/projects/mips2/src/sys/mips/mips/exception.S#11 edit : : Differences ... : : ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#11 (text+ko) ==== : : @@ -23,9 +23,128 @@ : * 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#10 $ : + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#11 $ : + */ : + : +/* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ : + : +/* : + * Copyright 2002 Wasabi Systems, Inc. : + * All rights reserved. : + * : + * Written by Simon Burge for Wasabi Systems, Inc. : + * : + * 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 for the NetBSD Project by : + * Wasabi Systems, Inc. : + * 4. The name of Wasabi Systems, Inc. may not be used to endorse : + * or promote products derived from this software without specific prior : + * written permission. : + * : + * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC : + * 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. : + */ : + : +/* : + * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author) : + * 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 Jonathan R. Stone for : + * the NetBSD Project. : + * 4. The name of the author may not be used to endorse or promote products : + * derived from this software without specific prior written permission. : + * : + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. : + */ : + : +/* : + * Copyright (c) 1992, 1993 : + * The Regents of the University of California. All rights reserved. : + * : + * This code is derived from software contributed to Berkeley by : + * Digital Equipment Corporation and Ralph Campbell. : + * : + * Redistribution and use in source and binary forms, with or without : + * modification, are permitted provided that the following conditions : + * are met: : + * 1. Redistributions of source code must retain the above copyright : + * notice, this list of conditions and the following disclaimer. : + * 2. Redistributions in binary form must reproduce the above copyright : + * notice, this list of conditions and the following disclaimer in the : + * documentation and/or other materials provided with the distribution. : + * 3. Neither the name of the University nor the names of its contributors : + * may be used to endorse or promote products derived from this software : + * without specific prior written permission. : + * : + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND : + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE : + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE : + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE : + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL : + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS : + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) : + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT : + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY : + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF : + * SUCH DAMAGE. : + * : + * Copyright (C) 1989 Digital Equipment Corporation. : + * Permission to use, copy, modify, and distribute this software and : + * its documentation for any purpose and without fee is hereby granted, : + * provided that the above copyright notice appears in all copies. : + * Digital Equipment Corporation makes no representations about the : + * suitability of this software for any purpose. It is provided "as is" : + * without express or implied warranty. : + * : + * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/loMem.s, : + * v 1.1 89/07/11 17:55:04 nelson Exp SPRITE (DECWRL) : + * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsm.s, : + * v 9.2 90/01/29 18:00:39 shirriff Exp SPRITE (DECWRL) : + * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s, : + * v 1.1 89/07/10 14:27:41 nelson Exp SPRITE (DECWRL) : + * : + * @(#)locore.s 8.5 (Berkeley) 1/4/94 : */ : : + : #include "opt_ddb.h" : : #include : @@ -201,38 +320,31 @@ : LEAF(TLBMissVector) : .set noat : : - mfc0 k0, MIPS_COP_0_BAD_VADDR : + mfc0 k0, MIPS_COP_0_BAD_VADDR # k0=badaddr : + bltz k0, 5f # k0<0 -> 5f (kernel fault) : nop : - bltz k0, 5f : - nop : : +6: : /* Userland */ : -6: : - /* XXX We should switch stack elsewhere. */ : - subu sp, sp, TF_SIZE : - lw k1, PC_CURTHREAD(t2) : - lw k1, TD_KSTACK(k1) : - subu k1, k1, TF_SIZE : + lui k1, %hi(segtab_active) : + lw k1, %lo(segtab_active)(k1) : + srl k0, 20 : + andi k0, k0, 0xffc : + addu k1, k0, k1 : + lw k1, 0(k1) : : - la k0, 4f : - j exception_save_registers : - nop : + mfc0 k0, MIPS_COP_0_BAD_VADDR # k0=bad address (again) : + beq k1, zero, 7f # ==0 -- no page table : + srl k0, 10 # k0=VPN (aka va>>10) : : - move sp, k1 : - : -4: mfc0 a1, MIPS_COP_0_CAUSE : - mfc0 a2, MIPS_COP_0_BAD_VADDR : - jal trap : - move a0, k1 : + break # XXX: Not ready yet : : - move k1, sp : - jal exception_restore_registers : - nop : - : - addu sp, sp, TF_SIZE : eret : 5: : - j kernfault : + j KVATLBMiss : + nop : +7: j GenericException : + nop : : VEND(TLBMissVector) : .data : @@ -240,7 +352,8 @@ : .text : : : -kernfault: : +LEAF(KVATLBMiss) : + .set noat : /* : * Shift right logical to get a page index, but leaving : * enough bits to index an array of 64 bit values, plus : @@ -281,32 +394,17 @@ : : tlbp : : - mfc0 k1, MIPS_COP_0_BAD_VADDR : - srl k1, PAGE_SHIFT : - andi k1, k1, 1 : - bne k1, zero, 2f : + mfc0 k0, MIPS_COP_0_TLB_INDEX : + nop : + bltz k0, 2f : nop : : - mfc0 k1, MIPS_COP_0_TLB_LO0 : - b 3f : - nop : + tlbwi : + eret : 2: : - mfc0 k1, MIPS_COP_0_TLB_LO1 : - nop : -3: : - andi k1, 2 : - bne k1, zero, 4f : - nop : - /* : - * The PTE that triggered the fault is not valid. We need to do a : - * "real" page fault. : - * : - * XXX Maybe we should just ignore the fact that it's not valid here : - * and just let the TLB Invalid Exception (vector 0x80000180) handler : - * deal with it. : - */ : - j 6b : - nop : + tlbwr : + eret : + : : 4: : mfc0 k0, MIPS_COP_0_TLB_INDEX : @@ -322,6 +420,7 @@ : : eret : .set at : +END(KVATLBMiss) : : : LEAF(XTLBMissVector) : From owner-p4-projects@FreeBSD.ORG Tue Oct 17 04:06: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 718FC16A416; Tue, 17 Oct 2006 04:06: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 325E916A403 for ; Tue, 17 Oct 2006 04:06:05 +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 BF1A543D5F for ; Tue, 17 Oct 2006 04:06:04 +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 k9H464n7072575 for ; Tue, 17 Oct 2006 04:06:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9H462Mb072571 for perforce@freebsd.org; Tue, 17 Oct 2006 04:06:02 GMT (envelope-from jb@freebsd.org) Date: Tue, 17 Oct 2006 04:06:02 GMT Message-Id: <200610170406.k9H462Mb072571@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 108016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 04:06:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=108016 Change 108016 by jb@jb_zoo on 2006/10/17 04:05:56 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#21 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#4 integrate .. //depot/projects/dtrace/ports/CHANGES#8 integrate .. //depot/projects/dtrace/ports/MOVED#25 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#5 integrate .. //depot/projects/dtrace/ports/UPDATING#18 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/MKterminfo.sh#4 integrate .. //depot/projects/dtrace/src/contrib/traceroute/traceroute.8#6 integrate .. //depot/projects/dtrace/src/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#18 integrate .. //depot/projects/dtrace/src/etc/disktab#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#10 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/cleartmp#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/idmapd#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/dtrace/src/lib/libc/i386/sys/i386_get_ldt.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/wctype.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_init.c#5 integrate .. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_select.c#4 integrate .. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_sig.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/dtrace/src/lib/msun/i387/fenv.h#4 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate .. //depot/projects/dtrace/src/sbin/Makefile#7 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.8#6 integrate .. //depot/projects/dtrace/src/sbin/idmapd/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/idmapd/idmapd.8#4 integrate .. //depot/projects/dtrace/src/sbin/kldload/kldload.8#4 integrate .. //depot/projects/dtrace/src/share/man/man1/builtin.1#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_schedparam.3#5 integrate .. //depot/projects/dtrace/src/share/man/man4/ipfirewall.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/ndis.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/pcm.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/sis.4#4 integrate .. //depot/projects/dtrace/src/share/man/man5/disktab.5#4 integrate .. //depot/projects/dtrace/src/share/man/man5/hosts.equiv.5#4 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/dtrace/src/share/man/man9/ktr.9#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/africa#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/australasia#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/backward#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/europe#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/northamerica#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/yearistype.sh#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/zone.tab#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/dtrace/src/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/dtrace/src/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/dtrace/src/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_signal.h#4 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#11 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#15 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#9 integrate .. //depot/projects/dtrace/src/sys/conf/kern.post.mk#8 integrate .. //depot/projects/dtrace/src/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi_debug.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi_disk.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfireg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfivar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/support.s#6 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_proto.h#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/syscalls.master#12 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/support.S#5 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/sys_process.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#12 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/dtrace/src/sys/modules/aio/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/mem/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/uart/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/copyinout.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#13 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/umtx.h#6 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/expand/expand.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/tr/tr.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/unexpand/unexpand.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/arp/arp.c#5 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#13 integrate .. //depot/projects/dtrace/www/en/gnome/contact.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/Makefile#5 integrate .. //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#5 integrate .. //depot/projects/dtrace/www/en/gnome/docs/example-Makefile.sgml#6 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq216.sgml#1 branch .. //depot/projects/dtrace/www/en/gnome/docs/porting.sgml#5 integrate .. //depot/projects/dtrace/www/en/gnome/images/Makefile#5 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss214-1-tn.png#3 delete .. //depot/projects/dtrace/www/en/gnome/images/ss214-1.png#3 delete .. //depot/projects/dtrace/www/en/gnome/images/ss214-2-tn.png#3 delete .. //depot/projects/dtrace/www/en/gnome/images/ss214-2.png#3 delete .. //depot/projects/dtrace/www/en/gnome/index.xsl#7 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#11 integrate .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#6 integrate .. //depot/projects/dtrace/www/en/platforms/sparc.sgml#4 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/approvals.sgml#3 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#7 integrate .. //depot/projects/dtrace/www/share/sgml/navibar.ent#3 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#6 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#4 (text+ko) ==== @@ -23,7 +23,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.4 2006/05/16 21:01:38 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.5 2006/10/16 12:35:23 keramida Exp $ &tm-attrib.freebsd; @@ -498,15 +498,15 @@ standards for non-technical reasons. Companies interested in promoting an evolving - standard that can become the core of other companies' commercial - products should be wary of the GPL. Regardless of the license + standard, which can become the core of other companies' commercial + products, should be wary of the GPL. Regardless of the license used, the resulting software will usually devolve to whoever actually makes the majority of the engineering changes and most understands the state of the system. The GPL simply adds additional legal friction to the result. - Large companies in which Open Source code is being - created should be aware that programmers appreciate Open Source + Large companies, in which Open Source code is + developed, should be aware that programmers appreciate Open Source because it leaves the software available to the employee when they change employers. Some companies encourage this behavior as an employment perk, especially when the software involved is not ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#3 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/building-products/article.sgml,v 1.6 2006/01/07 04:12:33 jkoshy Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/building-products/article.sgml,v 1.7 2006/10/16 11:59:08 keramida Exp $ &tm-attrib.freebsd; @@ -28,7 +28,7 @@ Abstract The FreeBSD project is a worldwide, voluntary, and - collaborative project developing a portable and high-quality + collaborative project, which develops a portable and high-quality operating system. The FreeBSD project distributes the source code for its product under a liberal license, with the intention of encouraging the use of its code. Collaborating @@ -164,7 +164,7 @@ FreeBSD source code is distributed under a liberal BSD license facilitating its adoption in commercial products - Mon2005 with the minimum of hassle. + Mon2005 with minimum hassle. The FreeBSD project has excellent engineering @@ -219,7 +219,7 @@ As a Unix compatible environment for the management functions of high-end storage and networking devices, - running on a separate processor 'blade'. + running on a separate processor blade. FreeBSD provides the tools for creating dedicated OS and application program images. Its implementation of a BSD unix API is mature and tested. FreeBSD can also @@ -246,7 +246,7 @@ url="http://www.rtems.com/">RTEMS and eCOS. There are many full-fledged development environments - in the 13,000-strong collection of applications ported and + in the &os.numports;-strong collection of applications ported and packaged with FreeBSD. @@ -278,7 +278,7 @@ A complete system that can cross-host itself for - the following architectures: alpha, amd64, ia64, i386, + the following architectures: alpha (up to &os; version 6.X), amd64, ia64, i386, sparc64, powerpc (see &man.build.7;). @@ -351,7 +351,7 @@ composed in flexible ways. - Over 13,000 ported applications, both commercial + Over &os.numports; ported applications, both commercial and open-source, managed via the FreeBSD ports collection. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#21 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -204,6 +204,10 @@ + &a.msmith; (1996 - 2003) + + + &a.semenu; (1998 - 2003) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 (text+ko) ==== @@ -23,7 +23,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.4 2006/02/18 19:15:20 brueffer Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.6 2006/10/16 11:41:22 keramida Exp $ &tm-attrib.freebsd; @@ -229,12 +229,12 @@ //depot/projects/smpng/... //client/... - The ... should taken literally. It + The ... should be taken literally. It is a Perforce idiom for saying this directory and all files and directories below it. - A View can contain multiple mappings. Let's say you + A Perforce view can contain multiple mappings. Let's say you want to map in both the SMPng tree and the NFS tree. Your View might look like: @@ -533,7 +533,7 @@ &prompt.user; p4 edit filename - This marks the file on the server as being in the edit state, + This marks the file on the server as being in the edit state, which then allows it to be submitted after changes are made, or marks it for special handling when doing an integration or sync operation. Note that editing is not exclusive in @@ -582,10 +582,46 @@ change, and what its change number was. A change can be examined in detail via the p4 describe changenumber command. This - will provide the submit log and the diffs of the actual change. - It is common to use the or - flags to produce unified or context diffs - instead of the native diff format. + will provide the submit log and the diffs of the actual change. + + Commonly, the p4 describe command is used in one + of three ways: + + + + p4 describe -s CHANGE + + + List a short description of + changeset CHANGE, including the commit log of + the particular changeset and a list of the files it affected. + + + + + p4 describe -du CHANGE + + + List a description of changeset CHANGE, + including the commit log of the particular changeset, a list of the + files it affected and a patch for each modified file, in a format + similar to unified diff patches (but not exactly the + same). + + + + + p4 describe -dc CHANGE + + + List a description of changeset CHANGE, + including the commit log of the particular changeset, a list of the + files it affected and a patch for each modified file, in a format + similar to context diff patches (but not exactly the + same). + + + The p4 filelog filename command will show @@ -664,10 +700,19 @@ If you want to add a whole tree of files, run a command like: - &prompt.user; find . -type f |xargs p4 add + &prompt.user; find . -type f | xargs p4 add + + + Perforce can track UNIX symlinks too, so + you can probably + use \! -type d as the + matching expression in &man.find.1; above. We don't commit symlinks + into the source tree of &os; though, so this should not be + necessary. + Doing a p4 submit will then copy the file - to the Depot on the server. It is very important to only add + to the depot on the server. It is very important to only add files, not directories. Explicitly adding a directory will cause Perforce to treat it like a file, which is not what you want. @@ -677,7 +722,7 @@ &prompt.user; p4 delete filename - This will mark the file for deletion from the Depot the next + This will mark the file for deletion from the depot the next time that a submit is run. It will also remove the local copy of the file, so beware. @@ -704,9 +749,9 @@ coerce the permissions on the files if needed. Then run the following commands: - &prompt.user; p4 diff -se ... |xargs p4 edit -&prompt.user; p4 diff -sd ... |xargs p4 delete -&prompt.user; find . -type f |xargs p4 add + &prompt.user; p4 diff -se ... | xargs p4 edit +&prompt.user; p4 diff -sd ... | xargs p4 delete +&prompt.user; find . -type f | xargs p4 add The first command tells Perforce to look for files that have changed, even if they are not open. The @@ -717,8 +762,14 @@ method, but it works because Perforce will only add the files that it does not already know about. The result of running these commands will be a set of files that are - opened for edit, removal, or add, as appropriate. Just do a - p4 submit after that. + opened for edit, removal, or add, as appropriate. + + Verify the active changelist with: + + &prompt.user; p4 changelist +&prompt.user; p4 diff -du + + and just do a p4 submit after that. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#4 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.77 2006/08/29 19:45:44 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.78 2006/10/16 13:05:47 keramida Exp $ &tm-attrib.freebsd; @@ -98,7 +98,7 @@ FreeBSD development where all new changes first enter the system. FreeBSD-STABLE is the development branch from which major releases are made. Changes go into this branch at a different pace, and - with general assumption that they have first gone into + with the general assumption that they have first gone into FreeBSD-CURRENT and have been thoroughly tested by our user community. @@ -134,16 +134,54 @@ RELENG_X_Y branches updated. - discusses the - different phases of the release engineering process leading up to - the actual system build and - describes the actual build process. describes how the base - release may be extended by third parties and details some of the - lessons learned through the release of FreeBSD 4.4. Finally, - presents future directions - of development. + + What this article describes + + The following sections of this article describe: + + + + + + + The different phases of the release engineering process + leading up to the actual system build. + + + + + + + + The actual build process. + + + + + + + + How the base release may be extended by third parties. + + + + + + + + Some of the lessons learned through the release of &os; 4.4. + + + + + + + + Future directions of development. + + + + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ Kernel &chap.dma; + &chap.kernelbuild; &chap.kerneldebug; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.21 2004/02/15 22:56:09 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.22 2006/10/16 19:15:36 danger Exp $ --> @@ -23,6 +23,7 @@ + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2512,7 +2512,7 @@ option IPFIREWALL_DEFAULT_TO_ACCEPT - The second is to set the firewall type to accept in the + The second is to set the firewall type to open in the rc.conf file: firewall_type="open" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -297,62 +297,31 @@ - Procedure 1. Building a Kernel the <quote>Traditional</quote> Way - - - Run &man.config.8; to generate the kernel source code. - - &prompt.root; /usr/sbin/config MYKERNEL - + Building a Kernel - Change into the build directory. &man.config.8; will print - the name of this directory after being run as above. + Change to the /usr/src directory: - &prompt.root; cd ../compile/MYKERNEL + &prompt.root; cd /usr/src - Compile the kernel. - - &prompt.root; make depend -&prompt.root; make - + Compile the kernel: - - Install the new kernel. - - &prompt.root; make install - - - - - Procedure 2. Building a Kernel the <quote>New</quote> - Way - - - Change to the /usr/src directory. - - &prompt.root; cd /usr/src - - - - Compile the kernel. - &prompt.root; make buildkernel KERNCONF=MYKERNEL - Install the new kernel. + Install the new kernel: &prompt.root; make installkernel KERNCONF=MYKERNEL - + - This method of kernel building requires full source files. If you - only installed the kernel source, use the traditional method, as - described above. + It is required to have full &os; source tree to build the + kernel. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -423,10 +423,6 @@ Setting Default Values for Mixer Channels - - This is only supported in &os; 5.3-RELEASE and later. - - The default values for the different mixer channels are hardcoded in the sourcecode of the &man.pcm.4; driver. There are a lot of different applications and daemons that allow @@ -435,6 +431,7 @@ solution, we want to have default values at the driver level. This is accomplished by defining the appropriate values in /boot/device.hints. E.g.: + hint.pcm.0.vol="100" This will set the volume channel to a default value of @@ -706,12 +703,6 @@ name hardcoded in them, you might find it useful to make symbolic links to the proper devices: - &prompt.root; ln -sf /dev/acd0c /dev/dvd -&prompt.root; ln -sf /dev/racd0c /dev/rdvd - - On FreeBSD 5.X, which uses &man.devfs.5; there - is a slightly different set of recommended links: - &prompt.root; ln -sf /dev/acd0 /dev/dvd &prompt.root; ln -sf /dev/acd0 /dev/rdvd @@ -728,17 +719,6 @@ special DVD-ROM functions, requires write permission on the DVD devices. - - kernel options - CPU_ENABLE_SSE - - - Some of the ports discussed rely on the following kernel - options to build correctly. Before attempting to build, add - this option to the kernel configuration file, build a new kernel, and reboot: - - options CPU_ENABLE_SSE - To enhance the shared memory X11 interface, it is recommended that the values of some &man.sysctl.8; variables should be increased: ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -841,7 +841,7 @@ If real locking between the NFS clients and NFS server is not required, it is - possible to let the NFSclient do locking + possible to let the NFS client do locking locally by passing to &man.mount.nfs.8;. Refer to the &man.mount.nfs.8; manual page for further details. @@ -1325,13 +1325,6 @@ This section will deal with setting up a sample NIS environment. - This section assumes that you are running - FreeBSD 3.3 or later. The instructions given here will - probably work for any version of FreeBSD - greater than 3.0, but there are no guarantees that this is - true. - - Planning ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -125,7 +125,7 @@ servers — meaning that external entities can connect and talk to them. As yesterday's mini-computers and mainframes become today's desktops, and as computers become networked and - internetwork, security becomes an even bigger issue. + inter-networked, security becomes an even bigger issue. System security also pertains to dealing with various forms of attack, including attacks that attempt to crash, or otherwise make a @@ -2296,6 +2296,10 @@ Issued Expires Principal Aug 27 15:37:58 Aug 28 01:37:58 krbtgt/EXAMPLE.ORG@EXAMPLE.ORG + The ticket can then be revoked when you have + finished: + + &prompt.user; k5destroy @@ -2319,7 +2323,7 @@ Kerberos enabled daemons and a workstation — the server must have a keytab file. This file - contains the servers host key, which allows it and the + contains the server's host key, which allows it and the KDC to verify each others identity. It must be transmitted to the server in a secure fashion, as the security of the server can be broken if the key is made public. @@ -2349,8 +2353,8 @@ you can use kadmin from the Kerberos server. The add --random-key command will let you add the - servers host principal, and the ext command - will allow you to extract the servers host principal to its own + server's host principal, and the ext command + will allow you to extract the server's host principal to its own keytab. For example: &prompt.root; kadmin ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.27 2006/07/03 15:36:58 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.28 2006/10/15 18:24:59 blackend Exp $ Original revision: 1.331 --> @@ -97,7 +97,7 @@ - Tâches de Pré-installation + Tâches de pré-installation Inventoriez votre ordinateur @@ -132,7 +132,7 @@ table comme celle-ci: - Exemple d'Inventaire de Périphériques + Exemple d'inventaire de périphériques @@ -301,7 +301,7 @@ Une installation minimale de FreeBSD prend aussi peu que 100 Mo d'espace disque. Cependant c'est vraiment une installation - minimale, ne laissant presqu'aucun espace + minimale, ne laissant presque aucun espace pour vos propres fichiers. Un minimum plus réaliste est 250 Mo sans environnement graphique, et 350 Mo ou plus si vous désirez une interface graphique. Si vous avez l'intention d'installer @@ -2349,7 +2349,7 @@ où n est un nombre qui change pour chaque disque. Mais vous pouvez choisir une autre - organisation si vous le préferrez. + organisation si vous le préférez. @@ -2485,7 +2485,7 @@ - La taille par defaut proposée créera une partition qui + La taille par défaut proposée créera une partition qui occupera le reste de la tranche. Si vous utilisez les tailles de partitions comme décrit dans l'exemple précédent, alors effacez la valeur proposée en utilisant Backspace, @@ -3266,7 +3266,7 @@ Where files uploaded by anonymous FTP users will go. - Le répertoire racine du ftp sera placé dans + Le répertoire racine du FTP sera placé dans /var par défaut. Si vous n'avez pas de place à cet endroit pour les besoins prévus du FTP, le répertoire /usr pourra être @@ -4160,7 +4160,7 @@ surveiller quelles machines demandent des verrous et la fréquence de ces demandes. Alors que ces options sont parfaites pour le déboguage, elles ne sont pas - nécessaires pour le bon fonctionnement des seveurs et + nécessaires pour le bon fonctionnement des serveurs et clients NFS. En parcourant la liste, l'option suivante est @@ -5175,7 +5175,7 @@ Inutile de dire, que vous devez vous assurer d'avoir un moyen de retrouver le mot de passe si vous l'oubliez. Notez que le mot de passe que vous taperez ne s'affichera pas, il ne sera - pas non plus remplacé par des astériques. + pas non plus remplacé par des astérisques. Changing local password for root. New password : ==== //depot/projects/dtrace/ports/CHANGES#8 (text+ko) ==== @@ -10,6 +10,14 @@ All ports committers are allowed to commit to this file. +20061014: +AUTHOR: gnome@FreeBSD.org +The following changes have been introduced to the GNOME porting process +during the GNOME 2.16 update: + +* GNOME is now installed into LOCALBASE. Any port which makes use of the + gnomeprefix component will have its PREFIX forced to LOCALBASE + 20060930: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -1219,4 +1227,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.61 2006/09/30 19:26:32 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.62 2006/10/14 09:31:38 marcus Exp $ ==== //depot/projects/dtrace/ports/MOVED#25 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1163 2006/10/12 00:44:14 maho Exp $ +# $FreeBSD: ports/MOVED,v 1.1166 2006/10/16 00:18:35 marcus Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -1306,7 +1306,6 @@ print/txfonts||2004-12-19|already included in the teTeX distribution databases/sqlite|databases/sqlite2|2004-12-23|port renamed print/acroread5|print/acroread|2004-12-23|last Acrobat Reader port remaining -graphics/gimp-devel|graphics/gimp|2004-12-24|GIMP 2.2 is now stable x11-toolkits/xtermcontrol|x11/xtermcontrol|2004-12-25|new category multimedia/gstreamer-player||2004-12-26|Unmaintained by developers www/horde2|www/horde|2004-12-26|Resurrect www/horde @@ -1677,7 +1676,6 @@ ukrainian/ooodict-uk_UA||2005-11-01|localized version should be built via knob net/libicq0|net/libicq|2005-11-01|leaf port removed mail/ximian-connector|mail/evolution-exchange|2005-11-04|POOF! Now it's called evolution-exchange! -editors/gedit-plugins||2005-11-04|This component is unmaintained, and has succumbed to code rot www/pyphany||2005-11-04|Has been merged into epiphany editors/abiword-devel|editors/abiword|2005-11-04|Has been merged into abiword editors/abiword-plugins-devel|editors/abiword-plugins|2005-11-04|Has been merged into abiword-plugins @@ -2444,7 +2442,6 @@ net/lam7|net/lam|2006-08-21|Replace lam-6 which was deprecated devel/py-ui||2006-08-25|Has expired: PyUI does not work with well with current versions of graphics/py-opengl and has not been developed in over two years. Python game development should be done with devel/py-game instead net-im/jabber-msn||2006-08-25|Has expired: Depends on broken net-im/jabber, please use net-im/jabber-pymsn instead -net-im/gaim-devel|net-im/gaim|2006-08-26|Remove since gaim's maintainer don't want to add it now graphics/GIFgraph|graphics/p5-GD-Graph|2006-08-27|broken, use graphics/p5-GD-Graph instead www/p5-Apache-SizeLimit||2006-09-02|unresolvable conflict with www/mod_perl www/firefox10|www/firefox|2006-09-02|Security vulnerabilities ==== //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#6 (text+ko) ==== @@ -1,9 +1,9 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.132 2006/08/14 13:24:18 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.135 2006/10/15 03:42:39 marcus Exp $ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.370 2006/04/27 01:40:22 ahze Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ # # Please view me with 4 column tabs! >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 17 08:14: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 52ED416A4A0; Tue, 17 Oct 2006 08:14: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 2BD6D16A47C; Tue, 17 Oct 2006 08:14:56 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59D5843D8B; Tue, 17 Oct 2006 08:14:43 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id k9H8EgpG073599 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 Oct 2006 10:14:42 +0200 (CEST) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id k9H8Egb9073598; Tue, 17 Oct 2006 10:14:42 +0200 (CEST) Date: Tue, 17 Oct 2006 10:14:42 +0200 From: Divacky Roman To: John Baldwin Message-ID: <20061017081441.GA73503@stud.fit.vutbr.cz> References: <200610141604.k9EG4x8o040869@repoman.freebsd.org> <200610161537.27772.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200610161537.27772.jhb@freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 107903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 08:14:56 -0000 On Mon, Oct 16, 2006 at 03:37:27PM -0400, John Baldwin wrote: > On Saturday 14 October 2006 12:04, Roman Divacky wrote: > > http://perforce.freebsd.org/chv.cgi?CH=107903 > > > > Change 107903 by rdivacky@rdivacky_witten on 2006/10/14 16:04:47 > > > > A bunch of fixes that makes this not panic when killpg() is called. > > > > Affected files ... > > > > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#10 edit > > > > Differences ... > > > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#10 > (text+ko) ==== > > > > @@ -212,8 +212,12 @@ > > q = LIST_FIRST(&p->p_children); > > for (; q != NULL; q = nq) { > > nq = LIST_NEXT(q, p_sibling); > > - if (__predict_true(q->p_sysent != &elf_linux_sysvec)) > > - break; > > + PROC_LOCK(q); > > + if (q->p_flag & P_WEXIT) > > + continue; > > + PROC_UNLOCK(q); > > + if (__predict_false(q->p_sysent != &elf_linux_sysvec)) > > + continue; > > em = em_find(q, EMUL_UNLOCKED); > > KASSERT(em != NULL, ("linux_reparent: emuldata not found: %i\n", > q->p_pid)); > > if (em->pdeath_signal != 0) { > > Holding the proc lock doesn't buy you anything here. Probably you should hold > an slock of the proctree_lock while you walk the list, and that should be > good enough to test P_WEXIT. However, even if you didn't hold it, grabbing > the lock just to do a read doesn't buy you anything as far as closing race > conditions. I am already holding the proctree_lock... so I'll just remove the PROC_LOCK() on the other hand.. I am very not sure about the locking I do but when I do it otherwiuse I am getting a LOR... hard situation :( From owner-p4-projects@FreeBSD.ORG Tue Oct 17 08:16: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 6566216A417; Tue, 17 Oct 2006 08:16: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 2461C16A415 for ; Tue, 17 Oct 2006 08:16:23 +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 4E96B43D83 for ; Tue, 17 Oct 2006 08:16:20 +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 k9H8GKlG023392 for ; Tue, 17 Oct 2006 08:16:20 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9H8GJfe023389 for perforce@freebsd.org; Tue, 17 Oct 2006 08:16:19 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 17 Oct 2006 08:16:19 GMT Message-Id: <200610170816.k9H8GJfe023389@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 108021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 08:16:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=108021 Change 108021 by rdivacky@rdivacky_witten on 2006/10/17 08:15:38 Remove locking of the proc. Holding of proctree_lock is sufficient. Pointed out by: jhb Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#12 (text+ko) ==== @@ -212,12 +212,8 @@ q = LIST_FIRST(&p->p_children); for (; q != NULL; q = nq) { nq = LIST_NEXT(q, p_sibling); - PROC_LOCK(q); - if (q->p_flag & P_WEXIT) { - PROC_UNLOCK(q); + if (q->p_flag & P_WEXIT) continue; - } - PROC_UNLOCK(q); if (__predict_false(q->p_sysent != &elf_linux_sysvec)) continue; em = em_find(q, EMUL_UNLOCKED); From owner-p4-projects@FreeBSD.ORG Tue Oct 17 17:44: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 1B16416A415; Tue, 17 Oct 2006 17:44: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 A641416A407 for ; Tue, 17 Oct 2006 17:44:23 +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 F222343D78 for ; Tue, 17 Oct 2006 17:44:15 +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 k9HHiFJF047287 for ; Tue, 17 Oct 2006 17:44:15 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9HHiF5A047284 for perforce@freebsd.org; Tue, 17 Oct 2006 17:44:15 GMT (envelope-from bushman@freebsd.org) Date: Tue, 17 Oct 2006 17:44:15 GMT Message-Id: <200610171744.k9HHiF5A047284@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 108032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 17:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=108032 Change 108032 by bushman@bushman_nss_ldap_cached on 2006/10/17 17:43:38 Draft implementation of paged results search was made + minor bug fix in schema mappings. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#10 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#13 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#11 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#13 (text+ko) ==== @@ -167,6 +167,7 @@ conf->connect_policy = NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD; conf->restart = 0; conf->debug = 0; + conf->search_page_size = NSS_LDAP_DEFAULT_SEARCH_PAGE_SIZE; conf->tls_checkpeer = NSS_LDAP_OPTION_DEFAULT; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#13 (text+ko) ==== @@ -63,6 +63,8 @@ #define NSS_LDAP_MAX_ERR_DESC_SIZE 256 +#define NSS_LDAP_DEFAULT_SEARCH_PAGE_SIZE 1024 + struct nss_ldap_configuration { /* schema and methods part @@ -99,6 +101,7 @@ int connect_policy; int restart; int debug; + int search_page_size; char *sasl_authid; char *root_sasl_authid; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#11 (text+ko) ==== @@ -96,7 +96,7 @@ { assert(schema != NULL); - + switch (rules_id) { case NSS_LDAP_SCHEMA_MAP_ATTRIBUTE_RULES: return (&schema->map_attribute_rules); @@ -190,7 +190,6 @@ assert(right_arg != NULL); memset(rule, 0, sizeof(struct nss_ldap_schema_rule)); - rule->left_arg = strdup(left_arg); if (rule->left_arg == NULL) return (NSS_LDAP_MEMORY_ERROR); @@ -305,7 +304,10 @@ assert(rule != NULL); if (rules->rules_size == rules->rules_eff_size) { - rules->rules_eff_size <<= 1; + if (rules->rules_eff_size == 0) + rules->rules_eff_size = 1; + else + rules->rules_eff_size <<= 1; new_coll = (struct nss_ldap_schema_rule *)malloc( sizeof(struct nss_ldap_schema_rule) * rules->rules_eff_size); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#11 (text+ko) ==== @@ -46,6 +46,10 @@ struct nss_ldap_search_request const *); static void destroy_request(struct nss_ldap_search_request *); +static int do_ldap_search_ext(struct nss_ldap_connection *, + struct nss_ldap_configuration *, struct nss_ldap_search_request *, + struct nss_ldap_search_context *, int *); + static struct nss_ldap_search_context *start_search_def( struct nss_ldap_connection *, struct nss_ldap_configuration *, struct nss_ldap_search_request *); @@ -83,23 +87,52 @@ free(request->filter); } +static int +do_ldap_search_ext(struct nss_ldap_connection *conn, + struct nss_ldap_configuration *conf, + struct nss_ldap_search_request *request, + struct nss_ldap_search_context *sctx, + int *msgid) +{ + LDAPControl *server_controls[2]; + int rv; + + assert(conn != NULL); + assert(conf != NULL); + assert(request != NULL); + assert(msgid != NULL); + + server_controls[1] = NULL; + rv = __nss_ldap_create_page_control(conn->ld, conf->search_page_size, + sctx == NULL ? NULL : sctx->cookie, 0, &server_controls[0]); + if (rv != LDAP_SUCCESS) { + /* TODO: warn the logs */ + } + + rv = ldap_search_ext( conn->ld, request->search_base, request->scope, + request->filter, NULL, 0, + rv == LDAP_SUCCESS ? server_controls : NULL, NULL, NULL, + LDAP_NO_LIMIT, msgid ); + + return (rv); +} + + static struct nss_ldap_search_context * start_search_def(struct nss_ldap_connection *conn, struct nss_ldap_configuration *conf, struct nss_ldap_search_request *request) { - struct nss_ldap_search_context *ctx; + struct nss_ldap_search_context *ctx; int msgid, rv; assert(conn != NULL); assert(request != NULL); - - rv = ldap_search_ext( conn->ld, request->search_base, request->scope, - request->filter, NULL, 0, NULL, NULL, NULL, LDAP_NO_LIMIT, - &msgid ); - if ( rv != LDAP_SUCCESS ) { + + rv = do_ldap_search_ext(conn, conf, request, NULL, &msgid); + if ((rv != LDAP_SUCCESS ) && (rv != LDAP_PARTIAL_RESULTS)){ __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "start_search_def: " - "ldap_search_ext failed: search_base='%s', scope='%d', " + "do_ldap_search_ext failed: search_base='%s', scope='%d', " "filter='%s', rv=%d", request->search_base, request->scope, request->filter); return (NULL); @@ -126,27 +159,18 @@ static int search_next_def(struct nss_ldap_search_context *ctx) { - struct timeval zerotime; - int finished, rv; + LDAPControl **server_controls; + char *matcheddn, *errmsg, **referrals; + int errcode, finished, rv; + unsigned long abs_rescount; assert(ctx != NULL); - if (ctx->msgid == -1) { - ldap_msgfree(ctx->msg); - ctx->msg = NULL; - return (NSS_LDAP_SUCCESS); - } - - finished = 0; - memset(&zerotime, 0, sizeof(struct timeval)); - while (!finished) { - if (ctx->msg != NULL) { - ldap_msgfree(ctx->msg); - ctx->msg = NULL; - } - rv = ldap_result( ctx->conn->ld, ctx->msgid, LDAP_MSG_ONE, - &zerotime, &ctx->msg); - +st: + if (ctx->msg_first == NULL) { + rv = ldap_result( ctx->conn->ld, ctx->msgid, LDAP_MSG_ALL, + NULL, &ctx->msg_first); + switch (rv) { case -1: __nss_ldap_log(NSS_LDAP_LL_ERR_INT, "search_next_def: " @@ -156,9 +180,13 @@ ctx->search_request.scope, ctx->search_request.filter); return (NSS_LDAP_CONNECTION_ERROR); - case 0: - break; + case 0: + goto st; + case LDAP_RES_SEARCH_RESULT: case LDAP_RES_SEARCH_ENTRY: + ctx->msg = ldap_first_message(ctx->conn->ld, + ctx->msg_first); + return (NSS_LDAP_SUCCESS); case LDAP_RES_SEARCH_REFERENCE: /* NOT IMPLEMENTED */ @@ -169,14 +197,70 @@ ctx->search_request.scope, ctx->search_request.filter); return (NSS_LDAP_GENERIC_ERROR); - case LDAP_RES_SEARCH_RESULT: - ctx->msgid = -1; - return (NSS_LDAP_SUCCESS); default: /* NOTE: SHOULD NOT BE REACHABLE */ - finished = 1; - break; - }; + __nss_ldap_log(NSS_LDAP_LL_ERR_INT, "search_next_def: " + "ldap_result returned %d" + ": search_base='%s', scope='%d', filter='%s', " + "rv=%d", rv, ctx->search_request.search_base, + ctx->search_request.scope, + ctx->search_request.filter); + return (NSS_LDAP_GENERIC_ERROR); + } + } else { + ctx->msg = ldap_next_message(ctx->conn->ld, ctx->msg); + if (ctx->msg != NULL) + return (NSS_LDAP_SUCCESS); + else { + rv = ldap_parse_result(ctx->conn->ld, + ctx->msg_first, &errcode, &matcheddn, + &errmsg, &referrals, &server_controls, + 0); + + ldap_msgfree(ctx->msg_first); + ctx->msg_first = NULL; + + if (rv == LDAP_SUCCESS) { + if (server_controls != NULL) { + if (ctx->cookie != NULL) { + ber_bvfree(ctx->cookie); + ctx->cookie = NULL; + } + + rv = __nss_ldap_parse_page_control( + ctx->conn->ld, server_controls, + &abs_rescount, &ctx->cookie); + + if (rv != LDAP_SUCCESS) { + // TODO: write to logs smth scary + } + + ldap_controls_free(server_controls); + } + + if (errmsg != NULL) + ldap_memfree(errmsg); + if (matcheddn != NULL) + ldap_memfree(matcheddn); + if (referrals != NULL) + ldap_value_free(referrals); + } else { + // TODO: signal to logs + } + + if (ctx->cookie && ctx->cookie->bv_val != NULL && + (strlen(ctx->cookie->bv_val) > 0)) { + rv = do_ldap_search_ext(ctx->conn, ctx->conf, + &ctx->search_request, ctx, &ctx->msgid); + if (rv != LDAP_SUCCESS) { + /* TODO: check this place */ + return (NSS_LDAP_SUCCESS); + } + + goto st; + } else + return (NSS_LDAP_SUCCESS); + } } return (NSS_LDAP_GENERIC_ERROR); @@ -188,9 +272,10 @@ assert(ctx != NULL); - if (ctx->msg != NULL) { - ldap_msgfree(ctx->msg); - ctx->msg = NULL; + if (ctx->msg_first != NULL) { + ldap_msgfree(ctx->msg_first); + ctx->msg_first = NULL; + ctx->msg = NULL; } destroy_request(&ctx->search_request); free(ctx); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#10 (text+ko) ==== @@ -40,13 +40,15 @@ struct nss_ldap_connection *conn; struct nss_ldap_configuration *conf; - LDAPMessage *msg; + LDAPMessage *msg_first; + LDAPMessage *msg; int msgid; int type; int retry_count; struct berval *cookie; + int controls_processed; }; struct nss_ldap_parse_context; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#12 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -251,3 +252,77 @@ return (rv); } + +int +__nss_ldap_create_page_control(LDAP *ld, unsigned long page_size, + struct berval *cookie, int is_critical, LDAPControl **control) +{ + BerElement *berelem; + int rv; + + assert(ld != NULL); + assert(control != NULL); + + berelem = ber_alloc_t(LBER_USE_DER); + if (berelem == NULL) { + /* TODO: error handling here */ + return (LDAP_NO_MEMORY); + } + + if (cookie == NULL) + rv = ber_printf(berelem, "{ion}", page_size, "", 0); + else + rv = ber_printf(berelem, "{iOn}", page_size, cookie); + + if (rv == LBER_ERROR) { + ber_free(berelem, 1); + /* TODO: error handling here */ + return (LDAP_ENCODING_ERROR); + } + + rv = ldap_create_control(LDAP_CONTROL_PAGEDRESULTS, + berelem, is_critical, control); + + ber_free(berelem, 1); + return (rv); +} + +int +__nss_ldap_parse_page_control(LDAP *ld, LDAPControl **server_controls, + unsigned long *total_count, struct berval **cookie) +{ + LDAPControl *page_control; + BerElement *berelem; + int rv; + + assert(ld != NULL); + assert(server_controls != NULL); + assert(total_count != NULL); + assert(cookie != NULL); + + page_control = ldap_find_control(LDAP_CONTROL_PAGEDRESULTS, + server_controls); + if (page_control == NULL) { + /* TODO: error handling here */ + return (LDAP_CONTROL_NOT_FOUND); + } + + berelem = ber_init(&page_control->ldctl_value); + if (berelem == NULL) { + /* TODO: check errors */ + return (LDAP_NO_MEMORY); + } + rv = ber_scanf(berelem, "{iO", &total_count, cookie); + if (rv == LBER_ERROR) { + /* TODO: write error log */ + ber_free(berelem, 1); + return (LDAP_DECODING_ERROR); + } + + ber_free(berelem, 1); + /* + * TODO: seems to be unneeded + ldap_control_free(page_control); + */ + return (LDAP_SUCCESS); +} ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#12 (text+ko) ==== @@ -42,4 +42,9 @@ extern int __nss_ldap_unescape_string(char const *, char *, size_t); extern int __nss_ldap_format_filter(char const *, int, char *, size_t, ...); +extern int __nss_ldap_create_page_control(LDAP *, unsigned long, + struct berval *, int, LDAPControl **); +extern int __nss_ldap_parse_page_control(LDAP *, LDAPControl **, + unsigned long *, struct berval **); + #endif /* _LDAPUTILS_H_ */ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#13 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Oct 17 19:15: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 D30C916A40F; Tue, 17 Oct 2006 19:15: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 A4BA616A407 for ; Tue, 17 Oct 2006 19:15:13 +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 1B01143D6E for ; Tue, 17 Oct 2006 19:15:13 +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 k9HJFCJB071519 for ; Tue, 17 Oct 2006 19:15:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9HJFClO071516 for perforce@freebsd.org; Tue, 17 Oct 2006 19:15:12 GMT (envelope-from imp@freebsd.org) Date: Tue, 17 Oct 2006 19:15:12 GMT Message-Id: <200610171915.k9HJFClO071516@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 108036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 19:15:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=108036 Change 108036 by imp@imp_lighthouse on 2006/10/17 19:15:01 Update for what the MMC_CMD_xx bits mean. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#14 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#14 (text+ko) ==== @@ -45,11 +45,11 @@ #define MMC_RSP_CRC (1ul << 2) /* Expect valid crc */ #define MMC_RSP_BUSY (1ul << 3) /* Card may send busy */ #define MMC_RSP_OPCODE (1ul << 4) /* Response include opcode */ -#define MMC_CMD_AC (0ul << 5) /* AC? */ -#define MMC_CMD_ADTC (1ul << 5) /* ADTC? */ -#define MMC_CMD_BC (2ul << 5) /* BC? */ -#define MMC_CMD_BCR (3ul << 5) /* BCR? */ #define MMC_RSP_MASK 0x1ful +#define MMC_CMD_AC (0ul << 5) /* Addressed Command, no data */ +#define MMC_CMD_ADTC (1ul << 5) /* Addressed Data transfer cmd */ +#define MMC_CMD_BC (2ul << 5) /* Broadcast command, no response */ +#define MMC_CMD_BCR (3ul << 5) /* Broadcast command with response */ #define MMC_CMD_MASK (3ul << 5) /* Possible response types defined in the standard: */ From owner-p4-projects@FreeBSD.ORG Tue Oct 17 19:15: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 13E3E16A555; Tue, 17 Oct 2006 19:15: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 E0F1216A4D8 for ; Tue, 17 Oct 2006 19:15:13 +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 D6AE843D6B for ; Tue, 17 Oct 2006 19:15:12 +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 k9HJFCXX071513 for ; Tue, 17 Oct 2006 19:15:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9HJFCVF071510 for perforce@freebsd.org; Tue, 17 Oct 2006 19:15:12 GMT (envelope-from piso@freebsd.org) Date: Tue, 17 Oct 2006 19:15:12 GMT Message-Id: <200610171915.k9HJFCVF071510@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 108035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 19:15:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=108035 Change 108035 by piso@piso_newluxor on 2006/10/17 19:14:29 Make IPFW compiles again with _no_ nat support in case LIBALIAS is not defined. Affected files ... .. //depot/projects/soc2005/libalias/sys/conf/options#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#23 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/conf/options#8 (text+ko) ==== @@ -375,7 +375,7 @@ IPXIP opt_ipx.h LIBMBPOOL LIBMCHAIN -LIBALIAS +LIBALIAS opt_net.h MBUF_STRESS_TEST NCP NETATALK opt_atalk.h ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#23 (text+ko) ==== @@ -137,7 +137,9 @@ struct ip_fw_chain { struct ip_fw *rules; /* list of rules */ struct ip_fw *reap; /* list of rules to reap */ +#ifdef LIBALIAS LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ +#endif struct radix_node_head *tables[IPFW_TABLES_MAX]; struct rwlock rwmtx; }; @@ -154,8 +156,6 @@ #define IPFW_WLOCK(p) rw_wlock(&(p)->rwmtx) #define IPFW_WUNLOCK(p) rw_wunlock(&(p)->rwmtx) -static eventhandler_tag ifaddr_event_tag; - /* * list of rules for layer 3 */ @@ -2031,6 +2031,35 @@ return match; } +#ifdef LIBALIAS +static eventhandler_tag ifaddr_event_tag; + +static void +ifaddr_change(void *arg __unused, struct ifnet *ifp) { + struct cfg_nat *ptr; + struct ifaddr *ifa; + + IPFW_WLOCK(&layer3_chain); + /* Check every nat entry... */ + LIST_FOREACH(ptr, &layer3_chain.nat, _next) { + /* ...using nic 'ifp->if_xname' as dynamic alias address. */ + if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) == 0) { + mtx_lock(&ifp->if_addr_mtx); + TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { + if (ifa->ifa_addr == NULL) + continue; + if (ifa->ifa_addr->sa_family != AF_INET) + continue; + ptr->ip = ((struct sockaddr_in *) + (ifa->ifa_addr))->sin_addr; + LibAliasSetAddress(ptr->lib, ptr->ip); + } + mtx_unlock(&ifp->if_addr_mtx); + } + } + IPFW_WUNLOCK(&layer3_chain); +} + static void flush_nat_ptrs(const int i) { struct ip_fw *rule; @@ -2197,6 +2226,7 @@ /* something really bad happened: panic! */ panic("%s\n", panic_err); } +#endif /* * The main check routine for the firewall. @@ -3420,7 +3450,7 @@ retval = (cmd->opcode == O_NETGRAPH) ? IP_FW_NETGRAPH : IP_FW_NGTEE; goto done; - +#ifdef LIBALIAS case O_NAT: { struct cfg_nat *t; struct mbuf *mcl; @@ -3567,7 +3597,7 @@ retval = IP_FW_NAT; goto done; } - +#endif default: panic("-- unknown opcode %d\n", cmd->opcode); } /* end of switch() on opcodes */ @@ -4293,33 +4323,6 @@ return (bp - (char *)buf); } - -static void -ifaddr_change(void *arg __unused, struct ifnet *ifp) { - struct cfg_nat *ptr; - struct ifaddr *ifa; - - IPFW_WLOCK(&layer3_chain); - /* Check every nat entry... */ - LIST_FOREACH(ptr, &layer3_chain.nat, _next) { - /* ...using nic 'ifp->if_xname' as dynamic alias address. */ - if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) == 0) { - mtx_lock(&ifp->if_addr_mtx); - TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { - if (ifa->ifa_addr == NULL) - continue; - if (ifa->ifa_addr->sa_family != AF_INET) - continue; - ptr->ip = ((struct sockaddr_in *) - (ifa->ifa_addr))->sin_addr; - LibAliasSetAddress(ptr->lib, ptr->ip); - } - mtx_unlock(&ifp->if_addr_mtx); - } - } - IPFW_WUNLOCK(&layer3_chain); -} - /** * {set|get}sockopt parser. */ @@ -4541,7 +4544,7 @@ free(tbl, M_TEMP); } break; - +#ifdef LIBALIAS case IP_FW_NAT_CFG: { struct cfg_nat *ptr, *ser_n; @@ -4710,7 +4713,7 @@ free(data, M_IPFW); } break; - +#endif default: printf("ipfw: ipfw_ctl invalid option %d\n", sopt->sopt_name); error = EINVAL; @@ -4883,9 +4886,11 @@ ip_fw_ctl_ptr = ipfw_ctl; ip_fw_chk_ptr = ipfw_chk; callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL); +#ifdef LIBALIAS LIST_INIT(&layer3_chain.nat); ifaddr_event_tag = EVENTHANDLER_REGISTER(ifaddr_event, ifaddr_change, NULL, EVENTHANDLER_PRI_ANY); +#endif return (0); } @@ -4893,13 +4898,16 @@ ipfw_destroy(void) { struct ip_fw *reap; +#ifdef LIBALIAS struct cfg_nat *ptr, *ptr_temp; +#endif ip_fw_chk_ptr = NULL; ip_fw_ctl_ptr = NULL; callout_drain(&ipfw_timeout); IPFW_WLOCK(&layer3_chain); flush_tables(&layer3_chain); +#ifdef LIBALIAS LIST_FOREACH_SAFE(ptr, &layer3_chain.nat, _next, ptr_temp) { LIST_REMOVE(ptr, _next); del_redir_spool_cfg(ptr, &ptr->redir_chain); @@ -4907,6 +4915,7 @@ free(ptr, M_IPFW); } EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag); +#endif layer3_chain.reap = NULL; free_chain(&layer3_chain, 1 /* kill default rule */); reap = layer3_chain.reap, layer3_chain.reap = NULL; From owner-p4-projects@FreeBSD.ORG Tue Oct 17 19:58: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 D799016A416; Tue, 17 Oct 2006 19:58: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 B2FE716A412 for ; Tue, 17 Oct 2006 19:58:08 +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 6376743D45 for ; Tue, 17 Oct 2006 19:58:08 +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 k9HJw8aE077603 for ; Tue, 17 Oct 2006 19:58:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9HJw8UJ077600 for perforce@freebsd.org; Tue, 17 Oct 2006 19:58:08 GMT (envelope-from piso@freebsd.org) Date: Tue, 17 Oct 2006 19:58:08 GMT Message-Id: <200610171958.k9HJw8UJ077600@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 108037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Oct 2006 19:58:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=108037 Change 108037 by piso@piso_newluxor on 2006/10/17 19:57:22 Turn (where possible) mallocs from NOWAIT to WAITOK. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#24 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#24 (text+ko) ==== @@ -2149,20 +2149,12 @@ for(cnt = 0, off = 0; cnt < ptr->redir_cnt; cnt++) { ser_r = (struct cfg_redir *)&buf[off]; - r = malloc(sof_redir, M_IPFW, M_NOWAIT | M_ZERO); - if (r == NULL) { - panic_err = "malloc(sof_redir, ...) failed"; - goto bad; - } + r = malloc(sof_redir, M_IPFW, M_WAITOK | M_ZERO); memcpy(r, ser_r, sof_redir); LIST_INIT(&r->spool_chain); off += sof_redir; r->alink = malloc(sof_alinkp*r->pport_cnt, - M_IPFW, M_NOWAIT | M_ZERO); - if (r->alink == NULL) { - panic_err = "malloc(sof_alinkp*r->pport_cnt, ...) failed"; - goto bad; - } + M_IPFW, M_WAITOK | M_ZERO); switch (r->mode) { case REDIR_ADDR: r->alink[0] = LibAliasRedirectAddr(ptr->lib, @@ -2205,11 +2197,7 @@ } else /* LSNAT handling. */ for (i = 0; i < r->spool_cnt; i++) { ser_s = (struct cfg_spool *)&buf[off]; - s = malloc(sof_redir, M_IPFW, M_NOWAIT | M_ZERO); - if (s == NULL) { - panic_err = "malloc(sof_redir, ...) failed"; - goto bad; - } + s = malloc(sof_redir, M_IPFW, M_WAITOK | M_ZERO); memcpy(s, ser_s, sof_spool); LibAliasAddServer(ptr->lib, r->alink[0], s->addr, @@ -4550,9 +4538,7 @@ struct cfg_nat *ptr, *ser_n; char *buf; - buf = malloc(NAT_BUF_LEN, M_IPFW, M_NOWAIT | M_ZERO); - if (buf == NULL) - return (ENOSPC); + buf = malloc(NAT_BUF_LEN, M_IPFW, M_WAITOK | M_ZERO); error = sooptcopyin(sopt, buf, NAT_BUF_LEN, sizeof(struct cfg_nat)); ser_n = (struct cfg_nat *)buf; @@ -4645,9 +4631,8 @@ int sof_spool = sizeof(struct cfg_spool); int nat_cnt = 0, off = sizeof(nat_cnt); - data = malloc(NAT_BUF_LEN, M_IPFW, M_NOWAIT | M_ZERO); - if (data == NULL) - return (ENOSPC); + data = malloc(NAT_BUF_LEN, M_IPFW, M_WAITOK | M_ZERO); + IPFW_RLOCK(&layer3_chain); /* Serialize all the data. */ LIST_FOREACH(n, &layer3_chain.nat, _next) { From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:17: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 4ED9A16A416; Wed, 18 Oct 2006 20:17: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 27DCB16A403 for ; Wed, 18 Oct 2006 20:17:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B804743D53 for ; Wed, 18 Oct 2006 20:17:53 +0000 (GMT) (envelope-from mjacob@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 k9IKHrTP098552 for ; Wed, 18 Oct 2006 20:17:53 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKHrOb098549 for perforce@freebsd.org; Wed, 18 Oct 2006 20:17:53 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:17:53 GMT Message-Id: <200610182017.k9IKHrOb098549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:17:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=108058 Change 108058 by mjacob@newisp on 2006/10/18 20:17:10 ISR reads should have the semaphore and mailbox pointers as pointers to 16 bit quantities- not 32 bit quantities. Put in an sdparam tag for PTISP SBus cards. Affected files ... .. //depot/projects/newisp/dev/isp/ispvar.h#7 edit Differences ... ==== //depot/projects/newisp/dev/isp/ispvar.h#7 (text+ko) ==== @@ -56,7 +56,7 @@ typedef struct ispsoftc ispsoftc_t; struct ispmdvec { int (*dv_rd_isr) - (ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *); + (ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *); uint32_t (*dv_rd_reg) (ispsoftc_t *, int); void (*dv_wr_reg) (ispsoftc_t *, int, uint32_t); int (*dv_mbxdma) (ispsoftc_t *); @@ -166,6 +166,7 @@ isp_cmd_dma_burst_enable: 1, isp_data_dma_burst_enabl: 1, isp_fifo_threshold : 3, + isp_ptisp : 1, isp_ultramode : 1, isp_diffmode : 1, isp_lvdmode : 1, @@ -691,7 +692,7 @@ * semaphore register and first mailbox register (if appropriate). This also * means that most spurious/bogus interrupts not for us can be filtered first. */ -void isp_intr(ispsoftc_t *, uint32_t, uint32_t, uint16_t); +void isp_intr(ispsoftc_t *, uint32_t, uint16_t, uint16_t); /* From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:19: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 0DC0716A4B3; Wed, 18 Oct 2006 20:19: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 C1B7F16A4A7 for ; Wed, 18 Oct 2006 20:19:57 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F8AF43D5A for ; Wed, 18 Oct 2006 20:19:57 +0000 (GMT) (envelope-from mjacob@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 k9IKJvtW098631 for ; Wed, 18 Oct 2006 20:19:57 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKJu67098628 for perforce@freebsd.org; Wed, 18 Oct 2006 20:19:56 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:19:56 GMT Message-Id: <200610182019.k9IKJu67098628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:19:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=108059 Change 108059 by mjacob@newisp on 2006/10/18 20:19:14 make the modifier tag for a marker type a short, not 8 bits. That makes SBus cards work better. Affected files ... .. //depot/projects/newisp/dev/isp/ispmbox.h#9 edit Differences ... ==== //depot/projects/newisp/dev/isp/ispmbox.h#9 (text+ko) ==== @@ -352,11 +352,10 @@ uint32_t mrk_handle; uint8_t mrk_reserved0; uint8_t mrk_target; - uint8_t mrk_modifier; - uint8_t mrk_reserved1; + uint16_t mrk_modifier; uint16_t mrk_flags; uint16_t mrk_lun; - uint8_t mrk_reserved2[48]; + uint8_t mrk_reserved1[48]; } isp_marker_t; typedef struct { From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:23: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 555E716A4A7; Wed, 18 Oct 2006 20:23: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 1416816A415 for ; Wed, 18 Oct 2006 20:23:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9CA143D72 for ; Wed, 18 Oct 2006 20:23:01 +0000 (GMT) (envelope-from mjacob@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 k9IKN1Fj099702 for ; Wed, 18 Oct 2006 20:23:01 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKN1Zh099699 for perforce@freebsd.org; Wed, 18 Oct 2006 20:23:01 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:23:01 GMT Message-Id: <200610182023.k9IKN1Zh099699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:23:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=108060 Change 108060 by mjacob@newisp on 2006/10/18 20:22:46 Put ISR read arguments for mailbox and semaphore pointers back to pointers to shorts. Reinstate PTISP checking, only set a bit for them in sdparam. Move some items araound and add a reset0 point to turn intsok back to zero. Put in request queue debug printouts. Affected files ... .. //depot/projects/newisp/dev/isp/isp_sbus.c#6 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_sbus.c#6 (text+ko) ==== @@ -56,13 +56,14 @@ static void isp_sbus_wr_reg(ispsoftc_t *, int, uint32_t); static int -isp_sbus_rd_isr(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *); +isp_sbus_rd_isr(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *); static int isp_sbus_mbxdma(ispsoftc_t *); static int isp_sbus_dmasetup(ispsoftc_t *, XS_T *, ispreq_t *, uint32_t *, uint32_t); static void isp_sbus_dmateardown(ispsoftc_t *, XS_T *, uint32_t); +static void isp_sbus_reset0(ispsoftc_t *); static void isp_sbus_reset1(ispsoftc_t *); static void isp_sbus_dumpregs(ispsoftc_t *, const char *); @@ -73,7 +74,7 @@ isp_sbus_mbxdma, isp_sbus_dmasetup, isp_sbus_dmateardown, - NULL, + isp_sbus_reset0, isp_sbus_reset1, isp_sbus_dumpregs, NULL, @@ -151,6 +152,7 @@ struct isp_sbussoftc *sbs; ispsoftc_t *isp = NULL; int locksetup = 0; + int ints_setup = 0; /* * Figure out if we're supposed to skip this one. @@ -186,10 +188,8 @@ regs = NULL; iqd = 0; - rid = 0; - regs = - bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + regs = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (regs == 0) { device_printf(dev, "unable to map registers\n"); goto bad; @@ -245,21 +245,19 @@ } /* - * Some early versions of the PTI SBus adapter - * would fail in trying to download (via poking) - * FW. We give up on them. + * We don't trust NVRAM on SBus cards + */ + isp->isp_confopts |= ISP_CFG_NONVRAM; + + /* + * Mark things if we're a PTI SBus adapter. */ if (strcmp("PTI,ptisp", ofw_bus_get_name(dev)) == 0 || strcmp("ptisp", ofw_bus_get_name(dev)) == 0) { - isp->isp_confopts |= ISP_CFG_NORELOAD; + SDPARAM(isp)->isp_ptisp = 1; } - /* - * We don't trust NVRAM on SBus cards - */ - isp->isp_confopts |= ISP_CFG_NONVRAM; - #if __FreeBSD_version >= 700000 isp->isp_osinfo.fw = firmware_get("isp_1000"); if (isp->isp_osinfo.fw) { @@ -279,14 +277,6 @@ } #endif - iqd = 0; - sbs->sbus_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd, - RF_ACTIVE | RF_SHAREABLE); - if (sbs->sbus_ires == NULL) { - device_printf(dev, "could not allocate interrupt\n"); - goto bad; - } - tval = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev), "fwload_disable", &tval) == 0 && tval != 0) { @@ -315,11 +305,20 @@ mtx_init(&isp->isp_osinfo.lock, "isp", NULL, MTX_DEF); locksetup++; + iqd = 0; + sbs->sbus_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd, + RF_ACTIVE | RF_SHAREABLE); + if (sbs->sbus_ires == NULL) { + device_printf(dev, "could not allocate interrupt\n"); + goto bad; + } + if (bus_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, isp_sbus_intr, isp, &sbs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; } + ints_setup++; /* * Set up logging levels. @@ -329,8 +328,9 @@ } else { isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR; } - if (bootverbose) + if (bootverbose) { isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO; + } /* * Make sure we're in reset state. @@ -338,6 +338,7 @@ ISP_LOCK(isp); isp_reset(isp); if (isp->isp_state != ISP_RESETSTATE) { + isp_uninit(isp); ISP_UNLOCK(isp); goto bad; } @@ -353,42 +354,33 @@ ISP_UNLOCK(isp); goto bad; } - /* - * XXXX: Here is where we might unload the f/w module - * XXXX: (or decrease the reference count to it). - */ ISP_UNLOCK(isp); return (0); bad: - if (sbs && sbs->ih) { + if (sbs && ints_setup) { (void) bus_teardown_intr(dev, sbs->sbus_ires, sbs->ih); } - if (locksetup && isp) { - mtx_destroy(&isp->isp_osinfo.lock); - } - if (sbs && sbs->sbus_ires) { bus_release_resource(dev, SYS_RES_IRQ, iqd, sbs->sbus_ires); } + if (locksetup && isp) { + mtx_destroy(&isp->isp_osinfo.lock); + } if (regs) { (void) bus_release_resource(dev, 0, 0, regs); } if (sbs) { - if (sbs->sbus_isp.isp_param) + if (sbs->sbus_isp.isp_param) { free(sbs->sbus_isp.isp_param, M_DEVBUF); + } free(sbs, M_DEVBUF); } - - /* - * XXXX: Here is where we might unload the f/w module - * XXXX: (or decrease the reference count to it). - */ return (ENXIO); } @@ -396,7 +388,8 @@ isp_sbus_intr(void *arg) { ispsoftc_t *isp = arg; - uint32_t isr, sema, mbox; + uint32_t isr; + uint16_t sema, mbox; ISP_LOCK(isp); isp->isp_intcnt++; @@ -419,7 +412,7 @@ bus_space_read_2(sbc->sbus_st, sbc->sbus_sh, off) static int -isp_sbus_rd_isr(ispsoftc_t *isp, uint32_t *isrp, uint32_t *semap, uint32_t *mbp) +isp_sbus_rd_isr(ispsoftc_t *isp, uint32_t *isrp, uint16_t *semap, uint16_t *mbp) { struct isp_sbussoftc *sbc = (struct isp_sbussoftc *) isp; uint16_t isr, sema; @@ -810,6 +803,9 @@ return (retval); } mbxsync: + if (isp->isp_dblev & ISP_LOGDEBUG1) { + isp_print_bytes(isp, "Request Queue Entry", QENTRY_LEN, rq); + } switch (rq->req_header.rqs_entry_type) { case RQSTYPE_REQUEST: isp_put_request(isp, rq, qep); @@ -837,10 +833,16 @@ static void +isp_sbus_reset0(ispsoftc_t *isp) +{ + isp->isp_osinfo.intsok = 0; +} + +static void isp_sbus_reset1(ispsoftc_t *isp) { - /* enable interrupts */ - ENABLE_INTS(isp); +/* isp->isp_osinfo.intsok = 1; */ + ISP_ENABLE_INTS(isp); } static void From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:24: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 3CA3E16A494; Wed, 18 Oct 2006 20:24: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 192F516A416 for ; Wed, 18 Oct 2006 20:24:18 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B445B43D82 for ; Wed, 18 Oct 2006 20:24:03 +0000 (GMT) (envelope-from mjacob@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 k9IKO3bC000172 for ; Wed, 18 Oct 2006 20:24:03 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKO3mc000166 for perforce@freebsd.org; Wed, 18 Oct 2006 20:24:03 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:24:03 GMT Message-Id: <200610182024.k9IKO3mc000166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=108061 Change 108061 by mjacob@newisp on 2006/10/18 20:23:22 Put ISR read arguments for mailbox and semaphore pointers back to pointers to shorts. Affected files ... .. //depot/projects/newisp/dev/isp/isp_pci.c#14 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_pci.c#14 (text+ko) ==== @@ -69,11 +69,11 @@ static uint32_t isp_pci_rd_reg_2400(ispsoftc_t *, int); static void isp_pci_wr_reg_2400(ispsoftc_t *, int, uint32_t); static int -isp_pci_rd_isr(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *); +isp_pci_rd_isr(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *); static int -isp_pci_rd_isr_2300(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *); +isp_pci_rd_isr_2300(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *); static int -isp_pci_rd_isr_2400(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *); +isp_pci_rd_isr_2400(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *); static int isp_pci_mbxdma(ispsoftc_t *); static int isp_pci_dmasetup(ispsoftc_t *, XS_T *, ispreq_t *, uint32_t *, uint32_t); @@ -1216,7 +1216,8 @@ isp_pci_intr(void *arg) { ispsoftc_t *isp = arg; - uint32_t isr, sema, mbox; + uint32_t isr; + uint16_t sema, mbox; ISP_LOCK(isp); isp->isp_intcnt++; @@ -1247,7 +1248,7 @@ static __inline int -isp_pci_rd_debounced(ispsoftc_t *isp, int off, uint32_t *rp) +isp_pci_rd_debounced(ispsoftc_t *isp, int off, uint16_t *rp) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp; uint32_t val0, val1; @@ -1266,10 +1267,10 @@ static int isp_pci_rd_isr(ispsoftc_t *isp, uint32_t *isrp, - uint32_t *semap, uint32_t *mbp) + uint16_t *semap, uint16_t *mbp) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp; - uint32_t isr, sema; + uint16_t isr, sema; if (IS_2100(isp)) { if (isp_pci_rd_debounced(isp, BIU_ISR, &isr)) { @@ -1303,7 +1304,7 @@ static int isp_pci_rd_isr_2300(ispsoftc_t *isp, uint32_t *isrp, - uint32_t *semap, uint32_t *mbox0p) + uint16_t *semap, uint16_t *mbox0p) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp; uint32_t hccr; @@ -1366,7 +1367,7 @@ static int isp_pci_rd_isr_2400(ispsoftc_t *isp, uint32_t *isrp, - uint32_t *semap, uint32_t *mbox0p) + uint16_t *semap, uint16_t *mbox0p) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp; uint32_t r2hisr; From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20: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 C515C16A415; Wed, 18 Oct 2006 20: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 8B90E16A412 for ; Wed, 18 Oct 2006 20:25:05 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A4AD43D5D for ; Wed, 18 Oct 2006 20:25:05 +0000 (GMT) (envelope-from mjacob@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 k9IKP5LZ000216 for ; Wed, 18 Oct 2006 20:25:05 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKP48b000213 for perforce@freebsd.org; Wed, 18 Oct 2006 20:25:04 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:25:04 GMT Message-Id: <200610182025.k9IKP48b000213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:25:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=108062 Change 108062 by mjacob@newisp on 2006/10/18 20:24:20 Make the modifier tag for a marker type a short, not 8 bits. That makes SBus cards work better. Affected files ... .. //depot/projects/newisp/dev/isp/isp_library.c#10 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_library.c#10 (text) ==== @@ -375,19 +375,16 @@ if (ISP_IS_SBUS(isp)) { ISP_IOXPUT_8(isp, src->mrk_reserved0, &dst->mrk_target); ISP_IOXPUT_8(isp, src->mrk_target, &dst->mrk_reserved0); - ISP_IOXPUT_8(isp, src->mrk_reserved1, &dst->mrk_modifier); - ISP_IOXPUT_8(isp, src->mrk_modifier, &dst->mrk_reserved1); } else { ISP_IOXPUT_8(isp, src->mrk_reserved0, &dst->mrk_reserved0); ISP_IOXPUT_8(isp, src->mrk_target, &dst->mrk_target); - ISP_IOXPUT_8(isp, src->mrk_modifier, &dst->mrk_modifier); - ISP_IOXPUT_8(isp, src->mrk_reserved1, &dst->mrk_reserved1); } + ISP_IOXPUT_16(isp, src->mrk_modifier, &dst->mrk_modifier); ISP_IOXPUT_16(isp, src->mrk_flags, &dst->mrk_flags); ISP_IOXPUT_16(isp, src->mrk_lun, &dst->mrk_lun); for (i = 0; i < 48; i++) { - ISP_IOXPUT_8(isp, src->mrk_reserved2[i], - &dst->mrk_reserved2[i]); + ISP_IOXPUT_8(isp, src->mrk_reserved1[i], + &dst->mrk_reserved1[i]); } } From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:26: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 7F75916A47E; Wed, 18 Oct 2006 20:26: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 5B87516A407 for ; Wed, 18 Oct 2006 20:26:07 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A10143D75 for ; Wed, 18 Oct 2006 20:26:07 +0000 (GMT) (envelope-from mjacob@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 k9IKQ6pN000373 for ; Wed, 18 Oct 2006 20:26:06 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKQ6sP000370 for perforce@freebsd.org; Wed, 18 Oct 2006 20:26:06 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:26:06 GMT Message-Id: <200610182026.k9IKQ6sP000370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:26:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=108063 Change 108063 by mjacob@newisp on 2006/10/18 20:25:33 Get rid of MBOX_REQUEST_OFFLINE_MODE- it doesn't work for what we want. Affected files ... .. //depot/projects/newisp/dev/isp/isp_library.c#11 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_library.c#11 (text) ==== @@ -234,15 +234,6 @@ isp_shutdown(ispsoftc_t *isp) { if (IS_FC(isp)) { - if (isp->isp_role != ISP_ROLE_NONE) { - mbreg_t mbs; - MEMZERO(&mbs, sizeof (mbs)); - mbs.param[0] = MBOX_REQUEST_OFFLINE_MODE; - (void) isp_control(isp, ISPCTL_RUN_MBOXCMD, &mbs); - if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { - return; - } - } if (IS_24XX(isp)) { ISP_WRITE(isp, BIU2400_ICR, 0); ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_PAUSE); From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:27: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 A384916A4B3; Wed, 18 Oct 2006 20:27: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 699C916A492 for ; Wed, 18 Oct 2006 20:27:09 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B527443D77 for ; Wed, 18 Oct 2006 20:27:08 +0000 (GMT) (envelope-from mjacob@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 k9IKR85T000409 for ; Wed, 18 Oct 2006 20:27:08 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKR8nb000406 for perforce@freebsd.org; Wed, 18 Oct 2006 20:27:08 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:27:08 GMT Message-Id: <200610182027.k9IKR8nb000406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:27:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=108064 Change 108064 by mjacob@newisp on 2006/10/18 20:26:19 ISR reads should have the semaphore and mailbox pointers as pointers to 16 bit quantities- not 32 bit quantities. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.h#8 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#8 (text+ko) ==== @@ -495,7 +495,8 @@ int lim = ((isp->isp_mbxwrk0)? 240 : 60) * 10000; int j; for (j = 0; j < lim; j++) { - uint32_t isr, sema, mbox; + uint32_t isr; + uint16_t sema, mbox; if (isp->isp_mboxbsy == 0) { break; } From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:27: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 30E6116A4A0; Wed, 18 Oct 2006 20:27: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 0ED2216A494 for ; Wed, 18 Oct 2006 20:27:13 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6DD643D5C for ; Wed, 18 Oct 2006 20:27:09 +0000 (GMT) (envelope-from mjacob@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 k9IKR89i000415 for ; Wed, 18 Oct 2006 20:27:08 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKR8lM000412 for perforce@freebsd.org; Wed, 18 Oct 2006 20:27:08 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:27:08 GMT Message-Id: <200610182027.k9IKR8lM000412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:27:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=108065 Change 108065 by mjacob@newisp on 2006/10/18 20:26:36 ISR reads should have the semaphore and mailbox pointers as pointers to 16 bit quantities- not 32 bit quantities. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#13 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#13 (text+ko) ==== @@ -2008,7 +2008,8 @@ isp_poll(struct cam_sim *sim) { ispsoftc_t *isp = cam_sim_softc(sim); - uint32_t isr, sema, mbox; + uint32_t isr; + uint16_t sema, mbox; ISP_LOCK(isp); if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { @@ -2036,7 +2037,8 @@ isp->isp_osinfo.intsok = 0; handle = isp_find_handle(isp, xs); if (handle) { - uint32_t isr, sema, mbox; + uint32_t isr; + uint16_t sema, mbox; if (XS_CMD_DONE_P(xs)) { isp_prt(isp, ISP_LOGDEBUG1, @@ -2352,7 +2354,8 @@ break; } for (i = 0; isp->isp_osinfo.leact[seq] && i < 30 * 1000; i++) { - uint32_t isr, sema, mbox; + uint32_t isr; + uint16_t sema, mbox; if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { isp_intr(isp, isr, sema, mbox); } From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:30: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 9C58A16A4D8; Wed, 18 Oct 2006 20:30: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 4477C16A4C2 for ; Wed, 18 Oct 2006 20:30:20 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3535C43D6A for ; Wed, 18 Oct 2006 20:30:13 +0000 (GMT) (envelope-from mjacob@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 k9IKUDxv000545 for ; Wed, 18 Oct 2006 20:30:13 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKUC9N000542 for perforce@freebsd.org; Wed, 18 Oct 2006 20:30:12 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:30:12 GMT Message-Id: <200610182030.k9IKUC9N000542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:30:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=108066 Change 108066 by mjacob@newisp on 2006/10/18 20:29:41 ISR reads should have the semaphore and mailbox pointers as pointers to 16 bit quantities- not 32 bit quantities. Put in PTISP stuff again, but conditionalized on a tag set in sdparam by the outerlayer. *Don't* call isp_intr from isp_start except for ZIO capable cards (23XX/24XX). When getting interrupted when not ready, only disable ints for the 24XX. This needs a better solution, really. Make isp_parse_status/isp_parse_status_24xx take a pointer to a residual so we can do things like setting the residual to the xfer count for things like selection timeout instead of getting some completely bogus value from the status IOCB. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#17 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#17 (text+ko) ==== @@ -100,9 +100,9 @@ static int isp_handle_other_response(ispsoftc_t *, int, isphdr_t *, uint32_t *); static void -isp_parse_status(ispsoftc_t *, ispstatusreq_t *, XS_T *); +isp_parse_status(ispsoftc_t *, ispstatusreq_t *, XS_T *, long *); static void -isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *); +isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *, long *); static void isp_fastpost_complete(ispsoftc_t *, uint16_t); static int isp_mbox_continue(ispsoftc_t *); static void isp_scsi_init(ispsoftc_t *); @@ -638,7 +638,22 @@ ISP_SETBITS(isp, CDMA_CONF, DMA_ENABLE_BURST); ISP_SETBITS(isp, DDMA_CONF, DMA_ENABLE_BURST); } - ISP_WRITE(isp, RISC_MTR, 0x1212); + if (SDPARAM(isp)->isp_ptisp) { + if (SDPARAM(isp)->isp_ultramode) { + while (ISP_READ(isp, RISC_MTR) != 0x1313) { + ISP_WRITE(isp, RISC_MTR, 0x1313); + ISP_WRITE(isp, HCCR, HCCR_CMD_STEP); + } + } else { + ISP_WRITE(isp, RISC_MTR, 0x1212); + } + /* + * PTI specific register + */ + ISP_WRITE(isp, RISC_EMB, DUAL_BANK); + } else { + ISP_WRITE(isp, RISC_MTR, 0x1212); + } ISP_WRITE(isp, HCCR, HCCR_CMD_RELEASE); } else { ISP_WRITE(isp, RISC_MTR2100, 0x1212); @@ -3869,7 +3884,8 @@ isp_start(XS_T *xs) { ispsoftc_t *isp; - uint32_t nxti, optr, handle, isr, sema, mbox; + uint32_t nxti, optr, handle, isr; + uint16_t sema, mbox; uint8_t local[QENTRY_LEN]; ispreq_t *reqp, *qep; void *cdbp; @@ -3981,6 +3997,7 @@ MEMZERO(m, QENTRY_LEN); m->mrk_header.rqs_entry_count = 1; m->mrk_header.rqs_entry_type = RQSTYPE_MARKER; + m->mrk_target = (i << 7); /* bus # */ m->mrk_modifier = SYNC_ALL; isp_put_marker(isp, m, (isp_marker_t *) qep); ISP_ADD_REQUEST(isp, nxti); @@ -4125,8 +4142,10 @@ (long) XS_XFRLEN(xs)); ISP_ADD_REQUEST(isp, nxti); isp->isp_nactive++; - if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { - isp_intr(isp, isr, sema, mbox); + if (IS_23XX(isp) || IS_24XX(isp)) { + if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { + isp_intr(isp, isr, sema, mbox); + } } return (CMD_QUEUED); } @@ -4157,8 +4176,7 @@ */ mbs.param[0] = MBOX_BUS_RESET; if (IS_SCSI(isp)) { - mbs.param[1] = - ((sdparam *) isp->isp_param)->isp_bus_reset_delay; + mbs.param[1] = SDPARAM(isp)->isp_bus_reset_delay; if (mbs.param[1] < 2) { mbs.param[1] = 2; } @@ -4345,7 +4363,7 @@ #endif void -isp_intr(ispsoftc_t *isp, uint32_t isr, uint32_t sema, uint16_t mbox) +isp_intr(ispsoftc_t *isp, uint32_t isr, uint16_t sema, uint16_t mbox) { XS_T *complist[MAX_REQUESTQ_COMPLETIONS], *xs; uint32_t iptr, optr, junk; @@ -4402,7 +4420,9 @@ */ ISP_WRITE(isp, isp->isp_respoutrp, ISP_READ(isp, isp->isp_respinrp)); - ISP_DISABLE_INTS(isp); + if (IS_24XX(isp)) { + ISP_DISABLE_INTS(isp); + } goto out; } @@ -4718,9 +4738,9 @@ XS_SET_STATE_STAT(isp, xs, sp); if (IS_24XX(isp)) { isp_parse_status_24xx(isp, - (isp24xx_statusreq_t *)sp, xs); + (isp24xx_statusreq_t *)sp, xs, &resid); } else { - isp_parse_status(isp, (void *)sp, xs); + isp_parse_status(isp, (void *)sp, xs, &resid); } if ((XS_NOERR(xs) || XS_ERR(xs) == HBA_NOERROR) && (*XS_STSP(xs) == SCSI_BUSY)) { @@ -5318,7 +5338,7 @@ } static void -isp_parse_status(ispsoftc_t *isp, ispstatusreq_t *sp, XS_T *xs) +isp_parse_status(ispsoftc_t *isp, ispstatusreq_t *sp, XS_T *xs, long *rp) { switch (sp->req_completion_status & 0xff) { case RQCS_COMPLETE: @@ -5334,6 +5354,7 @@ XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs)); if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_SELTIMEOUT); + *rp = XS_XFRLEN(xs); } return; } @@ -5346,6 +5367,7 @@ case RQCS_DMA_ERROR: isp_prt(isp, ISP_LOGERR, "DMA error for command on %d.%d.%d", XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs)); + *rp = XS_XFRLEN(xs); break; case RQCS_TRANSPORT_ERROR: @@ -5401,6 +5423,7 @@ isp_prt(isp, ISP_LOGERR, "%s", buf); isp_prt(isp, ISP_LOGERR, "transport error for %d.%d.%d:\n%s", XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), buf); + *rp = XS_XFRLEN(xs); break; } case RQCS_RESET_OCCURRED: @@ -5411,6 +5434,7 @@ if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_BUSRESET); } + *rp = XS_XFRLEN(xs); return; case RQCS_ABORTED: @@ -5705,7 +5729,8 @@ } static void -isp_parse_status_24xx(ispsoftc_t *isp, isp24xx_statusreq_t *sp, XS_T *xs) +isp_parse_status_24xx(ispsoftc_t *isp, isp24xx_statusreq_t *sp, + XS_T *xs, long *rp) { switch (sp->req_completion_status) { case RQCS_COMPLETE: @@ -5766,6 +5791,7 @@ if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_ABORTED); } + *rp = XS_XFRLEN(xs); return; case RQCS_24XX_TABORT: /* aborted by target */ From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:49: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 419DB16A407; Wed, 18 Oct 2006 20:49: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 1AF5216A40F for ; Wed, 18 Oct 2006 20:49:40 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEAB343D6E for ; Wed, 18 Oct 2006 20:49:39 +0000 (GMT) (envelope-from mjacob@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 k9IKndhN011681 for ; Wed, 18 Oct 2006 20:49:39 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKndSg011677 for perforce@freebsd.org; Wed, 18 Oct 2006 20:49:39 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:49:39 GMT Message-Id: <200610182049.k9IKndSg011677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=108069 Change 108069 by mjacob@newisp on 2006/10/18 20:49:00 Fix misdefinitions of TMF functions. Affected files ... .. //depot/projects/newisp/dev/isp/isp_stds.h#6 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_stds.h#6 (text+ko) ==== @@ -96,9 +96,9 @@ #define FCP_CMND_DATA_DIR_MASK 0x03 -#define FCP_CMND_TMF_ABORT_CLEAR_ACA 0x40 -#define FCP_CMND_TMF_ABORT_TGT_RESET 0x20 -#define FCP_CMND_TMF_ABORT_LUN_RESET 0x10 +#define FCP_CMND_TMF_CLEAR_ACA 0x40 +#define FCP_CMND_TMF_TGT_RESET 0x20 +#define FCP_CMND_TMF_LUN_RESET 0x10 #define FCP_CMND_TMF_CLEAR_TASK_SET 0x04 #define FCP_CMND_TMF_ABORT_TASK_SET 0x02 From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20: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 0FA5916A415; Wed, 18 Oct 2006 20: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 E287716A407 for ; Wed, 18 Oct 2006 20:50:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90C7443D6B for ; Wed, 18 Oct 2006 20:50:41 +0000 (GMT) (envelope-from mjacob@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 k9IKofiX011801 for ; Wed, 18 Oct 2006 20:50:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKofuc011797 for perforce@freebsd.org; Wed, 18 Oct 2006 20:50:41 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:50:41 GMT Message-Id: <200610182050.k9IKofuc011797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:50:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=108070 Change 108070 by mjacob@newisp on 2006/10/18 20:49:47 Add a 'needs ack' tag to tmd_notify_t. Affected files ... .. //depot/projects/newisp/dev/isp/isp_tpublic.h#5 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_tpublic.h#5 (text+ko) ==== @@ -119,7 +119,8 @@ uint64_t nt_iid; /* inititator id */ uint64_t nt_tgt; /* target id */ uint16_t nt_lun; /* logical unit */ - uint16_t nt_padding; /* padding */ + uint16_t : 15, + nt_need_ack : 1; /* this notify needs an ACK */ uint32_t nt_tagval; /* tag value */ tmd_ncode_t nt_ncode; /* action */ void * nt_lreserved; From owner-p4-projects@FreeBSD.ORG Wed Oct 18 20:50: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 D990516A56D; Wed, 18 Oct 2006 20:50: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 B796C16A56B for ; Wed, 18 Oct 2006 20:50:45 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1337F43D70 for ; Wed, 18 Oct 2006 20:50:42 +0000 (GMT) (envelope-from mjacob@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 k9IKofHF011807 for ; Wed, 18 Oct 2006 20:50:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKofcJ011804 for perforce@freebsd.org; Wed, 18 Oct 2006 20:50:41 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 18 Oct 2006 20:50:41 GMT Message-Id: <200610182050.k9IKofcJ011804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Oct 2006 20:50:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=108071 Change 108071 by mjacob@newisp on 2006/10/18 20:50:11 The latest/greatest for target mode for 24XX. Affected files ... .. //depot/projects/newisp/dev/isp/isp_target.c#8 edit .. //depot/projects/newisp/dev/isp/isp_target.h#10 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_target.c#8 (text+ko) ==== @@ -58,6 +58,7 @@ static void isp_got_msg(ispsoftc_t *, in_entry_t *); static void isp_got_msg_fc(ispsoftc_t *, in_fcentry_t *); +static void isp_got_tmf_24xx(ispsoftc_t *, at7_entry_t *); static void isp_handle_atio(ispsoftc_t *, at_entry_t *); static void isp_handle_atio2(ispsoftc_t *, at2_entry_t *); static void isp_handle_ctio(ispsoftc_t *, ct_entry_t *); @@ -191,6 +192,13 @@ } } /* + * Check for a task management function + */ + if (at7iop->at_cmnd.fcp_cmnd_task_management) { + isp_got_tmf_24xx(isp, at7iop); + break; + } + /* * Just go straight to outer layer for this one. */ (void) isp_async(isp, ISPASYNC_TARGET_ACTION, local); @@ -311,16 +319,29 @@ isp_prt(isp, ISP_LOGWARN, "Firmware out of ATIOs"); isp_notify_ack(isp, local); break; - case IN_RESET: /* same as IN24XX_LIP_RESET */ - case IN24XX_LINK_RESET: - (void) isp_target_async(isp, 0, ASYNC_BUS_RESET); + case IN_RESET: + { + /* + * We form the notify structure here because we need + * to mark it as needing a NOTIFY ACK on return. + */ + tmd_notify_t notify; + + MEMZERO(¬ify, sizeof (tmd_notify_t)); + notify.nt_hba = isp; + notify.nt_iid = INI_ANY; + /* nt_tgt set in outer layers */ + notify.nt_lun = LUN_ANY; + notify.nt_tagval = TAG_ANY; + notify.nt_ncode = NT_BUS_RESET; + notify.nt_need_ack = 1; + (void) isp_async(isp, ISPASYNC_TARGET_NOTIFY, ¬ify); break; - case IN_PORT_LOGOUT: /* same as IN24XX_PORT_LOGOUT */ + } + case IN_PORT_LOGOUT: case IN_ABORT_TASK: - case IN_PORT_CHANGED: /* same as IN24XX_PORT_CHANGED */ - case IN_GLOBAL_LOGO: /* same as IN24XX_LINK_FAILED */ - case IN24XX_SRR_RCVD: - case IN24XX_ELS_RCVD: + case IN_PORT_CHANGED: + case IN_GLOBAL_LOGO: (void) isp_async(isp, ISPASYNC_TARGET_ACTION, &local); break; default: @@ -528,12 +549,14 @@ (ct2_entry_t *) outp); } break; + case RQSTYPE_CTIO7: + isp_put_ctio7(isp, (ct7_entry_t *) ap, (ct7_entry_t *) outp); + break; default: isp_prt(isp, ISP_LOGERR, "Unknown type 0x%x in isp_put_entry", etype); return (-1); } - ISP_TDQE(isp, "isp_target_put_entry", (int) optr, ap); ISP_ADD_REQUEST(isp, nxti); return (0); @@ -600,21 +623,42 @@ */ int -isp_endcmd(ispsoftc_t *isp, void *arg, uint32_t code, uint16_t hdl) +isp_endcmd(ispsoftc_t *isp, void *arg, uint32_t code, uint32_t hdl) { int sts; union { ct_entry_t _ctio; ct2_entry_t _ctio2; ct2e_entry_t _ctio2e; + ct7_entry_t _ctio7; } un; MEMZERO(&un, sizeof un); sts = code & 0xff; if (IS_24XX(isp)) { - isp_prt(isp, ISP_LOGERR, "XXX ISP_ENDCMD NOT DONE YET FOR 24XX"); - return (0); + at7_entry_t *aep = arg; + ct7_entry_t *cto = &un._ctio7; + + cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + cto->ct_header.rqs_entry_count = 1; +/* XXXX */ cto->ct_nphdl = aep->at_hdr.seq_id; + cto->ct_rxid = aep->at_rxid; + cto->ct_iid_lo = (aep->at_hdr.s_id[1] << 8) | + aep->at_hdr.s_id[2]; + cto->ct_iid_hi = aep->at_hdr.s_id[0]; + cto->ct_oxid = aep->at_hdr.ox_id; + cto->ct_scsi_status = sts; + cto->ct_flags = CT7_FLAG_MODE1 | CT7_NO_DATA | CT7_SENDSTATUS; + if (sts == SCSI_CHECK && (code & ECMD_SVALID)) { + cto->rsp.m1.ct_resplen = 16; + cto->rsp.m1.ct_resp[0] = 0xf0; + cto->rsp.m1.ct_resp[2] = (code >> 12) & 0xf; + cto->rsp.m1.ct_resp[7] = 8; + cto->rsp.m1.ct_resp[12] = (code >> 24) & 0xff; + cto->rsp.m1.ct_resp[13] = (code >> 16) & 0xff; + } + cto->ct_syshandle = hdl; } else if (IS_FC(isp)) { at2_entry_t *aep = arg; ct2_entry_t *cto = &un._ctio2; @@ -675,6 +719,35 @@ } /* + * Terminate a command + */ +int +isp_terminate_cmd(ispsoftc_t *isp, void *arg) +{ + tmd_cmd_t *tmd = arg; + ct7_entry_t local, *cto = &local;; + + if (!IS_24XX(isp)) { + return (-1); + } + isp_prt(isp, ISP_LOGTDEBUG0, + "isp_terminate_cmd: tag 0x%0x is being terminated", + tmd->cd_tagval); + MEMZERO(&local, sizeof (local)); + cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + cto->ct_header.rqs_entry_count = 1; + cto->ct_nphdl = tmd->cd_nphdl; + cto->ct_rxid = tmd->cd_tagval; + cto->ct_iid_lo = tmd->cd_portid; + cto->ct_iid_hi = tmd->cd_portid >> 16; + cto->ct_oxid = tmd->cd_oxid; + cto->ct_flags = CT7_TERMINATE; + cto->ct_syshandle = 0; + return (isp_target_put_entry(isp, &local)); +} + + +/* * These are either broadcast events or specifically CTIO fast completion */ int @@ -723,7 +796,13 @@ { uint8_t storage[QENTRY_LEN]; memset(storage, 0, QENTRY_LEN); - if (IS_FC(isp)) { + if (IS_24XX(isp)) { + ct7_entry_t *ct = (ct7_entry_t *) storage; + ct->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + ct->ct_nphdl = CT7_OK; + ct->ct_syshandle = bus; + ct->ct_flags = CT7_SENDSTATUS|CT7_FASTPOST; + } else if (IS_FC(isp)) { /* This should also suffice for 2K login code */ ct2_entry_t *ct = (ct2_entry_t *) storage; ct->ct_header.rqs_entry_type = RQSTYPE_CTIO2; @@ -738,7 +817,7 @@ ct->ct_flags = CT_SENDSTATUS; } (void) isp_async(isp, ISPASYNC_TARGET_ACTION, storage); - return (0); + break; } default: isp_prt(isp, ISP_LOGERR, @@ -818,9 +897,9 @@ isp_got_msg_fc(ispsoftc_t *isp, in_fcentry_t *inp) { tmd_notify_t nt; - static const char f1[] = "%s from loop id %d lun %d seq 0x%x"; + static const char f1[] = "%s from N-port handle 0x%x lun %d seq 0x%x"; static const char f2[] = - "unknown %s 0x%x lun %d loop id %d task flags 0x%x seq 0x%x\n"; + "unknown %s 0x%x lun %d N-Port handle 0x%x task flags 0x%x seq 0x%x\n"; uint16_t seqid, loopid; MEMZERO(&nt, sizeof (tmd_notify_t)); @@ -841,6 +920,7 @@ nt.nt_lun = inp->in_lun; } IN_FC_MAKE_TAGID(nt.nt_tagval, 0, seqid); + nt.nt_need_ack = 1; nt.nt_lreserved = inp; if (inp->in_status != IN_MSG_RECEIVED) { @@ -880,6 +960,64 @@ (void) isp_async(isp, ISPASYNC_TARGET_NOTIFY, &nt); } +static void +isp_got_tmf_24xx(ispsoftc_t *isp, at7_entry_t *aep) +{ + tmd_notify_t nt; + static const char f1[] = "%s from PortID 0x%06x lun %d seq 0x%x"; + static const char f2[] = + "unknown Task Flag 0x%x lun %d PortID 0x%x tag 0x%x\n"; + uint32_t sid; + + MEMZERO(&nt, sizeof (tmd_notify_t)); + nt.nt_hba = isp; + nt.nt_iid = INI_ANY; + nt.nt_lun = + (aep->at_cmnd.fcp_cmnd_lun[0] << 8) | + (aep->at_cmnd.fcp_cmnd_lun[1]); + nt.nt_tagval = aep->at_rxid; + nt.nt_lreserved = aep; + sid = + (aep->at_hdr.s_id[0] << 16) | + (aep->at_hdr.s_id[1] << 8) | + (aep->at_hdr.s_id[2]); + + if (aep->at_cmnd.fcp_cmnd_task_management & + FCP_CMND_TMF_ABORT_TASK_SET) { + isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK SET", + sid, nt.nt_lun, nt.nt_tagval); + nt.nt_ncode = NT_ABORT_TASK_SET; + } else if (aep->at_cmnd.fcp_cmnd_task_management & + FCP_CMND_TMF_CLEAR_TASK_SET) { + isp_prt(isp, ISP_LOGINFO, f1, "CLEAR TASK SET", + sid, nt.nt_lun, nt.nt_tagval); + nt.nt_ncode = NT_CLEAR_TASK_SET; + } else if (aep->at_cmnd.fcp_cmnd_task_management & + FCP_CMND_TMF_LUN_RESET) { + isp_prt(isp, ISP_LOGINFO, f1, "LUN RESET", + sid, nt.nt_lun, nt.nt_tagval); + nt.nt_ncode = NT_LUN_RESET; + } else if (aep->at_cmnd.fcp_cmnd_task_management & + FCP_CMND_TMF_TGT_RESET) { + isp_prt(isp, ISP_LOGINFO, f1, "TARGET RESET", + sid, nt.nt_lun, nt.nt_tagval); + nt.nt_ncode = NT_TARGET_RESET; + nt.nt_lun = LUN_ANY; + } else if (aep->at_cmnd.fcp_cmnd_task_management & + FCP_CMND_TMF_CLEAR_ACA) { + isp_prt(isp, ISP_LOGINFO, f1, "CLEAR ACA", + sid, nt.nt_lun, nt.nt_tagval); + nt.nt_ncode = NT_CLEAR_ACA; + } else { + isp_prt(isp, ISP_LOGWARN, f2, + aep->at_cmnd.fcp_cmnd_task_management, + nt.nt_lun, sid, nt.nt_tagval); + isp_endcmd(isp, aep, 0, 0); + return; + } + (void) isp_async(isp, ISPASYNC_TARGET_NOTIFY, &nt); +} + void isp_notify_ack(ispsoftc_t *isp, void *arg) { @@ -895,7 +1033,11 @@ MEMZERO(storage, QENTRY_LEN); - if (IS_24XX(isp) && arg != NULL && (((isphdr_t *)arg)->rqs_entry_type == RQSTYPE_ABTS_RSP)) { + if (IS_24XX(isp) && arg != NULL && (((isphdr_t *)arg)->rqs_entry_type == RQSTYPE_ATIO)) { + at7_entry_t *aep = arg; + isp_endcmd(isp, aep, 0, 0); + return; + } else if (IS_24XX(isp) && arg != NULL && (((isphdr_t *)arg)->rqs_entry_type == RQSTYPE_ABTS_RSP)) { abts_rsp_t *abts_rsp = (abts_rsp_t *) storage; /* * The caller will have set response values as appropriate @@ -1519,8 +1661,9 @@ break; case CT7_RESET: - if (fmsg == NULL) + if (fmsg == NULL) { fmsg = "LIP Reset"; + } /*FALLTHROUGH*/ case CT7_ABORTED: /* @@ -1531,14 +1674,14 @@ if (fmsg == NULL) { fmsg = "ABORT"; } - isp_prt(isp, ISP_LOGTDEBUG0, - "CTIO2 destroyed by %s: RX_ID=0x%x", fmsg, ct->ct_rxid); + "CTIO7 destroyed by %s: RX_ID=0x%x", fmsg, ct->ct_rxid); break; case CT7_TIMEOUT: - if (fmsg == NULL) + if (fmsg == NULL) { fmsg = "command"; + } isp_prt(isp, ISP_LOGERR, "Firmware timed out on %s", fmsg); break; @@ -1546,16 +1689,19 @@ fmsg = "Completed with Error"; /*FALLTHROUGH*/ case CT7_LOGOUT: - if (fmsg == NULL) + if (fmsg == NULL) { fmsg = "Port Logout"; + } /*FALLTHROUGH*/ case CT7_PORTUNAVAIL: - if (fmsg == NULL) + if (fmsg == NULL) { fmsg = "Port not available"; + } /*FALLTHROUGH*/ case CT7_PORTCHANGED: - if (fmsg == NULL) + if (fmsg == NULL) { fmsg = "Port Changed"; + } isp_prt(isp, ISP_LOGWARN, "CTIO returned by f/w- %s", fmsg); break; @@ -1565,7 +1711,7 @@ * Just print a message. */ isp_prt(isp, ISP_LOGWARN, - "CTIO2 completed with Invalid RX_ID 0x%x", ct->ct_rxid); + "CTIO7 completed with Invalid RX_ID 0x%x", ct->ct_rxid); break; case CT7_REASSY_ERR: @@ -1577,7 +1723,7 @@ break; default: - isp_prt(isp, ISP_LOGERR, "Unknown CTIO2 status 0x%x", + isp_prt(isp, ISP_LOGERR, "Unknown CTIO7 status 0x%x", ct->ct_nphdl); break; } @@ -1591,7 +1737,11 @@ * order we got them. */ if (ct->ct_syshandle == 0) { - if ((ct->ct_flags & CT7_SENDSTATUS) == 0) { + if (ct->ct_flags & CT7_TERMINATE) { + isp_prt(isp, ISP_LOGALL, + "termination of 0x%x complete", + ct->ct_rxid); + } else if ((ct->ct_flags & CT7_SENDSTATUS) == 0) { isp_prt(isp, pl, "intermediate CTIO completed ok"); } else { ==== //depot/projects/newisp/dev/isp/isp_target.h#10 (text+ko) ==== @@ -932,10 +932,15 @@ * General routine to send a final CTIO for a command- used mostly for * local responses. */ -int isp_endcmd(ispsoftc_t *, void *, uint32_t, uint16_t); +int isp_endcmd(ispsoftc_t *, void *, uint32_t, uint32_t); #define ECMD_SVALID 0x100 /* + * General routine to terminate an active command + */ +int isp_terminate_cmd(ispsoftc_t *, void *); + +/* * Handle an asynchronous event * * Return nonzero if the interrupt that generated this event has been dismissed. From owner-p4-projects@FreeBSD.ORG Thu Oct 19 06:03: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 6D9FF16A415; Thu, 19 Oct 2006 06:03: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 DB3EF16A403 for ; Thu, 19 Oct 2006 06:03:33 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AB1E43D55 for ; Thu, 19 Oct 2006 06:03:33 +0000 (GMT) (envelope-from mjacob@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 k9J63X8X030970 for ; Thu, 19 Oct 2006 06:03:33 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9J63Xuf030965 for perforce@freebsd.org; Thu, 19 Oct 2006 06:03:33 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 19 Oct 2006 06:03:33 GMT Message-Id: <200610190603.k9J63Xuf030965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 06:03:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=108088 Change 108088 by mjacob@newisp on 2006/10/19 06:02:32 Change mbreg_t to take a logging value and a timeout value. Change MBOX_ACQUIRE to be a predicate that is non-zero if it fails to acquire MBOX regs. Clean up freebsd and linux mailbox routines to run a *much* shorter timeout on commands as a default. This seems to fix the booting on e4500 with PTI SBus card issue- we seem to hang when trying to get or set target parameters while the card is busy with a command. By making the default timeouts much shorter, we fail the mailbox command much quicker and move on (and retry). Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#18 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.c#14 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.h#9 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#10 edit .. //depot/projects/newisp/dev/isp/ispreg.h#6 edit .. //depot/projects/newisp/dev/isp/ispvar.h#8 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#18 (text+ko) ==== @@ -129,7 +129,7 @@ static uint16_t isp_nxt_handle(ispsoftc_t *, uint16_t); static void isp_fw_state(ispsoftc_t *); static void isp_mboxcmd_qnw(ispsoftc_t *, mbreg_t *, int); -static void isp_mboxcmd(ispsoftc_t *, mbreg_t *, int); +static void isp_mboxcmd(ispsoftc_t *, mbreg_t *); static void isp_update(ispsoftc_t *); static void isp_update_bus(ispsoftc_t *, int); @@ -208,7 +208,8 @@ } MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_ABOUT_FIRMWARE; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { isp->isp_romfw_rev[0] = mbs.param[1]; isp->isp_romfw_rev[1] = mbs.param[2]; @@ -705,7 +706,8 @@ */ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_NO_OP; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -720,7 +722,8 @@ mbs.param[5] = 0xa5a5; mbs.param[6] = 0x0000; mbs.param[7] = 0x0000; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -809,7 +812,8 @@ mbs.param[6] = DMA_WD3(isp->isp_rquest_dma); mbs.param[7] = DMA_WD2(isp->isp_rquest_dma); mbs.param[8] = la >> 16; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "F/W Risc Ram Load Failed"); @@ -869,7 +873,8 @@ mbs.param[6] = DMA_WD3(isp->isp_rquest_dma); mbs.param[7] = DMA_WD2(isp->isp_rquest_dma); mbs.param[8] = la >> 16; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "F/W Risc Ram Load Failed"); @@ -885,7 +890,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_VERIFY_CHECKSUM; mbs.param[1] = code_org; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, dcrc); return; @@ -920,7 +926,8 @@ mbs.param[0] = MBOX_WRITE_RAM_WORD; mbs.param[1] = code_org; mbs.param[2] = ptr[0]; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "F/W download failed at word %d", @@ -933,7 +940,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_VERIFY_CHECKSUM; mbs.param[1] = code_org; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, dcrc); return; @@ -973,19 +981,19 @@ mbs.param[1] = code_org; } - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGALL; + mbs.timeout = 2000000; + isp_mboxcmd(isp, &mbs); if (IS_2322(isp) || IS_24XX(isp)) { if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, "EXEC F/W failed: 0x%x", - mbs.param[0]); return; } } /* - * Give it a chance to start + * Give it a chance to finish starting up. */ - USEC_DELAY(500); + USEC_DELAY(1000); if (IS_SCSI(isp)) { /* @@ -994,14 +1002,16 @@ if (isp->isp_clock) { mbs.param[0] = MBOX_SET_CLOCK_RATE; mbs.param[1] = isp->isp_clock; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); /* we will try not to care if this fails */ } } MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_ABOUT_FIRMWARE; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1091,7 +1101,8 @@ if (!IS_24XX(isp)) { MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_GET_FIRMWARE_STATUS; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1216,8 +1227,8 @@ mbs.param[2] = sdp_chan0->isp_retry_delay; mbs.param[6] = sdp_chan1->isp_retry_count; mbs.param[7] = sdp_chan1->isp_retry_delay; - - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1229,7 +1240,8 @@ mbs.param[0] = MBOX_SET_ASYNC_DATA_SETUP_TIME; mbs.param[1] = sdp_chan0->isp_async_data_setup; mbs.param[2] = sdp_chan1->isp_async_data_setup; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1245,9 +1257,8 @@ mbs.param[2] = (sdp_chan1->isp_req_ack_active_neg << 4) | (sdp_chan1->isp_data_line_active_neg << 5); - - MEMZERO(&mbs, sizeof (mbs)); - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "failed to set active negation state (%d,%d), (%d,%d)", @@ -1267,7 +1278,8 @@ mbs.param[0] = MBOX_SET_TAG_AGE_LIMIT; mbs.param[1] = sdp_chan0->isp_tag_aging; mbs.param[2] = sdp_chan1->isp_tag_aging; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "failed to set tag age limit (%d,%d)", sdp_chan0->isp_tag_aging, sdp_chan1->isp_tag_aging); @@ -1281,7 +1293,8 @@ mbs.param[0] = MBOX_SET_SELECT_TIMEOUT; mbs.param[1] = sdp_chan0->isp_selection_timeout; mbs.param[2] = sdp_chan1->isp_selection_timeout; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1304,7 +1317,8 @@ mbs.param[4] = 0; mbs.param[6] = DMA_WD3(isp->isp_result_dma); mbs.param[7] = DMA_WD2(isp->isp_result_dma); - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1318,7 +1332,8 @@ mbs.param[5] = 0; mbs.param[6] = DMA_WD3(isp->isp_result_dma); mbs.param[7] = DMA_WD2(isp->isp_result_dma); - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1330,7 +1345,8 @@ mbs.param[2] = DMA_WD1(isp->isp_result_dma); mbs.param[3] = DMA_WD0(isp->isp_result_dma); mbs.param[4] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1342,7 +1358,8 @@ mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); mbs.param[5] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1372,7 +1389,8 @@ #endif if (mbs.param[1] != 0) { uint16_t sfeat = mbs.param[1]; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGINFO, "Enabled FW features (0x%x)", sfeat); @@ -1401,7 +1419,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_SET_INIT_SCSI_ID; mbs.param[1] = (channel << 7) | sdp->isp_initiator_id; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1457,7 +1476,8 @@ "Initial Settings bus%d tgt%d flags 0x%x off 0x%x per 0x%x", channel, tgt, mbs.param[2], mbs.param[3] >> 8, mbs.param[3] & 0xff); - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { sdf = DPARM_SAFE_DFLT; MEMZERO(&mbs, sizeof (mbs)); @@ -1465,7 +1485,8 @@ mbs.param[1] = (tgt << 8) | (channel << 15); mbs.param[2] = sdf; mbs.param[3] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { continue; } @@ -1489,7 +1510,8 @@ mbs.param[1] = (channel << 15) | (tgt << 8) | lun; mbs.param[2] = sdp->isp_max_queue_depth; mbs.param[3] = sdp->isp_devparam[tgt].exc_throttle; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { break; } @@ -1682,7 +1704,8 @@ mbs.param[1] = 0xb; mbs.param[2] = 0; mbs.param[3] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1739,11 +1762,12 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma); mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); + mbs.logval = MBLOGALL; isp_prt(isp, ISP_LOGDEBUG0, "INIT F/W from %p (%08x%08x)", fcp->isp_scratch, (uint32_t) ((uint64_t)fcp->isp_scdma >> 32), (uint32_t) fcp->isp_scdma); MEMORYBARRIER(isp, SYNC_SFORDEV, 0, sizeof (*icbp)); - isp_mboxcmd(isp, &mbs, MBLOGALL); + isp_mboxcmd(isp, &mbs); FC_SCRATCH_RELEASE(isp); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; @@ -1774,9 +1798,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_SET_FIRMWARE_OPTIONS; mbs.param[1] = 1; - mbs.param[2] = 0; - mbs.param[3] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1822,7 +1845,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_GET_RESOURCE_COUNT; mbs.obits = 0x4cf; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -1995,11 +2019,12 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma); mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); + mbs.logval = MBLOGALL; isp_prt(isp, ISP_LOGDEBUG0, "INIT F/W from %04x%04x%04x%04x", DMA_WD3(fcp->isp_scdma), DMA_WD2(fcp->isp_scdma), DMA_WD1(fcp->isp_scdma), DMA_WD0(fcp->isp_scdma)); MEMORYBARRIER(isp, SYNC_SFORDEV, 0, sizeof (*icbp)); - isp_mboxcmd(isp, &mbs, MBLOGALL); + isp_mboxcmd(isp, &mbs); FC_SCRATCH_RELEASE(isp); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; @@ -2133,8 +2158,9 @@ mbs.param[3] = DMA_WD0(FCPARAM(isp)->isp_scdma); mbs.param[6] = DMA_WD3(FCPARAM(isp)->isp_scdma); mbs.param[7] = DMA_WD2(FCPARAM(isp)->isp_scdma); + mbs.logval = MBLOGALL; MEMORYBARRIER(isp, SYNC_SFORDEV, 0, QENTRY_LEN); - isp_mboxcmd(isp, &mbs, MBLOGALL); + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { *log_ret = mbs.param[0]; } @@ -2241,7 +2267,8 @@ mbs.param[2] = portid >> 16; mbs.param[3] = portid; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); switch (mbs.param[0]) { case MBOX_PORT_ID_USED: @@ -2292,7 +2319,8 @@ } else { mbs.param[1] = handle << 8; } - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); } static int @@ -2320,11 +2348,12 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma); mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); + mbs.logval = MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR; if (dolock) { FC_SCRATCH_ACQUIRE(isp); } MEMORYBARRIER(isp, SYNC_SFORDEV, 0, sizeof (un)); - isp_mboxcmd(isp, &mbs, MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR); + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { if (dolock) { FC_SCRATCH_RELEASE(isp); @@ -2372,7 +2401,8 @@ mbs.param[1] |= 1; } } - isp_mboxcmd(isp, &mbs, MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR); + mbs.logval = MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { wwn = (((uint64_t)(mbs.param[2] & 0xff)) << 56) | @@ -2491,7 +2521,8 @@ */ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_GET_LOOP_ID; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return (-1); } @@ -2576,7 +2607,8 @@ mbs.param[0] = MBOX_GET_SET_DATA_RATE; mbs.param[1] = MBGSD_GET_RATE; /* mbs.param[2] undefined if we're just getting rate */ - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { if (mbs.param[1] == MBGSD_FOURGB) { isp_prt(isp, ISP_LOGINFO, "4Gb link speed/s"); @@ -3090,7 +3122,8 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma); mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { if (mbs.param[0] == MBOX_INVALID_COMMAND) { return (1); @@ -3171,8 +3204,9 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF); mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF); mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF); + mbs.logval = MBLOGALL; MEMORYBARRIER(isp, SYNC_SFORDEV, XTXOFF, 2 * QENTRY_LEN); - isp_mboxcmd(isp, &mbs, MBLOGALL); + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return (-1); } @@ -3735,8 +3769,9 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma); mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); + mbs.logval = MBLOGALL; MEMORYBARRIER(isp, SYNC_SFORDEV, 0, SNS_RFT_ID_REQ_SIZE); - isp_mboxcmd(isp, &mbs, MBLOGALL); + isp_mboxcmd(isp, &mbs); FC_SCRATCH_RELEASE(isp); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { return (0); @@ -3811,8 +3846,9 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF); mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF); mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF); + mbs.logval = MBLOGALL; MEMORYBARRIER(isp, SYNC_SFORDEV, XTXOFF, 2 * QENTRY_LEN); - isp_mboxcmd(isp, &mbs, MBLOGALL); + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { FC_SCRATCH_RELEASE(isp); return (-1); @@ -3956,6 +3992,7 @@ target = fcp->portdb[i - 1].handle; } +#if 0 /* * Next check to see if any HBA or Device parameters need to be updated. */ @@ -3963,6 +4000,8 @@ isp_update(isp); } +#endif + start_again: if (isp_getrqentry(isp, &nxti, &optr, (void *)&qep)) { @@ -4189,7 +4228,8 @@ bus = 0; } isp->isp_sendmarker |= (1 << bus); - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { break; } @@ -4212,7 +4252,8 @@ } } mbs.param[2] = 3; /* 'delay', in seconds */ - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { break; } @@ -4248,7 +4289,8 @@ (bus << 15) | (XS_TGT(xs) << 8) | XS_LUN(xs); } mbs.param[2] = handle; - isp_mboxcmd(isp, &mbs, MBLOGALL & ~MBOX_COMMAND_ERROR); + mbs.logval = MBLOGALL & ~MBOX_COMMAND_ERROR; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { return (0); } @@ -4302,7 +4344,8 @@ if (FCPARAM(isp)->isp_2klogin) { mbs.ibits = (1 << 10); } - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { return (0); } @@ -4319,7 +4362,7 @@ case ISPCTL_RUN_MBOXCMD: - isp_mboxcmd(isp, arg, MBLOGALL); + isp_mboxcmd(isp, arg); return(0); #ifdef ISP_TARGET_MODE @@ -4335,7 +4378,8 @@ mbs.param[0] = MBOX_ENABLE_TARGET_MODE; mbs.param[1] = param & 0xffff; mbs.param[2] = param >> 16; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { break; } @@ -4396,8 +4440,7 @@ MBOX_NOTIFY_COMPLETE(isp); } else { isp_prt(isp, ISP_LOGWARN, - "Mbox Command Async (0x%x) with no waiters", - mbox); + "mailbox cmd (0x%x) with no waiters", mbox); } } else if (isp_parse_async(isp, mbox) < 0) { return; @@ -5687,6 +5730,7 @@ if (FCPARAM(isp)->isp_2klogin) { mbs.ibits = (1 << 10); } + mbs.logval = MBLOGALL; isp_mboxcmd_qnw(isp, &mbs, 1); } @@ -5844,6 +5888,7 @@ if (FCPARAM(isp)->isp_2klogin) { mbs.ibits = (1 << 10); } + mbs.logval = MBLOGALL; isp_mboxcmd_qnw(isp, &mbs, 1); } @@ -5999,6 +6044,7 @@ isp->isp_mbxworkp = ptr; isp->isp_mbxwrk0--; mbs.param[0] = isp->isp_lastmbxcmd; + mbs.logval = MBLOGALL; isp_mboxcmd_qnw(isp, &mbs, 0); return (0); } @@ -6103,7 +6149,6 @@ ISPOPMAP(0x01, 0x01) /* 0x5d: GET NOST DATA */ }; -#ifndef ISP_STRIPPED static char *scsi_mbcmd_names[] = { "NO-OP", "LOAD RAM", @@ -6200,7 +6245,6 @@ "SET HOST DATA", "GET NOST DATA", }; -#endif static const uint32_t mbpfc[] = { ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */ @@ -6340,7 +6384,6 @@ * is that we won't overflow. */ -#ifndef ISP_STRIPPED static char *fc_mbcmd_names[] = { "NO-OP", "LOAD RAM", @@ -6470,7 +6513,6 @@ "SEND LFA", "Lun RESET" }; -#endif static void isp_mboxcmd_qnw(ispsoftc_t *isp, mbreg_t *mbp, int nodelay) @@ -6517,7 +6559,7 @@ } static void -isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp, int logmask) +isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp) { char *cname, *xname, tname[16], mname[16]; unsigned int lim, ibits, obits, box, opcode; @@ -6555,7 +6597,10 @@ /* * Get exclusive usage of mailbox registers. */ - MBOX_ACQUIRE(isp); + if (MBOX_ACQUIRE(isp)) { + mbp->param[0] = MBOX_REGS_BUSY; + goto out; + } for (box = 0; box < MAX_MAILBOX(isp); box++) { if (ibits & (1 << box)) { @@ -6586,15 +6631,14 @@ /* * While we haven't finished the command, spin our wheels here. */ - MBOX_WAIT_COMPLETE(isp); + MBOX_WAIT_COMPLETE(isp, mbp); /* * Did the command time out? */ - if (isp->isp_mboxbsy) { - isp->isp_mboxbsy = 0; + if (mbp->param[0] == MBOX_TIMEOUT) { MBOX_RELEASE(isp); - return; + goto out; } /* @@ -6609,15 +6653,12 @@ } MBOX_RELEASE(isp); - - if (logmask == 0 || opcode == MBOX_EXEC_FIRMWARE) { + out: + isp->isp_mboxbsy = 0; + if (mbp->logval == 0 || opcode == MBOX_EXEC_FIRMWARE) { return; } -#ifdef ISP_STRIPPED - cname = NULL; -#else cname = (IS_FC(isp))? fc_mbcmd_names[opcode] : scsi_mbcmd_names[opcode]; -#endif if (cname == NULL) { cname = tname; SNPRINTF(tname, sizeof tname, "opcode %x", opcode); @@ -6631,46 +6672,49 @@ case MBOX_COMMAND_COMPLETE: break; case MBOX_INVALID_COMMAND: - if (logmask & MBLOGMASK(MBOX_COMMAND_COMPLETE)) { + if (mbp->logval & MBLOGMASK(MBOX_COMMAND_COMPLETE)) { xname = "INVALID COMMAND"; } break; case MBOX_HOST_INTERFACE_ERROR: - if (logmask & MBLOGMASK(MBOX_HOST_INTERFACE_ERROR)) { + if (mbp->logval & MBLOGMASK(MBOX_HOST_INTERFACE_ERROR)) { xname = "HOST INTERFACE ERROR"; } break; case MBOX_TEST_FAILED: - if (logmask & MBLOGMASK(MBOX_TEST_FAILED)) { + if (mbp->logval & MBLOGMASK(MBOX_TEST_FAILED)) { xname = "TEST FAILED"; } break; case MBOX_COMMAND_ERROR: - if (logmask & MBLOGMASK(MBOX_COMMAND_ERROR)) { + if (mbp->logval & MBLOGMASK(MBOX_COMMAND_ERROR)) { xname = "COMMAND ERROR"; } break; case MBOX_COMMAND_PARAM_ERROR: - if (logmask & MBLOGMASK(MBOX_COMMAND_PARAM_ERROR)) { + if (mbp->logval & MBLOGMASK(MBOX_COMMAND_PARAM_ERROR)) { xname = "COMMAND PARAMETER ERROR"; } break; case MBOX_LOOP_ID_USED: - if (logmask & MBLOGMASK(MBOX_LOOP_ID_USED)) { + if (mbp->logval & MBLOGMASK(MBOX_LOOP_ID_USED)) { xname = "LOOP ID ALREADY IN USE"; } break; case MBOX_PORT_ID_USED: - if (logmask & MBLOGMASK(MBOX_PORT_ID_USED)) { + if (mbp->logval & MBLOGMASK(MBOX_PORT_ID_USED)) { xname = "PORT ID ALREADY IN USE"; } break; case MBOX_ALL_IDS_USED: - if (logmask & MBLOGMASK(MBOX_ALL_IDS_USED)) { + if (mbp->logval & MBLOGMASK(MBOX_ALL_IDS_USED)) { xname = "ALL LOOP IDS IN USE"; } break; - case 0: /* special case */ + case MBOX_REGS_BUSY: + xname = "REGISTERS BUSY"; + break; + case MBOX_TIMEOUT: xname = "TIMEOUT"; break; default: @@ -6693,7 +6737,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_GET_FW_STATE; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { fcp->isp_fwstate = mbs.param[1]; } @@ -6806,7 +6851,8 @@ continue; } mbs.param[1] = (bus << 15) | (tgt << 8); - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (get == 0) { isp->isp_sendmarker |= (1 << bus); continue; @@ -6993,7 +7039,8 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_GET_ACT_NEG_STATE; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { sdp->isp_req_ack_active_neg = 1; sdp->isp_data_line_active_neg = 1; ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#14 (text+ko) ==== ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#9 (text+ko) ==== @@ -151,15 +151,16 @@ struct intr_config_hook ehook; uint16_t loop_down_time; uint16_t loop_down_limit; - uint32_t - : 16, + uint32_t : 5, + simqfrozen : 3, hysteresis : 8, + : 2, disabled : 1, fcbsy : 1, - : 1, + mboxcmd_done : 1, + mboxbsy : 1, mboxwaiting : 1, - intsok : 1, - simqfrozen : 3; + intsok : 1; #if __FreeBSD_version >= 500000 struct firmware * fw; struct mtx lock; @@ -251,15 +252,15 @@ break; \ } -#define MBOX_ACQUIRE(isp) +#define MBOX_ACQUIRE isp_mbox_acquire #define MBOX_WAIT_COMPLETE isp_mbox_wait_complete #define MBOX_NOTIFY_COMPLETE(isp) \ if (isp->isp_osinfo.mboxwaiting) { \ isp->isp_osinfo.mboxwaiting = 0; \ wakeup(&isp->isp_mbxworkp); \ } \ - isp->isp_mboxbsy = 0 -#define MBOX_RELEASE(isp) + isp->isp_osinfo.mboxcmd_done = 1 +#define MBOX_RELEASE isp_mbox_release #define FC_SCRATCH_ACQUIRE(isp) \ if (isp->isp_osinfo.fcbsy) { \ @@ -470,12 +471,36 @@ * Platform specific inline functions */ -static __inline void isp_mbox_wait_complete(ispsoftc_t *); +static __inline int isp_mbox_acquire(ispsoftc_t *); +static __inline void isp_mbox_wait_complete(ispsoftc_t *, mbreg_t *); +static __inline void isp_mbox_release(ispsoftc_t *); + +static __inline int +isp_mbox_acquire(ispsoftc_t *isp) +{ + if (isp->isp_osinfo.mboxbsy) { + return (1); + } else { + isp->isp_osinfo.mboxbsy = 1; + return (0); + } +} + static __inline void -isp_mbox_wait_complete(ispsoftc_t *isp) +isp_mbox_wait_complete(ispsoftc_t *isp, mbreg_t *mbp) { + int lim = mbp->timeout; + + if (lim == 0) { + lim = MBCMD_DEFAULT_TIMEOUT; + } + if (isp->isp_mbxwrk0) { + lim *= isp->isp_mbxwrk0; + } + + isp->isp_osinfo.mboxcmd_done = 0; if (isp->isp_osinfo.intsok) { - int lim = ((isp->isp_mbxwrk0)? 120 : 20) * hz; + lim = (lim * 1000000) / hz; isp->isp_osinfo.mboxwaiting = 1; #ifdef ISP_SMPLOCK (void) msleep(&isp->isp_mbxworkp, @@ -484,20 +509,20 @@ (void) tsleep(&isp->isp_mbxworkp, PRIBIO, "isp_mboxwaiting", lim); #endif - if (isp->isp_mboxbsy != 0) { + isp->isp_osinfo.mboxwaiting = 0; + if (isp->isp_osinfo.mboxcmd_done == 0) { isp_prt(isp, ISP_LOGWARN, "Interrupting Mailbox Command (0x%x) Timeout", isp->isp_lastmbxcmd); - isp->isp_mboxbsy = 0; + mbp->param[0] = MBOX_TIMEOUT; } - isp->isp_osinfo.mboxwaiting = 0; } else { - int lim = ((isp->isp_mbxwrk0)? 240 : 60) * 10000; int j; - for (j = 0; j < lim; j++) { + + for (j = 0; j < lim; j += 100) { uint32_t isr; uint16_t sema, mbox; - if (isp->isp_mboxbsy == 0) { + if (isp->isp_osinfo.mboxcmd_done) { break; } if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { @@ -506,16 +531,24 @@ break; } } - USEC_DELAY(500); + USEC_DELAY(100); } - if (isp->isp_mboxbsy != 0) { + if (isp->isp_osinfo.mboxcmd_done == 0) { isp_prt(isp, ISP_LOGWARN, "Polled Mailbox Command (0x%x) Timeout", isp->isp_lastmbxcmd); + isp->isp_mboxbsy = 0; + mbp->param[0] = MBOX_TIMEOUT; } } } +static __inline void +isp_mbox_release(ispsoftc_t *isp) +{ + isp->isp_osinfo.mboxbsy = 0; +} + static __inline uint64_t nanotime_sub(struct timespec *, struct timespec *); static __inline uint64_t nanotime_sub(struct timespec *b, struct timespec *a) ==== //depot/projects/newisp/dev/isp/ispmbox.h#10 (text+ko) ==== @@ -176,6 +176,10 @@ #define MBOX_LOOP_ID_USED 0x4008 #define MBOX_ALL_IDS_USED 0x4009 #define MBOX_NOT_LOGGED_IN 0x400A +/* pseudo mailbox completion codes */ +#define MBOX_REGS_BUSY 0x6000 /* registers in use */ +#define MBOX_TIMEOUT 0x6001 /* command timed out */ + #define MBLOGALL 0x000f #define MBLOGNONE 0x0000 #define MBLOGMASK(x) ((x) & 0xf) ==== //depot/projects/newisp/dev/isp/ispreg.h#6 (text+ko) ==== @@ -461,9 +461,15 @@ #define MAX_MAILBOX(isp) ((IS_FC(isp))? 12 : 8) #define MAILBOX_STORAGE 12 +/* if timeout == 0, then default timeout is picked */ +#define MBCMD_DEFAULT_TIMEOUT 100000 /* 100 ms */ typedef struct { uint16_t param[MAILBOX_STORAGE]; - uint16_t ibits, obits; + uint16_t ibits; + uint16_t obits; + uint32_t + timeout : 28, + logval : 4; } mbreg_t; /* ==== //depot/projects/newisp/dev/isp/ispvar.h#8 (text+ko) ==== @@ -888,7 +888,7 @@ * of the same object is consistent. * * MBOX_ACQUIRE(ispsoftc_t *) acquire lock on mailbox regs - * MBOX_WAIT_COMPLETE(ispsoftc_t *) wait for mailbox cmd to be done + * MBOX_WAIT_COMPLETE(ispsoftc_t *, mbreg_t *) wait for cmd to be done * MBOX_NOTIFY_COMPLETE(ispsoftc_t *) notification of mbox cmd donee * MBOX_RELEASE(ispsoftc_t *) release lock on mailbox regs * From owner-p4-projects@FreeBSD.ORG Thu Oct 19 16:16: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 45A5F16A4A0; Thu, 19 Oct 2006 16:16: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 0610816A415 for ; Thu, 19 Oct 2006 16:16:35 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5055743D62 for ; Thu, 19 Oct 2006 16:16:32 +0000 (GMT) (envelope-from mjacob@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 k9JGGVDp055876 for ; Thu, 19 Oct 2006 16:16:31 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9JGGVPf055873 for perforce@freebsd.org; Thu, 19 Oct 2006 16:16:31 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 19 Oct 2006 16:16:31 GMT Message-Id: <200610191616.k9JGGVPf055873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 16:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=108100 Change 108100 by mjacob@newisp on 2006/10/19 16:15:44 So, make sure we actually *do* retry the isp_update operation if the mailbox command fails. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#19 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#19 (text+ko) ==== @@ -3992,7 +3992,6 @@ target = fcp->portdb[i - 1].handle; } -#if 0 /* * Next check to see if any HBA or Device parameters need to be updated. */ @@ -4000,8 +3999,6 @@ isp_update(isp); } -#endif - start_again: if (isp_getrqentry(isp, &nxti, &optr, (void *)&qep)) { @@ -6800,17 +6797,16 @@ */ if (sdp->isp_devparam[tgt].dev_refresh) { mbs.param[0] = MBOX_GET_TARGET_PARAMS; - sdp->isp_devparam[tgt].dev_refresh = 0; get = 1; } else if (sdp->isp_devparam[tgt].dev_update) { mbs.param[0] = MBOX_SET_TARGET_PARAMS; + /* * Make sure goal_flags has "Renegotiate on Error" * on and "Freeze Queue on Error" off. */ sdp->isp_devparam[tgt].goal_flags |= DPARM_RENEG; sdp->isp_devparam[tgt].goal_flags &= ~DPARM_QFRZ; - mbs.param[2] = sdp->isp_devparam[tgt].goal_flags; /* @@ -6844,8 +6840,6 @@ "bus %d set tgt %d flags 0x%x off 0x%x period 0x%x", bus, tgt, mbs.param[2], mbs.param[3] >> 8, mbs.param[3] & 0xff); - sdp->isp_devparam[tgt].dev_update = 0; - sdp->isp_devparam[tgt].dev_refresh = 1; get = 0; } else { continue; @@ -6853,18 +6847,24 @@ mbs.param[1] = (bus << 15) | (tgt << 8); mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + continue; + } if (get == 0) { isp->isp_sendmarker |= (1 << bus); - continue; + sdp->isp_devparam[tgt].dev_update = 0; + sdp->isp_devparam[tgt].dev_refresh = 1; + } else { + sdp->isp_devparam[tgt].dev_refresh = 0; + flags = mbs.param[2]; + period = mbs.param[3] & 0xff; + offset = mbs.param[3] >> 8; + sdp->isp_devparam[tgt].actv_flags = flags; + sdp->isp_devparam[tgt].actv_period = period; + sdp->isp_devparam[tgt].actv_offset = offset; + get = (bus << 16) | tgt; + (void) isp_async(isp, ISPASYNC_NEW_TGT_PARAMS, &get); } - flags = mbs.param[2]; - period = mbs.param[3] & 0xff; - offset = mbs.param[3] >> 8; - sdp->isp_devparam[tgt].actv_flags = flags; - sdp->isp_devparam[tgt].actv_period = period; - sdp->isp_devparam[tgt].actv_offset = offset; - get = (bus << 16) | tgt; - (void) isp_async(isp, ISPASYNC_NEW_TGT_PARAMS, &get); } for (tgt = 0; tgt < MAX_TARGETS; tgt++) { From owner-p4-projects@FreeBSD.ORG Thu Oct 19 22:13: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 6BBE716A587; Thu, 19 Oct 2006 22:13: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 2EE5B16A585 for ; Thu, 19 Oct 2006 22:13:15 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6434943D45 for ; Thu, 19 Oct 2006 22:13:14 +0000 (GMT) (envelope-from cognet@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 k9JMDEpN051122 for ; Thu, 19 Oct 2006 22:13:14 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9JMDETE051118 for perforce@freebsd.org; Thu, 19 Oct 2006 22:13:14 GMT (envelope-from cognet@freebsd.org) Date: Thu, 19 Oct 2006 22:13:14 GMT Message-Id: <200610192213.k9JMDETE051118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 108117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 22:13:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=108117 Change 108117 by cognet@cognet on 2006/10/19 22:13:02 Hopefully get the endianness write with pci space operations this time. Write the AHB=>PCI addresses the right way. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#9 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#9 (text+ko) ==== @@ -93,11 +93,20 @@ return (0); } +void +ixp425_pci_conf_reg_write(struct ixppcib_softc *sc, uint32_t reg, + uint32_t data) +{ + PCI_CSR_WRITE_4(sc, + PCI_CRP_AD_CBE, ((reg & ~3) | COMMAND_CRP_WRITE)); + PCI_CSR_WRITE_4(sc, + PCI_CRP_AD_WDATA, data); + printf("DID IT %x %x\n", reg, data); +} static int ixppcib_attach(device_t dev) { int rid; - uint32_t reg; struct ixppcib_softc *sc; sc = device_get_softc(dev); @@ -145,20 +154,20 @@ panic("ixppcib_probe: failed to set up memory rman"); } - device_add_child(dev, "pci", -1); /* * PCI->AHB address translation * begin at the physical memory start + OFFSET */ #define AHB_OFFSET 0x10000000UL - reg = (AHB_OFFSET + 0x00000000) >> 0; - reg |= (AHB_OFFSET + 0x01000000) >> 8; - reg |= (AHB_OFFSET + 0x02000000) >> 16; - reg |= (AHB_OFFSET + 0x03000000) >> 24; - PCI_CSR_WRITE_4(sc, PCI_AHBMEMBASE, reg); + PCI_CSR_WRITE_4(sc, PCI_AHBMEMBASE, + (AHB_OFFSET & 0xFF000000) + + ((AHB_OFFSET & 0xFF000000) >> 8) + + ((AHB_OFFSET & 0xFF000000) >> 16) + + ((AHB_OFFSET & 0xFF000000) >> 24) + + 0x00010203); #define IXPPCIB_WRITE_CONF(sc, reg, val) \ - ixppcib_write_config(dev, 0, 0, 0, (reg), (val), 4) + ixp425_pci_conf_reg_write(sc, reg, val) /* Write Mapping registers PCI Configuration Registers */ /* Base Address 0 - 3 */ IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR0, AHB_OFFSET + 0x00000000); @@ -194,6 +203,7 @@ */ DELAY(50000); + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); } ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#5 (text+ko) ==== @@ -163,22 +163,22 @@ #ifdef __ARMEB__ /* read (single) */ - .bs_r_1 = _pci_mem_bs_r_1, - .bs_r_2 = _pci_mem_bs_r_2, - .bs_r_4 = _pci_mem_bs_r_4, + .bs_r_1_s = _pci_mem_bs_r_1, + .bs_r_2_s = _pci_mem_bs_r_2, + .bs_r_4_s = _pci_mem_bs_r_4, - .bs_r_1_s = ixp425_pci_mem_bs_r_1, - .bs_r_2_s = ixp425_pci_mem_bs_r_2, - .bs_r_4_s = ixp425_pci_mem_bs_r_4, + .bs_r_1 = ixp425_pci_mem_bs_r_1, + .bs_r_2 = ixp425_pci_mem_bs_r_2, + .bs_r_4 = ixp425_pci_mem_bs_r_4, /* write (single) */ - .bs_w_1 = _pci_mem_bs_w_1, - .bs_w_2 = _pci_mem_bs_w_2, - .bs_w_4 = _pci_mem_bs_w_4, + .bs_w_1_s = _pci_mem_bs_w_1, + .bs_w_2_s = _pci_mem_bs_w_2, + .bs_w_4_s = _pci_mem_bs_w_4, - .bs_w_1_s = ixp425_pci_mem_bs_w_1, - .bs_w_2_s = ixp425_pci_mem_bs_w_2, - .bs_w_4_s = ixp425_pci_mem_bs_w_4, + .bs_w_1 = ixp425_pci_mem_bs_w_1, + .bs_w_2 = ixp425_pci_mem_bs_w_2, + .bs_w_4 = ixp425_pci_mem_bs_w_4, #else /* read (single) */ .bs_r_1 = ixp425_pci_mem_bs_r_1, @@ -460,7 +460,7 @@ static u_int16_t _pci_mem_bs_r_2(void *v, bus_space_handle_t ioh, bus_size_t off) { - return ixp425_pci_mem_bs_r_2(v, ioh, off); + return (ixp425_pci_mem_bs_r_2(v, ioh, off)); } static u_int32_t @@ -469,7 +469,7 @@ u_int32_t data; data = ixp425_pci_mem_bs_r_4(v, ioh, off); - return (data); + return (htole32(data)); } static void @@ -490,7 +490,7 @@ _pci_mem_bs_w_4(void *v, bus_space_handle_t ioh, bus_size_t off, u_int32_t val) { - ixp425_pci_mem_bs_w_4(v, ioh, off, val); + ixp425_pci_mem_bs_w_4(v, ioh, off, htole32(val)); } #endif /* __ARMEB__ */ From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23:01: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 2060016A416; Thu, 19 Oct 2006 23:01: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 EE26816A412 for ; Thu, 19 Oct 2006 23:01:20 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 987EE43D53 for ; Thu, 19 Oct 2006 23:01:20 +0000 (GMT) (envelope-from mjacob@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 k9JN1KU8058016 for ; Thu, 19 Oct 2006 23:01:20 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9JN1K7u058004 for perforce@freebsd.org; Thu, 19 Oct 2006 23:01:20 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 19 Oct 2006 23:01:20 GMT Message-Id: <200610192301.k9JN1K7u058004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:01:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=108127 Change 108127 by mjacob@newisp on 2006/10/19 23:01:10 Add the 24XX ABORT I/O data definition and the associated library function but punt on putting it into use as yet. Instead, just make sure we complain about not being able to things like ABORT I/O or RESET DEV instead of mistakenly trying them on a 24XX. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#20 edit .. //depot/projects/newisp/dev/isp/isp_library.c#12 edit .. //depot/projects/newisp/dev/isp/isp_library.h#9 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#11 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#20 (text+ko) ==== @@ -4210,8 +4210,13 @@ /* * Issue a bus reset. */ - mbs.param[0] = MBOX_BUS_RESET; - if (IS_SCSI(isp)) { + if (IS_24XX(isp)) { + isp_prt(isp, ISP_LOGWARN, "RESET BUS NOT IMPLETENTED"); + break; + } else if (IS_FC(isp)) { + mbs.param[1] = 10; + bus = 0; + } else { mbs.param[1] = SDPARAM(isp)->isp_bus_reset_delay; if (mbs.param[1] < 2) { mbs.param[1] = 2; @@ -4220,10 +4225,8 @@ if (IS_DUALBUS(isp)) { mbs.param[2] = bus; } - } else { - mbs.param[1] = 10; - bus = 0; } + mbs.param[0] = MBOX_BUS_RESET; isp->isp_sendmarker |= (1 << bus); mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); @@ -4236,18 +4239,22 @@ case ISPCTL_RESET_DEV: tgt = (*((int *) arg)) & 0xffff; - bus = (*((int *) arg)) >> 16; - mbs.param[0] = MBOX_ABORT_TARGET; - if (IS_SCSI(isp)) { - mbs.param[1] = (tgt << 8) | (bus << 15); - } else { + if (IS_24XX(isp)) { + isp_prt(isp, ISP_LOGWARN, "RESET DEV NOT IMPLETENTED"); + break; + } else if (IS_FC(isp)) { if (FCPARAM(isp)->isp_2klogin) { mbs.param[1] = tgt; mbs.ibits = (1 << 10); } else { mbs.param[1] = (tgt << 8); } + bus = 0; + } else { + bus = (*((int *) arg)) >> 16; + mbs.param[1] = (bus << 15) | (tgt << 8); } + mbs.param[0] = MBOX_ABORT_TARGET; mbs.param[2] = 3; /* 'delay', in seconds */ mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); @@ -4262,15 +4269,17 @@ case ISPCTL_ABORT_CMD: xs = (XS_T *) arg; tgt = XS_TGT(xs); + handle = isp_find_handle(isp, xs); if (handle == 0) { isp_prt(isp, ISP_LOGWARN, "cannot find handle for command to abort"); break; } - bus = XS_CHANNEL(xs); - mbs.param[0] = MBOX_ABORT; - if (IS_FC(isp)) { + if (IS_24XX(isp)) { + isp_prt(isp, ISP_LOGWARN, "ABORT CMD NOT IMPLETENTED"); + break; + } else if (IS_FC(isp)) { if (FCPARAM(isp)->isp_sccfw) { if (FCPARAM(isp)->isp_2klogin) { mbs.param[1] = tgt; @@ -4282,20 +4291,17 @@ mbs.param[1] = tgt << 8 | XS_LUN(xs); } } else { - mbs.param[1] = - (bus << 15) | (XS_TGT(xs) << 8) | XS_LUN(xs); + bus = XS_CHANNEL(xs); + mbs.param[1] = (bus << 15) | (tgt << 8) | XS_LUN(xs); } + mbs.param[0] = MBOX_ABORT; mbs.param[2] = handle; mbs.logval = MBLOGALL & ~MBOX_COMMAND_ERROR; isp_mboxcmd(isp, &mbs); - if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { - return (0); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + break; } - /* - * XXX: Look for command in the REQUEST QUEUE. That is, - * XXX: It hasen't been picked up by firmware yet. - */ - break; + return (0); case ISPCTL_UPDATE_PARAMS: @@ -4336,7 +4342,7 @@ case ISPCTL_SEND_LIP: - if (IS_FC(isp)) { + if (IS_FC(isp) && !IS_24XX(isp)) { mbs.param[0] = MBOX_INIT_LIP; if (FCPARAM(isp)->isp_2klogin) { mbs.ibits = (1 << 10); ==== //depot/projects/newisp/dev/isp/isp_library.c#12 (text) ==== @@ -266,6 +266,7 @@ #define ISP_IS_SBUS(isp) \ (ISP_SBUS_SUPPORTED && (isp)->isp_bustype == ISP_BT_SBUS) +#define ASIZE(x) (sizeof (x) / sizeof (x[0])) /* * Swizzle/Copy Functions */ @@ -346,7 +347,7 @@ ISP_IOXPUT_16(isp, rqsrc->req_flags, &rqdst->req_flags); ISP_IOXPUT_16(isp, rqsrc->req_time, &rqdst->req_time); ISP_IOXPUT_16(isp, rqsrc->req_seg_count, &rqdst->req_seg_count); - for (i = 0; i < 12; i++) { + for (i = 0; i < ASIZE(rqsrc->req_cdb); i++) { ISP_IOXPUT_8(isp, rqsrc->req_cdb[i], &rqdst->req_cdb[i]); } for (i = 0; i < ISP_RQDSEG; i++) { @@ -373,7 +374,7 @@ ISP_IOXPUT_16(isp, src->mrk_modifier, &dst->mrk_modifier); ISP_IOXPUT_16(isp, src->mrk_flags, &dst->mrk_flags); ISP_IOXPUT_16(isp, src->mrk_lun, &dst->mrk_lun); - for (i = 0; i < 48; i++) { + for (i = 0; i < ASIZE(src->mrk_reserved1); i++) { ISP_IOXPUT_8(isp, src->mrk_reserved1[i], &dst->mrk_reserved1[i]); } @@ -392,10 +393,10 @@ ISP_IOXPUT_8(isp, src->mrk_reserved1, &dst->mrk_reserved1); ISP_IOXPUT_8(isp, src->mrk_vphdl, &dst->mrk_vphdl); ISP_IOXPUT_8(isp, src->mrk_reserved2, &dst->mrk_reserved2); - for (i = 0; i < 8; i++) { + for (i = 0; i < ASIZE(src->mrk_lun); i++) { ISP_IOXPUT_8(isp, src->mrk_lun[i], &dst->mrk_lun[i]); } - for (i = 0; i < 40; i++) { + for (i = 0; i < ASIZE(src->mrk_reserved3); i++) { ISP_IOXPUT_8(isp, src->mrk_reserved3[i], &dst->mrk_reserved3[i]); } @@ -414,7 +415,7 @@ ISP_IOXPUT_16(isp, src->req_reserved, &dst->req_reserved); ISP_IOXPUT_16(isp, src->req_time, &dst->req_time); ISP_IOXPUT_16(isp, src->req_seg_count, &dst->req_seg_count); - for (i = 0; i < 16; i++) { + for (i = 0; i < ASIZE(src->req_cdb); i++) { ISP_IOXPUT_8(isp, src->req_cdb[i], &dst->req_cdb[i]); } ISP_IOXPUT_32(isp, src->req_totalcnt, &dst->req_totalcnt); @@ -438,7 +439,7 @@ ISP_IOXPUT_16(isp, src->req_reserved, &dst->req_reserved); ISP_IOXPUT_16(isp, src->req_time, &dst->req_time); ISP_IOXPUT_16(isp, src->req_seg_count, &dst->req_seg_count); - for (i = 0; i < 16; i++) { + for (i = 0; i < ASIZE(src->req_cdb); i++) { ISP_IOXPUT_8(isp, src->req_cdb[i], &dst->req_cdb[i]); } ISP_IOXPUT_32(isp, src->req_totalcnt, &dst->req_totalcnt); @@ -463,7 +464,7 @@ ISP_IOXPUT_16(isp, src->req_reserved, &dst->req_reserved); ISP_IOXPUT_16(isp, src->req_time, &dst->req_time); ISP_IOXPUT_16(isp, src->req_seg_count, &dst->req_seg_count); - for (i = 0; i < 16; i++) { + for (i = 0; i < ASIZE(src->req_cdb); i++) { ISP_IOXPUT_8(isp, src->req_cdb[i], &dst->req_cdb[i]); } ISP_IOXPUT_32(isp, src->req_totalcnt, &dst->req_totalcnt); @@ -489,7 +490,7 @@ ISP_IOXPUT_16(isp, src->req_reserved, &dst->req_reserved); ISP_IOXPUT_16(isp, src->req_time, &dst->req_time); ISP_IOXPUT_16(isp, src->req_seg_count, &dst->req_seg_count); - for (i = 0; i < 16; i++) { + for (i = 0; i < ASIZE(src->req_cdb); i++) { ISP_IOXPUT_8(isp, src->req_cdb[i], &dst->req_cdb[i]); } ISP_IOXPUT_32(isp, src->req_totalcnt, &dst->req_totalcnt); @@ -520,7 +521,7 @@ ISP_IOXPUT_16(isp, src->req_flags, &dst->req_flags); ISP_IOXPUT_16(isp, src->req_time, &dst->req_time); ISP_IOXPUT_16(isp, src->req_seg_count, &dst->req_seg_count); - for (i = 0; i < 44; i++) { + for (i = 0; i < ASIZE(src->req_cdb); i++) { ISP_IOXPUT_8(isp, src->req_cdb[i], &dst->req_cdb[i]); } } @@ -539,7 +540,7 @@ ISP_IOXPUT_16(isp, src->req_reserved, &dst->req_reserved); a = (uint32_t *) src->req_lun; b = (uint32_t *) dst->req_lun; - for (i = 0; i < 2; i++ ) { + for (i = 0; i < (ASIZE(src->req_lun) >> 2); i++ ) { ISP_IOZPUT_32(isp, *a++, b++); } ISP_IOXPUT_8(isp, src->req_alen_datadir, &dst->req_alen_datadir); @@ -548,7 +549,7 @@ ISP_IOXPUT_8(isp, src->req_crn, &dst->req_crn); a = (uint32_t *) src->req_cdb; b = (uint32_t *) dst->req_cdb; - for (i = 0; i < 4; i++ ) { + for (i = 0; i < (ASIZE(src->req_cdb) >> 2); i++ ) { ISP_IOZPUT_32(isp, *a++, b++); } ISP_IOXPUT_32(isp, src->req_dl, &dst->req_dl); @@ -564,6 +565,28 @@ } void +isp_put_24xx_abrt(ispsoftc_t *isp, isp24xx_abrt_t *src, isp24xx_abrt_t *dst) +{ + int i; + isp_put_hdr(isp, &src->abrt_header, &dst->abrt_header); + ISP_IOXPUT_32(isp, src->abrt_handle, &dst->abrt_handle); + ISP_IOXPUT_16(isp, src->abrt_nphdl, &dst->abrt_nphdl); + ISP_IOXPUT_16(isp, src->abrt_options, &dst->abrt_options); + ISP_IOXPUT_32(isp, src->abrt_cmd_handle, &dst->abrt_cmd_handle); + for (i = 0; i < ASIZE(src->abrt_reserved); i++) { + ISP_IOXPUT_8(isp, src->abrt_reserved[i], + &dst->abrt_reserved[i]); + } + ISP_IOXPUT_16(isp, src->abrt_tidlo, &dst->abrt_tidlo); + ISP_IOXPUT_8(isp, src->abrt_tidhi, &dst->abrt_tidhi); + ISP_IOXPUT_8(isp, src->abrt_vpidx, &dst->abrt_vpidx); + for (i = 0; i < ASIZE(src->abrt_reserved1); i++) { + ISP_IOXPUT_8(isp, src->abrt_reserved1[i], + &dst->abrt_reserved1[i]); + } +} + +void isp_put_cont_req(ispsoftc_t *isp, ispcontreq_t *src, ispcontreq_t *dst) { int i; @@ -640,6 +663,29 @@ } void +isp_get_24xx_abrt(ispsoftc_t *isp, isp24xx_abrt_t *src, isp24xx_abrt_t *dst) +{ + int i; + isp_get_hdr(isp, &src->abrt_header, &dst->abrt_header); + ISP_IOXGET_32(isp, &src->abrt_handle, dst->abrt_handle); + ISP_IOXGET_16(isp, &src->abrt_nphdl, dst->abrt_nphdl); + ISP_IOXGET_16(isp, &src->abrt_options, dst->abrt_options); + ISP_IOXGET_32(isp, &src->abrt_cmd_handle, dst->abrt_cmd_handle); + for (i = 0; i < ASIZE(&src->abrt_reserved); i++) { + ISP_IOXGET_8(isp, &src->abrt_reserved[i], + dst->abrt_reserved[i]); + } + ISP_IOXGET_16(isp, &src->abrt_tidlo, dst->abrt_tidlo); + ISP_IOXGET_8(isp, &src->abrt_tidhi, dst->abrt_tidhi); + ISP_IOXGET_8(isp, &src->abrt_vpidx, dst->abrt_vpidx); + for (i = 0; i < ASIZE(&src->abrt_reserved1); i++) { + ISP_IOXGET_8(isp, &src->abrt_reserved1[i], + dst->abrt_reserved1[i]); + } +} + + +void isp_get_rio2(ispsoftc_t *isp, isp_rio2_t *r2src, isp_rio2_t *r2dst) { int i; ==== //depot/projects/newisp/dev/isp/isp_library.h#9 (text) ==== @@ -62,6 +62,8 @@ extern void isp_put_request_t7(ispsoftc_t *, ispreqt7_t *, ispreqt7_t *); extern void +isp_put_24xx_abrt(ispsoftc_t *, isp24xx_abrt_t *, isp24xx_abrt_t *); +extern void isp_put_cont_req(ispsoftc_t *, ispcontreq_t *, ispcontreq_t *); extern void isp_put_cont64_req(ispsoftc_t *, ispcontreq64_t *, ispcontreq64_t *); @@ -69,6 +71,8 @@ isp_get_response(ispsoftc_t *, ispstatusreq_t *, ispstatusreq_t *); extern void isp_get_24xx_response(ispsoftc_t *, isp24xx_statusreq_t *, isp24xx_statusreq_t *); +void +isp_get_24xx_abrt(ispsoftc_t *, isp24xx_abrt_t *, isp24xx_abrt_t *); extern void isp_get_rio2(ispsoftc_t *, isp_rio2_t *, isp_rio2_t *); extern void ==== //depot/projects/newisp/dev/isp/ispmbox.h#11 (text+ko) ==== @@ -329,6 +329,7 @@ #define RQSTYPE_IP_RECV 0x23 #define RQSTYPE_IP_RECV_CONT 0x24 #define RQSTYPE_CT_PASSTHRU 0x29 +#define RQSTYPE_ABORT_IO 0x33 #define RQSTYPE_T6RQS 0x48 #define RQSTYPE_LOGIN 0x52 #define RQSTYPE_ABTS_RCVD 0x54 /* 24XX only */ @@ -530,6 +531,22 @@ ispds64_t req_dataseg; } ispreqt7_t; +/* I/O Abort Structure */ +typedef struct { + isphdr_t abrt_header; + uint32_t abrt_handle; + uint16_t abrt_nphdl; + uint16_t abrt_options; + uint32_t abrt_cmd_handle; + uint8_t abrt_reserved[32]; + uint16_t abrt_tidlo; + uint8_t abrt_tidhi; + uint8_t abrt_vpidx; + uint8_t abrt_reserved1[12]; +} isp24xx_abrt_t; +#define ISP24XX_ABRT_NO_ABTS 0x01 /* don't actually send an ABTS */ +#define ISP24XX_ABRT_ENXIO 0x31 /* in nphdl on return */ + #define ISP_CDSEG 7 typedef struct { isphdr_t req_header; From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23:03: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 7071C16A417; Thu, 19 Oct 2006 23:03: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 1063216A415 for ; Thu, 19 Oct 2006 23:03:26 +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 9A22543D49 for ; Thu, 19 Oct 2006 23:03: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 k9JN3PY3060449 for ; Thu, 19 Oct 2006 23:03:25 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 k9JN3N99060428 for perforce@freebsd.org; Thu, 19 Oct 2006 23:03:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Oct 2006 23:03:23 GMT Message-Id: <200610192303.k9JN3N99060428@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 108128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:03:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=108128 Change 108128 by rwatson@rwatson_zoo on 2006/10/19 23:02:40 Integrate TrustedBSD priv6 branch from FreeBSD CVS: - 6.2-BETA series. - Audit event identifier tweaks. - IPMI improvements - syscons ioctl fixes for sparc64. - More VFS deadlock/crash fixes. - Multicast teardown for ifnet removal fixes. - Audit limits for jail. - Misc. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/common/help.common#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/files#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 delete .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/trustedbsd/priv6/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/ah_osdep.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/ah_osdep.h#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/bpf.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if.c#5 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if_tap.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if_tap.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/in.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/in_var.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/intpm.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/buf.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/consio.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/digiio.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/kbio.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/mount.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/pioctl.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/proc.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/syscall.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv6/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/alpha/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.186.2.8 2006/07/13 08:11:46 delphij Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.186.2.9 2006/10/09 18:41:36 simon Exp $ machine alpha cpu EV4 @@ -43,7 +43,6 @@ options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) -#options SCHED_ULE # ULE scheduler # PREEMPTION appears to have a negative impact on stability (locking related # panics) at least on SMP machines. #options PREEMPTION # Enable kernel thread preemption ==== //depot/projects/trustedbsd/priv6/src/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.439.2.13 2006/07/13 08:11:46 delphij Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.14 2006/10/09 18:41:36 simon Exp $ machine amd64 cpu HAMMER @@ -27,7 +27,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -#options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking ==== //depot/projects/trustedbsd/priv6/src/sys/amd64/include/intr_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.5.2.3 2006/03/10 19:37:31 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.5.2.4 2006/10/19 14:52:02 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -56,9 +56,9 @@ * - 7 counters for each CPU for IPI counters for SMP. */ #ifdef SMP +#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) +#else #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + 1) -#else -#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) #endif #ifndef LOCORE ==== //depot/projects/trustedbsd/priv6/src/sys/arm/at91/at91.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.7.2.1 2006/06/23 23:35:36 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.7.2.2 2006/10/04 11:44:12 cognet Exp $"); #include #include @@ -54,7 +54,11 @@ vm_paddr_t pa, endpa; pa = trunc_page(bpa); - if (pa >= 0xfff00000) + if (pa >= 0xfff00000) { + *bshp = pa - 0xf0000000 + 0xd0000000; + return (0); + } + if (pa >= 0xdff00000) return (0); endpa = round_page(bpa + size); @@ -417,8 +421,8 @@ rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); if (rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, - 0xfffffffful) != 0) + rman_manage_region(&sc->sc_mem_rman, 0xdff00000ul, + 0xdffffffful) != 0) panic("at91_attach: failed to set up memory rman"); if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) @@ -543,7 +547,7 @@ void **cookiep) { struct at91_softc *sc = device_get_softc(dev); - + if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, ==== //depot/projects/trustedbsd/priv6/src/sys/arm/at91/at91rm92reg.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $$FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.3.2.1 2006/06/23 23:35:36 cognet Exp $ */ +/* $$FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.3.2.2 2006/10/04 11:44:12 cognet Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -41,7 +41,7 @@ * 0xf0000000 - 0xfffffffff : Peripherals */ -#define AT91RM92_BASE 0xf0000000 +#define AT91RM92_BASE 0xd0000000 /* Usart */ #define AT91RM92_USART0_BASE 0xffc0000 ==== //depot/projects/trustedbsd/priv6/src/sys/arm/at91/kb920x_machdep.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.8.2.2 2006/07/18 22:01:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.8.2.3 2006/10/04 11:44:12 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -153,8 +153,8 @@ * and the timer. Other devices should use newbus to * map their memory anyway. */ + 0xdff00000, 0xfff00000, - 0xfff00000, 0x100000, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, @@ -364,7 +364,7 @@ l1pagetable = kernel_l1pt.pv_va; /* Map the L2 pages tables in the L1 page table */ - pmap_link_l2pt(l1pagetable, ARM_VECTORS_LOW, + pmap_link_l2pt(l1pagetable, ARM_VECTORS_HIGH, &kernel_pt_table[KERNEL_PT_SYS]); for (i = 0; i < KERNEL_PT_KERN_NUM; i++) pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x100000, @@ -383,7 +383,7 @@ /* Map the vector page. */ - pmap_map_entry(l1pagetable, ARM_VECTORS_LOW, systempage.pv_pa, + pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, @@ -462,7 +462,7 @@ thread0.td_frame = &proc0_tf; pcpup->pc_curpcb = thread0.td_pcb; - arm_vector_init(ARM_VECTORS_LOW, ARM_VEC_ALL); + arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); pmap_curmaxkvaddr = afterkern + 0x100000 * (KERNEL_PT_KERN_NUM - 1); pmap_bootstrap(freemempos, @@ -478,7 +478,7 @@ dump_avail[2] = 0; dump_avail[3] = 0; - phys_avail[0] = freemempos - KERNVIRTADDR + KERNPHYSADDR; + phys_avail[0] = virtual_avail - KERNVIRTADDR + KERNPHYSADDR; phys_avail[1] = KERNPHYSADDR + memsize; phys_avail[2] = 0; phys_avail[3] = 0; ==== //depot/projects/trustedbsd/priv6/src/sys/boot/common/help.common#2 (text+ko) ==== @@ -44,7 +44,7 @@ bcachestat - Displays statistics about disk cache usage. For depuration only. + Displays statistics about disk cache usage. For debugging only. ################################################################################ # Techo DEcho arguments ==== //depot/projects/trustedbsd/priv6/src/sys/boot/common/loader.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82.2.4 2006/10/01 12:07:06 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82.2.5 2006/10/16 12:32:37 ru Exp $ .\" .Dd August 18, 2006 .Dt LOADER 8 @@ -159,7 +159,7 @@ .Pp .It Ic bcachestat Displays statistics about disk cache usage. -For depuration only. +For debugging only. .Pp .It Ic boot .It Ic boot Ar kernelname Op Cm ... ==== //depot/projects/trustedbsd/priv6/src/sys/boot/common/merge_help.awk#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/awk -f # -# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.5 2001/11/07 17:53:25 fenner Exp $ +# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.5.14.1 2006/10/19 14:47:21 jhb Exp $ # # Merge two boot loader help files for FreeBSD 3.0 # Joe Abley @@ -25,9 +25,12 @@ match($0, " T[[:graph:]]+"); T = substr($0, RSTART + 2, RLENGTH - 2); match($0, " S[[:graph:]]+"); + SSTART = RSTART S = (RLENGTH == -1) ? "" : substr($0, RSTART + 2, RLENGTH - 2); match($0, " D[[:graph:]][[:print:]]*$"); D = substr($0, RSTART + 2); + if (SSTART > RSTART) + S = ""; # find a suitable place to store this one... ind++; ==== //depot/projects/trustedbsd/priv6/src/sys/boot/forth/support.4th#2 (text+ko) ==== @@ -22,7 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.15 2002/05/24 02:28:58 gordon Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.15.14.1 2006/10/16 12:32:38 ru Exp $ \ Loader.rc support functions: \ @@ -1012,7 +1012,7 @@ ." ^" cr ; -\ Depuration support functions +\ Debugging support functions only forth definitions also support-functions ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biossmap.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.3.2.1 2006/10/01 12:07:07 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.3.2.2 2006/10/19 14:47:21 jhb Exp $"); /* * Obtain memory configuration information from the BIOS @@ -95,6 +95,7 @@ break; } while (v86.ebx != 0 && smaplen < n); } + void bios_addsmapdata(struct preloaded_file *kfp) { @@ -105,3 +106,18 @@ len = smaplen * sizeof(*smapbase); file_addmetadata(kfp, MODINFOMD_SMAP, len, smapbase); } + +COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap); + +static int +command_smap(int argc, char *argv[]) +{ + int i; + + if (smapbase == 0 || smaplen == 0) + return (CMD_ERROR); + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx\n", + smapbase[i].type, smapbase[i].base, smapbase[i].length); + return (CMD_OK); +} ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/loader/help.i386#2 (text+ko) ==== @@ -54,3 +54,10 @@ forced by setting this variable. ################################################################################ +# Tsmap DDisplay BIOS SMAP table + + smap + + Displays the BIOS SMAP (system memory map) table. + +################################################################################ ==== //depot/projects/trustedbsd/priv6/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.60.2.1 2006/02/26 22:38:39 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.60.2.2 2006/10/09 21:44:23 mjacob Exp $"); #include #include @@ -86,6 +86,14 @@ MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers"); +static int periph_selto_delay = 1000; +TUNABLE_INT("kern.cam.periph_selto_delay", &periph_selto_delay); +static int periph_noresrc_delay = 500; +TUNABLE_INT("kern.cam.periph_noresrc_delay", &periph_noresrc_delay); +static int periph_busy_delay = 500; +TUNABLE_INT("kern.cam.periph_busy_delay", &periph_busy_delay); + + void periphdriver_register(void *data) { @@ -1534,7 +1542,7 @@ int error, printed = 0; int openings; u_int32_t relsim_flags; - u_int32_t timeout; + u_int32_t timeout = 0; action_string = NULL; status = ccb->ccb_h.status; @@ -1626,11 +1634,11 @@ } /* - * Wait a second to give the device + * Wait a bit to give the device * time to recover before we try again. */ relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; - timeout = 1000; + timeout = periph_selto_delay; break; } } @@ -1689,8 +1697,16 @@ } break; case CAM_RESRC_UNAVAIL: + /* Wait a bit for the resource shortage to abate. */ + timeout = periph_noresrc_delay; + /* FALLTHROUGH */ case CAM_BUSY: - /* timeout??? */ + if (timeout == 0) { + /* Wait a bit for the busy condition to abate. */ + timeout = periph_busy_delay; + } + relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; + /* FALLTHROUGH */ default: /* decrement the number of retries */ if (ccb->ccb_h.retry_count > 0) { ==== //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.7 2006/09/21 14:06:49 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.7 2006/09/21 14:06:19 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.9 2006/10/10 13:22:05 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.8 2006/10/10 13:20:49 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.7 2006/09/21 14:06:49 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.7 2006/09/21 14:06:19 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.9 2006/10/10 13:22:05 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.8 2006/10/10 13:20:49 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.7 2006/09/21 14:06:49 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.7 2006/09/21 14:06:19 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.9 2006/10/10 13:22:05 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.8 2006/10/10 13:20:49 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.7 2006/09/21 14:06:49 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.7 2006/09/21 14:06:19 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.9 2006/10/10 13:22:05 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.8 2006/10/10 13:20:49 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.7 2006/09/21 14:06:19 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.8 2006/10/10 13:20:49 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -144,7 +144,7 @@ 61 AUE_CHROOT MNOPROTO { int chroot(char *path); } 62 AUE_FSTAT OBSOL ofstat 63 AUE_NULL OBSOL ogetkerninfo -64 AUE_GETPAGESIZE OBSOL ogetpagesize +64 AUE_NULL OBSOL ogetpagesize ; XXX implement (not OBSOL at all) 65 AUE_MSYNC MNOPROTO { int msync(void *addr, size_t len, \ int flags); } ==== //depot/projects/trustedbsd/priv6/src/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.21 2006/09/02 13:12:08 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.23 2006/10/15 18:24:30 kris Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -169,7 +169,8 @@ # # SCHED_ULE is a new scheduler that has been designed for SMP and has some # advantages for UP as well. It is intended to replace the 4BSD scheduler -# over time. +# over time. NOTE: SCHED_ULE is currently considered experimental and is +# not recommended for production use at this time. # options SCHED_4BSD #options SCHED_ULE @@ -342,16 +343,18 @@ options KTRACE_REQUEST_POOL=101 # -# KTR is a kernel tracing mechanism imported from BSD/OS. Currently it -# has no userland interface aside from a few sysctl's. It is enabled with -# the KTR option. KTR_ENTRIES defines the number of entries in the circular -# trace buffer. KTR_COMPILE defines the mask of events to compile into the -# kernel as defined by the KTR_* constants in . KTR_MASK defines the -# initial value of the ktr_mask variable which determines at runtime what -# events to trace. KTR_CPUMASK determines which CPU's log events, with -# bit X corresponding to cpu X. KTR_VERBOSE enables dumping of KTR events -# to the console by default. This functionality can be toggled via the -# debug.ktr_verbose sysctl and defaults to off if KTR_VERBOSE is not defined. +# KTR is a kernel tracing mechanism imported from BSD/OS. Currently +# it has no userland interface aside from a few sysctl's. It is +# enabled with the KTR option. KTR_ENTRIES defines the number of +# entries in the circular trace buffer; it must be a power of two. +# KTR_COMPILE defines the mask of events to compile into the kernel as +# defined by the KTR_* constants in . KTR_MASK defines the +# initial value of the ktr_mask variable which determines at runtime +# what events to trace. KTR_CPUMASK determines which CPU's log +# events, with bit X corresponding to cpu X. KTR_VERBOSE enables +# dumping of KTR events to the console by default. This functionality +# can be toggled via the debug.ktr_verbose sysctl and defaults to off +# if KTR_VERBOSE is not defined. # options KTR options KTR_ENTRIES=1024 ==== //depot/projects/trustedbsd/priv6/src/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1031.2.41 2006/09/04 15:39:10 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031.2.44 2006/10/16 05:36:19 delphij Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -246,7 +246,6 @@ contrib/dev/acpica/utmisc.c optional acpi contrib/dev/acpica/utobject.c optional acpi contrib/dev/acpica/utxface.c optional acpi -contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal contrib/ipfilter/netinet/fil.c optional ipfilter inet contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet @@ -433,15 +432,23 @@ dev/ata/ata-pci.c optional ata pci dev/ata/ata-queue.c optional ata dev/ata/ata-raid.c optional ataraid +dev/ata/ata-usb.c optional atausb dev/ata/atapi-cam.c optional atapicam dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist -dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr -dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe -dev/ath/ath_rate/sample/sample.c optional ath_rate_sample -dev/ath/if_ath.c optional ath -dev/ath/if_ath_pci.c optional ath pci +dev/ath/ah_osdep.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath" +dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \ + compile-with "${NORMAL_C} -I$S/dev/ath" +dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ + compile-with "${NORMAL_C} -I$S/dev/ath" +dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ + compile-with "${NORMAL_C} -I$S/dev/ath" +dev/ath/if_ath.c optional ath \ + compile-with "${NORMAL_C} -I$S/dev/ath" +dev/ath/if_ath_pci.c optional ath pci \ + compile-with "${NORMAL_C} -I$S/dev/ath" dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard ==== //depot/projects/trustedbsd/priv6/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65.2.2 2005/11/07 09:55:47 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65.2.3 2006/10/16 01:26:13 sam Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -59,7 +59,7 @@ INCLUDES+= -I$S/contrib/pf # ... and the same for Atheros HAL -INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +INCLUDES+= -I$S/dev/ath # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm ==== //depot/projects/trustedbsd/priv6/src/sys/ddb/db_main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_main.c,v 1.4 2005/01/06 01:34:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_main.c,v 1.4.2.1 2006/10/16 09:00:30 bde Exp $"); #include #include @@ -198,6 +198,7 @@ if (cnunavailable()) return (0); + cndbctl(TRUE); bkpt = IS_BREAKPOINT_TRAP(type, code); watchpt = IS_WATCHPOINT_TRAP(type, code); @@ -224,5 +225,6 @@ db_restart_at_pc(watchpt); + cndbctl(FALSE); return (1); } ==== //depot/projects/trustedbsd/priv6/src/sys/dev/acpica/Osd/OsdHardware.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.15.2.3 2006/05/11 17:41:00 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.15.2.4 2006/10/09 12:44:53 hrs Exp $"); #include @@ -126,7 +126,9 @@ error = acpi_os_check_port(InPort, Width); if (error != 0) { - printf("acpi: bad read from port 0x%03x (%d)\n", (int)InPort, Width); + if (bootverbose) + printf("acpi: bad read from port 0x%03x (%d)\n", + (int)InPort, Width); if (error == -1) return (AE_BAD_PARAMETER); } @@ -159,8 +161,9 @@ error = acpi_os_check_port(OutPort, Width); if (error != 0) { - printf("acpi: bad write to port 0x%03x (%d), val %#x\n", (int)OutPort, - Width, Value); + if (bootverbose) + printf("acpi: bad write to port 0x%03x (%d), val %#x\n", + (int)OutPort, Width, Value); if (error == -1) return (AE_BAD_PARAMETER); } ==== //depot/projects/trustedbsd/priv6/src/sys/dev/acpica/acpi.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.214.2.7 2006/09/19 19:08:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.214.2.8 2006/10/04 19:08:23 jhb Exp $"); #include "opt_acpi.h" #include @@ -1083,7 +1083,7 @@ * If we know about this address, deactivate it and release it to the * local pool. If we don't, pass this request up to the parent. */ - if (acpi_sysres_find(bus, type, rman_get_start(r)) == NULL) { + if (acpi_sysres_find(bus, type, rman_get_start(r)) != NULL) { if (rman_get_flags(r) & RF_ACTIVE) { ret = bus_deactivate_resource(child, type, rid, r); if (ret != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.126.2.14 2006/09/30 14:51:49 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.126.2.15 2006/10/09 16:01:35 sos Exp $"); #include "opt_ata.h" #include @@ -950,6 +950,7 @@ struct ata_chip_id *idx; static struct ata_chip_id ids[] = {{ ATA_ALI_5289, 0x00, 2, ALISATA, ATA_SA150, "M5289" }, + { ATA_ALI_5288, 0x00, 4, ALISATA, ATA_SA300, "M5288" }, { ATA_ALI_5287, 0x00, 4, ALISATA, ATA_SA150, "M5287" }, { ATA_ALI_5281, 0x00, 2, ALISATA, ATA_SA150, "M5281" }, { ATA_ALI_5229, 0xc5, 0, ALINEW, ATA_UDMA6, "M5229" }, ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_ath.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.94.2.27 2006/09/30 21:25:11 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.94.2.28 2006/10/16 01:01:41 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -254,7 +254,7 @@ } while (0) #define KEYPRINTF(sc, ix, hk, mac) do { \ if (sc->sc_debug & ATH_DEBUG_KEYCACHE) \ - ath_keyprint(__func__, ix, hk, mac); \ + ath_keyprint(sc, __func__, ix, hk, mac); \ } while (0) static void ath_printrxbuf(struct ath_buf *bf, u_int ix, int); static void ath_printtxbuf(struct ath_buf *bf, u_int qnum, u_int ix, int done); @@ -342,18 +342,6 @@ */ for (i = 0; i < sc->sc_keymax; i++) ath_hal_keyreset(ah, i); - /* - * Mark key cache slots associated with global keys - * as in use. If we knew TKIP was not to be used we - * could leave the +32, +64, and +32+64 slots free. - * XXX only for splitmic. - */ - for (i = 0; i < IEEE80211_WEP_NKID; i++) { - setbit(sc->sc_keymap, i); - setbit(sc->sc_keymap, i+32); - setbit(sc->sc_keymap, i+64); - setbit(sc->sc_keymap, i+32+64); - } /* * Collect the channel list using the default country @@ -541,12 +529,30 @@ */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_MIC)) ic->ic_caps |= IEEE80211_C_TKIPMIC; - if (ath_hal_tkipsplit(ah)) + /* + * If the h/w supports storing tx+rx MIC keys + * in one cache slot automatically enable use. + */ + if (ath_hal_hastkipsplit(ah) || + !ath_hal_settkipsplit(ah, AH_FALSE)) sc->sc_splitmic = 1; } sc->sc_hasclrkey = ath_hal_ciphersupported(ah, HAL_CIPHER_CLR); sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah); /* + * Mark key cache slots associated with global keys + * as in use. If we knew TKIP was not to be used we + * could leave the +32, +64, and +32+64 slots free. + */ + for (i = 0; i < IEEE80211_WEP_NKID; i++) { + setbit(sc->sc_keymap, i); + setbit(sc->sc_keymap, i+64); + if (sc->sc_splitmic) { + setbit(sc->sc_keymap, i+32); + setbit(sc->sc_keymap, i+32+64); + } + } + /* * TPC support can be done either with a global cap or * per-packet support. The latter is not available on * all parts. We're a bit pedantic here as all parts @@ -1300,7 +1306,7 @@ #ifdef ATH_DEBUG static void -ath_keyprint(const char *tag, u_int ix, +ath_keyprint(struct ath_softc *sc, const char *tag, u_int ix, const HAL_KEYVAL *hk, const u_int8_t mac[IEEE80211_ADDR_LEN]) { static const char *ciphers[] = { @@ -1318,9 +1324,16 @@ printf("%02x", hk->kv_val[i]); printf(" mac %s", ether_sprintf(mac)); if (hk->kv_type == HAL_CIPHER_TKIP) { - printf(" mic "); + printf(" %s ", sc->sc_splitmic ? "mic" : "rxmic"); for (i = 0; i < sizeof(hk->kv_mic); i++) printf("%02x", hk->kv_mic[i]); +#if HAL_ABI_VERSION > 0x06052200 + if (!sc->sc_splitmic) { + printf(" txmic "); + for (i = 0; i < sizeof(hk->kv_txmic); i++) + printf("%02x", hk->kv_txmic[i]); + } +#endif } printf("\n"); } @@ -1341,21 +1354,34 @@ KASSERT(k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP, ("got a non-TKIP key, cipher %u", k->wk_cipher->ic_cipher)); - KASSERT(sc->sc_splitmic, ("key cache !split")); if ((k->wk_flags & IEEE80211_KEY_XR) == IEEE80211_KEY_XR) { - /* - * TX key goes at first index, RX key at the rx index. - * The hal handles the MIC keys at index+64. - */ - memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); - KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); - if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) - return 0; + if (sc->sc_splitmic) { + /* + * TX key goes at first index, RX key at the rx index. + * The hal handles the MIC keys at index+64. + */ + memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); + KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); + if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) + return 0; - memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); - KEYPRINTF(sc, k->wk_keyix+32, hk, mac); - /* XXX delete tx key on failure? */ - return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); + KEYPRINTF(sc, k->wk_keyix+32, hk, mac); + /* XXX delete tx key on failure? */ + return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); + } else { + /* + * Room for both TX+RX MIC keys in one key cache + * slot, just set key at the first index; the hal + * will handle the reset. + */ + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); +#if HAL_ABI_VERSION > 0x06052200 + memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic)); +#endif + KEYPRINTF(sc, k->wk_keyix, hk, mac); + return ath_hal_keyset(ah, k->wk_keyix, hk, mac); + } } else if (k->wk_flags & IEEE80211_KEY_XR) { /* * TX/RX key goes at first index. @@ -1424,8 +1450,7 @@ mac = mac0; if (hk.kv_type == HAL_CIPHER_TKIP && - (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && - sc->sc_splitmic) { + (k->wk_flags & IEEE80211_KEY_SWMIC) == 0) { return ath_keyset_tkip(sc, k, &hk, mac); } else { KEYPRINTF(sc, k->wk_keyix, &hk, mac); @@ -1490,6 +1515,54 @@ } /* + * Allocate tx/rx key slots for TKIP. We allocate two slots for + * each key, one for decrypt/encrypt and the other for the MIC. + */ +static u_int16_t +key_alloc_pair(struct ath_softc *sc, + ieee80211_keyix *txkeyix, ieee80211_keyix *rxkeyix) +{ +#define N(a) (sizeof(a)/sizeof(a[0])) + u_int i, keyix; + + KASSERT(!sc->sc_splitmic, ("key cache split")); + /* XXX could optimize */ + for (i = 0; i < N(sc->sc_keymap)/4; i++) { + u_int8_t b = sc->sc_keymap[i]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23:10: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 E8D7B16A417; Thu, 19 Oct 2006 23: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 B97D716A415 for ; Thu, 19 Oct 2006 23:10:41 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB82343D73 for ; Thu, 19 Oct 2006 23:10:34 +0000 (GMT) (envelope-from cognet@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 k9JNAYxj062076 for ; Thu, 19 Oct 2006 23:10:34 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9JNAYtH062073 for perforce@freebsd.org; Thu, 19 Oct 2006 23:10:34 GMT (envelope-from cognet@freebsd.org) Date: Thu, 19 Oct 2006 23:10:34 GMT Message-Id: <200610192310.k9JNAYtH062073@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 108129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:10:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=108129 Change 108129 by cognet@cognet on 2006/10/19 23:10:33 Use BUS_DMA_COHERENT to get the descriptor memory uncached. Affected files ... .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#19 (text+ko) ==== @@ -2508,7 +2508,8 @@ } error = bus_dmamem_alloc(dd->dd_dmat, (void**) &dd->dd_desc, - BUS_DMA_NOWAIT, &dd->dd_dmamap); + BUS_DMA_NOWAIT | BUS_DMAMEM_COHERENT, + &dd->dd_dmamap); if (error != 0) { if_printf(ifp, "unable to alloc memory for %u %s descriptors, " "error %u\n", nbuf * ndesc, dd->dd_name, error); From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23:14: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 C424616A417; Thu, 19 Oct 2006 23:14: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 9DB7616A403 for ; Thu, 19 Oct 2006 23:14:43 +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 1EECA43D45 for ; Thu, 19 Oct 2006 23:14:43 +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 k9JNEgFi063325 for ; Thu, 19 Oct 2006 23:14:43 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 k9JNEeWA063322 for perforce@freebsd.org; Thu, 19 Oct 2006 23:14:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Oct 2006 23:14:40 GMT Message-Id: <200610192314.k9JNEeWA063322@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 108130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=108130 Change 108130 by rwatson@rwatson_zoo on 2006/10/19 23:14:35 Integrate TrustedBSD base branch from FreeBSD CVS: - CLONE_VFORK. - if_bce fixes. - devfs and VFS fixes. Etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#47 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#80 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#25 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/MKterminfo.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#8 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#12 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#61 integrate .. //depot/projects/trustedbsd/base/etc/disktab#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#44 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleartmp#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/idmapd#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_arm.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wctype.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/freopen.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_init.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_select.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sig.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/msg.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/sock.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#26 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#6 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/fenv.h#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#113 integrate .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#8 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#36 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/idmapd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/idmapd/idmapd.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/kldload/kldload.8#11 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/README.examples#6 integrate .. //depot/projects/trustedbsd/base/share/man/man1/builtin.1#8 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_schedparam.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gre.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipfirewall.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ndis.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sis.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/disktab.5#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/hosts.equiv.5#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#63 integrate .. //depot/projects/trustedbsd/base/share/man/man9/hash.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ktr.9#11 integrate .. //depot/projects/trustedbsd/base/share/misc/iso3166#9 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/africa#7 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#12 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/australasia#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/backward#9 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/europe#12 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/northamerica#12 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/southamerica#13 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/yearistype.sh#4 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/zone.tab#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/fusu.S#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.h#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#105 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#67 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#56 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/if_awi_pccard.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#62 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_disk.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ray/if_ray.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.h#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#45 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#71 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/support.s#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#27 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#27 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#26 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/busdma_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/clock.c#17 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/support.S#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#56 integrate .. //depot/projects/trustedbsd/base/sys/modules/aio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/modules/mem/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/uart/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#19 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_message.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.h#4 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs.h#21 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#41 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#37 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#25 integrate .. //depot/projects/trustedbsd/base/sys/pci/nfsmb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/copyinout.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.S#8 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/elf32.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/elf64.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/sem.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#60 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#60 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#61 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#41 integrate .. //depot/projects/trustedbsd/base/sys/sys/umtx.h#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#49 integrate .. //depot/projects/trustedbsd/base/usr.bin/expand/expand.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/tr/tr.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/unexpand/unexpand.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#57 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#22 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#18 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pccard/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/Makefile#3 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/cardd.c#7 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/cardd.h#6 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/file.c#4 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/pccard.conf.5#5 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/pccardd.8#8 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/pccardd.c#4 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/server.c#3 delete .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/zic/zdump/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/zic/zic/Makefile#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#47 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ +# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ # # The user-driven targets are: # @@ -266,7 +266,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 i386 ia64 pc98 sparc64 +.for target in amd64 i386 ia64 pc98 sparc64 sun4v KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/trustedbsd/base/Makefile.inc1#80 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.562 2006/10/09 04:58:44 kmacy Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -98,7 +98,7 @@ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET= ${TARGET_ARCH} ==== //depot/projects/trustedbsd/base/bin/ls/print.c#25 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.75 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); #include #include @@ -628,9 +628,10 @@ p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since - * pathconf() and acl_get_file() both follow them. + * pathconf() and acl_get_file() both follow them. They also don't + * support whiteouts. */ - if (S_ISLNK(p->fts_statp->st_mode)) { + if (S_ISLNK(p->fts_statp->st_mode) || S_ISWHT(p->fts_statp->st_mode)) { *haveacls = 1; return; } ==== //depot/projects/trustedbsd/base/bin/rm/rm.c#18 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.54 2006/04/15 09:26:23 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); #include #include @@ -347,7 +347,7 @@ if (!fflag && !S_ISWHT(sb.st_mode) && !check(f, f, &sb)) continue; rval = 0; - if (!uid && + if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); ==== //depot/projects/trustedbsd/base/contrib/ncurses/man/MKterminfo.sh#3 (text+ko) ==== @@ -1,6 +1,10 @@ #!/bin/sh +# $Id: MKterminfo.sh,v 1.12 2003/01/11 21:42:12 tom Exp $ +# +# MKterminfo.sh -- generate terminfo.5 from Caps tabular data +# #*************************************************************************** -# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. * +# Copyright (c) 1998,2002,2003 Free Software Foundation, Inc. * # * # Permission is hereby granted, free of charge, to any person obtaining a * # copy of this software and associated documentation files (the * @@ -27,10 +31,6 @@ # authorization. * #*************************************************************************** # -# $Id: MKterminfo.sh,v 1.9 2001/09/01 23:06:18 tom Exp $ -# -# MKterminfo.sh -- generate terminfo.5 from Caps tabular data -# # This script takes terminfo.head and terminfo.tail and splices in between # them a table derived from the Caps data file. Besides avoiding having # the docs fall out of sync with the table, this also lets us set up tbl @@ -41,10 +41,13 @@ # had better be no s in the table source text. # # keep the order independent of locale: -LANGUAGE=C -LC_ALL=C -export LANGUAGE -export LC_ALL +if test "${LANGUAGE+set}" = set; then LANGUAGE=C; export LANGUAGE; fi +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi + # head=$1 caps=$2 @@ -66,11 +69,11 @@ sed -n <$caps "\ /%%-STOP-HERE-%%/q -/^#%/s///p +/^#%/s/#%//p /^#/d -s/[ ]\+/ /g +s/[ ][ ]*/ /g s/$/T}/ -s/ [A-Z0-9_()\-]\+ [0-9\-]\+ [Y\-][B\-][C\-][G\-][EK\-]\** / T{/ +s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]* [Y\-][B\-][C\-][G\-][EK\-]\** / T{/ s/ bool / /p s/ num / /p s/ str / /p ==== //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#8 (text+ko) ==== @@ -14,7 +14,7 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.14 2006/06/13 14:59:07 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ .\" .TH TRACEROUTE 8 "21 September 2000" .UC 6 @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-deFISdnrvx +.B \-dDeFISnrvx ] [ .B \-f .I first_ttl @@ -112,6 +112,18 @@ .B \-d Enable socket level debugging. .TP +.B \-D +When an ICMP response to our probe datagram is received, +print the differences between the transmitted packet and +the packet quoted by the ICMP response. +A key showing the location of fields within the transmitted packet is printed, +followed by the original packet in hex, +followed by the quoted packet in hex. +Bytes that are unchanged in the quoted packet are shown as underscores. +Note, +the IP checksum and the TTL of the quoted packet are not expected to match. +By default, only one probe per hop is sent with this option. +.TP .B \-g Specify a loose source route gateway (8 maximum). .TP @@ -163,7 +175,11 @@ to pick an unused port range. .TP .B \-q -Set the number of probes per hop (default is 3). +Set the number of probes per hop (default is 3, +unless +.B -D +is specified, +when it is 1). .TP .B \-r Bypass the normal routing tables and send directly to a host on an attached ==== //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.30 2006/06/13 14:59:07 dwmalone Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $"; #endif /* @@ -316,6 +316,9 @@ struct ip *outip; /* last output ip packet */ u_char *outp; /* last output inner protocol packet */ +struct ip *hip = NULL; /* Quoted IP header */ +int hiplen = 0; + /* loose source route gateway list (including room for final destination) */ u_int32_t gwlist[NGATEWAYS + 1]; @@ -337,7 +340,7 @@ char *device; static const char devnull[] = "/dev/null"; -int nprobes = 3; +int nprobes = -1; int max_ttl; int first_ttl = 1; u_short ident; @@ -354,6 +357,7 @@ #endif int optlen; /* length of ip options */ int fixedPort = 0; /* Use fixed destination port for TCP and UDP */ +int printdiff = 0; /* Print the difference between sent and quoted */ extern int optind; extern int opterr; @@ -380,6 +384,7 @@ void tvsub(struct timeval *, struct timeval *); void usage(void); int wait_for_reply(int, struct sockaddr_in *, const struct timeval *); +void pkt_compare(const u_char *, int, const u_char *, int); #ifndef HAVE_USLEEP int usleep(u_int); #endif @@ -398,6 +403,7 @@ /* Descriptor structure for each outgoing protocol we support */ struct outproto { char *name; /* name of protocol */ + const char *key; /* An ascii key for the bytes of the header */ u_char num; /* IP protocol number */ u_short hdrlen; /* max size of protocol header */ u_short port; /* default base protocol-specific "port" */ @@ -412,6 +418,7 @@ struct outproto protos[] = { { "udp", + "spt dpt len sum", IPPROTO_UDP, sizeof(struct udphdr), 32768 + 666, @@ -420,6 +427,7 @@ }, { "tcp", + "spt dpt seq ack xxflwin sum urp", IPPROTO_TCP, sizeof(struct tcphdr), 32768 + 666, @@ -428,6 +436,7 @@ }, { "gre", + "flg pro len clid", IPPROTO_GRE, sizeof(struct grehdr), GRE_PPTP_PROTO, @@ -436,6 +445,7 @@ }, { "icmp", + "typ cod sum ", IPPROTO_ICMP, sizeof(struct icmp), 0, @@ -444,6 +454,7 @@ }, { NULL, + NULL, 0, 2 * sizeof(u_short), 0, @@ -453,6 +464,8 @@ }; struct outproto *proto = &protos[0]; +const char *ip_hdr_key = "vhtslen id off tlprsum srcip dstip opts"; + int main(int argc, char **argv) { @@ -522,13 +535,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { case 'd': options |= SO_DEBUG; break; + case 'D': + printdiff = 1; + break; + case 'e': fixedPort = 1; break; @@ -628,6 +645,9 @@ /* Set requested port, if any, else default for this protocol */ port = (requestPort != -1) ? requestPort : proto->port; + if (nprobes == -1) + nprobes = printdiff ? 1 : 3; + if (first_ttl > max_ttl) { Fprintf(stderr, "%s: first ttl (%d) may not be greater than max ttl (%d)\n", @@ -968,6 +988,16 @@ #endif precis = 3; Printf(" %.*f ms", precis, T); + if (printdiff) { + Printf("\n"); + Printf("%*.*s%s\n", + -(outip->ip_hl << 3), + outip->ip_hl << 3, + ip_hdr_key, + proto->key); + pkt_compare((void *)outip, packlen, + (void *)hip, hiplen); + } if (i == -2) { #ifndef ARCHAIC ip = (struct ip *)packet; @@ -1275,10 +1305,10 @@ return -2; if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS) || type == ICMP_UNREACH) { - struct ip *hip; u_char *inner; hip = &icp->icmp_ip; + hiplen = ((u_char *)icp + cc) - (u_char *)hip; hlen = hip->ip_hl << 2; inner = (u_char *)((u_char *)hip + hlen); if (hlen + 12 <= cc @@ -1708,13 +1738,33 @@ } void +pkt_compare(const u_char *a, int la, const u_char *b, int lb) { + int l; + int i; + + for (i = 0; i < la; i++) + Printf("%02x", (unsigned int)a[i]); + Printf("\n"); + l = (la <= lb) ? la : lb; + for (i = 0; i < l; i++) + if (a[i] == b[i]) + Printf("__"); + else + Printf("%02x", (unsigned int)b[i]); + for (; i < lb; i++) + Printf("%02x", (unsigned int)b[i]); + Printf("\n"); +} + + +void usage(void) { extern char version[]; Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dFInrSvx] [-g gateway] [-i iface] [-f first_ttl]\n" + "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); exit(1); ==== //depot/projects/trustedbsd/base/etc/defaults/rc.conf#61 (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.298 2006/10/06 23:22:12 flz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.300 2006/10/15 15:55:00 ceri Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -242,6 +242,8 @@ nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled). +idmapd_enable="NO" # Run the NFS4 id mapper (YES/NO). +idmapd_flags="" # Additional flags for idmapd. mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. ==== //depot/projects/trustedbsd/base/etc/disktab#3 (text+ko) ==== @@ -1,33 +1,7 @@ -# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/disktab,v 1.26 2006/10/14 16:39:03 ru Exp $ # # Disk geometry and partition layout tables. -# Key: -# dt controller type -# ty type of disk (fixed, removeable, simulated) -# d[0-4] drive-type-dependent parameters -# ns #sectors/track -# nt #tracks/cylinder -# nc #cylinders/disk -# sc #sectors/cylinder, ns*nt default -# su #sectors/unit, sc*nc default -# se sector size, DEV_BSIZE default -# rm rpm, 3600 default -# sf supports bad144-style bad sector forwarding -# sk sector skew per track, default 0 -# cs sector skew per cylinder, default 0 -# hs headswitch time, default 0 -# ts one-cylinder seek time, default 0 -# il sector interleave (n:1), 1 default -# bs boot block size, default BBSIZE -# sb superblock size, default SBSIZE -# o[a-h] partition offsets in sectors -# p[a-h] partition sizes in sectors -# b[a-h] partition block sizes in bytes -# f[a-h] partition fragment sizes in bytes -# t[a-h] partition types (filesystem, swap, etc) -# -# All partition sizes reserve space for bad sector tables. -# (5 cylinders needed for maintenance + replacement sectors) +# See disktab(5) for format of this file. # # ==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#44 (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.77 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ .include @@ -15,7 +15,7 @@ gbde geli geli2 \ hcsecd \ hostapd hostname \ - inetd initrandom \ + idmapd inetd initrandom \ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ jail \ ==== //depot/projects/trustedbsd/base/etc/rc.d/amd#13 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.17 2006/04/11 09:02:06 flz Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $ # # PROVIDE: amd @@ -16,6 +16,7 @@ command="/usr/sbin/${name}" start_precmd="amd_precmd" command_args="&" +extra_commands="reload" amd_precmd() { ==== //depot/projects/trustedbsd/base/etc/rc.d/auto_linklocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.1 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.2 2006/10/13 12:41:35 ume Exp $ # # PROVIDE: auto_linklocal @@ -10,9 +10,15 @@ . /etc/rc.subr name="auto_linklocal" -rcvar=`set_rcvar ipv6` -start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1" +start_cmd="auto_linklocal_start" stop_cmd=":" +auto_linklocal_start() +{ + if ! checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/trustedbsd/base/etc/rc.d/cleartmp#10 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.17 2005/12/27 23:22:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $ # # PROVIDE: cleartmp @@ -10,47 +10,48 @@ . /etc/rc.subr name="cleartmp" -rcvar=`set_rcvar clear_tmp` - +# Disguise rcvar for the start method to run irrespective of its setting. +rcvar1=`set_rcvar clear_tmp` start_cmd="${name}_start" +stop_cmd=":" -cleartmp_prestart() +cleartmp_start() { - checkyesno clear_tmp_X || return + # Make /tmp location variable for easier debugging. + local tmp="/tmp" - local x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix \ - /tmp/.XIM-unix" + # X related directories to create in /tmp. + local x11_socket_dirs="${tmp}/.X11-unix ${tmp}/.XIM-unix \ + ${tmp}/.ICE-unix ${tmp}/.font-unix" - # Remove X lock files, since they will prevent you from restarting X. - rm -f /tmp/.X[0-9]-lock + if checkyesno ${rcvar1}; then + echo "Clearing ${tmp}." - # Create socket directories with correct permissions to avoid - # security problem. - # - rm -fr ${x11_socket_dirs} - mkdir -m 1777 ${x11_socket_dirs} + # This is not needed for mfs, but doesn't hurt anything. + # Things to note: + # + The dot in ${tmp}/. is important. + # + Put -prune before -exec so find never descends + # into a directory that was already passed to rm -rf. + # + "--" in rm arguments isn't strictly necessary, but + # it can prevent foot-shooting in future. + # + /tmp/lost+found is preserved, but its contents are removed. + # + lost+found and quota.* in subdirectories are removed. + find -x ${tmp}/. ! -name . \ + ! \( -name lost+found -type d -user root \) \ + ! \( \( -name quota.user -or -name quota.group \) \ + -type f -user root \) \ + -prune -exec rm -rf -- {} + + elif checkyesno clear_tmp_X; then + # Remove X lock files, since they will prevent you from + # restarting X. Remove other X related directories. + echo "Clearing ${tmp} (X related)." + rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} + fi + if checkyesno clear_tmp_X; then + # Create X related directories with proper permissions. + mkdir -m 1777 ${x11_socket_dirs} + fi } -cleartmp_start() -{ - echo "Clearing /tmp." - # - # Prune quickly with one rm, then use find to clean up - # /tmp/[lq]* (this is not needed with mfs /tmp, but - # doesn't hurt anything). - # - (cd /tmp && rm -rf [a-km-pr-zA-Z]* && - find -x . ! -name . ! -name lost+found ! -name quota.user \ - ! -name quota.group ! -name .X11-unix ! -name .ICE-unix \ - ! -name .font-unix ! -name .XIM-unix \ - -exec rm -rf -- {} \; -type d -prune) -} - load_rc_config $name - -# The clear_tmp_X variable should be tested even if clear_tmp_enable is NO -case "$1" in -*start) cleartmp_prestart ;; -esac - run_rc_command "$1" ==== //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kthr.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.4 2006/08/25 16:20:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.5 2006/10/16 20:07:23 jhb Exp $"); #include #include @@ -102,7 +102,7 @@ stopped_cpus = 0; stoppcbs = lookup("_stoppcbs"); - + while (paddr != 0) { if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) warnx("kvm_read: %s", kvm_geterr(kvm)); @@ -118,7 +118,7 @@ else if (td.td_state == TDS_RUNNING && ((1 << td.td_oncpu) & stopped_cpus) && stoppcbs != 0) kt->pcb = (uintptr_t) stoppcbs + sizeof(struct pcb) * td.td_oncpu; - else + else kt->pcb = (uintptr_t)td.td_pcb; kt->kstack = td.td_kstack; kt->tid = td.td_tid; ==== //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.4 2005/09/10 18:25:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5 2006/10/16 20:06:32 jhb Exp $"); #include #include @@ -45,6 +45,26 @@ static struct target_ops kgdb_trgt_ops; +#define KERNOFF (kgdb_kernbase ()) +#define INKERNEL(x) ((x) >= KERNOFF) + +static CORE_ADDR +kgdb_kernbase (void) +{ + static CORE_ADDR kernbase; + struct minimal_symbol *sym; + + if (kernbase == 0) { + sym = lookup_minimal_symbol ("kernbase", NULL, NULL); + if (sym == NULL) { + kernbase = KERNBASE; + } else { + kernbase = SYMBOL_VALUE_ADDRESS (sym); + } + } + return kernbase; +} + static char * kgdb_trgt_extra_thread_info(struct thread_info *ti) { @@ -114,6 +134,71 @@ return (tb->to_xfer_memory(memaddr, myaddr, len, write, attrib, tb)); } +static void +kgdb_switch_to_thread(struct kthr *thr) +{ + if (thr->tid == ptid_get_tid(inferior_ptid)) + return; + + inferior_ptid = ptid_build(thr->pid, 0, thr->tid); + flush_cached_frames (); + registers_changed (); + stop_pc = read_pc (); + select_frame (get_current_frame ()); +} + +static void +kgdb_set_proc_cmd (char *arg, int from_tty) +{ + CORE_ADDR addr; + struct kthr *thr; + + if (!arg) + error_no_arg ("proc address for the new context"); + + if (kvm == NULL) + error ("no kernel core file"); + + addr = (CORE_ADDR) parse_and_eval_address (arg); + + if (!INKERNEL (addr)) { + thr = kgdb_thr_lookup_pid((int)addr); + if (thr == NULL) + error ("invalid pid"); + } else { + thr = kgdb_thr_lookup_paddr(addr); + if (thr == NULL) + error("invalid proc address"); + } + kgdb_switch_to_thread(thr); +} + +static void +kgdb_set_tid_cmd (char *arg, int from_tty) +{ + CORE_ADDR addr; + struct kthr *thr; + + if (!arg) + error_no_arg ("TID or thread address for the new context"); + + if (kvm == NULL) + error ("no kernel core file"); + + addr = (CORE_ADDR) parse_and_eval_address (arg); + + if (!INKERNEL (addr)) { + thr = kgdb_thr_lookup_tid((int)addr); + if (thr == NULL) + error ("invalid TID"); + } else { + thr = kgdb_thr_lookup_taddr(addr); + if (thr == NULL) + error("invalid thread address"); + } + kgdb_switch_to_thread(thr); +} + void kgdb_target(void) { @@ -147,4 +232,8 @@ } if (curkthr != 0) inferior_ptid = ptid_build(curkthr->pid, 0, curkthr->tid); + add_com ("proc", class_obscure, kgdb_set_proc_cmd, + "Set current process context"); + add_com ("tid", class_obscure, kgdb_set_tid_cmd, + "Set current thread context"); } ==== //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_arm.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.2 2006/09/14 07:51:52 imp Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.3 2006/10/16 20:07:23 jhb Exp $"); #include #ifndef CROSS_DEBUGGER @@ -54,7 +54,7 @@ struct kthr *kt; struct pcb pcb; int i, reg; - + kt = kgdb_thr_lookup_tid(ptid_get_tid(inferior_ptid)); if (kt == NULL) return; @@ -63,7 +63,7 @@ memset(&pcb, 0, sizeof(pcb)); } for (i = ARM_A1_REGNUM + 8; i <= ARM_SP_REGNUM; i++) { - supply_register(i, (char *)&pcb.un_32.pcb32_r8 + + supply_register(i, (char *)&pcb.un_32.pcb32_r8 + (i - (ARM_A1_REGNUM + 8 )) * 4); } if (pcb.un_32.pcb32_sp != 0) { @@ -174,7 +174,7 @@ return; cache = kgdb_trgt_frame_cache(next_frame, this_cache); - + if (is_undef && (regnum == ARM_SP_REGNUM || regnum == ARM_PC_REGNUM)) { *addrp = cache->sp + offsetof(struct trapframe, tf_spsr); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23:21: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 EA09316A417; Thu, 19 Oct 2006 23:21: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 6686016A407 for ; Thu, 19 Oct 2006 23:21:56 +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 8168343D60 for ; Thu, 19 Oct 2006 23:21:54 +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 k9JNLsXw066024 for ; Thu, 19 Oct 2006 23:21: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 k9JNLqag066019 for perforce@freebsd.org; Thu, 19 Oct 2006 23:21:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Oct 2006 23:21:52 GMT Message-Id: <200610192321.k9JNLqag066019@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 108131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=108131 Change 108131 by rwatson@rwatson_zoo on 2006/10/19 23:21:43 Integrate TrustedBSD priv branch from TrustedBSD base branch; see @108130 for a detailed list of changes. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.i386#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.pc98#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/acpica/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/support.s#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_trap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_generic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_process.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.master#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/aio/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/linux/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/mem/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/uart/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/agp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/nfsmb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/elf32.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/elf64.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sem.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/umtx.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.78 2006/10/15 16:52:59 hrs Exp $"); #include #include @@ -520,7 +520,7 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { - printf("bus_dmamem_alloc failed to align memory properly."); + printf("bus_dmamem_alloc failed to align memory properly.\n"); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#3 (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.24 2006/10/13 17:31:57 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $ */ /* @@ -58,6 +58,7 @@ #ifndef DEV_ATPIC #include +#include #include #include #include ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/support.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.120 2006/08/28 02:28:14 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ */ #include "opt_ddb.h" @@ -342,10 +342,10 @@ ret /* - * casuptr. Compare and set user pointer. Returns -1 or the current value. + * casuword. Compare and set user word. Returns -1 or the current value. * dst = %rdi, old = %rsi, new = %rdx */ -ENTRY(casuptr) +ENTRY(casuword) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/NOTES#3 (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.59 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.60 2006/10/19 05:17:55 imp Exp $ # # @@ -103,7 +103,7 @@ # # sio: serial ports (see sio(4)), including support for various -# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# PC Card devices, such as Modem and NICs # device sio hint.sio.0.at="isa" @@ -257,7 +257,7 @@ # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# HP PC Lan+, various PC Card devices # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.5 2006/08/19 15:13:01 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.7 2006/10/15 14:22:12 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -830,6 +830,7 @@ #define CLONE_FILES 0x400 #define CLONE_SIGHAND 0x800 #define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_VFORK 0x4000 #define CLONE_PARENT 0x00008000 #define CLONE_THREAD 0x10000 #define CLONE_SETTLS 0x80000 @@ -839,4 +840,6 @@ #define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) +#include + #endif /* !_AMD64_LINUX_LINUX_H_ */ ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.22 2006/10/15 13:39:39 netchild Exp $"); #include #include @@ -530,7 +530,13 @@ ff |= RFMEM; if (args->flags & CLONE_SIGHAND) ff |= RFSIGSHARE; - if (!(args->flags & CLONE_FILES)) + /* + * XXX: in linux sharing of fs info (chroot/cwd/umask) + * and open files is independant. in fbsd its in one + * structure but in reality it doesnt make any problems + * because both this flags are set at once usually. + */ + if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; /* @@ -634,6 +640,16 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; + + if (args->flags & CLONE_VFORK) { + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + while (p2->p_flag & P_PPWAIT) + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + PROC_UNLOCK(p2); + } + return (0); } ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#3 (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.22 2006/08/27 08:58:00 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -724,6 +724,30 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_io_setup_args { + char nr_reqs_l_[PADL_(l_uint)]; l_uint nr_reqs; char nr_reqs_r_[PADR_(l_uint)]; + char ctxp_l_[PADL_(linux_aio_context_t *)]; linux_aio_context_t * ctxp; char ctxp_r_[PADR_(linux_aio_context_t *)]; +}; +struct linux_io_destroy_args { + char ctx_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx; char ctx_r_[PADR_(linux_aio_context_t)]; +}; +struct linux_io_getevents_args { + char ctx_id_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx_id; char ctx_id_r_[PADR_(linux_aio_context_t)]; + char min_nr_l_[PADL_(l_long)]; l_long min_nr; char min_nr_r_[PADR_(l_long)]; + char nr_l_[PADL_(l_long)]; l_long nr; char nr_r_[PADR_(l_long)]; + char events_l_[PADL_(struct linux_io_event *)]; struct linux_io_event * events; char events_r_[PADR_(struct linux_io_event *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; +}; +struct linux_io_submit_args { + char ctx_id_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx_id; char ctx_id_r_[PADR_(linux_aio_context_t)]; + char nr_l_[PADL_(l_long)]; l_long nr; char nr_r_[PADR_(l_long)]; + char iocbpp_l_[PADL_(struct linux_iocb **)]; struct linux_iocb ** iocbpp; char iocbpp_r_[PADR_(struct linux_iocb **)]; +}; +struct linux_io_cancel_args { + char ctx_id_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx_id; char ctx_id_r_[PADR_(linux_aio_context_t)]; + char iocb_l_[PADL_(struct linux_iocb *)]; struct linux_iocb * iocb; char iocb_r_[PADR_(struct linux_iocb *)]; + char result_l_[PADL_(struct linux_io_event *)]; struct linux_io_event * result; char result_r_[PADR_(struct linux_io_event *)]; +}; struct linux_fadvise64_args { register_t dummy; }; @@ -1081,6 +1105,11 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_io_setup(struct thread *, struct linux_io_setup_args *); +int linux_io_destroy(struct thread *, struct linux_io_destroy_args *); +int linux_io_getevents(struct thread *, struct linux_io_getevents_args *); +int linux_io_submit(struct thread *, struct linux_io_submit_args *); +int linux_io_cancel(struct thread *, struct linux_io_cancel_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); int linux_exit_group(struct thread *, struct linux_exit_group_args *); int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); @@ -1326,6 +1355,11 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_io_setup AUE_NULL +#define LINUX_SYS_AUE_linux_io_destroy AUE_NULL +#define LINUX_SYS_AUE_linux_io_getevents AUE_NULL +#define LINUX_SYS_AUE_linux_io_submit AUE_NULL +#define LINUX_SYS_AUE_linux_io_cancel AUE_NULL #define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL #define LINUX_SYS_AUE_linux_exit_group AUE_EXIT #define LINUX_SYS_AUE_linux_lookup_dcookie AUE_NULL ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#3 (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.22 2006/08/27 08:58:00 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,6 +221,11 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_io_setup 245 +#define LINUX_SYS_linux_io_destroy 246 +#define LINUX_SYS_linux_io_getevents 247 +#define LINUX_SYS_linux_io_submit 248 +#define LINUX_SYS_linux_io_cancel 249 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_linux_exit_group 252 #define LINUX_SYS_linux_lookup_dcookie 253 ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#3 (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.22 2006/08/27 08:58:00 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #include @@ -265,11 +265,11 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ { 0, (sy_call_t *)nosys, 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 */ + { AS(linux_io_setup_args), (sy_call_t *)linux_io_setup, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ + { AS(linux_io_destroy_args), (sy_call_t *)linux_io_destroy, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ + { AS(linux_io_getevents_args), (sy_call_t *)linux_io_getevents, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ + { AS(linux_io_submit_args), (sy_call_t *)linux_io_submit, AUE_NULL, NULL, 0, 0 }, /* 248 = linux_io_submit */ + { AS(linux_io_cancel_args), (sy_call_t *)linux_io_cancel, 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(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -406,11 +406,11 @@ 242 AUE_NULL UNIMPL linux_sched_getaffinity 243 AUE_NULL UNIMPL linux_set_thread_area 244 AUE_NULL UNIMPL linux_get_thread_area -245 AUE_NULL UNIMPL linux_io_setup -246 AUE_NULL UNIMPL linux_io_destroy -247 AUE_NULL UNIMPL linux_io_getevents -248 AUE_NULL UNIMPL linux_io_submit -249 AUE_NULL UNIMPL linux_io_cancel +245 AUE_NULL STD { int linux_io_setup(l_uint nr_reqs, linux_aio_context_t *ctxp); } +246 AUE_NULL STD { int linux_io_destroy(linux_aio_context_t ctx); } +247 AUE_NULL STD { int linux_io_getevents(linux_aio_context_t ctx_id, l_long min_nr, l_long nr, struct linux_io_event *events, struct l_timespec *timeout); } +248 AUE_NULL STD { int linux_io_submit(linux_aio_context_t ctx_id, l_long nr, struct linux_iocb **iocbpp); } +249 AUE_NULL STD { int linux_io_cancel(linux_aio_context_t ctx_id, struct linux_iocb *iocb, struct linux_io_event *result); } 250 AUE_NULL STD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } ==== //depot/projects/trustedbsd/priv/sys/arm/arm/fusu.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.10 2006/08/30 11:44:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.11 2006/10/17 02:24:46 davidxu Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -53,7 +53,7 @@ */ ENTRY_NP(casuword32) -ENTRY(casuptr) +ENTRY(casuword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ stmfd sp!, {r0, r14} @@ -72,7 +72,7 @@ beq .Lfusupcbfault #endif stmfd sp!, {r4, r5} - adr r4, .Lcasuptrfault + adr r4, .Lcasuwordfault str r4, [r3, #PCB_ONFAULT] ldrt r5, [r0] cmp r5, r1 @@ -85,10 +85,10 @@ RET /* - * Handle faults from casuptr. Clean up and return -1. + * Handle faults from casuword. Clean up and return -1. */ -.Lcasuptrfault: +.Lcasuwordfault: mov r0, #0x00000000 str r0, [r3, #PCB_ONFAULT] mvn r0, #0x00000000 ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.69 2006/10/06 08:24:37 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.70 2006/10/17 02:28:58 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.82 2006/10/06 08:22:08 davidxu Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -301,7 +301,7 @@ struct freebsd32_umtx_op_args { char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)]; char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; - char val_l_[PADL_(uintptr_t)]; uintptr_t val; char val_r_[PADR_(uintptr_t)]; + char val_l_[PADL_(u_long)]; u_long val; char val_r_[PADR_(u_long)]; char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; }; ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.67 2006/10/06 08:24:37 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.68 2006/10/17 02:28:58 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.82 2006/10/06 08:22:08 davidxu Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.58 2006/10/06 08:24:37 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.59 2006/10/17 02:28:58 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.82 2006/10/06 08:22:08 davidxu Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.68 2006/10/06 08:24:37 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.69 2006/10/17 02:28:58 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.82 2006/10/06 08:22:08 davidxu Exp */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.82 2006/10/06 08:22:08 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.83 2006/10/17 02:28:26 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -743,7 +743,7 @@ 452 AUE_SETAUDIT_ADDR UNIMPL setaudit_addr 453 AUE_AUDITCTL UNIMPL auditctl 454 AUE_NULL STD { int freebsd32_umtx_op(void *obj, int op,\ - uintptr_t val, void *uaddr, \ + u_long val, void *uaddr, \ void *uaddr2); } 455 AUE_NULL STD { int freebsd32_thr_new( \ struct thr_param32 *param, \ ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.59 2006/08/19 15:13:01 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.61 2006/10/15 14:34:03 netchild Exp $"); #include #include @@ -144,7 +144,7 @@ struct sigaction act, oact, *nsa, *osa; int error, sig; - if (linux_sig <= 0 || linux_sig > LINUX_NSIG) + if (!LINUX_SIG_VALID(linux_sig)) return (EINVAL); osa = (linux_osa != NULL) ? &oact : NULL; @@ -438,7 +438,7 @@ /* * Allow signal 0 as a means to check for privileges */ - if (args->signum < 0 || args->signum > LINUX_NSIG) + if (!LINUX_SIG_VALID(args->signum) && args->signum != 0) return EINVAL; if (args->signum > 0 && args->signum <= LINUX_SIGTBLSZ) ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_signal.h,v 1.6 2002/03/20 05:42:02 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_signal.h,v 1.7 2006/10/15 12:51:43 netchild Exp $ */ #ifndef _LINUX_SIGNAL_H_ @@ -35,4 +35,6 @@ void bsd_to_linux_sigset(sigset_t *, l_sigset_t *); int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *); +#define LINUX_SIG_VALID(sig) ((sig) <= LINUX_NSIG && (sig) > 0) + #endif /* _LINUX_SIGNAL_H_ */ ==== //depot/projects/trustedbsd/priv/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1150 2006/10/08 13:51:27 piso Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1151 2006/10/17 18:08:04 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -50,12 +50,7 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -emu10k1-alsa%diked.h optional snd_emu10k1 pci \ - dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ - compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ - no-obj no-implicit-rule before-depend \ - clean "emu10k1-alsa%diked.h" -emu10k1-alsa%diked.h optional snd_emu10kx pci \ +emu10k1-alsa%diked.h optional snd_emu10k1 | snd_emu10kx \ dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ ==== //depot/projects/trustedbsd/priv/sys/conf/files.amd64#4 (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.94 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.95 2006/10/15 14:22:13 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -240,6 +240,7 @@ amd64/linux32/linux32_machdep.c optional compat_linux32 amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 +compat/linux/linux_aio.c optional compat_linux32 compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 compat/linux/linux_futex.c optional compat_linux32 ==== //depot/projects/trustedbsd/priv/sys/conf/files.i386#3 (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.566 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.567 2006/10/15 14:22:13 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -85,6 +85,7 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_aio.c optional compat_linux compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux compat/linux/linux_futex.c optional compat_linux ==== //depot/projects/trustedbsd/priv/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.345 2006/08/18 15:46:38 netchild Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.346 2006/10/16 02:26:06 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -55,6 +55,7 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_aio.c optional compat_linux compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux compat/linux/linux_futex.c optional compat_linux ==== //depot/projects/trustedbsd/priv/sys/dev/awi/if_awi_pccard.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.23 2005/09/20 19:46:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.24 2006/10/19 05:25:29 imp Exp $"); #include #include @@ -158,8 +158,9 @@ #if 1 /* * XXX: awi needs to access memory with 8bit, - * but pccardd apparently maps memory with MDF_16BITS flag. + * but OLDCARD apparently maps memory with MDF_16BITS flag. * So memory mapped access is disabled and use IO port instead. + * XXX: Should check to see if this is true of NEWCARD */ psc->sc_mem_res = 0; #else ==== //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#4 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.10 2006/10/13 05:18:03 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.16 2006/10/19 08:01:43 scottl Exp $"); /* * The following controllers are supported by this driver: @@ -276,7 +276,6 @@ /* */ /****************************************************************************/ static void bce_dma_map_addr (void *, bus_dma_segment_t *, int, int); -static void bce_dma_map_tx_desc (void *, bus_dma_segment_t *, int, bus_size_t, int); static int bce_dma_alloc (device_t); static void bce_dma_free (struct bce_softc *); static void bce_release_resources (struct bce_softc *); @@ -300,7 +299,7 @@ static void bce_free_rx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); -static int bce_tx_encap (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); +static int bce_tx_encap (struct bce_softc *, struct mbuf **); static void bce_start_locked (struct ifnet *); static void bce_start (struct ifnet *); static int bce_ioctl (struct ifnet *, u_long, caddr_t); @@ -468,10 +467,10 @@ /* Allocate PCI memory resources. */ rid = PCIR_BAR(0); sc->bce_res = bus_alloc_resource_any( - dev, /* dev */ - SYS_RES_MEMORY, /* type */ - &rid, /* rid */ - RF_ACTIVE | PCI_RF_DENSE); /* flags */ + dev, /* dev */ + SYS_RES_MEMORY, /* type */ + &rid, /* rid */ + RF_ACTIVE | PCI_RF_DENSE); /* flags */ if (sc->bce_res == NULL) { BCE_PRINTF(sc, "%s(%d): PCI memory allocation failed\n", @@ -2131,135 +2130,24 @@ static void bce_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error) { - struct bce_dmamap_arg *map_arg = arg; - struct bce_softc *sc = map_arg->sc; + bus_addr_t *busaddr = arg; /* Simulate a mapping failure. */ DBRUNIF(DB_RANDOMTRUE(bce_debug_dma_map_addr_failure), - BCE_PRINTF(sc, "%s(%d): Simulating DMA mapping error.\n", + printf("bce: %s(%d): Simulating DMA mapping error.\n", __FILE__, __LINE__); error = ENOMEM); /* Check for an error and signal the caller that an error occurred. */ - if (error || (nseg > map_arg->maxsegs)) { - BCE_PRINTF(sc, "%s(%d): DMA mapping error! error = %d, " - "nseg = %d, maxsegs = %d\n", - __FILE__, __LINE__, error, nseg, map_arg->maxsegs); - map_arg->maxsegs = 0; - goto bce_dma_map_addr_exit; - } - - map_arg->busaddr = segs->ds_addr; - -bce_dma_map_addr_exit: - return; -} - - -/****************************************************************************/ -/* Map TX buffers into TX buffer descriptors. */ -/* */ -/* Given a series of DMA memory containting an outgoing frame, map the */ -/* segments into the tx_bd structure used by the hardware. */ -/* */ -/* Returns: */ -/* Nothing. */ -/****************************************************************************/ -static void -bce_dma_map_tx_desc(void *arg, bus_dma_segment_t *segs, - int nseg, bus_size_t mapsize, int error) -{ - struct bce_dmamap_arg *map_arg; - struct bce_softc *sc; - struct tx_bd *txbd = NULL; - int i = 0; - u16 prod, chain_prod; - u32 prod_bseq; -#ifdef BCE_DEBUG - u16 debug_prod; -#endif - - map_arg = arg; - sc = map_arg->sc; - if (error) { - DBPRINT(sc, BCE_WARN, "%s(): Called with error = %d\n", - __FUNCTION__, error); + printf("bce %s(%d): DMA mapping error! error = %d, " + "nseg = %d\n", __FILE__, __LINE__, error, nseg); + *busaddr = 0; return; } - /* Signal error to caller if there's too many segments */ - if (nseg > map_arg->maxsegs) { - DBPRINT(sc, BCE_WARN, - "%s(): Mapped TX descriptors: max segs = %d, " - "actual segs = %d\n", - __FUNCTION__, map_arg->maxsegs, nseg); - - map_arg->maxsegs = 0; - return; - } - - /* prod points to an empty tx_bd at this point. */ - prod = map_arg->prod; - chain_prod = map_arg->chain_prod; - prod_bseq = map_arg->prod_bseq; - -#ifdef BCE_DEBUG - debug_prod = chain_prod; -#endif - - DBPRINT(sc, BCE_INFO_SEND, - "%s(): Start: prod = 0x%04X, chain_prod = %04X, " - "prod_bseq = 0x%08X\n", - __FUNCTION__, prod, chain_prod, prod_bseq); - - /* - * Cycle through each mbuf segment that makes up - * the outgoing frame, gathering the mapping info - * for that segment and creating a tx_bd to for - * the mbuf. - */ - - txbd = &map_arg->tx_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)]; - - /* Setup the first tx_bd for the first segment. */ - txbd->tx_bd_haddr_lo = htole32(BCE_ADDR_LO(segs[i].ds_addr)); - txbd->tx_bd_haddr_hi = htole32(BCE_ADDR_HI(segs[i].ds_addr)); - txbd->tx_bd_mss_nbytes = htole16(segs[i].ds_len); - txbd->tx_bd_vlan_tag_flags = htole16(map_arg->tx_flags | - TX_BD_FLAGS_START); - prod_bseq += segs[i].ds_len; - - /* Setup any remaing segments. */ - for (i = 1; i < nseg; i++) { - prod = NEXT_TX_BD(prod); - chain_prod = TX_CHAIN_IDX(prod); - - txbd = &map_arg->tx_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)]; - - txbd->tx_bd_haddr_lo = htole32(BCE_ADDR_LO(segs[i].ds_addr)); - txbd->tx_bd_haddr_hi = htole32(BCE_ADDR_HI(segs[i].ds_addr)); - txbd->tx_bd_mss_nbytes = htole16(segs[i].ds_len); - txbd->tx_bd_vlan_tag_flags = htole16(map_arg->tx_flags); - - prod_bseq += segs[i].ds_len; - } - - /* Set the END flag on the last TX buffer descriptor. */ - txbd->tx_bd_vlan_tag_flags |= htole16(TX_BD_FLAGS_END); - - DBRUN(BCE_INFO_SEND, bce_dump_tx_chain(sc, debug_prod, nseg)); - - DBPRINT(sc, BCE_INFO_SEND, - "%s(): End: prod = 0x%04X, chain_prod = %04X, " - "prod_bseq = 0x%08X\n", - __FUNCTION__, prod, chain_prod, prod_bseq); - - /* prod points to the last tx_bd at this point. */ - map_arg->maxsegs = nseg; - map_arg->prod = prod; - map_arg->chain_prod = chain_prod; - map_arg->prod_bseq = prod_bseq; + *busaddr = segs->ds_addr; + return; } @@ -2277,17 +2165,17 @@ { struct bce_softc *sc; int i, error, rc = 0; - struct bce_dmamap_arg map_arg; + bus_addr_t busaddr; sc = device_get_softc(dev); - + DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); /* * Allocate the parent bus DMA tag appropriate for PCI. */ if (bus_dma_tag_create(NULL, /* parent */ - BCE_DMA_ALIGN, /* alignment */ + 1, /* alignment */ BCE_DMA_BOUNDARY, /* boundary */ sc->max_bus_addr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2345,26 +2233,23 @@ bzero((char *)sc->status_block, BCE_STATUS_BLK_SZ); - map_arg.sc = sc; - map_arg.maxsegs = 1; - error = bus_dmamap_load( sc->status_tag, /* dmat */ sc->status_map, /* map */ sc->status_block, /* buf */ BCE_STATUS_BLK_SZ, /* buflen */ bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ + &busaddr, /* callbackarg */ BUS_DMA_NOWAIT); /* flags */ - if(error || (map_arg.maxsegs == 0)) { + if (error) { BCE_PRINTF(sc, "%s(%d): Could not map status block DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; goto bce_dma_alloc_exit; } - sc->status_block_paddr = map_arg.busaddr; + sc->status_block_paddr = busaddr; /* DRC - Fix for 64 bit addresses. */ DBPRINT(sc, BCE_INFO, "status_block_paddr = 0x%08X\n", (u32) sc->status_block_paddr); @@ -2408,26 +2293,23 @@ bzero((char *)sc->stats_block, BCE_STATS_BLK_SZ); - map_arg.sc = sc; - map_arg.maxsegs = 1; - error = bus_dmamap_load( sc->stats_tag, /* dmat */ sc->stats_map, /* map */ sc->stats_block, /* buf */ BCE_STATS_BLK_SZ, /* buflen */ bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ + &busaddr, /* callbackarg */ BUS_DMA_NOWAIT); /* flags */ - if(error || (map_arg.maxsegs == 0)) { + if(error) { BCE_PRINTF(sc, "%s(%d): Could not map statistics block DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; goto bce_dma_alloc_exit; } - sc->stats_block_paddr = map_arg.busaddr; + sc->stats_block_paddr = busaddr; /* DRC - Fix for 64 bit address. */ DBPRINT(sc,BCE_INFO, "stats_block_paddr = 0x%08X\n", (u32) sc->stats_block_paddr); @@ -2471,26 +2353,23 @@ goto bce_dma_alloc_exit; } - map_arg.maxsegs = 1; - map_arg.sc = sc; - error = bus_dmamap_load( sc->tx_bd_chain_tag, /* dmat */ sc->tx_bd_chain_map[i], /* map */ sc->tx_bd_chain[i], /* buf */ BCE_TX_CHAIN_PAGE_SZ, /* buflen */ bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ + &busaddr, /* callbackarg */ BUS_DMA_NOWAIT); /* flags */ - if(error || (map_arg.maxsegs == 0)) { + if (error) { BCE_PRINTF(sc, "%s(%d): Could not map TX descriptor chain DMA memory!\n", __FILE__, __LINE__); rc = ENOMEM; goto bce_dma_alloc_exit; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23: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 1917116A47E; Thu, 19 Oct 2006 23: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 E546916A407 for ; Thu, 19 Oct 2006 23:30: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 6184E43D4C for ; Thu, 19 Oct 2006 23:30: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 k9JNU5M9067764 for ; Thu, 19 Oct 2006 23:30: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 k9JNU5RQ067761 for perforce@freebsd.org; Thu, 19 Oct 2006 23:30:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Oct 2006 23:30:05 GMT Message-Id: <200610192330.k9JNU5RQ067761@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 108132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:30:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=108132 Change 108132 by rwatson@rwatson_zoo on 2006/10/19 23:29:16 Merge from priv branch: This is a silly suser() call, so replace it with a silly priv_check() call. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_misc.c#4 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_misc.c#4 (text+ko) ==== @@ -1356,7 +1356,7 @@ switch (args->cmd) { case REBOOT_CAD_ON: case REBOOT_CAD_OFF: - return suser(td); + return (priv_check(td, PRIV_REBOOT)); case REBOOT_HALT: bsd_args.opt = RB_HALT; break; From owner-p4-projects@FreeBSD.ORG Thu Oct 19 23:59: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 7400F16A416; Thu, 19 Oct 2006 23:59: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 4834E16A407 for ; Thu, 19 Oct 2006 23:59:44 +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 EE6AD43D4C for ; Thu, 19 Oct 2006 23:59:43 +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 k9JNxhtS072528 for ; Thu, 19 Oct 2006 23:59:43 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 k9JNxhDj072525 for perforce@freebsd.org; Thu, 19 Oct 2006 23:59:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Oct 2006 23:59:43 GMT Message-Id: <200610192359.k9JNxhDj072525@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 108134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Oct 2006 23:59:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=108134 Change 108134 by rwatson@rwatson_zoo on 2006/10/19 23:59:26 Replace incorrect version check with an imperfect one. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/drm/drmP.h#4 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/drm/drmP.h#4 (text+ko) ==== @@ -50,7 +50,7 @@ #include #include #include -#if __FreeBSD_version >= 700000 +#if __FreeBSD_version >= 600000 #include #endif #include From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:03: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 891D216A407; Fri, 20 Oct 2006 00:03: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 278B116A415 for ; Fri, 20 Oct 2006 00:03:56 +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 48F8843D5D for ; Fri, 20 Oct 2006 00:03: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 k9K03nkK074773 for ; Fri, 20 Oct 2006 00:03: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 k9K03nnK074770 for perforce@freebsd.org; Fri, 20 Oct 2006 00:03:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:03:49 GMT Message-Id: <200610200003.k9K03nnK074770@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 108135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=108135 Change 108135 by rwatson@rwatson_zoo on 2006/10/20 00:03:11 Merge from HEAD version of priv(9): Keep comments about layering, but switch to priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/net/if_gre.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/net/if_gre.c#3 (text+ko) ==== @@ -463,7 +463,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFFLAGS)) != 0) break; if ((ifr->ifr_flags & IFF_LINK0) != 0) sc->g_proto = IPPROTO_GRE; @@ -479,7 +479,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFMTU)) != 0) break; if (ifr->ifr_mtu < 576) { error = EINVAL; @@ -491,12 +491,36 @@ ifr->ifr_mtu = GRE2IFP(sc)->if_mtu; break; case SIOCADDMULTI: + /* + * XXXRW: Isn't this suser() redundant to the ifnet layer + * check? + */ + if ((error = priv_check(curthread, PRIV_NET_ADDMULTI)) != 0) + break; + if (ifr == 0) { + error = EAFNOSUPPORT; + break; + } + switch (ifr->ifr_addr.sa_family) { +#ifdef INET + case AF_INET: + break; +#endif +#ifdef INET6 + case AF_INET6: + break; +#endif + default: + error = EAFNOSUPPORT; + break; + } + break; case SIOCDELMULTI: /* * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_DELIFGROUP)) != 0) break; if (ifr == 0) { error = EAFNOSUPPORT; @@ -521,7 +545,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_GRE)) != 0) break; sc->g_proto = ifr->ifr_flags; switch (sc->g_proto) { @@ -612,7 +636,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0) break; if (aifr->ifra_addr.sin_family != AF_INET || aifr->ifra_dstaddr.sin_family != AF_INET) { @@ -632,7 +656,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0) break; if (lifr->addr.ss_family != AF_INET || lifr->dstaddr.ss_family != AF_INET) { @@ -653,7 +677,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0) break; sc->g_src.s_addr = INADDR_ANY; sc->g_dst.s_addr = INADDR_ANY; From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:07: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 D718016A415; Fri, 20 Oct 2006 00:07: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 B283216A40F for ; Fri, 20 Oct 2006 00:07:06 +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 CBE7A43D4C for ; Fri, 20 Oct 2006 00:06:54 +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 k9K06sMc075347 for ; Fri, 20 Oct 2006 00:06: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 k9K06rlV075339 for perforce@freebsd.org; Fri, 20 Oct 2006 00:06:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:06:53 GMT Message-Id: <200610200006.k9K06rlV075339@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 108136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:07:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=108136 Change 108136 by rwatson@rwatson_zoo on 2006/10/20 00:06:18 Merge from HEAD priv(9): Clean up a number of priv(9) loose ends for VFS: make file system checks for utimes() NULL timestamp more consistent. Add privileges for dtrace. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/fs/hpfs/hpfs_vnops.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/msdosfs/msdosfs_vnops.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/smbfs/smbfs_vnops.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_mount.c#5 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#6 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/fs/hpfs/hpfs_vnops.c#3 (text+ko) ==== @@ -501,15 +501,12 @@ if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - /* - * XXXRW: Why not just rely on the VOP_ACCESS() check here - * instead of calling suser()? - */ - if (cred->cr_uid != hp->h_uid && - (error = suser_cred(cred, SUSER_ALLOWJAIL)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(vp, VWRITE, cred, td)))) - return (error); + if (vap->va_vaflags & VA_UTIMES_NULL) { + error = VOP_ACCESS(vp, VADMIN, cred, td); + if (error) + error = VOP_ACCESS(vp, VWRITE, cred, td); + } else + error = VOP_ACCESS(vp, VADMIN, cred, td); if (vap->va_atime.tv_sec != VNOVAL) hp->h_atime = vap->va_atime.tv_sec; if (vap->va_mtime.tv_sec != VNOVAL) ==== //depot/projects/trustedbsd/priv6/src/sys/fs/msdosfs/msdosfs_vnops.c#3 (text+ko) ==== @@ -484,15 +484,13 @@ if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - /* - * XXXRW: Isn't VOP_ACCESS() enough here? Why is suser() - * required? - */ - if (cred->cr_uid != pmp->pm_uid && - (error = suser_cred(cred, SUSER_ALLOWJAIL)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(ap->a_vp, VWRITE, cred, ap->a_td)))) - return (error); + if (vap->va_vaflags & VA_UTIMES_NULL) { + error = VOP_ACCESS(vp, VADMIN, cred, ap->a_td); + if (error) + error = VOP_ACCESS(vp, VWRITE, cred, + ap->a_td); + } else + error = VOP_ACCESS(vp, VADMIN, cred, ap->a_td); if (vp->v_type != VDIR) { if ((pmp->pm_flags & MSDOSFSMNT_NOWIN95) == 0 && vap->va_atime.tv_sec != VNOVAL) { ==== //depot/projects/trustedbsd/priv6/src/sys/fs/smbfs/smbfs_vnops.c#3 (text+ko) ==== @@ -352,14 +352,13 @@ if (vap->va_atime.tv_sec != VNOVAL) atime = &vap->va_atime; if (mtime != atime) { - /* - * XXXRW: Isn't VOP_ACCESS() here sufficient? Why suser()? - */ - if (ap->a_cred->cr_uid != VTOSMBFS(vp)->sm_uid && - (error = suser_cred(ap->a_cred, SUSER_ALLOWJAIL)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td)))) - return (error); + if (vap->va_vaflags & VA_UTIMES_NULL) { + error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td); + if (error) + error = VOP_ACCESS(vp, VWRITE, ap->a_cred, + ap->a_td); + } else + error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td); #if 0 if (mtime == NULL) mtime = &np->n_mtime; ==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_mount.c#5 (text+ko) ==== @@ -796,12 +796,11 @@ } /* * Silently enforce MNT_NOSUID and MNT_USER for unprivileged users. - * - * XXXRW: Which privileges to map this to? Wouldn't it be better - * to see if they weren't already set and only then check privilege? */ - if (suser(td) != 0) - fsflags |= MNT_NOSUID | MNT_USER; + if ((fsflags & (MNT_NOSUID | MNT_USER)) != (MNT_NOSUID | MNT_USER)) { + if (priv_check(td, PRIV_VFS_MOUNT_NONUSER) != 0) + fsflags |= MNT_NOSUID | MNT_USER; + } /* Load KLDs before we lock the covered vnode to avoid reversals. */ vfsp = NULL; ==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#6 (text+ko) ==== @@ -1206,9 +1206,14 @@ case S_IFBLK: error = priv_check(td, PRIV_VFS_MKNOD_DEV); break; + case S_IFMT: + error = priv_check(td, PRIV_VFS_MKNOD_BAD); + break; + case S_IFWHT: + error = priv_check(td, PRIV_VFS_MKNOD_WHT); + break; default: - /* XXXRW: Should do a full enumeration here. */ - error = suser_cred(td->td_ucred, SUSER_ALLOWJAIL); + error = EINVAL; break; } if (error) @@ -1253,8 +1258,7 @@ whiteout = 1; break; default: - error = EINVAL; - break; + panic("kern_mknod: invalid mode"); } } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { ==== //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#3 (text+ko) ==== @@ -104,6 +104,9 @@ PRIV_DEBUG_DIFFCRED, /* Exempt debugging other users. */ PRIV_DEBUG_SUGID, /* Exempt debugging setuid proc. */ PRIV_DEBUG_UNPRIV, /* Exempt unprivileged debug limit. */ + PRIV_DTRACE_KERNEL, /* Allow use of DTrace on the kernel. */ + PRIV_DTRACE_USER, /* Allow process to submit DTrace events. */ + PRIV_DTRACE_PROC, /* Allow attaching DTrace to process. */ PRIV_FIRMWARE_LOAD, /* Can load firmware. */ PRIV_JAIL_ATTACH, /* Attach to a jail. */ PRIV_KENV_SET, /* Set kernel env. variables. */ @@ -167,12 +170,15 @@ PRIV_VFS_GENERATION, /* stat() returns generation number. */ PRIV_VFS_GETFH, /* Can retrieve file handles. */ PRIV_VFS_LINK, /* bsd.hardlink_check_uid */ - PRIV_VFS_MKNOD_DEV, /* Can create device nodes. */ + PRIV_VFS_MKNOD_BAD, /* Can use mknod() to mark bad inodes. */ + PRIV_VFS_MKNOD_DEV, /* Can use mknod() to create device nodes. */ + PRIV_VFS_MKNOD_WHT, /* Can use mknod() to create whiteout. */ PRIV_VFS_MOUNT, /* Can mount(). */ PRIV_VFS_MOUNT_OWNER, /* Override owner on user mounts. */ PRIV_VFS_MOUNT_EXPORTED, /* Can set MNT_EXPORTED on mount. */ PRIV_VFS_MOUNT_PERM, /* Override device node perms at mount. */ PRIV_VFS_MOUNT_SUIDDIR, /* Can set MNT_SUIDDIR on mount. */ + PRIV_VFS_MOUNT_NONUSER, /* Can perform a non-user mount. */ PRIV_VFS_SETGID, /* Can setgid if not in group. */ PRIV_VFS_STICKYFILE, /* Can set sticky bit on file. */ PRIV_VFS_SYSFLAGS, /* Can modify system flags. */ From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:08: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 E5E5316A47C; Fri, 20 Oct 2006 00:08: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 A905616A417 for ; Fri, 20 Oct 2006 00:08: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 DDCDE43D80 for ; Fri, 20 Oct 2006 00:07: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 k9K07ukB075408 for ; Fri, 20 Oct 2006 00:07: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 k9K07t52075405 for perforce@freebsd.org; Fri, 20 Oct 2006 00:07:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:07:55 GMT Message-Id: <200610200007.k9K07t52075405@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 108137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:08:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=108137 Change 108137 by rwatson@rwatson_zoo on 2006/10/20 00:06:58 Merge more changes from HEAD to priv6: More suser replacement in the network stack -- add/remove addresses. Handle broadcast/etc ioctls (obsolete) using similar checks, but we might want to move to explicit checks. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/netinet/in.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#4 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/netinet/in.c#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -232,10 +233,25 @@ switch (cmd) { case SIOCALIFADDR: + if (td != NULL) { + error = priv_check(td, PRIV_NET_ADDIFADDR); + if (error) + return (error); + } + if (!ifp) + return EINVAL; + return in_lifaddr_ioctl(so, cmd, data, ifp, td); + case SIOCDLIFADDR: - if (td && (error = suser(td)) != 0) - return error; - /*fall through*/ + if (td != NULL) { + error = priv_check(td, PRIV_NET_DELIFADDR); + if (error) + return (error); + } + if (!ifp) + return EINVAL; + return in_lifaddr_ioctl(so, cmd, data, ifp, td); + case SIOCGLIFADDR: if (!ifp) return EINVAL; @@ -292,8 +308,11 @@ case SIOCSIFADDR: case SIOCSIFNETMASK: case SIOCSIFDSTADDR: - if (td && (error = suser(td)) != 0) - return error; + if (td != NULL) { + error = priv_check(td, PRIV_NET_ADDIFADDR); + if (error) + return (error); + } if (ifp == 0) return (EADDRNOTAVAIL); @@ -330,8 +349,11 @@ break; case SIOCSIFBRDADDR: - if (td && (error = suser(td)) != 0) - return error; + if (td != NULL) { + error = priv_check(td, PRIV_NET_ADDIFADDR); + if (error) + return (error); + } /* FALLTHROUGH */ case SIOCGIFADDR: ==== //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#4 (text+ko) ==== @@ -212,6 +212,8 @@ PRIV_NET_DELIFGROUP, /* Delete interface group. */ PRIV_NET_IFCREATE, /* Create cloned interface. */ PRIV_NET_IFDESTROY, /* Destroy cloned interface. */ + PRIV_NET_ADDIFADDR, /* Add protocol address to interface. */ + PRIV_NET_DELIFADDR, /* Delete protocol address on interface. */ PRIV_NET80211_GETKEY, /* Query 802.11 keys. */ PRIV_NET80211_MANAGE, /* Administer 802.11. */ PRIV_NETATALK_RESERVEDPORT, /* Bind low port number. */ From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:32: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 E2D8016A4C2; Fri, 20 Oct 2006 00:32: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 BDB0C16A494 for ; Fri, 20 Oct 2006 00:32: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 7C78943D7D for ; Fri, 20 Oct 2006 00:32:27 +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 k9K0WRad079424 for ; Fri, 20 Oct 2006 00:32:27 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 k9K0WRJl079421 for perforce@freebsd.org; Fri, 20 Oct 2006 00:32:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:32:27 GMT Message-Id: <200610200032.k9K0WRJl079421@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 108138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:32:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=108138 Change 108138 by rwatson@rwatson_zoo on 2006/10/20 00:32:17 Do allow System V IPC and POSIX message queue privileges in Jail. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#8 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#8 (text+ko) ==== @@ -592,12 +592,12 @@ * The following privileges should be granted to jail once * implemented. */ - /* case PRIV_IPC_READ: */ - /* case PRIV_IPC_WRITE: */ - /* case PRIV_IPC_EXEC: */ - /* case PRIV_IPC_ADMIN: */ - /* case PRIV_IPC_MSGSIZE: */ - /* case PRIV_MQ_ADMIN: */ + case PRIV_IPC_READ: + case PRIV_IPC_WRITE: + case PRIV_IPC_EXEC: + case PRIV_IPC_ADMIN: + case PRIV_IPC_MSGSIZE: + case PRIV_MQ_ADMIN: /* * Jail implements its own inter-process limits, so allow From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:33: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 BFB6516A416; Fri, 20 Oct 2006 00:33: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 8655716A407 for ; Fri, 20 Oct 2006 00:33: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 36F0643D68 for ; Fri, 20 Oct 2006 00:33:29 +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 k9K0XTcH079873 for ; Fri, 20 Oct 2006 00:33:29 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 k9K0XSbN079870 for perforce@freebsd.org; Fri, 20 Oct 2006 00:33:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:33:28 GMT Message-Id: <200610200033.k9K0XSbN079870@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 108139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:33:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=108139 Change 108139 by rwatson@rwatson_zoo on 2006/10/20 00:32:57 Merge from HEAD priv(9): Do allow System V IPC and POSIX message queue privileges in Jail. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_jail.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -593,12 +593,12 @@ * The following privileges should be granted to jail once * implemented. */ - /* case PRIV_IPC_READ: */ - /* case PRIV_IPC_WRITE: */ - /* case PRIV_IPC_EXEC: */ - /* case PRIV_IPC_ADMIN: */ - /* case PRIV_IPC_MSGSIZE: */ - /* case PRIV_MQ_ADMIN: */ + case PRIV_IPC_READ: + case PRIV_IPC_WRITE: + case PRIV_IPC_EXEC: + case PRIV_IPC_ADMIN: + case PRIV_IPC_MSGSIZE: + case PRIV_MQ_ADMIN: /* * Jail implements its own inter-process limits, so allow From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:35: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 C8E8916A40F; Fri, 20 Oct 2006 00:35: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 7EC3616A403 for ; Fri, 20 Oct 2006 00:35: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 3391A43D45 for ; Fri, 20 Oct 2006 00:35: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 k9K0ZWWA080026 for ; Fri, 20 Oct 2006 00:35: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 k9K0ZVUt080023 for perforce@freebsd.org; Fri, 20 Oct 2006 00:35:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:35:31 GMT Message-Id: <200610200035.k9K0ZVUt080023@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 108140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:35:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=108140 Change 108140 by rwatson@rwatson_zoo on 2006/10/20 00:35:07 Update comment. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#9 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#9 (text+ko) ==== @@ -589,8 +589,7 @@ case PRIV_PROC_SETRLIMIT: /* - * The following privileges should be granted to jail once - * implemented. + * System V and POSIX IPC privileges are granted in jail. */ case PRIV_IPC_READ: case PRIV_IPC_WRITE: From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:36: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 A622316A415; Fri, 20 Oct 2006 00:36: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 6A85916A40F for ; Fri, 20 Oct 2006 00:36: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 0BE6743D53 for ; Fri, 20 Oct 2006 00:36: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 k9K0aXY3080067 for ; Fri, 20 Oct 2006 00:36:33 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 k9K0aXnB080064 for perforce@freebsd.org; Fri, 20 Oct 2006 00:36:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:36:33 GMT Message-Id: <200610200036.k9K0aXnB080064@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 108141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:36:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=108141 Change 108141 by rwatson@rwatson_zoo on 2006/10/20 00:35:35 Merge comment. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_jail.c#4 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_jail.c#4 (text+ko) ==== @@ -590,8 +590,7 @@ case PRIV_PROC_SETRLIMIT: /* - * The following privileges should be granted to jail once - * implemented. + * System V and POSIX IPC privileges are granted in jail. */ case PRIV_IPC_READ: case PRIV_IPC_WRITE: From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:39: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 9F9A616A416; Fri, 20 Oct 2006 00:39: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 6897F16A40F for ; Fri, 20 Oct 2006 00:39: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 63FA243D75 for ; Fri, 20 Oct 2006 00:39:39 +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 k9K0ddhj080180 for ; Fri, 20 Oct 2006 00:39:39 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 k9K0ddGe080177 for perforce@freebsd.org; Fri, 20 Oct 2006 00:39:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:39:39 GMT Message-Id: <200610200039.k9K0ddGe080177@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 108142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:39:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=108142 Change 108142 by rwatson@rwatson_zoo on 2006/10/20 00:39:00 Include not needed in RELENG_6. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_thr.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_thr.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Oct 20 00:45: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 B9E1E16A47C; Fri, 20 Oct 2006 00:45: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 74BB016A403 for ; Fri, 20 Oct 2006 00:45:48 +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 3F87143D49 for ; Fri, 20 Oct 2006 00:45:48 +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 k9K0jmUn081610 for ; Fri, 20 Oct 2006 00:45:48 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 k9K0jln0081607 for perforce@freebsd.org; Fri, 20 Oct 2006 00:45:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 00:45:47 GMT Message-Id: <200610200045.k9K0jln0081607@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 108144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 00:45:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=108144 Change 108144 by rwatson@rwatson_zoo on 2006/10/20 00:45:05 White space fix. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#6 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#6 (text+ko) ==== @@ -3274,7 +3274,7 @@ } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && !priv_check_cred(cred, PRIV_VFS_EXEC, SUSER_ALLOWJAIL)) - priv_granted |= VEXEC; + priv_granted |= VEXEC; } if ((acc_mode & VREAD) && ((dac_granted & VREAD) == 0) && From owner-p4-projects@FreeBSD.ORG Fri Oct 20 01:06: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 CC5AF16A47B; Fri, 20 Oct 2006 01:06: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 6D95516A412 for ; Fri, 20 Oct 2006 01:06:16 +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 D2F5143D55 for ; Fri, 20 Oct 2006 01:06:15 +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 k9K16FTB093818 for ; Fri, 20 Oct 2006 01:06:15 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 k9K16FII093815 for perforce@freebsd.org; Fri, 20 Oct 2006 01:06:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 01:06:15 GMT Message-Id: <200610200106.k9K16FII093815@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 108145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 01:06:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=108145 Change 108145 by rwatson@rwatson_zoo on 2006/10/20 01:05:41 Merge built nit fix from HEAD to RELENG_6 priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/cnw/if_cnw.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/cnw/if_cnw.c#3 (text+ko) ==== @@ -125,7 +125,6 @@ #include #include #include -#include #include #include @@ -237,6 +236,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Oct 20 01:09: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 6098216A415; Fri, 20 Oct 2006 01:09: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 383D816A40F for ; Fri, 20 Oct 2006 01:09:20 +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 009F543D45 for ; Fri, 20 Oct 2006 01:09:19 +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 k9K19Jlg093927 for ; Fri, 20 Oct 2006 01:09:19 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 k9K19JoR093924 for perforce@freebsd.org; Fri, 20 Oct 2006 01:09:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 01:09:19 GMT Message-Id: <200610200109.k9K19JoR093924@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 108146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 01:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=108146 Change 108146 by rwatson@rwatson_zoo on 2006/10/20 01:08:49 Integrate TrustedBSD priv6 branch. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athvar.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athvar.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.27.2.10 2006/10/16 01:01:41 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.27.2.11 2006/10/19 23:34:00 sam Exp $ */ /* @@ -419,7 +419,7 @@ ((*(_ah)->ah_getDiagState)((_ah), (_id), \ (_indata), (_insize), (_outdata), (_outsize))) #define ath_hal_getfatalstate(_ah, _outdata, _outsize) \ - ath_hal_getdiagstate(_ah, 27, NULL, 0, (void **)(_outdata), _outsize) + ath_hal_getdiagstate(_ah, 29, NULL, 0, (void **)(_outdata), _outsize) #define ath_hal_setuptxqueue(_ah, _type, _irq) \ ((*(_ah)->ah_setupTxQueue)((_ah), (_type), (_irq))) #define ath_hal_resettxqueue(_ah, _q) \ From owner-p4-projects@FreeBSD.ORG Fri Oct 20 01:26: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 A3E0E16A415; Fri, 20 Oct 2006 01:26: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 6654516A40F for ; Fri, 20 Oct 2006 01:26: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 2DA5643D53 for ; Fri, 20 Oct 2006 01:26: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 k9K1QgYL002384 for ; Fri, 20 Oct 2006 01:26:42 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 k9K1Qgrk002381 for perforce@freebsd.org; Fri, 20 Oct 2006 01:26:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 01:26:42 GMT Message-Id: <200610200126.k9K1Qgrk002381@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 108147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 01:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=108147 Change 108147 by rwatson@rwatson_peppercorn on 2006/10/20 01:25:59 Sort. Affected files ... .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#7 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#5 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/sys/priv.h#7 (text+ko) ==== @@ -105,8 +105,8 @@ PRIV_DEBUG_SUGID, /* Exempt debugging setuid proc. */ PRIV_DEBUG_UNPRIV, /* Exempt unprivileged debug limit. */ PRIV_DTRACE_KERNEL, /* Allow use of DTrace on the kernel. */ + PRIV_DTRACE_PROC, /* Allow attaching DTrace to process. */ PRIV_DTRACE_USER, /* Allow process to submit DTrace events. */ - PRIV_DTRACE_PROC, /* Allow attaching DTrace to process. */ PRIV_FIRMWARE_LOAD, /* Can load firmware. */ PRIV_JAIL_ATTACH, /* Attach to a jail. */ PRIV_KENV_SET, /* Set kernel env. variables. */ ==== //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#5 (text+ko) ==== @@ -105,8 +105,8 @@ PRIV_DEBUG_SUGID, /* Exempt debugging setuid proc. */ PRIV_DEBUG_UNPRIV, /* Exempt unprivileged debug limit. */ PRIV_DTRACE_KERNEL, /* Allow use of DTrace on the kernel. */ + PRIV_DTRACE_PROC, /* Allow attaching DTrace to process. */ PRIV_DTRACE_USER, /* Allow process to submit DTrace events. */ - PRIV_DTRACE_PROC, /* Allow attaching DTrace to process. */ PRIV_FIRMWARE_LOAD, /* Can load firmware. */ PRIV_JAIL_ATTACH, /* Attach to a jail. */ PRIV_KENV_SET, /* Set kernel env. variables. */ From owner-p4-projects@FreeBSD.ORG Fri Oct 20 01:32: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 4157A16A4A0; Fri, 20 Oct 2006 01:32: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 C373216A4CE for ; Fri, 20 Oct 2006 01:32:01 +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 ABABC43D8D for ; Fri, 20 Oct 2006 01:31: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 k9K1VnmV003313 for ; Fri, 20 Oct 2006 01:31: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 k9K1VmJh003310 for perforce@freebsd.org; Fri, 20 Oct 2006 01:31:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Oct 2006 01:31:48 GMT Message-Id: <200610200131.k9K1VmJh003310@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 108148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 01:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=108148 Change 108148 by rwatson@rwatson_zoo on 2006/10/20 01:31:41 Update for new privs, test directory on zoo. Includes need fixing before commit. Affected files ... .. //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_priv_names.c#2 edit .. //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_privs.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_priv_names.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include -#include "/home/robert/p4/projects/trustedbsd/priv/sys/sys/priv.h" +#include "/zoo/rwatson/p4/projects/trustedbsd/priv/sys/sys/priv.h" #include #include @@ -94,6 +94,9 @@ { PRIV_DEBUG_DIFFCRED, "debug_diffcred" }, { PRIV_DEBUG_SUGID, "debug_sugid" }, { PRIV_DEBUG_UNPRIV, "debug_unpriv" }, + { PRIV_DTRACE_KERNEL, "dtrace_kernel" }, + { PRIV_DTRACE_PROC, "dtrace_proc" }, + { PRIV_DTRACE_USER, "dtrace_user" }, { PRIV_FIRMWARE_LOAD, "firmware_load" }, { PRIV_JAIL_ATTACH, "jail_attach" }, { PRIV_KENV_SET, "kenv_set" }, @@ -157,12 +160,15 @@ { PRIV_VFS_GENERATION, "vfs_generation" }, { PRIV_VFS_GETFH, "vfs_getfh" }, { PRIV_VFS_LINK, "vfs_link" }, + { PRIV_VFS_MKNOD_BAD, "vfs_mknod_bad" }, { PRIV_VFS_MKNOD_DEV, "vfs_mknod_dev" }, + { PRIV_VFS_MKNOD_WHT, "vfs_mknod_wht" }, { PRIV_VFS_MOUNT, "vfs_mount" }, { PRIV_VFS_MOUNT_OWNER, "vfs_mount_owner" }, { PRIV_VFS_MOUNT_EXPORTED, "vfs_mount_exported" }, { PRIV_VFS_MOUNT_PERM, "vfs_mount_perm" }, { PRIV_VFS_MOUNT_SUIDDIR, "vfs_mount_suiddir" }, + { PRIV_VFS_MOUNT_NONUSER, "vfs_mount_nonuser" }, { PRIV_VFS_SETGID, "vfs_setgid" }, { PRIV_VFS_STICKYFILE, "vfs_stickyfile" }, { PRIV_VFS_SYSFLAGS, "vfds_sysflags" }, @@ -196,6 +202,8 @@ { PRIV_NET_DELIFGROUP, "net_delifgroup" }, { PRIV_NET_IFCREATE, "net_ifcreate" }, { PRIV_NET_IFDESTROY, "net_ifdestroy" }, + { PRIV_NET_ADDIFADDR, "net_addifaddr" }, + { PRIV_NET_DELIFADDR, "net_delifaddr" }, { PRIV_NET80211_GETKEY, "net80211_getkey" }, { PRIV_NET80211_MANAGE, "net80211_manage" }, { PRIV_NETATALK_RESERVEDPORT, "netatalk_reservedport" }, @@ -203,6 +211,7 @@ { PRIV_NETATM_ADD, "netatm_add" }, { PRIV_NETATM_DEL, "netatm_del" }, { PRIV_NETATM_SET, "netatm_set" }, + { PRIV_NETBLUETOOTH_RAW, "netbluetooth_raw" }, { PRIV_NETGRAPH_CONTROL, "netgraph_control" }, { PRIV_NETGRAPH_TTY, "netgraph_tty" }, { PRIV_NETINET_RESERVEDPORT, "netinet_reservedport" }, ==== //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_privs.c#2 (text+ko) ==== @@ -32,8 +32,8 @@ #include #include -#include "/home/robert/p4/projects/trustedbsd/priv/sys/sys/priv.h" -#include "/home/robert/p4/projects/trustedbsd/priv/sys/security/mac_privs/mac_privs.h" +#include "/zoo/rwatson/p4/projects/trustedbsd/priv/sys/sys/priv.h" +#include "/zoo/rwatson/p4/projects/trustedbsd/priv/sys/security/mac_privs/mac_privs.h" #include #include From owner-p4-projects@FreeBSD.ORG Fri Oct 20 11:12: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 0D77816A54B; Fri, 20 Oct 2006 11:12: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 C2FC216A546 for ; Fri, 20 Oct 2006 11:12:30 +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 7CD7F43D6A for ; Fri, 20 Oct 2006 11:12:21 +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 k9KBCL0f013701 for ; Fri, 20 Oct 2006 11:12:21 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KBCKVl013698 for perforce@freebsd.org; Fri, 20 Oct 2006 11:12:20 GMT (envelope-from bushman@freebsd.org) Date: Fri, 20 Oct 2006 11:12:20 GMT Message-Id: <200610201112.k9KBCKVl013698@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 108172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 11:12:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=108172 Change 108172 by bushman@bushman_nss_ldap_cached on 2006/10/20 11:11:40 + Support for Range option for groups members parsing added. Needs debugging. + Issue with proper return of (NS_RETURN) and setting errno to ERANGE fixed. + Lot of debugging printfs - will be deleted when everything works as expected. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.h#10 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#9 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#14 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.c#9 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#14 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#11 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" @@ -64,6 +65,40 @@ assert(pctx != NULL); +/* int start, end; + int res; + printf("1\n"); + res = __nss_ldap_parse_range("member;range=1-*", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("2\n"); + res = __nss_ldap_parse_range("member;range=134-100", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("3\n"); + res = __nss_ldap_parse_range("member;range=-*", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("4\n"); + res = __nss_ldap_parse_range("member;range=1-", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("5\n"); + res = __nss_ldap_parse_range("member;range=*-*", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("6\n"); + res = __nss_ldap_parse_range("member;range=1-*;binary", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("7\n"); + res = __nss_ldap_parse_range("member;binary;range=1-*;binary", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end); + + printf("8\n"); + res = __nss_ldap_parse_range("member;binary;range=1-*;", &start, &end); + printf("res: %d, start: %d, end: %d\n", res, start, end);*/ + sctx = pctx->sctx; grp = (struct group *)pctx->mdata; buf = pctx->buffer; @@ -92,8 +127,9 @@ goto errfin; buflen -= len; buf += len; - - rv = __nss_ldap_assign_attr_multi_str(sctx, + + //rv = __nss_ldap_assign_attr_multi_str(sctx, + rv = __nss_ldap_assign_attr_multi_str_paged(sctx, _ATM(schema, GROUP, memberUid), &grp->gr_mem, &memlen, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) @@ -102,6 +138,7 @@ buf += len; errfin: + //printf("__ %s %d %d\n", __FILE__, __LINE__, rv); return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.h#10 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#12 (text+ko) ==== @@ -33,6 +33,8 @@ #include #include #include +#include + #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#9 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#14 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include "ldapschema.h" #include "ldapconn.h" #include "ldapsearch.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#13 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include "ldapschema.h" #include "ldapsearch.h" #include "ldaptls.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#12 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include "ldapschema.h" #include "ldapsearch.h" #include "nss_ldap.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#12 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include "ldapschema.h" #include "ldapconn.h" #include "ldapsearch.h" @@ -42,10 +43,18 @@ #include "ldapconf.h" #include "nss_ldap.h" +#define DO_ASSIGN_ATTR_MULTI_STR_END_WITH_PTRS (1) +#define DO_ASSIGN_ATTR_MULTI_STR_NO_END_NULL (1 << 1) + static int copy_request(struct nss_ldap_search_request *, struct nss_ldap_search_request const *); static void destroy_request(struct nss_ldap_search_request *); +static int do_assign_attr_multi_str(struct nss_ldap_search_context *, + char const *, char ***, size_t *, size_t *, char *, size_t, int); +static int do_assign_attr_multi_str_paged(struct nss_ldap_search_context *, + char const *, char const *, char ***, size_t *, size_t *, char *, + size_t); static int do_ldap_search_ext(struct nss_ldap_connection *, struct nss_ldap_configuration *, struct nss_ldap_search_request *, struct nss_ldap_search_context *, int *); @@ -60,6 +69,7 @@ copy_request(struct nss_ldap_search_request *dest, struct nss_ldap_search_request const *src) { + char **cp, *s; assert(dest != NULL); assert(src != NULL); @@ -74,6 +84,21 @@ if (dest->filter == NULL) return (NSS_LDAP_MEMORY_ERROR); + if (src->attributes != NULL) { + dest->attributes = sl_init(); + if (dest->attributes == NULL) + return (NSS_LDAP_MEMORY_ERROR); + + for (cp = dest->attributes->sl_str; *cp; ++cp) { + s = strdup(*cp); + if (s == NULL) + return (NSS_LDAP_MEMORY_ERROR); + if (sl_add(dest->attributes,s) != 0) + return (NSS_LDAP_MEMORY_ERROR); + } + } else + dest->attributes = NULL; + return (NSS_LDAP_SUCCESS); } @@ -85,8 +110,216 @@ free(request->search_base); free(request->filter); + if (request->attributes != NULL) + sl_free(request->attributes, 1); +} + +static int +do_assign_attr_multi_str(struct nss_ldap_search_context *ctx, + char const *attr, char ***str_array, size_t *str_array_size, + size_t *len, char *buf, size_t bufsize, int flags) +{ + char **values, **viter, **siter, **siter_end; + size_t size, valsize; + int rv; + + values = (char **)ldap_get_values(ctx->conn->ld, ctx->msg, attr); + valsize = values == NULL ? 0 : ldap_count_values(values); + *str_array_size = valsize; + if (!(flags & DO_ASSIGN_ATTR_MULTI_STR_NO_END_NULL)) + ++*str_array_size; + *len = sizeof(char *) * (*str_array_size); + + //printf("__ %s %d %d\n", __FILE__, __LINE__, valsize); + if (flags & DO_ASSIGN_ATTR_MULTI_STR_END_WITH_PTRS) { + siter_end = (char **)ALIGN(buf + bufsize); + while ((char *)siter_end > buf + bufsize - sizeof(char *)) + --siter_end; + + siter = siter_end - valsize; + //printf("__ %s %d %p %p\n", __FILE__, __LINE__, (void *)buf, (void *)siter); + if ((char *)siter <= buf) { + //printf("__ %s %d %d\n", __FILE__, __LINE__, valsize); + ldap_value_free(values); + __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, + "do_assign_attr_multi_str: " + "buffer size exceeded"); + //printf("__ %s %d\n", __FILE__, __LINE__); + return (NSS_LDAP_BUFFER_ERROR); + } + } else { + siter = (char **)ALIGN(buf); + if ((char *)siter + *len > buf + bufsize) { + ldap_value_free(values); + __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, + "do_assign_attr_multi_str: " + "buffer size exceeded"); + //printf("__ %s %d\n", __FILE__, __LINE__); + return (NSS_LDAP_BUFFER_ERROR); + } + } + + *str_array = siter; + + if (!(flags & DO_ASSIGN_ATTR_MULTI_STR_END_WITH_PTRS)) + buf = (char *)siter + *len; + bufsize -= *len; + + if (values != NULL) { + for (viter = values; *viter; ++viter, ++siter) { + rv = __nss_ldap_assign_str(*viter, siter, &size, + buf, bufsize); + //printf("__ %s %d %d\n", __FILE__, __LINE__, bufsize); + if (rv != NSS_LDAP_SUCCESS) { + ldap_value_free(values); + //printf("__ %s %d %d\n", __FILE__, __LINE__, valsize); + goto fin; + } + + buf += size; + *len += size; + bufsize -= size; + } + + ldap_value_free(values); + } + + if (!(flags & DO_ASSIGN_ATTR_MULTI_STR_NO_END_NULL)) + *siter = NULL; + rv = NSS_LDAP_SUCCESS; + //printf("__ %s %d %d\n", __FILE__, __LINE__, *str_array_size); + +fin: + //printf("__ %s %d\n", __FILE__, __LINE__); + return (rv); } +static int +do_assign_attr_multi_str_paged(struct nss_ldap_search_context *ctx, + char const *attr_model, char const *attr, char ***str_array, + size_t *str_array_size, size_t *len, char *buf, size_t bufsize) +{ + char range_buffer[128]; + struct nss_ldap_search_request sreq; + struct nss_ldap_search_context *newctx; + BerElement *cookie; + char **res_arr, **new_res_arr; + size_t res_arr_size, res_buf_size, res_buf_offset, res_arr_offset; + int range_start, range_end, rv, sf; + + rv = __nss_ldap_parse_range(attr, &range_start, &range_end); + if (rv != NSS_LDAP_SUCCESS) + return (rv); + + res_arr_size = 0; + res_buf_size = 0; + sf = 0; + do { +st: + rv = do_assign_attr_multi_str(ctx, attr, + &res_arr, &res_arr_offset, &res_buf_offset, buf, + bufsize, sf == 0 ? + DO_ASSIGN_ATTR_MULTI_STR_END_WITH_PTRS : + DO_ASSIGN_ATTR_MULTI_STR_END_WITH_PTRS | + DO_ASSIGN_ATTR_MULTI_STR_NO_END_NULL); + if (rv != NSS_LDAP_SUCCESS) + goto fin; + + res_arr_size += res_arr_offset; + res_buf_size += res_buf_offset; + + if (range_end == -1) + break; + + memset(&sreq, 0, sizeof(sreq)); + sreq.scope = LDAP_SCOPE_BASE; + sreq.filter = "(objectClass=*)"; + sreq.search_base = ldap_get_dn(ctx->conn->ld, ctx->msg); + if (sreq.search_base == NULL) { + rv = NSS_LDAP_CONNECTION_ERROR; + break; + } + + sreq.attributes = sl_init(); + rv = __nss_ldap_form_range(range_buffer, sizeof(range_buffer), + range_end + 1, -1); + if (rv == -1) { + rv = NSS_LDAP_GENERIC_ERROR; + break; + } + rv = sl_add(sreq.attributes, range_buffer); + if (rv == -1) { + rv = NSS_LDAP_MEMORY_ERROR; + break; + } + rv = sl_add(sreq.attributes, NULL); + if (rv == -1) { + rv = NSS_LDAP_MEMORY_ERROR; + break; + } + + newctx = __nss_ldap_start_search(&__nss_ldap_conf->search_method, + ctx->conn, ctx->conf, &sreq); + sl_free(sreq.attributes, 1); + ldap_memfree(sreq.search_base); + if (newctx == NULL) { + rv = NSS_LDAP_CONNECTION_ERROR; + break; + } + + if (sf != 0) { + __nss_ldap_end_search(&__nss_ldap_conf->search_method, + ctx); + + attr = NULL; + sf = 1; + } + ctx = newctx; + + rv = __nss_ldap_search_next(&__nss_ldap_conf->search_method, + ctx); + if (rv != NSS_LDAP_SUCCESS) + break; + + attr = ldap_first_attribute(ctx->conn->ld, ctx->msg, &cookie); + ber_free(cookie, 0); + + if (attr == NULL) + break; + + rv = __nss_ldap_parse_range(attr, &range_start, &range_end); + if (rv != NSS_LDAP_SUCCESS) + break; + goto st; + } while (range_end != -1); + + if (sf != 0) { + if (ctx != NULL) + __nss_ldap_end_search(&__nss_ldap_conf->search_method, + ctx); + if (attr != NULL) + ldap_memfree((char *)attr); + } + + + new_res_arr = (char **)ALIGN(buf + res_buf_size - sizeof(char *) * + res_arr_size); + if (new_res_arr != res_arr) + memmove(new_res_arr, res_arr, sizeof(char *) * res_arr_size); + *str_array = res_arr; + *str_array_size = res_arr_size; + *len = res_buf_size; + rv = NSS_LDAP_SUCCESS; + +fin: + if (rv != NSS_LDAP_SUCCESS) + __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, + "do_assign_attr_multi_str_paged failed: attr='%s', rv=%d", + attr, rv); + + return (rv); +} + static int do_ldap_search_ext(struct nss_ldap_connection *conn, struct nss_ldap_configuration *conf, @@ -110,7 +343,8 @@ } rv = ldap_search_ext( conn->ld, request->search_base, request->scope, - request->filter, NULL, 0, + request->filter, request->attributes == NULL ? NULL : + request->attributes->sl_str, 0, rv == LDAP_SUCCESS ? server_controls : NULL, NULL, NULL, LDAP_NO_LIMIT, msgid ); @@ -439,7 +673,7 @@ if (values != NULL) { type_len = strlen(type); for (viter = values; *viter; ++viter) - if ((strncmp(*viter, type, type_len) == 0) && + if ((strncasecmp(*viter, type, type_len) == 0) && (*(*viter + type_len) != '\0')) { res = *viter + type_len + 1; rv = __nss_ldap_assign_str(res, str, len, buf, @@ -515,8 +749,6 @@ char const *attr, char ***str_array, size_t *str_array_size, size_t *len, char *buf, size_t bufsize) { - char **values, **viter, **siter; - size_t size, valsize; int rv; assert(ctx != NULL); @@ -525,51 +757,92 @@ assert(str_array_size != NULL); assert(len != NULL); assert(buf != NULL); + + rv = do_assign_attr_multi_str(ctx, attr, str_array, str_array_size, + len, buf, bufsize, 0); + if (rv != NSS_LDAP_SUCCESS) + __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, + "__nss_ldap_assign_attr_multi_str failed: attr='%s', rv=%d", + attr, rv); + + return (rv); +} + +int +__nss_ldap_assign_attr_multi_str_paged(struct nss_ldap_search_context *ctx, + char const *attr, char ***str_array, size_t *str_array_size, + size_t *len, char *buf, size_t bufsize) +{ + BerElement *cookie; + char *aname; + size_t attr_len; + int rv; - values = (char **)ldap_get_values(ctx->conn->ld, ctx->msg, attr); - valsize = values == NULL ? 0 : ldap_count_values(values); + assert(ctx != NULL); + assert(attr != NULL); + assert(str_array != NULL); + assert(str_array_size != NULL); + assert(len != NULL); + assert(buf != NULL); - siter = (char **)ALIGN(buf); - - *str_array = siter; - *str_array_size = valsize + 1; - *len = sizeof(char *) * (*str_array_size); - - if ((char *)siter + *len > buf + bufsize) { - ldap_value_free(values); - __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, - "__nss_ldap_assign_attr_multi_str: " - "buffer size exceeded"); - return (NSS_LDAP_BUFFER_ERROR); - } + attr_len = strlen(attr); - buf = (char *)siter + *len; - bufsize -= *len; - - if (values != NULL) { - for (viter = values; *viter; ++viter, ++siter) { - rv = __nss_ldap_assign_str(*viter, siter, &size, - buf, bufsize); - if (rv != NSS_LDAP_SUCCESS) { - ldap_value_free(values); - goto fin; + aname = ldap_first_attribute(ctx->conn->ld, ctx->msg, &cookie); + if (aname != NULL) { + do { + if (strncasecmp(aname, attr, attr_len) == 0) { + /* + * Falling back to standard routine if there + * is no Range option in the + * AttributeDescription + */ + if (strlen(aname) == attr_len) { +// printf("__ %s %d %s\n", +// __FILE__, +// __LINE__, +// aname); + rv = do_assign_attr_multi_str( + ctx, attr, str_array, + str_array_size, len, buf, + bufsize, 0); + } else { +// printf("__ %s %d %s\n", +// __FILE__, +// __LINE__, +// aname); + rv = do_assign_attr_multi_str_paged( + ctx, attr, aname, str_array, + str_array_size, len, buf, + bufsize); + } + +// printf("__ %s %d\n", __FILE__, __LINE__); + if ((rv != NSS_LDAP_SUCCESS) || + ((rv == NSS_LDAP_SUCCESS) && + (*str_array_size != 1))) { + ldap_memfree(aname); + ber_free(cookie, 0); +// printf("__ %s %d %d\n", __FILE__, __LINE__, *str_array_size); + goto fin; + } +// printf("__ %s %d\n", __FILE__, __LINE__); } - - buf += size; - *len += size; - bufsize -= size; - } - - ldap_value_free(values); + + ldap_memfree(aname); + aname = ldap_next_attribute(ctx->conn->ld, ctx->msg, + cookie); + } while (aname != NULL); + ber_free(cookie, 0); } - - *siter = NULL; - rv = NSS_LDAP_SUCCESS; + + rv = NSS_LDAP_PARSE_ERROR; fin: - if (rv == NSS_LDAP_PARSE_ERROR) + if (rv != NSS_LDAP_SUCCESS) __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, - "__nss_ldap_assign_attr_multi_str failed: attr='%s'", attr); - + "__nss_ldap_assign_attr_multi_str_paged failed: attr='%s', " + "rv=%d", attr, rv); + +// printf("__ %s %d %d\n", __FILE__, __LINE__, rv); return (rv); } @@ -747,9 +1020,9 @@ if (values != NULL) { /* NOTE: actually, we can insert a hook in the configuration file - * parser to avoid using strcmp() every time. But the approach + * parser to avoid using strcasecmp() every time. But the approach * below seems to be a bit cleaner */ - if (strcmp(attr, "userPassword") == 0) { + if (strcasecmp(attr, "userPassword") == 0) { for (viter = values; *viter; ++viter) { if (strncmp(*viter, "{CRYPT}", sizeof("{CRYPT}") - 1) == 0) { @@ -757,7 +1030,7 @@ break; } } - } else if (strcmp(attr, "authPassword") == 0) { + } else if (strcasecmp(attr, "authPassword") == 0) { for (viter = values; *viter; ++viter) { if (strncmp(*viter, "CRYPT$", sizeof("CRYPT$") - 1) == 0) { ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#11 (text+ko) ==== @@ -32,7 +32,9 @@ struct nss_ldap_search_request { char *search_base; int scope; - char *filter; + char *filter; + + StringList *attributes; }; struct nss_ldap_search_context { @@ -105,6 +107,9 @@ char const *, char **, size_t *, char *, size_t); extern int __nss_ldap_assign_attr_multi_str(struct nss_ldap_search_context *, char const *, char ***, size_t *, size_t *, char *, size_t); +extern int __nss_ldap_assign_attr_multi_str_paged( + struct nss_ldap_search_context *, char const *, char ***, size_t *, + size_t *, char *, size_t); extern int __nss_ldap_assign_attr_indexed_str(struct nss_ldap_search_context *, char const *, ssize_t, size_t *, char **, size_t *, char *, size_t); extern int __nss_ldap_assign_attr_uid(struct nss_ldap_search_context *, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.c#9 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include "ldapconn.h" #include "ldapsearch.h" #include "ldapschema.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#13 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include "ldaputil.h" #include "ldapschema.h" /* for NSS_LDAP_FILTER_MAX_SIZE */ #include "ldapsearch.h" @@ -121,17 +122,17 @@ if (slash_mod == 1 ) { cmp_buf[0] = *sp; cmp_buf[1] = *(sp + 1); - if (strncasecmp(cmp_buf, "2a", 2) == 0) { + if (strncasecmp(cmp_buf, "2a", 2) == 0) *bp = '*'; - } else if (strncasecmp(cmp_buf, "2b", 2) == 0) { + else if (strncasecmp(cmp_buf, "2b", 2) == 0) *bp = '+'; - } else if (strncasecmp(cmp_buf, "28", 2) == 0) { + else if (strncasecmp(cmp_buf, "28", 2) == 0) *bp = '('; - } else if (strncasecmp(cmp_buf, "29", 2) == 0) { + else if (strncasecmp(cmp_buf, "29", 2) == 0) *bp = ')'; - } else if (strncasecmp(cmp_buf, "5c", 2) == 0) { + else if (strncasecmp(cmp_buf, "5c", 2) == 0) *bp = '\\'; - } else + else return (NSS_LDAP_PARSE_ERROR); ++bp; @@ -326,3 +327,114 @@ */ return (LDAP_SUCCESS); } + +/* TODO: review again for border-cases */ +int +__nss_ldap_parse_range(char const *str, int *range_start, int *range_end) +{ + char numeric_buf[16]; + char *p, *p2, *ends; + size_t slen, str_len; + + assert(str != NULL); + assert(range_start != NULL); + assert(range_end != NULL); + + //printf("-- %s %d %s\n", __FILE__, __LINE__, str); + str_len = strlen(str); + p = strchr(str, ';'); + if ((p == NULL) || (*(++p) == '\0')) + return (NSS_LDAP_GENERIC_ERROR); + + //printf("-- %s %d\n", __FILE__, __LINE__); + do { + p2 = strchr(p, ';'); + if (p2 != NULL) + slen = p2 - p; + else + slen = str_len - (p - str); + + //printf("-- %s %d %s %d\n", __FILE__, __LINE__, p, slen); + if (strncasecmp("range=", p, sizeof("range") - 1) == 0) { + p += sizeof("range=") - 1; + slen -= sizeof("range=") - 1; + + //printf("-- %s %d\n", __FILE__, __LINE__); + p2 = memchr(p, '-', slen); + if ((p2 == NULL) || (p2 == p)) + return (NSS_LDAP_PARSE_ERROR); + + if (p2 - p > sizeof(numeric_buf) - 1) + return (NSS_LDAP_BUFFER_ERROR); + + //printf("-- %s %d\n", __FILE__, __LINE__); + memcpy(numeric_buf, p, p2 - p); + numeric_buf[p2 - p] = '\0'; + + //printf("-- %s %d\n", __FILE__, __LINE__); + *range_start = strtol(numeric_buf, &ends, 10); + if (*ends != '\0') + return (NSS_LDAP_PARSE_ERROR); + + //printf("-- %s %d\n", __FILE__, __LINE__); + slen -= p2 + 1 - p; + p = p2 + 1; + if (slen == 0) + return (NSS_LDAP_PARSE_ERROR); + + //printf("-- %s %d %s %d\n", __FILE__, __LINE__, p, slen); + if (*p == '*') + *range_end = -1; + else { + //printf("-- %s %d\n", __FILE__, __LINE__); + if (slen > sizeof(numeric_buf) - 1) + return (NSS_LDAP_BUFFER_ERROR); + + memcpy(numeric_buf, p, slen); + numeric_buf[slen] = '\0'; + *range_end = strtol(numeric_buf, &ends, 10); + if (*ends != '\0') + return (NSS_LDAP_PARSE_ERROR); + } + + //printf("-- %s %d\n", __FILE__, __LINE__); + return (NSS_LDAP_SUCCESS); + } + + //printf("-- %s %d\n", __FILE__, __LINE__); + p = p2 + 1; + } while (p2 != NULL); + + //printf("-- %s %d\n", __FILE__, __LINE__); + *range_start = 0; + *range_end = -1; + return (NSS_LDAP_SUCCESS); +} + +int +__nss_ldap_form_range(char *buf, size_t bufsize, int range_start, + int range_end) +{ + size_t rv; + + assert(buf != NULL); + assert(range_start >= 0); + assert((range_end >= 0) || (range_end == -1)); + + if (range_end == -1) + rv = snprintf(buf, bufsize, "%d-*", range_start); + else + rv = snprintf(buf, bufsize, "%d-%d", range_start, range_end); + + if (rv >= bufsize) + return (NSS_LDAP_BUFFER_ERROR); + + return (NSS_LDAP_SUCCESS); +} + +int +__nss_ldap_check_control_suppot(LDAP *ld, char const *option) +{ + /* TODO: implement */ + return (LDAP_SUCCESS); +} ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#13 (text+ko) ==== @@ -47,4 +47,9 @@ extern int __nss_ldap_parse_page_control(LDAP *, LDAPControl **, unsigned long *, struct berval **); +extern int __nss_ldap_parse_range(char const *, int *, int *); +extern int __nss_ldap_form_range(char *, size_t, int, int); + +extern int __nss_ldap_check_option_suppot(LDAP *, char const *); + #endif /* _LDAPUTILS_H_ */ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#14 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include "ldapschema.h" #include "ldapconn.h" @@ -662,6 +663,7 @@ conn_flag = 0; memset(&conn_error, 0, sizeof(struct nss_ldap_connection_error)); while (conn_flag < 2) { +// printf("__ %s %d\n", __FILE__, __LINE__); rv = nss_ldap_connection_init(connection_method, tls_method, &conn, &conn_error); if (rv != NS_SUCCESS) { @@ -683,6 +685,7 @@ parse_tls != 0 ? tls_method : NULL, map_id, filter, &pctx, conn, &pctx_model); if (rv != NS_SUCCESS) { +// printf("__ %s %d\n", __FILE__, __LINE__); __nss_ldap_log(NSS_LDAP_LL_DEBUG, "nss_ldap_get_common: parse context was not " "initialized: rv=%d, map_id=%d, filter='%s'", @@ -690,12 +693,16 @@ goto fin; } +// printf("__ %s %d\n", __FILE__, __LINE__); rv = NSS_LDAP_PARSE_ERROR; while ((rv == NSS_LDAP_PARSE_ERROR) || (rv == NSS_LDAP_SUCCESS)) { rv = __nss_ldap_parse_next(pctx); +// printf("__ %s %d %d\n", __FILE__, __LINE__, rv); if (rv == NSS_LDAP_PARSE_ERROR) { +// printf("__ %s %d %d\n", __FILE__, __LINE__, rv); rv = __nss_ldap_search_next(search_method, pctx->sctx); if (pctx->sctx->msg == NULL) { +// printf("__ %s %d %d\n", __FILE__, __LINE__, rv); rv = NSS_LDAP_GENERIC_ERROR; break; } @@ -703,24 +710,29 @@ break; } +// printf("__ %s %d %d\n", __FILE__, __LINE__, rv); switch (rv) { case NSS_LDAP_SUCCESS: +// printf("__ %s %d\n", __FILE__, __LINE__); rv = NS_SUCCESS; break; case NSS_LDAP_BUFFER_ERROR: rv = NS_RETURN; errno = ERANGE; +// printf("__ %s %d\n", __FILE__, __LINE__); __nss_ldap_log(NSS_LDAP_LL_DEBUG, "nss_ldap_get_common: supplied buffer was too " "small: map_id=%d, filter='%s'", map_id, filter); break; case NSS_LDAP_CONNECTION_ERROR: rv = NS_UNAVAIL; +// printf("__ %s %d\n", __FILE__, __LINE__); __nss_ldap_log(NSS_LDAP_LL_ERR, "nss_ldap_get_common: connection_error " "small: map_id=%d, filter='%s'", map_id, filter); break; default: +// printf("__ %s %d\n", __FILE__, __LINE__); __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "nss_ldap_get_common: not found: " "map_id=%d, filter='%s'", map_id, filter); @@ -756,6 +768,7 @@ // else // nss_ldap_connection_reset(tls_method, conn); +// printf("__ %s %d\n", __FILE__, __LINE__); return (rv); } @@ -772,6 +785,7 @@ int rv, isthreaded; rv = nss_ldap_configure(); +// printf("__ %s %d\n", __FILE__, __LINE__); if (rv != NSS_LDAP_SUCCESS) return (NS_UNAVAIL); @@ -785,12 +799,14 @@ } } +// printf("__ %s %d\n", __FILE__, __LINE__); rv = nss_ldap_get_common(map_id, filter, mdata, buffer, bufsize, parse_next_fn, NULL, 0); if (isthreaded) pthread_rwlock_unlock(&nss_ldap_lock); +// printf("__ %s %d %d %d\n", __FILE__, __LINE__, rv, NS_SUCCESS); return (rv); } @@ -818,6 +834,8 @@ rv = nss_ldap_get_common(map_id, filter, mdata, buffer, bufsize, parse_next_fn, parse_destroy_fn, 1); +// printf("__ %s %d %d\n", __FILE__, __LINE__, bufsize); +// printf("__ %s %d %d %d %d %d %d\n", __FILE__, __LINE__, rv, NS_RETURN, NS_NOTFOUND, errno, ERANGE); if (isthreaded) pthread_rwlock_unlock(&nss_ldap_lock); From owner-p4-projects@FreeBSD.ORG Fri Oct 20 13:07: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 EFDAF16A501; Fri, 20 Oct 2006 13:07: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 C99E216A534 for ; Fri, 20 Oct 2006 13:07:45 +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 D89AB43D8A for ; Fri, 20 Oct 2006 13:06:57 +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 k9KD6mo3042052 for ; Fri, 20 Oct 2006 13:06:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KD6m9e042049 for perforce@freebsd.org; Fri, 20 Oct 2006 13:06:48 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 20 Oct 2006 13:06:48 GMT Message-Id: <200610201306.k9KD6m9e042049@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 108175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 13:07:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=108175 Change 108175 by rdivacky@rdivacky_witten on 2006/10/20 13:06:18 Clone can be passed exit_signal = 0. Fix that. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#13 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#9 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#13 (text+ko) ==== @@ -539,7 +539,7 @@ #endif exit_signal = args->flags & 0x000000ff; - if (!LINUX_SIG_VALID(exit_signal)) + if (!LINUX_SIG_VALID(exit_signal) && exit_signal != 0) return (EINVAL); if (exit_signal <= LINUX_SIGTBLSZ) ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#9 (text+ko) ==== @@ -365,7 +365,7 @@ #endif exit_signal = args->flags & 0x000000ff; - if (!LINUX_SIG_VALID(exit_signal)) + if (!LINUX_SIG_VALID(exit_signal) && exit_signal != 0) return (EINVAL); if (exit_signal <= LINUX_SIGTBLSZ) From owner-p4-projects@FreeBSD.ORG Fri Oct 20 14:49: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 F231716A47E; Fri, 20 Oct 2006 14:49: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 B5A6616A415 for ; Fri, 20 Oct 2006 14:49:00 +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 7D4E643D68 for ; Fri, 20 Oct 2006 14:49:00 +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 k9KEmvQC058669 for ; Fri, 20 Oct 2006 14:48:57 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KEmuKp058666 for perforce@freebsd.org; Fri, 20 Oct 2006 14:48:56 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 20 Oct 2006 14:48:56 GMT Message-Id: <200610201448.k9KEmuKp058666@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 108176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 14:49:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=108176 Change 108176 by rdivacky@rdivacky_witten on 2006/10/20 14:48:12 Return EPERM when trying to setrlimit of maxfiles to over 1 milion. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#14 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#14 (text+ko) ==== @@ -1111,6 +1111,13 @@ if (error) return (error); + /* + * the 1024*1024 is a hardcoded constant of max files + * per proc in linux + */ + if (which == RLIMIT_NOFILE && args->rlim > (1024*1024)) + return (EPERM); + bsd_rlim.rlim_cur = (rlim_t)rlim.rlim_cur; bsd_rlim.rlim_max = (rlim_t)rlim.rlim_max; return (kern_setrlimit(td, which, &bsd_rlim)); From owner-p4-projects@FreeBSD.ORG Fri Oct 20 14:54: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 294D316A519; Fri, 20 Oct 2006 14:54: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 DB70516A47C for ; Fri, 20 Oct 2006 14:54:04 +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 ED6F243D70 for ; Fri, 20 Oct 2006 14:54:03 +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 k9KEs3UX059873 for ; Fri, 20 Oct 2006 14:54:03 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KEs36i059868 for perforce@freebsd.org; Fri, 20 Oct 2006 14:54:03 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 20 Oct 2006 14:54:03 GMT Message-Id: <200610201454.k9KEs36i059868@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 108177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 14:54:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=108177 Change 108177 by rdivacky@rdivacky_witten on 2006/10/20 14:53:17 Make it actually work (args->rlim -> rlim.rlim_max). :( Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#15 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#15 (text+ko) ==== @@ -1115,7 +1115,7 @@ * the 1024*1024 is a hardcoded constant of max files * per proc in linux */ - if (which == RLIMIT_NOFILE && args->rlim > (1024*1024)) + if (which == RLIMIT_NOFILE && rlim.rlim_max > (1024*1024)) return (EPERM); bsd_rlim.rlim_cur = (rlim_t)rlim.rlim_cur; From owner-p4-projects@FreeBSD.ORG Fri Oct 20 19:34: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 7F71B16A4E2; Fri, 20 Oct 2006 19:34: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 388AC16A501 for ; Fri, 20 Oct 2006 19:34:58 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79C9743DFF for ; Fri, 20 Oct 2006 19:31:23 +0000 (GMT) (envelope-from mjacob@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 k9KJV8KW023942 for ; Fri, 20 Oct 2006 19:31:08 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KJUp5X023866 for perforce@freebsd.org; Fri, 20 Oct 2006 19:30:51 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 20 Oct 2006 19:30:51 GMT Message-Id: <200610201930.k9KJUp5X023866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 19:34:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=108183 Change 108183 by mjacob@mjexp on 2006/10/20 19:29:55 IFC Affected files ... .. //depot/projects/mjexp/Makefile#2 integrate .. //depot/projects/mjexp/Makefile.inc1#2 integrate .. //depot/projects/mjexp/ObsoleteFiles.inc#2 integrate .. //depot/projects/mjexp/bin/cp/cp.1#2 integrate .. //depot/projects/mjexp/bin/cp/cp.c#2 integrate .. //depot/projects/mjexp/bin/cp/utils.c#2 integrate .. //depot/projects/mjexp/bin/ls/ls.1#2 integrate .. //depot/projects/mjexp/bin/ls/print.c#2 integrate .. //depot/projects/mjexp/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/mjexp/bin/rm/rm.c#2 integrate .. //depot/projects/mjexp/bin/sh/jobs.c#2 integrate .. //depot/projects/mjexp/bin/sh/jobs.h#2 integrate .. //depot/projects/mjexp/bin/sh/main.c#2 integrate .. //depot/projects/mjexp/bin/sh/sh.1#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/mjexp/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/mjexp/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/mjexp/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/crypto/openssh/config.h#2 integrate .. //depot/projects/mjexp/crypto/openssh/configure.ac#2 integrate .. //depot/projects/mjexp/crypto/openssh/sshd.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/CHANGES#2 integrate .. //depot/projects/mjexp/crypto/openssl/Configure#2 integrate .. //depot/projects/mjexp/crypto/openssl/FAQ#2 integrate .. //depot/projects/mjexp/crypto/openssl/LICENSE#2 integrate .. //depot/projects/mjexp/crypto/openssl/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/mjexp/crypto/openssl/Makefile.shared#2 integrate .. //depot/projects/mjexp/crypto/openssl/NEWS#2 integrate .. //depot/projects/mjexp/crypto/openssl/README#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/config#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/aes/aes_ige.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/aes/asm/aes-586.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/Makefile#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/camellia.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/camellia.h#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_cbc.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_cfb.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_ctr.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_ecb.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_locl.h#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_misc.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_ofb.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/e_camellia.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/apps/ciphers.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/mjexp/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_algs.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/tls1.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/mjexp/crypto/openssl/test/igetest.c#1 branch .. //depot/projects/mjexp/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/mjexp/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/mjexp/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/util/mkfiles.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/util/pl/Mingw32.pl#2 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#2 integrate .. //depot/projects/mjexp/etc/disktab#2 integrate .. //depot/projects/mjexp/etc/libalias.conf#2 integrate .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/mjexp/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/mjexp/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/mjexp/etc/network.subr#2 integrate .. //depot/projects/mjexp/etc/rc.d/Makefile#2 integrate .. //depot/projects/mjexp/etc/rc.d/amd#2 integrate .. //depot/projects/mjexp/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/mjexp/etc/rc.d/cleartmp#2 integrate .. //depot/projects/mjexp/etc/rc.d/dhclient#2 integrate .. //depot/projects/mjexp/etc/rc.d/idmapd#1 branch .. //depot/projects/mjexp/etc/rc.d/mixer#2 integrate .. //depot/projects/mjexp/etc/rc.subr#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/mjexp/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/mjexp/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/grep/grep.1#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/mjexp/include/Makefile#2 integrate .. //depot/projects/mjexp/include/elf.h#2 integrate .. //depot/projects/mjexp/lib/csu/sparc64/crt1.c#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/Makefile.inc#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/cuseeme/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/dummy/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/ftp/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/irc/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/nbt/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/pptp/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/skinny/Makefile#2 integrate .. //depot/projects/mjexp/lib/libalias/modules/smedia/Makefile#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/mjexp/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/mjexp/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/mjexp/lib/libc/gen/basename.3#2 integrate .. //depot/projects/mjexp/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/mjexp/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/mjexp/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/mjexp/lib/libc/gen/tls.c#2 integrate .. //depot/projects/mjexp/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/mjexp/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/mjexp/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/mjexp/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/mjexp/lib/libc/string/ffs.3#2 integrate .. //depot/projects/mjexp/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/mjexp/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/intro.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/read.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/stat.2#2 integrate .. //depot/projects/mjexp/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/mjexp/lib/libc_r/uthread/uthread_select.c#2 integrate .. //depot/projects/mjexp/lib/libc_r/uthread/uthread_sig.c#2 integrate .. //depot/projects/mjexp/lib/libdisk/Makefile#2 integrate .. //depot/projects/mjexp/lib/libkvm/Makefile#2 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_sparc64.c#2 integrate .. //depot/projects/mjexp/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/mjexp/lib/libnetgraph/sock.c#2 integrate .. //depot/projects/mjexp/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/mjexp/lib/libthread_db/Makefile#2 integrate .. //depot/projects/mjexp/lib/libutil/login.conf.5#2 integrate .. //depot/projects/mjexp/lib/msun/i387/fenv.h#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/mjexp/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/mjexp/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate .. //depot/projects/mjexp/release/scripts/package-split.py#2 integrate .. //depot/projects/mjexp/sbin/Makefile#2 integrate .. //depot/projects/mjexp/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/mjexp/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/mjexp/sbin/dump/main.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/Makefile#2 integrate .. //depot/projects/mjexp/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/mjexp/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/mjexp/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/mjexp/sbin/gpt/add.c#2 integrate .. //depot/projects/mjexp/sbin/gpt/label.c#2 integrate .. //depot/projects/mjexp/sbin/gpt/remove.c#2 integrate .. //depot/projects/mjexp/sbin/idmapd/Makefile#2 integrate .. //depot/projects/mjexp/sbin/idmapd/idmapd.8#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/mjexp/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/mjexp/sbin/kldload/kldload.8#2 integrate .. //depot/projects/mjexp/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/mjexp/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/mjexp/sbin/restore/restore.8#2 integrate .. //depot/projects/mjexp/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_set_mark.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_Applink.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_config.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ecdsa.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/engine.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/pem.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ui.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ui_compat.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/x509.3#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-amd64.h#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-arm.h#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-i386.h#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-ia64.h#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-powerpc.h#2 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-sparc64.h#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/Makefile.man#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CIPHER_get_name.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_add_session.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_ctrl.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_free.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sess_number.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sessions.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_mode.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_options.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_timeout.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_verify.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_use_certificate.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_SESSION_free.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_SESSION_get_time.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_accept.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_alert_type_string.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_clear.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_connect.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_do_handshake.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_free.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_SSL_CTX.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_ciphers.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_client_CA_list.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_current_cipher.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_default_timeout.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_error.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_ex_new_index.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_fd.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_peer_certificate.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_rbio.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_session.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_verify_result.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_version.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_library_init.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_load_client_CA_file.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_new.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_pending.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_read.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_rstate_string.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_session_reused.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_bio.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_connect_state.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_fd.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_session.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_shutdown.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_verify_result.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_shutdown.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_state_string.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_want.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_write.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/d2i_SSL_SESSION.3#2 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/ssl.3#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/Makefile.man#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/CA.pl.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/asn1parse.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ca.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ciphers.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/crl.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/crl2pkcs7.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dgst.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dhparam.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dsa.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dsaparam.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ec.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ecparam.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/enc.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/errstr.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/gendsa.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/genrsa.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/nseq.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ocsp.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/openssl.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/passwd.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/pkcs12.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/pkcs7.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/pkcs8.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/rand.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/req.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/rsa.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/rsautl.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/s_client.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/s_server.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/s_time.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/sess_id.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/smime.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/speed.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/spkac.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/verify.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/version.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/x509.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/x509v3_config.1#2 integrate .. //depot/projects/mjexp/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/mjexp/share/colldef/Makefile#2 integrate .. //depot/projects/mjexp/share/doc/papers/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man1/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man1/builtin.1#2 integrate .. //depot/projects/mjexp/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man4/aue.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ddb.4#2 integrate .. //depot/projects/mjexp/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/mjexp/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ipfirewall.4#2 integrate .. //depot/projects/mjexp/share/man/man4/kue.4#2 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pcm.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sis.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_hda.4#1 branch .. //depot/projects/mjexp/share/man/man4/tun.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ural.4#2 integrate .. //depot/projects/mjexp/share/man/man4/uscanner.4#2 integrate .. //depot/projects/mjexp/share/man/man5/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man5/disktab.5#2 integrate .. //depot/projects/mjexp/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man9/kqueue.9#1 branch .. //depot/projects/mjexp/share/man/man9/ktr.9#2 integrate .. //depot/projects/mjexp/share/man/man9/zone.9#2 integrate .. //depot/projects/mjexp/share/misc/iso3166#2 integrate .. //depot/projects/mjexp/share/mk/sys.mk#2 integrate .. //depot/projects/mjexp/share/mklocale/Makefile#2 integrate .. //depot/projects/mjexp/share/monetdef/Makefile#2 integrate .. //depot/projects/mjexp/share/monetdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/mjexp/share/msgdef/Makefile#2 integrate .. //depot/projects/mjexp/share/msgdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/mjexp/share/numericdef/Makefile#2 integrate .. //depot/projects/mjexp/share/numericdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/mjexp/share/timedef/Makefile#2 integrate .. //depot/projects/mjexp/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/mjexp/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/mjexp/share/timedef/mn_MN.UTF-8.src#1 branch .. //depot/projects/mjexp/share/zoneinfo/africa#2 integrate .. //depot/projects/mjexp/share/zoneinfo/asia#2 integrate .. //depot/projects/mjexp/share/zoneinfo/australasia#2 integrate .. //depot/projects/mjexp/share/zoneinfo/backward#2 integrate .. //depot/projects/mjexp/share/zoneinfo/europe#2 integrate .. //depot/projects/mjexp/share/zoneinfo/northamerica#2 integrate .. //depot/projects/mjexp/share/zoneinfo/southamerica#2 integrate .. //depot/projects/mjexp/share/zoneinfo/yearistype.sh#2 integrate .. //depot/projects/mjexp/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/mjexp/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/mjexp/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/mjexp/sys/amd64/include/clock.h#2 integrate .. //depot/projects/mjexp/sys/amd64/include/elf.h#2 integrate .. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/mjexp/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/mjexp/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/mjexp/sys/arm/include/clock.h#2 integrate .. //depot/projects/mjexp/sys/arm/include/elf.h#2 integrate .. //depot/projects/mjexp/sys/boot/Makefile#2 integrate .. //depot/projects/mjexp/sys/boot/common/help.common#2 integrate .. //depot/projects/mjexp/sys/boot/common/loader.8#2 integrate .. //depot/projects/mjexp/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/mjexp/sys/boot/forth/support.4th#2 integrate .. //depot/projects/mjexp/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/mjexp/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/mjexp/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/mjexp/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/mjexp/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/mjexp/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/mjexp/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/mjexp/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/mjexp/sys/conf/NOTES#2 integrate .. //depot/projects/mjexp/sys/conf/files#2 integrate .. //depot/projects/mjexp/sys/conf/files.amd64#2 integrate .. //depot/projects/mjexp/sys/conf/files.i386#2 integrate .. //depot/projects/mjexp/sys/conf/files.pc98#2 integrate .. //depot/projects/mjexp/sys/conf/files.sun4v#1 branch .. //depot/projects/mjexp/sys/conf/kern.post.mk#2 integrate .. //depot/projects/mjexp/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/mjexp/sys/conf/kmod.mk#2 integrate .. //depot/projects/mjexp/sys/conf/options#2 integrate .. //depot/projects/mjexp/sys/conf/options.sun4v#1 branch .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/mjexp/sys/ddb/db_command.c#2 integrate .. //depot/projects/mjexp/sys/ddb/db_examine.c#2 integrate .. //depot/projects/mjexp/sys/ddb/db_output.c#2 integrate .. //depot/projects/mjexp/sys/ddb/db_output.h#2 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/mjexp/sys/dev/ips/ips.c#2 integrate .. //depot/projects/mjexp/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/mjexp/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/mjexp/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/mjexp/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/mjexp/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/driver.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/mjexp/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/mjexp/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/mjexp/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/mjexp/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/mjexp/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/mjexp/sys/i386/bios/apm.c#2 integrate .. //depot/projects/mjexp/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/support.s#2 integrate .. //depot/projects/mjexp/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/mjexp/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/mjexp/sys/i386/include/clock.h#2 integrate .. //depot/projects/mjexp/sys/i386/include/elf.h#2 integrate .. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/mjexp/sys/i386/isa/clock.c#2 integrate .. //depot/projects/mjexp/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/mjexp/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/mjexp/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/mjexp/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/mjexp/sys/ia64/include/clock.h#2 integrate .. //depot/projects/mjexp/sys/ia64/include/elf.h#2 integrate .. //depot/projects/mjexp/sys/kern/init_sysent.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_conf.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_lock.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_sig.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_time.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_clock.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_rtc.c#1 branch .. //depot/projects/mjexp/sys/kern/subr_trap.c#2 integrate .. //depot/projects/mjexp/sys/kern/sys_generic.c#2 integrate .. //depot/projects/mjexp/sys/kern/sys_process.c#2 integrate .. //depot/projects/mjexp/sys/kern/syscalls.c#2 integrate .. //depot/projects/mjexp/sys/kern/syscalls.master#2 integrate .. //depot/projects/mjexp/sys/kern/systrace_args.c#2 integrate .. //depot/projects/mjexp/sys/kern/tty_pty.c#2 integrate .. //depot/projects/mjexp/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/mjexp/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/mjexp/sys/modules/aio/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/geom/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/linux/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/mem/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/uart/Makefile#2 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#2 integrate .. //depot/projects/mjexp/sys/net/if_vlan.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/mjexp/sys/netinet/if_ether.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/mjexp/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/nd6.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/mjexp/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/mjexp/sys/pci/agp.c#2 integrate .. //depot/projects/mjexp/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/mjexp/sys/pci/nfsmb.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/mjexp/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/mjexp/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/mjexp/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/mjexp/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/mjexp/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/mjexp/sys/sun4v/conf/MAC#1 branch .. //depot/projects/mjexp/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/mjexp/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/mjexp/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/_types.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/asi.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/asm.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/bus.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/cache.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/clock.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/elf.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/endian.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/exec.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/float.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/fp.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/frame.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/instr.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/limits.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/param.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/proc.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/profile.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/reg.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/resource.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/runq.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/signal.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/smp.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/tick.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/trap.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/tte.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/upa.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/ver.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/watch.h#1 branch .. //depot/projects/mjexp/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 20 19:35: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 1641616A4ED; Fri, 20 Oct 2006 19:35: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 B579F16A4E7 for ; Fri, 20 Oct 2006 19:35:14 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70F3A43EF4 for ; Fri, 20 Oct 2006 19:32:15 +0000 (GMT) (envelope-from mjacob@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 k9KJWFjI024662 for ; Fri, 20 Oct 2006 19:32:15 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KJWAee024642 for perforce@freebsd.org; Fri, 20 Oct 2006 19:32:10 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 20 Oct 2006 19:32:10 GMT Message-Id: <200610201932.k9KJWAee024642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 19:35:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=108184 Change 108184 by mjacob@newisp on 2006/10/20 19:31:29 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/newisp/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/newisp/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/newisp/amd64/amd64/support.S#3 integrate .. //depot/projects/newisp/amd64/conf/NOTES#3 integrate .. //depot/projects/newisp/amd64/linux32/linux.h#2 integrate .. //depot/projects/newisp/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/newisp/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/newisp/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/newisp/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/newisp/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/newisp/arm/arm/fusu.S#4 integrate .. //depot/projects/newisp/arm/arm/trap.c#2 integrate .. //depot/projects/newisp/arm/at91/at91_mci.c#1 branch .. //depot/projects/newisp/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/newisp/arm/at91/at91_spi.c#2 integrate .. //depot/projects/newisp/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/newisp/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/newisp/arm/at91/at91_twi.c#3 integrate .. //depot/projects/newisp/arm/at91/if_ate.c#2 integrate .. //depot/projects/newisp/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/newisp/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/newisp/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/newisp/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/mci_device.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/newisp/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/newisp/boot/common/help.common#2 integrate .. //depot/projects/newisp/boot/common/loader.8#2 integrate .. //depot/projects/newisp/boot/forth/support.4th#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/newisp/compat/linux/linux_aio.c#1 branch .. //depot/projects/newisp/compat/linux/linux_aio.h#1 branch .. //depot/projects/newisp/compat/linux/linux_signal.c#2 integrate .. //depot/projects/newisp/compat/linux/linux_signal.h#2 integrate .. //depot/projects/newisp/conf/NOTES#8 integrate .. //depot/projects/newisp/conf/files#7 integrate .. //depot/projects/newisp/conf/files.amd64#4 integrate .. //depot/projects/newisp/conf/files.i386#3 integrate .. //depot/projects/newisp/conf/files.pc98#2 integrate .. //depot/projects/newisp/conf/kern.post.mk#2 integrate .. //depot/projects/newisp/conf/kern.pre.mk#3 integrate .. //depot/projects/newisp/conf/kmod.mk#2 integrate .. //depot/projects/newisp/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/newisp/dev/bce/if_bce.c#5 integrate .. //depot/projects/newisp/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/newisp/dev/mfi/mfi.c#7 integrate .. //depot/projects/newisp/dev/mfi/mfi_debug.c#3 integrate .. //depot/projects/newisp/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/newisp/dev/mfi/mfireg.h#3 integrate .. //depot/projects/newisp/dev/mfi/mfivar.h#4 integrate .. //depot/projects/newisp/dev/mmc/bridge.h#1 branch .. //depot/projects/newisp/dev/mmc/mmc.c#1 branch .. //depot/projects/newisp/dev/mmc/mmcbr_if.m#1 branch .. //depot/projects/newisp/dev/mmc/mmcbrvar.h#1 branch .. //depot/projects/newisp/dev/mmc/mmcbus_if.m#1 branch .. //depot/projects/newisp/dev/mmc/mmcreg.h#1 branch .. //depot/projects/newisp/dev/mmc/mmcsd.c#1 branch .. //depot/projects/newisp/dev/mmc/mmcvar.h#1 branch .. //depot/projects/newisp/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/newisp/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/newisp/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/newisp/dev/ray/if_ray.c#2 integrate .. //depot/projects/newisp/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/newisp/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/newisp/dev/spibus/spibus.c#2 integrate .. //depot/projects/newisp/dev/usb/ehci.c#4 integrate .. //depot/projects/newisp/dev/usb/if_axe.c#3 integrate .. //depot/projects/newisp/dev/usb/if_udav.c#3 integrate .. //depot/projects/newisp/dev/usb/if_ural.c#4 integrate .. //depot/projects/newisp/dev/usb/ohci.c#4 integrate .. //depot/projects/newisp/dev/usb/uhci.c#3 integrate .. //depot/projects/newisp/dev/usb/usb.c#3 integrate .. //depot/projects/newisp/dev/usb/usbdi.h#3 integrate .. //depot/projects/newisp/fs/devfs/devfs.h#3 integrate .. //depot/projects/newisp/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/newisp/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/newisp/i386/acpica/Makefile#3 integrate .. //depot/projects/newisp/i386/conf/NOTES#4 integrate .. //depot/projects/newisp/i386/i386/db_trace.c#2 integrate .. //depot/projects/newisp/i386/i386/support.s#3 integrate .. //depot/projects/newisp/i386/linux/linux.h#2 integrate .. //depot/projects/newisp/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/newisp/i386/linux/linux_proto.h#4 integrate .. //depot/projects/newisp/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/newisp/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/newisp/i386/linux/syscalls.master#4 integrate .. //depot/projects/newisp/ia64/conf/NOTES#2 integrate .. //depot/projects/newisp/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/newisp/ia64/ia64/clock.c#3 integrate .. //depot/projects/newisp/ia64/ia64/support.S#3 integrate .. //depot/projects/newisp/kern/init_sysent.c#7 integrate .. //depot/projects/newisp/kern/kern_conf.c#2 integrate .. //depot/projects/newisp/kern/kern_intr.c#2 integrate .. //depot/projects/newisp/kern/kern_sig.c#3 integrate .. //depot/projects/newisp/kern/kern_umtx.c#8 integrate .. //depot/projects/newisp/kern/subr_trap.c#2 integrate .. //depot/projects/newisp/kern/sys_generic.c#3 integrate .. //depot/projects/newisp/kern/sys_process.c#2 integrate .. //depot/projects/newisp/kern/syscalls.c#7 integrate .. //depot/projects/newisp/kern/syscalls.master#7 integrate .. //depot/projects/newisp/kern/systrace_args.c#7 integrate .. //depot/projects/newisp/kern/vfs_aio.c#4 integrate .. //depot/projects/newisp/modules/aio/Makefile#2 integrate .. //depot/projects/newisp/modules/linux/Makefile#2 integrate .. //depot/projects/newisp/modules/mem/Makefile#2 integrate .. //depot/projects/newisp/modules/mmc/Makefile#1 branch .. //depot/projects/newisp/modules/mmcsd/Makefile#1 branch .. //depot/projects/newisp/modules/uart/Makefile#2 integrate .. //depot/projects/newisp/netgraph/netgraph.h#2 integrate .. //depot/projects/newisp/netgraph/ng_message.h#2 integrate .. //depot/projects/newisp/netgraph/ng_nat.c#2 integrate .. //depot/projects/newisp/netgraph/ng_socket.c#2 integrate .. //depot/projects/newisp/netgraph/ng_socket.h#2 integrate .. //depot/projects/newisp/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/newisp/netinet6/in6_proto.c#2 integrate .. //depot/projects/newisp/nfsclient/nfs.h#2 integrate .. //depot/projects/newisp/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/newisp/pc98/conf/NOTES#2 integrate .. //depot/projects/newisp/pci/agp.c#2 integrate .. //depot/projects/newisp/pci/nfsmb.c#3 integrate .. //depot/projects/newisp/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/newisp/sparc64/conf/NOTES#2 integrate .. //depot/projects/newisp/sparc64/sparc64/support.S#3 integrate .. //depot/projects/newisp/sun4v/conf/NOTES#2 integrate .. //depot/projects/newisp/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/newisp/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/newisp/sun4v/sun4v/support.S#2 integrate .. //depot/projects/newisp/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/newisp/sys/conf.h#2 integrate .. //depot/projects/newisp/sys/elf32.h#3 integrate .. //depot/projects/newisp/sys/elf64.h#3 integrate .. //depot/projects/newisp/sys/rwlock.h#2 integrate .. //depot/projects/newisp/sys/sem.h#2 integrate .. //depot/projects/newisp/sys/syscall.h#7 integrate .. //depot/projects/newisp/sys/syscall.mk#7 integrate .. //depot/projects/newisp/sys/sysproto.h#7 integrate .. //depot/projects/newisp/sys/systm.h#4 integrate .. //depot/projects/newisp/sys/umtx.h#4 integrate .. //depot/projects/newisp/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.78 2006/10/15 16:52:59 hrs Exp $"); #include #include @@ -520,7 +520,7 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { - printf("bus_dmamem_alloc failed to align memory properly."); + printf("bus_dmamem_alloc failed to align memory properly.\n"); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/newisp/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.76 2006/10/20 09:44:20 bde Exp $"); #include #include @@ -91,6 +91,7 @@ { "r15", DB_OFFSET(tf_r15), db_frame }, { "rip", DB_OFFSET(tf_rip), db_frame }, { "rflags", DB_OFFSET(tf_rflags), db_frame }, +#define DB_N_SHOW_REGS 20 /* Don't show registers after here. */ { "dr0", NULL, db_dr0 }, { "dr1", NULL, db_dr1 }, { "dr2", NULL, db_dr2 }, @@ -100,7 +101,7 @@ { "dr6", NULL, db_dr6 }, { "dr7", NULL, db_dr7 }, }; -struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +struct db_variable *db_eregs = db_regs + DB_N_SHOW_REGS; #define DB_DRX_FUNC(reg) \ static int \ ==== //depot/projects/newisp/amd64/amd64/intr_machdep.c#3 (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.23 2006/10/13 04:53:22 jb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $ */ /* @@ -52,15 +52,16 @@ #include #include #include -#include -#include #ifdef DDB #include #endif #ifndef DEV_ATPIC +#include +#include #include #include +#include #endif #define MAX_STRAY_LOG 5 ==== //depot/projects/newisp/amd64/amd64/support.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.120 2006/08/28 02:28:14 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ */ #include "opt_ddb.h" @@ -342,10 +342,10 @@ ret /* - * casuptr. Compare and set user pointer. Returns -1 or the current value. + * casuword. Compare and set user word. Returns -1 or the current value. * dst = %rdi, old = %rsi, new = %rdx */ -ENTRY(casuptr) +ENTRY(casuword) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) ==== //depot/projects/newisp/amd64/conf/NOTES#3 (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.59 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.62 2006/10/20 09:52:26 des Exp $ # # @@ -103,7 +103,7 @@ # # sio: serial ports (see sio(4)), including support for various -# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# PC Card devices, such as Modem and NICs # device sio hint.sio.0.at="isa" @@ -202,6 +202,63 @@ # Optional devices: # +# PS/2 mouse +device psm +hint.psm.0.at="atkbdc" +hint.psm.0.irq="12" + +# Options for psm: +options PSM_HOOKRESUME #hook the system resume event, useful + #for some laptops +options PSM_RESETAFTERSUSPEND #reset the device at the resume event + +# The keyboard controller; it controls the keyboard and the PS/2 mouse. +device atkbdc +hint.atkbdc.0.at="isa" +hint.atkbdc.0.port="0x060" + +# The AT keyboard +device atkbd +hint.atkbd.0.at="atkbdc" +hint.atkbd.0.irq="1" + +# Options for atkbd: +options ATKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions ATKBD_DFLT_KEYMAP=jp.106 + +# `flags' for atkbd: +# 0x01 Force detection of keyboard, else we always assume a keyboard +# 0x02 Don't reset keyboard, useful for some newer ThinkPads +# 0x03 Force detection and avoid reset, might help with certain +# dockingstations +# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads + +# Video card driver for VGA adapters. +device vga +hint.vga.0.at="isa" + +# Options for vga: +# Try the following option if the mouse pointer is not drawn correctly +# or font does not seem to be loaded properly. May cause flicker on +# some systems. +options VGA_ALT_SEQACCESS + +# If you can dispense with some vga driver features, you may want to +# use the following options to save some memory. +#options VGA_NO_FONT_LOADING # don't save/load font +#options VGA_NO_MODE_CHANGE # don't change video modes + +# Older video cards may require this option for proper operation. +options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs + +# The following option probably won't work with the LCD displays. +options VGA_WIDTH90 # support 90 column modes + +# Debugging. +options VGA_DEBUG + +device splash # Splash screen and screen saver support + # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as @@ -257,7 +314,7 @@ # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# HP PC Lan+, various PC Card devices # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters @@ -609,7 +666,3 @@ # Enable NDIS binary driver support options NDISAPI device ndis - - -# The I/O device -device io ==== //depot/projects/newisp/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.5 2006/08/19 15:13:01 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.7 2006/10/15 14:22:12 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -830,6 +830,7 @@ #define CLONE_FILES 0x400 #define CLONE_SIGHAND 0x800 #define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_VFORK 0x4000 #define CLONE_PARENT 0x00008000 #define CLONE_THREAD 0x10000 #define CLONE_SETTLS 0x80000 @@ -839,4 +840,6 @@ #define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) +#include + #endif /* !_AMD64_LINUX_LINUX_H_ */ ==== //depot/projects/newisp/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.22 2006/10/15 13:39:39 netchild Exp $"); #include #include @@ -530,7 +530,13 @@ ff |= RFMEM; if (args->flags & CLONE_SIGHAND) ff |= RFSIGSHARE; - if (!(args->flags & CLONE_FILES)) + /* + * XXX: in linux sharing of fs info (chroot/cwd/umask) + * and open files is independant. in fbsd its in one + * structure but in reality it doesnt make any problems + * because both this flags are set at once usually. + */ + if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; /* @@ -634,6 +640,16 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; + + if (args->flags & CLONE_VFORK) { + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + while (p2->p_flag & P_PPWAIT) + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + PROC_UNLOCK(p2); + } + return (0); } ==== //depot/projects/newisp/amd64/linux32/linux32_proto.h#3 (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.22 2006/08/27 08:58:00 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -724,6 +724,30 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_io_setup_args { + char nr_reqs_l_[PADL_(l_uint)]; l_uint nr_reqs; char nr_reqs_r_[PADR_(l_uint)]; + char ctxp_l_[PADL_(linux_aio_context_t *)]; linux_aio_context_t * ctxp; char ctxp_r_[PADR_(linux_aio_context_t *)]; +}; +struct linux_io_destroy_args { + char ctx_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx; char ctx_r_[PADR_(linux_aio_context_t)]; +}; +struct linux_io_getevents_args { + char ctx_id_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx_id; char ctx_id_r_[PADR_(linux_aio_context_t)]; + char min_nr_l_[PADL_(l_long)]; l_long min_nr; char min_nr_r_[PADR_(l_long)]; + char nr_l_[PADL_(l_long)]; l_long nr; char nr_r_[PADR_(l_long)]; + char events_l_[PADL_(struct linux_io_event *)]; struct linux_io_event * events; char events_r_[PADR_(struct linux_io_event *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; +}; +struct linux_io_submit_args { + char ctx_id_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx_id; char ctx_id_r_[PADR_(linux_aio_context_t)]; + char nr_l_[PADL_(l_long)]; l_long nr; char nr_r_[PADR_(l_long)]; + char iocbpp_l_[PADL_(struct linux_iocb **)]; struct linux_iocb ** iocbpp; char iocbpp_r_[PADR_(struct linux_iocb **)]; +}; +struct linux_io_cancel_args { + char ctx_id_l_[PADL_(linux_aio_context_t)]; linux_aio_context_t ctx_id; char ctx_id_r_[PADR_(linux_aio_context_t)]; + char iocb_l_[PADL_(struct linux_iocb *)]; struct linux_iocb * iocb; char iocb_r_[PADR_(struct linux_iocb *)]; + char result_l_[PADL_(struct linux_io_event *)]; struct linux_io_event * result; char result_r_[PADR_(struct linux_io_event *)]; +}; struct linux_fadvise64_args { register_t dummy; }; @@ -1081,6 +1105,11 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_io_setup(struct thread *, struct linux_io_setup_args *); +int linux_io_destroy(struct thread *, struct linux_io_destroy_args *); +int linux_io_getevents(struct thread *, struct linux_io_getevents_args *); +int linux_io_submit(struct thread *, struct linux_io_submit_args *); +int linux_io_cancel(struct thread *, struct linux_io_cancel_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); int linux_exit_group(struct thread *, struct linux_exit_group_args *); int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); @@ -1326,6 +1355,11 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_io_setup AUE_NULL +#define LINUX_SYS_AUE_linux_io_destroy AUE_NULL +#define LINUX_SYS_AUE_linux_io_getevents AUE_NULL +#define LINUX_SYS_AUE_linux_io_submit AUE_NULL +#define LINUX_SYS_AUE_linux_io_cancel AUE_NULL #define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL #define LINUX_SYS_AUE_linux_exit_group AUE_EXIT #define LINUX_SYS_AUE_linux_lookup_dcookie AUE_NULL ==== //depot/projects/newisp/amd64/linux32/linux32_syscall.h#3 (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.22 2006/08/27 08:58:00 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,6 +221,11 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_io_setup 245 +#define LINUX_SYS_linux_io_destroy 246 +#define LINUX_SYS_linux_io_getevents 247 +#define LINUX_SYS_linux_io_submit 248 +#define LINUX_SYS_linux_io_cancel 249 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_linux_exit_group 252 #define LINUX_SYS_linux_lookup_dcookie 253 ==== //depot/projects/newisp/amd64/linux32/linux32_sysent.c#3 (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.22 2006/08/27 08:58:00 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.23 2006/10/15 14:24:09 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp */ #include @@ -265,11 +265,11 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ { 0, (sy_call_t *)nosys, 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 */ + { AS(linux_io_setup_args), (sy_call_t *)linux_io_setup, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ + { AS(linux_io_destroy_args), (sy_call_t *)linux_io_destroy, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ + { AS(linux_io_getevents_args), (sy_call_t *)linux_io_getevents, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ + { AS(linux_io_submit_args), (sy_call_t *)linux_io_submit, AUE_NULL, NULL, 0, 0 }, /* 248 = linux_io_submit */ + { AS(linux_io_cancel_args), (sy_call_t *)linux_io_cancel, 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(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ ==== //depot/projects/newisp/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -406,11 +406,11 @@ 242 AUE_NULL UNIMPL linux_sched_getaffinity 243 AUE_NULL UNIMPL linux_set_thread_area 244 AUE_NULL UNIMPL linux_get_thread_area -245 AUE_NULL UNIMPL linux_io_setup -246 AUE_NULL UNIMPL linux_io_destroy -247 AUE_NULL UNIMPL linux_io_getevents -248 AUE_NULL UNIMPL linux_io_submit -249 AUE_NULL UNIMPL linux_io_cancel +245 AUE_NULL STD { int linux_io_setup(l_uint nr_reqs, linux_aio_context_t *ctxp); } +246 AUE_NULL STD { int linux_io_destroy(linux_aio_context_t ctx); } +247 AUE_NULL STD { int linux_io_getevents(linux_aio_context_t ctx_id, l_long min_nr, l_long nr, struct linux_io_event *events, struct l_timespec *timeout); } +248 AUE_NULL STD { int linux_io_submit(linux_aio_context_t ctx_id, l_long nr, struct linux_iocb **iocbpp); } +249 AUE_NULL STD { int linux_io_cancel(linux_aio_context_t ctx_id, struct linux_iocb *iocb, struct linux_io_event *result); } 250 AUE_NULL STD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } ==== //depot/projects/newisp/arm/arm/fusu.S#4 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.10 2006/08/30 11:44:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.11 2006/10/17 02:24:46 davidxu Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -53,7 +53,7 @@ */ ENTRY_NP(casuword32) -ENTRY(casuptr) +ENTRY(casuword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ stmfd sp!, {r0, r14} @@ -72,7 +72,7 @@ beq .Lfusupcbfault #endif stmfd sp!, {r4, r5} - adr r4, .Lcasuptrfault + adr r4, .Lcasuwordfault str r4, [r3, #PCB_ONFAULT] ldrt r5, [r0] cmp r5, r1 @@ -85,10 +85,10 @@ RET /* - * Handle faults from casuptr. Clean up and return -1. + * Handle faults from casuword. Clean up and return -1. */ -.Lcasuptrfault: +.Lcasuwordfault: mov r0, #0x00000000 str r0, [r3, #PCB_ONFAULT] mvn r0, #0x00000000 ==== //depot/projects/newisp/arm/arm/trap.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.27 2006/07/28 20:22:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.28 2006/10/20 11:00:03 cognet Exp $"); #include @@ -940,22 +940,8 @@ } switch (error) { case 0: -#ifdef __ARMEB__ - if ((insn & 0x000fffff) && - (code != SYS_lseek)) { - /* - * 64-bit return, 32-bit syscall. Fixup byte order - */ - frame->tf_r0 = 0; - frame->tf_r1 = td->td_retval[0]; - } else { - frame->tf_r0 = td->td_retval[0]; - frame->tf_r1 = td->td_retval[1]; - } -#else frame->tf_r0 = td->td_retval[0]; frame->tf_r1 = td->td_retval[1]; -#endif frame->tf_spsr &= ~PSR_C_bit; /* carry bit */ break; ==== //depot/projects/newisp/arm/at91/at91_spi.c#2 (text) ==== @@ -23,14 +23,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.2 2006/07/14 21:35:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.3 2006/10/20 07:10:13 imp Exp $"); #include #include #include #include #include -#include #include #include #include @@ -50,9 +49,9 @@ void *intrhand; /* Interrupt handle */ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ - struct mtx sc_mtx; /* basically a perimeter lock */ bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ bus_dmamap_t map[4]; /* Maps for the transaction */ + int rxdone; }; static inline uint32_t @@ -67,19 +66,7 @@ bus_write_4(sc->mem_res, off, val); } -#define AT91_SPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define AT91_SPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define AT91_SPI_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ - "spi", MTX_DEF) -#define AT91_SPI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define AT91_SPI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define AT91_SPI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); - -static devclass_t at91_spi_devclass; - /* bus entry points */ - static int at91_spi_probe(device_t dev); static int at91_spi_attach(device_t dev); static int at91_spi_detach(device_t dev); @@ -87,6 +74,7 @@ /* helper routines */ static int at91_spi_activate(device_t dev); static void at91_spi_deactivate(device_t dev); +static void at91_spi_intr(void *arg); static int at91_spi_probe(device_t dev) @@ -106,8 +94,6 @@ if (err) goto out; - AT91_SPI_LOCK_INIT(sc); - /* * Allocate DMA tags and maps */ @@ -124,6 +110,7 @@ // reset the SPI WR4(sc, SPI_CR, SPI_CR_SWRST); + WR4(sc, SPI_IDR, 0xffffffff); WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | (0xE << 16)); @@ -141,8 +128,6 @@ WR4(sc, PDC_RCR, 0); WR4(sc, PDC_TPR, 0); WR4(sc, PDC_TCR, 0); - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); RD4(sc, SPI_RDR); RD4(sc, SPI_SR); @@ -164,7 +149,7 @@ at91_spi_activate(device_t dev) { struct at91_spi_softc *sc; - int rid; + int rid, err = ENOMEM; sc = device_get_softc(dev); rid = 0; @@ -175,12 +160,16 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) + goto errout; + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + at91_spi_intr, sc, &sc->intrhand); + if (err != 0) goto errout; return (0); errout: at91_spi_deactivate(dev); - return (ENOMEM); + return (err); } static void @@ -216,7 +205,7 @@ at91_spi_transfer(device_t dev, device_t child, struct spi_command *cmd) { struct at91_spi_softc *sc; - int i; + int i, j, rxdone, err, mode[4]; bus_addr_t addr; sc = device_get_softc(dev); @@ -228,49 +217,73 @@ WR4(sc, PDC_TPR, addr); WR4(sc, PDC_TCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); - i++; - if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->tx_data, - cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) - goto out; - WR4(sc, PDC_TNPR, addr); - WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); - bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); - i++; + mode[i++] = BUS_DMASYNC_POSTWRITE; + if (cmd->tx_data_sz > 0) { + if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->tx_data, + cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) + goto out; + WR4(sc, PDC_TNPR, addr); + WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); + bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); + mode[i++] = BUS_DMASYNC_POSTWRITE; + } if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_cmd, cmd->tx_cmd_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_RPR, addr); WR4(sc, PDC_RCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); - i++; - if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, - cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) - goto out; - WR4(sc, PDC_RNPR, addr); - WR4(sc, PDC_RNCR, cmd->tx_data_sz); - bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); - + mode[i++] = BUS_DMASYNC_POSTREAD; + if (cmd->tx_data_sz > 0) { + if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, + cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) + goto out; + WR4(sc, PDC_RNPR, addr); + WR4(sc, PDC_RNCR, cmd->tx_data_sz); + bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); + mode[i++] = BUS_DMASYNC_POSTREAD; + } + WR4(sc, SPI_IER, SPI_SR_ENDRX); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN | PDC_PTCR_RXTEN); - // wait for completion - // XXX should be done as an ISR of some sort. - while (RD4(sc, SPI_SR) & SPI_SR_ENDRX) - DELAY(700); - - // Sync the buffers after the DMA is done, and unload them. - bus_dmamap_sync(sc->dmatag, sc->map[0], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[1], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[2], BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc->dmatag, sc->map[3], BUS_DMASYNC_POSTREAD); - for (i = 0; i < 4; i++) - bus_dmamap_unload(sc->dmatag, sc->map[i]); - return (0); + rxdone = sc->rxdone; + do { + err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz); + } while (rxdone == sc->rxdone && err != EINTR); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); + if (err == 0) { + for (j = 0; j < i; j++) + bus_dmamap_sync(sc->dmatag, sc->map[j], mode[j]); + } + for (j = 0; j < i; j++) + bus_dmamap_unload(sc->dmatag, sc->map[j]); + return (err); out:; - while (i-- > 0) - bus_dmamap_unload(sc->dmatag, sc->map[i]); + for (j = 0; j < i; j++) + bus_dmamap_unload(sc->dmatag, sc->map[j]); return (EIO); } +static void +at91_spi_intr(void *arg) +{ + struct at91_spi_softc *sc = (struct at91_spi_softc*)arg; + uint32_t sr; + + sr = RD4(sc, SPI_SR) & RD4(sc, SPI_IMR); + if (sr & SPI_SR_ENDRX) { + sc->rxdone++; + WR4(sc, SPI_IDR, SPI_SR_ENDRX); + wakeup(&sc->rxdone); + } + if (sr & ~SPI_SR_ENDRX) { + device_printf(sc->dev, "Unexpected ISR %#x\n", sr); + WR4(sc, SPI_IDR, sr & ~SPI_SR_ENDRX); + } +} + +static devclass_t at91_spi_devclass; + static device_method_t at91_spi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_spi_probe), ==== //depot/projects/newisp/arm/at91/at91_ssc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.2 2006/07/14 22:30:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.3 2006/10/20 07:08:59 imp Exp $"); #include #include @@ -88,14 +88,16 @@ /* cdev routines */ static d_open_t at91_ssc_open; static d_close_t at91_ssc_close; -static d_ioctl_t at91_ssc_ioctl; +static d_read_t at91_ssc_read; +static d_write_t at91_ssc_write; static struct cdevsw at91_ssc_cdevsw = { .d_version = D_VERSION, .d_open = at91_ssc_open, .d_close = at91_ssc_close, - .d_ioctl = at91_ssc_ioctl + .d_read = at91_ssc_read, + .d_write = at91_ssc_write, }; static int @@ -134,6 +136,19 @@ goto out; } sc->cdev->si_drv1 = sc; + + // Init for TSC needs + WR4(sc, SSC_CR, SSC_CR_SWRST); + WR4(sc, SSC_CMR, 0); // clock divider unused + WR4(sc, SSC_RCMR, + SSC_RCMR_CKS_RK | SSC_RCMR_CKO_NONE | SSC_RCMR_START_FALL_EDGE_RF); + WR4(sc, SSC_RFMR, + 0x1f | SSC_RFMR_MSFBF | SSC_RFMR_FSOS_NONE); + WR4(sc, SSC_TCMR, + SSC_TCMR_CKS_TK | SSC_TCMR_CKO_NONE | SSC_RCMR_START_CONT); + WR4(sc, SSC_TFMR, + 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_NEG_PULSE); + out:; if (err) at91_ssc_deactivate(dev); @@ -161,7 +176,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; return (0); errout: @@ -241,10 +256,15 @@ } static int -at91_ssc_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, - struct thread *td) +at91_ssc_read(struct cdev *dev, struct uio *uio, int flag) +{ + return EIO; +} + +static int +at91_ssc_write(struct cdev *dev, struct uio *uio, int flag) { - return (ENXIO); + return EIO; } static device_method_t at91_ssc_methods[] = { ==== //depot/projects/newisp/arm/at91/at91_sscreg.h#2 (text) ==== @@ -22,9 +22,114 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.1 2006/03/24 07:42:33 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.2 2006/10/20 07:08:15 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H +/* Registers */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 20 20:53: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 2BB8616A407; Fri, 20 Oct 2006 20:53: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 D30BD16A416 for ; Fri, 20 Oct 2006 20:53:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E54943D72 for ; Fri, 20 Oct 2006 20:53:41 +0000 (GMT) (envelope-from mjacob@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 k9KKrf0I049782 for ; Fri, 20 Oct 2006 20:53:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KKreIR049777 for perforce@freebsd.org; Fri, 20 Oct 2006 20:53:40 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 20 Oct 2006 20:53:40 GMT Message-Id: <200610202053.k9KKreIR049777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 20:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=108190 Change 108190 by mjacob@newisp on 2006/10/20 20:52:59 IFC Affected files ... .. //depot/projects/newisp/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/newisp/netinet/ip_input.c#2 integrate Differences ... ==== //depot/projects/newisp/netinet/ip_fw_pfil.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.21 2006/05/12 04:41:27 mlaier Exp $ + * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.22 2006/10/20 19:32:08 julian Exp $ */ #if !defined(KLD_MODULE) @@ -80,6 +80,14 @@ /* ng_ipfw hooks. */ ng_ipfw_input_t *ng_ipfw_input_p = NULL; +/* + * ipfw_ether and ipfw_bridge hooks. + * XXX: Temporary until those are converted to pfil_hooks as well. + */ +ip_fw_chk_t *ip_fw_chk_ptr = NULL; +ip_dn_io_t *ip_dn_io_ptr = NULL; +int fw_one_pass = 1; + /* Forward declarations. */ static int ipfw_divert(struct mbuf **, int, int); #define DIV_DIR_IN 1 ==== //depot/projects/newisp/netinet/ip_input.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.320 2006/08/17 00:37:03 julian Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.321 2006/10/20 19:32:08 julian Exp $ */ #include "opt_bootp.h" @@ -77,10 +77,6 @@ #include -/* XXX: Temporary until ipfw_ether and ipfw_bridge are converted. */ -#include -#include - int rsvp_on = 0; int ipforwarding = 0; @@ -192,14 +188,6 @@ &ipstealth, 0, ""); #endif -/* - * ipfw_ether and ipfw_bridge hooks. - * XXX: Temporary until those are converted to pfil_hooks as well. - */ -ip_fw_chk_t *ip_fw_chk_ptr = NULL; -ip_dn_io_t *ip_dn_io_ptr = NULL; -int fw_one_pass = 1; - static void ip_freef(struct ipqhead *, struct ipq *); /* From owner-p4-projects@FreeBSD.ORG Fri Oct 20 22:07: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 55A3A16A47C; Fri, 20 Oct 2006 22:07: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 18A4116A416 for ; Fri, 20 Oct 2006 22:07:18 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59EA143D5C for ; Fri, 20 Oct 2006 22:07:16 +0000 (GMT) (envelope-from cognet@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 k9KM7GdF068077 for ; Fri, 20 Oct 2006 22:07:16 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KM7GXL068074 for perforce@freebsd.org; Fri, 20 Oct 2006 22:07:16 GMT (envelope-from cognet@freebsd.org) Date: Fri, 20 Oct 2006 22:07:16 GMT Message-Id: <200610202207.k9KM7GXL068074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 108194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 22:07:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=108194 Change 108194 by cognet@cognet on 2006/10/20 22:06:56 BUS_DMAMEM_COHERENT is really spelled BUS_DMA_COHERENT. Affected files ... .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#20 edit Differences ... ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#20 (text+ko) ==== @@ -2508,7 +2508,7 @@ } error = bus_dmamem_alloc(dd->dd_dmat, (void**) &dd->dd_desc, - BUS_DMA_NOWAIT | BUS_DMAMEM_COHERENT, + BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &dd->dd_dmamap); if (error != 0) { if_printf(ifp, "unable to alloc memory for %u %s descriptors, " From owner-p4-projects@FreeBSD.ORG Fri Oct 20 22:42: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 7473416A494; Fri, 20 Oct 2006 22:42: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 3526716A47C for ; Fri, 20 Oct 2006 22:42:02 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CCB443D64 for ; Fri, 20 Oct 2006 22:42:00 +0000 (GMT) (envelope-from cognet@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 k9KMg0MR073880 for ; Fri, 20 Oct 2006 22:42:00 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KMg0FC073873 for perforce@freebsd.org; Fri, 20 Oct 2006 22:42:00 GMT (envelope-from cognet@freebsd.org) Date: Fri, 20 Oct 2006 22:42:00 GMT Message-Id: <200610202242.k9KMg0FC073873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 108195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 22:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=108195 Change 108195 by cognet@cognet on 2006/10/20 22:41:46 Hack and slash to get the UART working, even in userland : - call device_add_child for the uart0. - Hack the allocation routines to special case for the UART. The way used to detect if it is the uart is WRONG, it is probably best to add a new "bus", just for the UART. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#10 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#10 (text+ko) ==== @@ -229,6 +229,7 @@ device_add_child(dev, "pcib", 0); device_add_child(dev, "ixpclk", 0); device_add_child(dev, "ixpiic", 0); + device_add_child(dev, "uart", 0); if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) @@ -257,6 +258,15 @@ case SYS_RES_MEMORY: rmanp = &sc->sc_mem_rman; + /* Naughty hack to get the UART memory-mapped register. */ + /* I'm not sure of how to do it cleanly. */ + if (start == 0 && end == ~0) { + if (device_get_unit(dev) == 0) + start = IXP425_UART0_HWBASE; + else + start = IXP425_UART1_HWBASE; + end = start + 0x1000; + } if (getvbase(start, end - start, &vbase)) return (rv); break; @@ -269,7 +279,11 @@ if (rv != NULL) { rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { - rman_set_bustag(rv, sc->sc_iot); + if (start == IXP425_UART0_HWBASE || start == + IXP425_UART1_HWBASE) + rman_set_bustag(rv, &ixp425_a4x_bs_tag); + else + rman_set_bustag(rv, sc->sc_iot); rman_set_bushandle(rv, vbase); } } @@ -283,6 +297,13 @@ void **cookiep) { + if (flags & INTR_TYPE_TTY) { + /* XXX: wrong. */ + if (device_get_unit(dev) == 0) + rman_set_start(ires, IXP425_INT_UART0); + else + rman_set_start(ires, IXP425_INT_UART1); + } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); intr_enabled |= 1 << rman_get_start(ires); ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -36,12 +36,14 @@ #include #include +#include #include #include #include #include +#include #include "uart_if.h" @@ -71,6 +73,8 @@ sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); + bus_space_write_4(&ixp425_a4x_bs_tag, device_get_unit(dev) == 0 ? + IXP425_UART0_VBASE : IXP425_UART1_VBASE, REG_IER, 0x40); return(uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0)); } ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Oct 20 23:01: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 5843216A40F; Fri, 20 Oct 2006 23:01: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 1239916A403 for ; Fri, 20 Oct 2006 23:01:33 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E96943D45 for ; Fri, 20 Oct 2006 23:01:32 +0000 (GMT) (envelope-from cognet@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 k9KN1Wip076499 for ; Fri, 20 Oct 2006 23:01:32 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9KN1PZU076303 for perforce@freebsd.org; Fri, 20 Oct 2006 23:01:25 GMT (envelope-from cognet@freebsd.org) Date: Fri, 20 Oct 2006 23:01:25 GMT Message-Id: <200610202301.k9KN1PZU076303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 108197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Oct 2006 23:01:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=108197 Change 108197 by cognet@cognet on 2006/10/20 23:01:03 IFC Affected files ... .. //depot/projects/arm/src/Makefile#6 integrate .. //depot/projects/arm/src/Makefile.inc1#16 integrate .. //depot/projects/arm/src/bin/cp/cp.1#3 integrate .. //depot/projects/arm/src/bin/cp/cp.c#4 integrate .. //depot/projects/arm/src/bin/cp/utils.c#3 integrate .. //depot/projects/arm/src/bin/ls/ls.1#3 integrate .. //depot/projects/arm/src/bin/ls/print.c#2 integrate .. //depot/projects/arm/src/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/arm/src/bin/rm/rm.c#2 integrate .. //depot/projects/arm/src/bin/sh/jobs.c#2 integrate .. //depot/projects/arm/src/bin/sh/jobs.h#2 integrate .. //depot/projects/arm/src/bin/sh/main.c#2 integrate .. //depot/projects/arm/src/bin/sh/sh.1#5 integrate .. //depot/projects/arm/src/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/arm/src/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/arm/src/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/arm/src/crypto/openssh/config.h#3 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/arm/src/etc/disktab#2 integrate .. //depot/projects/arm/src/etc/libalias.conf#2 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/arm/src/etc/network.subr#4 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/arm/src/etc/rc.d/amd#2 integrate .. //depot/projects/arm/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/arm/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/arm/src/etc/rc.d/idmapd#1 branch .. //depot/projects/arm/src/etc/rc.d/mixer#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/arm/src/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/arm/src/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/grep/grep.1#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/arm/src/include/Makefile#4 integrate .. //depot/projects/arm/src/lib/csu/sparc64/crt1.c#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/cuseeme/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/dummy/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/ftp/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/irc/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/nbt/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/pptp/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/skinny/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/smedia/Makefile#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/arm/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tls.c#4 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/ffs.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/read.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/stat.2#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_select.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sig.c#2 integrate .. //depot/projects/arm/src/lib/libdisk/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkvm/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_sparc64.c#2 integrate .. //depot/projects/arm/src/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/arm/src/lib/libnetgraph/sock.c#2 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/arm/src/lib/libutil/login.conf.5#3 integrate .. //depot/projects/arm/src/lib/msun/i387/fenv.h#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate .. //depot/projects/arm/src/release/scripts/package-split.py#3 integrate .. //depot/projects/arm/src/sbin/Makefile#3 integrate .. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/arm/src/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/arm/src/sbin/dump/main.c#3 integrate .. //depot/projects/arm/src/sbin/geom/class/Makefile#2 integrate .. //depot/projects/arm/src/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/arm/src/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/arm/src/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/arm/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/arm/src/sbin/idmapd/Makefile#2 integrate .. //depot/projects/arm/src/sbin/idmapd/idmapd.8#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/arm/src/sbin/kldload/kldload.8#2 integrate .. //depot/projects/arm/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/arm/src/sbin/restore/restore.8#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#7 integrate .. //depot/projects/arm/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/arm/src/share/examples/etc/README.examples#2 integrate .. //depot/projects/arm/src/share/man/man1/builtin.1#2 integrate .. //depot/projects/arm/src/share/man/man3/pthread_schedparam.3#3 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#3 integrate .. //depot/projects/arm/src/share/man/man4/aue.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ddb.4#4 integrate .. //depot/projects/arm/src/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/arm/src/share/man/man4/gre.4#2 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/arm/src/share/man/man4/ipfirewall.4#3 integrate .. //depot/projects/arm/src/share/man/man4/kue.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/arm/src/share/man/man4/pcm.4#3 integrate .. //depot/projects/arm/src/share/man/man4/sis.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/arm/src/share/man/man4/tun.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ural.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uscanner.4#3 integrate .. //depot/projects/arm/src/share/man/man5/disktab.5#2 integrate .. //depot/projects/arm/src/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/arm/src/share/man/man9/hash.9#3 integrate .. //depot/projects/arm/src/share/man/man9/ktr.9#3 integrate .. //depot/projects/arm/src/share/misc/iso3166#2 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/arm/src/share/mk/sys.mk#2 integrate .. //depot/projects/arm/src/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/arm/src/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/arm/src/share/zoneinfo/africa#2 integrate .. //depot/projects/arm/src/share/zoneinfo/asia#2 integrate .. //depot/projects/arm/src/share/zoneinfo/australasia#2 integrate .. //depot/projects/arm/src/share/zoneinfo/backward#2 integrate .. //depot/projects/arm/src/share/zoneinfo/europe#2 integrate .. //depot/projects/arm/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/arm/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/arm/src/share/zoneinfo/yearistype.sh#2 integrate .. //depot/projects/arm/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#14 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/arm/src/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#11 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#11 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#10 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#6 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#26 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#57 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#37 integrate .. //depot/projects/arm/src/sys/boot/Makefile#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#23 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200.h#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#10 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#35 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#20 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#19 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#10 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.c#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/printf.c#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/putchar.c#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#12 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#18 integrate .. //depot/projects/arm/src/sys/boot/common/help.common#4 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#5 integrate .. //depot/projects/arm/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/arm/src/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#34 integrate .. //depot/projects/arm/src/sys/conf/files#48 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#17 integrate .. //depot/projects/arm/src/sys/conf/files.i386#19 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#10 integrate .. //depot/projects/arm/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#12 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#13 integrate .. //depot/projects/arm/src/sys/conf/options#31 integrate .. //depot/projects/arm/src/sys/ddb/db_command.c#7 integrate .. //depot/projects/arm/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_output.c#4 integrate .. //depot/projects/arm/src/sys/ddb/db_output.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/arm/src/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_disk.c#4 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#14 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/arm/src/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/arm/src/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/arm/src/sys/dev/spibus/spibus.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cdce.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs.h#7 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/arm/src/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#23 integrate .. //depot/projects/arm/src/sys/i386/acpica/Makefile#3 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#19 integrate .. //depot/projects/arm/src/sys/i386/i386/db_trace.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#5 integrate .. //depot/projects/arm/src/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/arm/src/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#6 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/arm/src/sys/ia64/conf/NOTES#6 integrate .. //depot/projects/arm/src/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/ia64/ia64/clock.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#7 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#8 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#18 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#21 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#13 integrate .. //depot/projects/arm/src/sys/modules/aio/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/linux/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/mem/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/mmc/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/mmcsd/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/uart/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#19 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#21 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#13 integrate .. //depot/projects/arm/src/sys/netinet/libalias/libalias.3#5 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/arm/src/sys/pci/agp.c#6 integrate .. //depot/projects/arm/src/sys/pci/agp_amd64.c#7 integrate .. //depot/projects/arm/src/sys/pci/nfsmb.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/arm/src/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/arm/src/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/arm/src/sys/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/arm/src/sys/sys/conf.h#6 integrate .. //depot/projects/arm/src/sys/sys/elf32.h#4 integrate .. //depot/projects/arm/src/sys/sys/elf64.h#5 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#4 integrate .. //depot/projects/arm/src/sys/sys/sem.h#2 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#18 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#18 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#19 integrate .. //depot/projects/arm/src/sys/sys/systm.h#15 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#9 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#9 integrate .. //depot/projects/arm/src/tools/regression/execve/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/execve/execve.t#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.australia#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.holiday#3 integrate .. //depot/projects/arm/src/usr.bin/expand/expand.1#2 integrate .. //depot/projects/arm/src/usr.bin/find/find.1#3 integrate .. //depot/projects/arm/src/usr.bin/jot/jot.1#2 integrate .. //depot/projects/arm/src/usr.bin/lam/lam.1#2 integrate .. //depot/projects/arm/src/usr.bin/make/str.c#2 integrate .. //depot/projects/arm/src/usr.bin/rs/rs.1#2 integrate .. //depot/projects/arm/src/usr.bin/systat/systat.1#2 integrate .. //depot/projects/arm/src/usr.bin/tput/tput.c#2 integrate .. //depot/projects/arm/src/usr.bin/tr/tr.1#2 integrate .. //depot/projects/arm/src/usr.bin/unexpand/unexpand.c#2 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#8 integrate .. //depot/projects/arm/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/arm/src/usr.sbin/pccard/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/arm/src/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/Makefile#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/cardd.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/cardd.h#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/file.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/pccard.conf.5#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/pccardd.8#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/pccardd.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/server.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/arm/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/arm/src/usr.sbin/wicontrol/wicontrol.8#2 integrate .. //depot/projects/arm/src/usr.sbin/wicontrol/wicontrol.c#2 integrate .. //depot/projects/arm/src/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ +# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ # # The user-driven targets are: # @@ -268,7 +268,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 i386 ia64 pc98 sparc64 +.for target in amd64 i386 ia64 pc98 sparc64 sun4v KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/arm/src/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -98,7 +98,7 @@ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET= ${TARGET_ARCH} @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -1012,56 +1012,58 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/arm/src/bin/cp/cp.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $ .\" -.Dd August 24, 2006 +.Dd October 7, 2006 .Dt CP 1 .Os .Sh NAME @@ -252,8 +252,37 @@ .Fl r option. This implementation supports that option, however, its use is strongly -discouraged, as it does not correctly copy special files, symbolic links -or fifo's. +discouraged as its behavior is very implementation dependent. +In this version of +.Nm , +.Fl r +is just a synonym for +.Fl RL . +The +.Fl R +option gives the correct behavior while +.Fl L +preserves the sometimes-useful historical behavior of following symbolic links. +The +.Fl r +option is deprecated in +.Tn POSIX + and its behavior is likely to be different +in future versions of +.Nm +and its behavior is likely to be different +in future versions of +.Fx . +Previous versions of +.Nm +in +.Fx , +the +.Fl r +behavior was to not correctly copy special files, symbolic links +or fifos. +Symbolic links were followed, and the contents of special +files and fifos were copied to regular files. .Pp The .Fl v ==== //depot/projects/arm/src/bin/cp/cp.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); /* * Cp copies source files to target files. @@ -138,7 +138,8 @@ pflag = 1; break; case 'r': - rflag = 1; + rflag = Lflag = 1; + Hflag = Pflag = 0; break; case 'v': vflag = 1; @@ -154,16 +155,10 @@ usage(); fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - if (rflag) { - if (Rflag) - errx(1, - "the -R and -r options may not be specified together."); - if (Hflag || Lflag || Pflag) - errx(1, - "the -H, -L, and -P options may not be specified with the -r option."); - fts_options &= ~FTS_PHYSICAL; - fts_options |= FTS_LOGICAL; - } + if (Rflag && rflag) + errx(1, "the -R and -r options may not be specified together"); + if (rflag) + Rflag = 1; if (Rflag) { if (Hflag) fts_options |= FTS_COMFOLLOW; @@ -227,12 +222,12 @@ * the initial mkdir(). */ if (r == -1) { - if (rflag || (Rflag && (Lflag || Hflag))) + if (Rflag && (Lflag || Hflag)) stat(*argv, &tmp_stat); else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag)) + if (S_ISDIR(tmp_stat.st_mode) && Rflag) type = DIR_TO_DNE; else type = FILE_TO_FILE; @@ -420,7 +415,7 @@ } break; case S_IFDIR: - if (!Rflag && !rflag) { + if (!Rflag) { warnx("%s is a directory (not copied).", curr->fts_path); (void)fts_set(ftsp, curr, FTS_SKIP); ==== //depot/projects/arm/src/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); #include #include @@ -54,17 +54,18 @@ #include #include "extern.h" -#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y)) + +#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) int copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; - int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; - size_t wtotal; + off_t wtotal; + int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; @@ -149,16 +150,17 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { @@ -179,16 +181,17 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { ==== //depot/projects/arm/src/bin/ls/ls.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ .\" -.Dd March 24, 2006 +.Dd October 12, 2006 .Dt LS 1 .Os .Sh NAME @@ -68,7 +68,10 @@ The following options are available: .Bl -tag -width indent .It Fl A -List all entries except for +Include directory entries whose names begin with a +dot +.Pq Sq Pa \&. +except for .Pa \&. and .Pa .. . @@ -159,7 +162,7 @@ .It Fl a Include directory entries whose names begin with a dot -.Pq Pa \&. . +.Pq Sq Pa \&. . .It Fl b As .Fl B , @@ -364,6 +367,8 @@ follows: .Pp .Bl -tag -width 4n -offset indent -compact +.It Sy \- +Regular file. .It Sy b Block special file. .It Sy c @@ -372,12 +377,12 @@ Directory. .It Sy l Symbolic link. -.It Sy s -Socket link. .It Sy p .Tn FIFO . -.It Sy \- -Regular file. +.It Sy s +Socket. +.It Sy w +Whiteout. .El .Pp The next three fields ==== //depot/projects/arm/src/bin/ls/print.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.75 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); #include #include @@ -628,9 +628,10 @@ p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since - * pathconf() and acl_get_file() both follow them. + * pathconf() and acl_get_file() both follow them. They also don't + * support whiteouts. */ - if (S_ISLNK(p->fts_statp->st_mode)) { + if (S_ISLNK(p->fts_statp->st_mode) || S_ISWHT(p->fts_statp->st_mode)) { *haveacls = 1; return; } ==== //depot/projects/arm/src/bin/mkdir/mkdir.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $"); #include #include @@ -99,19 +99,19 @@ } for (exitval = 0; *argv != NULL; ++argv) { - success = 1; if (pflag) { - if (build(*argv, omode)) - success = 0; + success = build(*argv, omode); } else if (mkdir(*argv, omode) < 0) { if (errno == ENOTDIR || errno == ENOENT) warn("%s", dirname(*argv)); else warn("%s", *argv); success = 0; - } else if (vflag) - (void)printf("%s\n", *argv); - + } else { + success = 1; + if (vflag) + (void)printf("%s\n", *argv); + } if (!success) exitval = 1; /* @@ -119,9 +119,10 @@ * nine bits, so if you try to set a mode including the * sticky, setuid, setgid bits you lose them. Don't do * this unless the user has specifically requested a mode, - * as chmod will (obviously) ignore the umask. + * as chmod will (obviously) ignore the umask. Do this + * on newly created directories only. */ - if (success && mode != NULL && chmod(*argv, omode) == -1) { + if (success == 1 && mode != NULL && chmod(*argv, omode) == -1) { warn("%s", *argv); exitval = 1; } @@ -129,6 +130,11 @@ exit(exitval); } + +/* + * Returns 1 if a directory has been created, + * 2 if it already existed, and 0 on failure. + */ int build(char *path, mode_t omode) { @@ -139,7 +145,7 @@ p = path; oumask = 0; - retval = 0; + retval = 1; if (p[0] == '/') /* Skip leading '/'. */ ++p; for (first = 1, last = 0; !last ; ++p) { @@ -154,7 +160,7 @@ /* * POSIX 1003.2: * For each dir operand that does not name an existing - * directory, effects equivalent to those cased by the + * directory, effects equivalent to those caused by the * following command shall occcur: * * mkdir -p -m $(umask -S),u+wx $(dirname dir) && @@ -174,7 +180,7 @@ if (errno == EEXIST || errno == EISDIR) { if (stat(path, &sb) < 0) { warn("%s", path); - retval = 1; + retval = 0; break; } else if (!S_ISDIR(sb.st_mode)) { if (last) @@ -182,12 +188,14 @@ else errno = ENOTDIR; warn("%s", path); - retval = 1; + retval = 0; break; } + if (last) + retval = 2; } else { warn("%s", path); - retval = 1; + retval = 0; break; } } else if (vflag) ==== //depot/projects/arm/src/bin/rm/rm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.54 2006/04/15 09:26:23 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); #include #include @@ -347,7 +347,7 @@ if (!fflag && !S_ISWHT(sb.st_mode) && !check(f, f, &sb)) continue; rval = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 21 01:28:53 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 4A63116A417; Sat, 21 Oct 2006 01:28: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 F31D516A403 for ; Sat, 21 Oct 2006 01:28:52 +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 6A53F43D49 for ; Sat, 21 Oct 2006 01:28: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 k9L1SqwW014473 for ; Sat, 21 Oct 2006 01:28:52 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 k9L1SpxV014470 for perforce@freebsd.org; Sat, 21 Oct 2006 01:28:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 21 Oct 2006 01:28:51 GMT Message-Id: <200610210128.k9L1SpxV014470@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 108205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 01:28:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=108205 Change 108205 by rwatson@rwatson_peppercorn on 2006/10/21 01:27:53 Catch a couple more suser's specific to RELENG_6 -- vfs_init and pcvt (not present in 7.x). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_drv.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_ext.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_init.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_drv.c#2 (text+ko) ==== @@ -302,7 +302,8 @@ ttyld_modem(tp, 1); /* fake connection */ winsz = 1; /* set winsize later */ } - else if (tp->t_state & TS_XCLUDE && suser(td)) + else if (tp->t_state & TS_XCLUDE && priv_check(td, + PRIV_TTY_EXCLUSIVE)) { return (EBUSY); } ==== //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_ext.c#2 (text+ko) ==== @@ -2620,7 +2620,7 @@ { struct trapframe *fp = td->td_frame; - error = suser(td); + error = priv_check(td, PRIV_TTY_EXCLUSIVE); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/trustedbsd/priv6/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_init.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -115,7 +116,7 @@ return (vfsp); /* Only load modules for root (very important!). */ - *error = suser(td); + *error = priv_check(td, PRIV_KLD_LOAD); if (*error) return (NULL); *error = securelevel_gt(td->td_ucred, 0); From owner-p4-projects@FreeBSD.ORG Sat Oct 21 03:22: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 7CD3016A47C; Sat, 21 Oct 2006 03:22: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 4E72716A417 for ; Sat, 21 Oct 2006 03:22:20 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6D5643D5C for ; Sat, 21 Oct 2006 03:22:19 +0000 (GMT) (envelope-from mjacob@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 k9L3MJkS041793 for ; Sat, 21 Oct 2006 03:22:19 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9L3MJK2041780 for perforce@freebsd.org; Sat, 21 Oct 2006 03:22:19 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 21 Oct 2006 03:22:19 GMT Message-Id: <200610210322.k9L3MJK2041780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 03:22:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=108207 Change 108207 by mjacob@newisp on 2006/10/21 03:21:20 IFC Affected files ... .. //depot/projects/newisp/arm/arm/trap.c#3 integrate .. //depot/projects/newisp/dev/pci/pci.c#4 integrate .. //depot/projects/newisp/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/newisp/netinet/ip_input.c#3 integrate Differences ... ==== //depot/projects/newisp/arm/arm/trap.c#3 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.28 2006/10/20 11:00:03 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.30 2006/10/21 00:46:56 cognet Exp $"); #include @@ -900,9 +900,9 @@ nap--; } else if (code == SYS___syscall) { - code = *ap++; + code = ap[_QUAD_LOWWORD]; nap -= 2; - ap++; + ap += 2; } if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; @@ -940,8 +940,23 @@ } switch (error) { case 0: - frame->tf_r0 = td->td_retval[0]; - frame->tf_r1 = td->td_retval[1]; +#ifdef __ARMEB__ + if ((insn & 0x000fffff) == SYS___syscall && + (code != SYS_lseek)) { + /* + * 64-bit return, 32-bit syscall. Fixup byte order + */ + frame->tf_r0 = 0; + frame->tf_r1 = td->td_retval[0]; + } else { + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; + } +#else + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; +#endif + frame->tf_spsr &= ~PSR_C_bit; /* carry bit */ break; ==== //depot/projects/newisp/dev/pci/pci.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.315 2006/10/09 16:15:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.316 2006/10/20 21:28:11 jmg Exp $"); #include "opt_bus.h" @@ -653,12 +653,37 @@ cfg->vpd.vpd_ros[off].keyword[0] = byte; cfg->vpd.vpd_ros[off].keyword[1] = vpd_nextbyte(&vrs); dflen = vpd_nextbyte(&vrs); - cfg->vpd.vpd_ros[off].value = malloc((dflen + 1) * - sizeof *cfg->vpd.vpd_ros[off].value, - M_DEVBUF, M_WAITOK); + if (dflen == 0 && + strncmp(cfg->vpd.vpd_ros[off].keyword, "RV", + 2) == 0) { + /* + * if this happens, we can't trust the rest + * of the VPD. + */ + printf("pci%d:%d:%d: bad keyword length: %d\n", + cfg->bus, cfg->slot, cfg->func, dflen); + cksumvalid = 0; + end = 1; + break; + } else if (dflen == 0) { + cfg->vpd.vpd_ros[off].value = malloc(1 * + sizeof *cfg->vpd.vpd_ros[off].value, + M_DEVBUF, M_WAITOK); + cfg->vpd.vpd_ros[off].value[0] = '\x00'; + } else + cfg->vpd.vpd_ros[off].value = malloc( + (dflen + 1) * + sizeof *cfg->vpd.vpd_ros[off].value, + M_DEVBUF, M_WAITOK); remain -= 3; i = 0; - state = 3; + /* keep in sync w/ state 3's transistions */ + if (dflen == 0 && remain == 0) + state = 0; + else if (dflen == 0) + state = 2; + else + state = 3; break; case 3: /* VPD-R Keyword Value */ @@ -673,10 +698,13 @@ cfg->bus, cfg->slot, cfg->func, vrs.cksum); cksumvalid = 0; + end = 1; + break; } } dflen--; remain--; + /* keep in sync w/ state 2's transistions */ if (dflen == 0) cfg->vpd.vpd_ros[off++].value[i++] = '\0'; if (dflen == 0 && remain == 0) { @@ -710,13 +738,20 @@ M_DEVBUF, M_WAITOK); remain -= 3; i = 0; - state = 6; + /* keep in sync w/ state 6's transistions */ + if (dflen == 0 && remain == 0) + state = 0; + else if (dflen == 0) + state = 5; + else + state = 6; break; case 6: /* VPD-W Keyword Value */ cfg->vpd.vpd_w[off].value[i++] = byte; dflen--; remain--; + /* keep in sync w/ state 5's transistions */ if (dflen == 0) cfg->vpd.vpd_w[off++].value[i++] = '\0'; if (dflen == 0 && remain == 0) { @@ -736,6 +771,15 @@ break; } } + + if (cksumvalid == 0) { + /* read-only data bad, clean up */ + for (; off; off--) + free(cfg->vpd.vpd_ros[off].value, M_DEVBUF); + + free(cfg->vpd.vpd_ros, M_DEVBUF); + cfg->vpd.vpd_ros = NULL; + } #undef REG } @@ -1111,12 +1155,12 @@ struct vpd_readonly *vrop; vrop = &cfg->vpd.vpd_ros[i]; if (strncmp("CP", vrop->keyword, 2) == 0) - printf("CP: id %d, BAR%d, off %#x\n", + printf("\tCP: id %d, BAR%d, off %#x\n", vrop->value[0], vrop->value[1], le16toh( *(uint16_t *)&vrop->value[2])); else if (strncmp("RV", vrop->keyword, 2) == 0) - printf("RV: %#hhx\n", vrop->value[0]); + printf("\tRV: %#hhx\n", vrop->value[0]); else printf("\t%.2s: %s\n", vrop->keyword, vrop->value); ==== //depot/projects/newisp/netinet/ip_fw_pfil.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.22 2006/10/20 19:32:08 julian Exp $ + * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.23 2006/10/21 00:16:31 julian Exp $ */ #if !defined(KLD_MODULE) @@ -80,14 +80,6 @@ /* ng_ipfw hooks. */ ng_ipfw_input_t *ng_ipfw_input_p = NULL; -/* - * ipfw_ether and ipfw_bridge hooks. - * XXX: Temporary until those are converted to pfil_hooks as well. - */ -ip_fw_chk_t *ip_fw_chk_ptr = NULL; -ip_dn_io_t *ip_dn_io_ptr = NULL; -int fw_one_pass = 1; - /* Forward declarations. */ static int ipfw_divert(struct mbuf **, int, int); #define DIV_DIR_IN 1 ==== //depot/projects/newisp/netinet/ip_input.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.321 2006/10/20 19:32:08 julian Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.322 2006/10/21 00:16:31 julian Exp $ */ #include "opt_bootp.h" @@ -77,6 +77,10 @@ #include +/* XXX: Temporary until ipfw_ether and ipfw_bridge are converted. */ +#include +#include + int rsvp_on = 0; int ipforwarding = 0; @@ -188,6 +192,14 @@ &ipstealth, 0, ""); #endif +/* + * ipfw_ether and ipfw_bridge hooks. + * XXX: Temporary until those are converted to pfil_hooks as well. + */ +ip_fw_chk_t *ip_fw_chk_ptr = NULL; +ip_dn_io_t *ip_dn_io_ptr = NULL; +int fw_one_pass = 1; + static void ip_freef(struct ipqhead *, struct ipq *); /* From owner-p4-projects@FreeBSD.ORG Sat Oct 21 10:06: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 B911C16A47B; Sat, 21 Oct 2006 10:06: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 90C6216A416 for ; Sat, 21 Oct 2006 10:06: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 2BA8343D5F for ; Sat, 21 Oct 2006 10:06: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 k9LA62Wg028903 for ; Sat, 21 Oct 2006 10:06:02 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 k9LA61px028900 for perforce@freebsd.org; Sat, 21 Oct 2006 10:06:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 21 Oct 2006 10:06:01 GMT Message-Id: <200610211006.k9LA61px028900@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 108223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 10:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=108223 Change 108223 by rwatson@rwatson_peppercorn on 2006/10/21 10:05:57 Remove unneeded suser in RELENG_6; this is already gone in HEAD. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ktr.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ktr.c#2 (text+ko) ==== @@ -141,9 +141,6 @@ if (enable) { if (ktr_alq_enabled) return (0); - error = suser(curthread); - if (error) - return (error); error = alq_open(&ktr_alq, (const char *)ktr_alq_file, req->td->td_ucred, ALQ_DEFAULT_CMODE, sizeof(struct ktr_entry), ktr_alq_depth); From owner-p4-projects@FreeBSD.ORG Sat Oct 21 16:10: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 88A8D16A492; Sat, 21 Oct 2006 16:10: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 5A27D16A417 for ; Sat, 21 Oct 2006 16:10: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 0186F43D49 for ; Sat, 21 Oct 2006 16:10:50 +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 k9LGAnqC012583 for ; Sat, 21 Oct 2006 16:10:49 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9LGAn9U012578 for perforce@freebsd.org; Sat, 21 Oct 2006 16:10:49 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 21 Oct 2006 16:10:49 GMT Message-Id: <200610211610.k9LGAn9U012578@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 108234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 16:10:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=108234 Change 108234 by gabor@gabor_pluto on 2006/10/21 16:10:05 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#8 integrate .. //depot/projects/soc2006/gabor_ports/KNOBS#5 integrate .. //depot/projects/soc2006/gabor_ports/LEGAL#6 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#13 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gcc.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#7 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.lua.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#85 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.options.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#7 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sdl.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#10 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.tcl.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#5 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#4 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#15 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#8 (text+ko) ==== @@ -10,6 +10,30 @@ All ports committers are allowed to commit to this file. +20061014: +AUTHOR: gnome@FreeBSD.org +The following changes have been introduced to the GNOME porting process +during the GNOME 2.16 update: + +* GNOME is now installed into LOCALBASE. Any port which makes use of the + gnomeprefix component will have its PREFIX forced to LOCALBASE + +20060930: +AUTHOR: portmgr@FreeBSD.org +The following functional changes were made to bsd.port.mk: + + * The bsd.port.mk pre and post includes have been split into 3 pieces + instead of 2, to allow OPTIONS to be able to influence dependencies. + This is still experimental and not yet enabled by any port. This adds + the file 'bsd.port.options.mk'. + + * bsd.gcc.mk has been updated to understand gfortran. + + * emulators/linux_base is now removed. linux_base-fc4 has been the default + for some time. + + * The USE_FIREBIRD macro was added to bsd.database.mk. + 20060914: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -1203,4 +1227,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.60 2006/09/15 06:57:07 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.62 2006/10/14 09:31:38 marcus Exp $ ==== //depot/projects/soc2006/gabor_ports/KNOBS#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.15 2006/09/04 11:10:04 sat Exp $ +# $FreeBSD: ports/KNOBS,v 1.19 2006/10/09 18:51:50 alepulver Exp $ # # Rules to adding knobs: # @@ -20,8 +20,8 @@ # Length | | Length | A52 ATSC A/52 audio decoding (used in most DVDs) +APACHE2 Use www/apache2 port ARTS aRts support via the KDE sound daemon -APACHE2 Use www/apache2 port AVIFILE Adds support for AVI multimedia BDB Adds Berkeley DB Support CACA Libcaca colored ASCII graphics @@ -41,19 +41,22 @@ ESOUND Adds support for Esound EXAMPLES Installs optional example code, graphics, etc EXIF Support for EXIF headers in JPEG or TIFF files +FAAC FAAC AAC and MP4 audio encoder support FAAD FAAD AAC and MP4 audio decoder support -FAAC FAAC AAC and MP4 audio encoder support +FIREBIRD Firebird (Interbase) database support FLAC Flac audio support GHC Prefer/use Glasgow Haskell Compiler GNOME Adds GNOME support GNUTLS Adds GnuTLS support GSASL Adds GSASL support GSM GSM audio codec support +GSSAPI GSSAPI (Kerberos) support GSTREAMER Gstreamer multimedia support GTK1 Adds Gtk+1 support GTK2 Adds Gtk+2 support IMAGEMAGICK ImageMagick graphics support IMAP Adds support for IMAP mail protocol +IODBC Use IODBC as the ODBC driver IPV6 IPv6 internet support ISPELL Use textproc/ispell for spell checking JAVA Adds support for Java @@ -97,6 +100,7 @@ STATIC Build statically linked executables THEORA Theora video codec support TREMOR Tremor (integer-only Vorbis) audio support +UNIXODBC Use UNIXODBC as the ODBC driver VORBIS OGG/Vorbis audio support X11 Support for X11 X264 H.264/AVC (MPEG4 part 10) multimedia codec ==== //depot/projects/soc2006/gabor_ports/LEGAL#6 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.496 2006/09/11 18:06:11 vd Exp $ +# $FreeBSD: ports/LEGAL,v 1.507 2006/10/10 06:01:49 ale Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -26,20 +26,20 @@ 112887-04.tar editors/staroffice60 Must be bought and downloaded directly from Sun via WWW interface -116518-03.tar editors/staroffice70 Must be bought and downloaded +116518-* editors/staroffice70 Must be bought and downloaded directly from Sun via WWW interface -116518-03.tar german/staroffice70 Must be bought and downloaded +116518-* german/staroffice70 Must be bought and downloaded directly from Sun via WWW interface 5400s_fbsd_cli_v10.zip sysutils/aaccli May not be redistributed in binary form ac3dlx* graphics/linux-ac3d Commercial license, no distribution -acroread/AdobeReader_*-7*.*.rpm print/acroread7 Must fill out redistribution +acroread/AdobeReader_* print/acroread7 Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html -acroread/AdbeRdr70_linux_jpn.tar.gz japanese/acroread Must fill out redistribution +acroread/AdobeReader_* japanese/acroread Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html actx-* games/actx Contains commercial character @@ -49,24 +49,24 @@ author aestats-* games/aestats Commercial use is prohibited AGSatellite0520* net-p2p/linux-agsatellite Unsure of licensing issues -AlephOne-* games/alephone-data Bungie/Microsoft do not +infinity.* games/alephone-data Bungie/Microsoft do not allow charging for Marathon data files -adstudio-novm.tar.gz databases/adstudio Free for personal or educational +ads-java-novm-* databases/adstudio Free for personal or educational use but a commercial license is required for all other usages altivore.c security/altivore No redistribution allowed annelid-* games/annelid Redistribution is limited -apache*-ssl www/apache13-ssl Crypto; export-controlled -apache2/mod_taf_thief.c www/mod_traf_thief No license +apache_*ssl_* www/apache13-ssl Crypto; export-controlled +apache2/mod_traf_thief-*.c www/mod_traf_thief No license apple_pascal_0.dsk.gz emulators/p-interp Redistribution rights for Apple Pascal disk images are unclear -AquaGatekeeper-* net/AquaGatekeeper No redistribution allowed +AquaGatekeeper* net/AquaGatekeeper No redistribution allowed armyops*-linux.run games/linux-americasarmy Redistribution is limited 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 +autopano-sift-* graphics/autopano-sift May be covered by patents bamg* math/bamg Contact author personally regarding commercial use baudline_* audio/baudline No redistribution allowed @@ -76,14 +76,11 @@ redistribution bicom* archivers/bicom Contact author personally regarding commercial use -bk-*-x86-freebsd* devel/bitkeeper Redistribution is not permitted -blast-freebsd* biology/blast Must be downloaded from vendor site +blast*.freebsd-* biology/blast Must be downloaded from vendor site boodler-* audio/boodler Not for commercial use Browser*.tar.gz net/ldapbrowser No reply from author regarding redistribution licensing -bsp_upektfmess-* security/bsp_upektfmess License prohibits redistribution -bugseeker2ee* java/bugseeker License does not allow - redistribution +TFMESS_BSP_FreeBSD_* security/bsp_upektfmess License prohibits redistribution bzip-* archivers/bzip Some algorithms used may infringe certain US patents. Opinions differ. Commercial @@ -92,12 +89,13 @@ cap60/* net/cap Do not sell for profit ccc-*.alpha.rpm lang/compaq-cc Distribution not allowed checkpassword-*.tar.gz security/checkpassword Unsure of djb's license -citrix_ica-*-de.tar.gz german/citrix_ica License prohibits redistribution -citrix_ica-*.tar.gz net/citrix_ica License prohibits redistribution +citrix_ica-* german/citrix_ica License prohibits redistribution +citrix_ica-* japanese/citrix_ica License prohibits redistribution +citrix_ica-* net/citrix_ica License prohibits redistribution cfs-* security/cfs Crypto; export-controlled clibpdf*.tar.gz print/clibpdf Needs a license to bundle with other products -CODE2000.ZIP x11-fonts/code2000 Only unmodified original +code2000-*/CODE2000.ZIP x11-fonts/code2000 Only unmodified original package can be distributed collections*.zip java/collections See the license clibpdf* print/clibpdf License required for bundling @@ -121,13 +119,13 @@ is prohibited csound/* audio/csound-manual audio/same as csound cyberbit/* x11-fonts/cyberbit-ttfonts Not free for commercial use -DansGuardian-2.[678]-* www/dansguardian Not free for installation by +dansguardian-2.[678]* www/dansguardian Not free for installation by 3rd parties charging for installation or support; not free for commercial use -DarwinStreamingSrc*.zip net/DarwinStreamingServer Server License restrictions +DarwinStreamingSrvr*-Source.tar net/DarwinStreamingServer Server License restrictions See http://www.opensource.apple.com/apsl/ -dat-*.tar security/vscan Restricted to the license +vbsd*e.tar.Z security/vscan Restricted to the license terms set for VirusScan dc3play-* graphics/dc3play No redistribution due to beta status @@ -146,14 +144,14 @@ restrictions on distribution Source tarball may go on CD-ROM dgd/* net/dgd-net Same as dgd -diablo-caffe-1.5*.tar.bz2 java/diablo-jdk15 License does not allow distribution - with fee -diablo-latte-1.5*.tar.bz2 java/diablo-jre15 License does not allow distribution - with fee +diablo-caffe-freebsd*-*-* java/diablo-jdk15 License does not allow distribution + with fee +diablo-latte-freebsd*-*-* java/diablo-jre15 License does not allow distribution + with fee dist10.tar.gz audio/mp3encode Condition is not clear divx4linux-*.tgz multimedia/linux-divx4linux4 Unsure of licensing issues divx4linux-*.tar.gz multimedia/linux-divx4linux Unsure of licensing issues -djbdns dns/djbdns No license -- see +djbdns* dns/djbdns No license -- see http://cr.yp.to/softwarelaw.html djbfft-* math/djbfft No license -- see http://cr.yp.to/softwarelaw.html @@ -164,7 +162,7 @@ free trial for everybody We currently ask for permission to put a package on the CD-ROM -dns.tar.Z dns/h2n Never get an approval yet +dns.*.tar.Z dns/h2n Never get an approval yet doom3-linux-* games/linux-doom3* Redistribution limited doomsrc.zip games/doom requested by id Software dr_freebsd_*.zip sysutils/megarc Must be downloaded manually @@ -175,8 +173,8 @@ purposes only eawpats* audio/eawpats Some of the patches are not for commercial use -eClient-linux.run games/atitd Redistribution not allowed -eclipse/jp.azzurri.clay.core_1.0.5.bin.dist.20040730.zip java/eclipse-clay-core License +eClient-linux-i686.run games/atitd Redistribution not allowed +eclipse/jp.azzurri.clay.core_*.bin.dist.* java/eclipse-clay-core License agreement is required to download edith* editors/edith Redistribution not allowed eijiro* japanese/eijiro-fpw The original dictionary is not free @@ -191,9 +189,9 @@ f-prot-sig* security/f-prot-sig Free for personal use only f6kuzzzz.taz databases/libudbc Downloading and redistribution terms are unclear -faac audio/faac Restrictive copyright (do not +faac* audio/faac Restrictive copyright (do not sell for profit) -faad audio/faad Restrictive copyright (do not +faad* audio/faad Restrictive copyright (do not sell for profit) fasta2* biology/fasta May not be sold or incorporated into a commercial product @@ -212,15 +210,15 @@ festival/voice_mwm_di-* audio/festvox-mwm No commercial use festival/voice_ogirab_di-* audio/festvox-ogirab No commercial use festival/voice_tll_di-* audio/festvox-tll No commercial use -ffj30_ce_ml.class java/forte Restrictive license -fMSX* emulators/fmsx Unclear legal status of +fmsx*/* emulators/fmsx Unclear legal status of distributed ROMs foiltex* textproc/foiltex Redistribution on a not-for-profit basis only -fonts-ttf-gentium-* x11-fonts/gentium License forbids commercial +ttf-sil-gentium_* x11-fonts/gentium License forbids commercial distribution without permission fp-freebsd-ws-* security/f-prot Free for personal use only -FreeFem++* math/freefem++ No resale, not for commercial usage +freefem++-* math/freefem++ No resale, not for commercial usage +framework-* security/metasploit-devel May not be re-sold freefonts-* x11-fonts/freefonts Some of the fonts are shareware. Some are freeware. Permission must be obtained @@ -234,13 +232,16 @@ tempoita.license say "placed into the public domain and may [not be] sold") -freenet6-client-* net/freenet6 Must agree to License Agreement +tspc-*-src.tgz net/freenet6 Must agree to License Agreement before downloading freqship/* sysutils/freqsdwn License agreement is required to download +fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo + site is allowed to + distribute the music ftree-* misc/ftree Cannot distribute commercially fwtk/* security/fwtk No redistribution allowed -Frisk-* games/xfrisk Copyright/trademark violation? +XFrisk-* games/xfrisk Copyright/trademark violation? gap/* math/gap Do not sell for profit gentoo-linux/stage1-* emulators/linux_base-gentoo-stage1 Binaries licensed under GNU GPL without @@ -250,24 +251,22 @@ gibi-* french/gibi Only free for use in conjunction with french/aster. For any other purpose, you have to acquire a license -giftool-* graphics/giftool Do not redistribute for profit +giftool* graphics/giftool Do not redistribute for profit glimpse-* textproc/glimpse Do not sell for profit -gnome2/MCity-Alloy-* x11-themes/metacity-theme-alloy-c Themes may contain artwork not +gnome2/mcitymicrogui-default* x11-themes/metacity-theme-microgui Themes may contain artwork not done by the author. Keep FreeBSD safe if the theme author violated copyrights -gnome2/MCity-Hacked-2* x11-themes/metacity-theme-hacked-2 See x11-themes/metacity-theme-alloy-c -gnome2/MCity-Iridium-rounded* x11-themes/metacity-theme-iridium-rounded See x11-themes/metacity-theme-alloy-c -gnome2/MCity-microGUI* x11-themes/metacity-theme-microgui See x11-themes/metacity-theme-alloy-c gnupg-* security/gnupg Crypto; export-controlled goemon.tgz audio/timidity Uses copyrighted patches gogo239b.tgz audio/gogo Condition is not clear goodway*_free.zip games/linux-goodway Redistribution prohibited -GoogleEarthLinux.bin astro/google-earth Not really sure about the redistribution terms +GoogleEarthLinux-* astro/google-earth Not really sure about the redistribution terms goPod-* misc/*gopod Unclear legal status in EU countries grande-KXL-*.tar.gz games/grande Possible copyright infringement -graphviz/* graphics/graphviz Needs license before fetching +graphviz-* graphics/graphviz Needs license before fetching GTL-* misc/gtl Non-commercial use only, license forbids redistribution +hcfmdm/* comms/hcfmdm No redistribution allowed himeno/* benchmarks/himenobench Uncertain to distribute sources and binaries hjb3_0-linux.sfx www/hotjava Licensed for individual non-commercial use only @@ -281,19 +280,19 @@ prohibited IBMJava2-SDK-131.tgz java/linux-ibm-jdk13 Redistribution of repackaged binaries not permitted -IBMJava2-SDK-141.tgz java/linux-ibm-jdk14 Redistribution of repackaged +IBMJava2-SDK-* java/linux-ibm-jdk14 Redistribution of repackaged binaries not permitted ICON-AquaFusion.* x11-themes/gnome-icons-aqua-fusion Author rights unclear ICON-CoolGorilla.* x11-themes/gnome-icons-cool-gorilla Author rights unclear -ICON-Crystal-SVG-For-Gnome.* x11-themes/gnome-icons-crystal Author rights unclear +CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Author rights unclear ICON-Gentoo-Test.* x11-themes/gnome-icons-gentoo-test Author rights unclear ICON-Gnome-RH8.* x11-themes/gnome-icons-refined Author rights unclear -ICON-Iris-* x11-themes/gnome-icons-iris Author rights unclear -ICON-Noia-full-* x11-themes/gnome-icons-noia-full Author rights unclear -ICON-NoiaWarm-* x11-themes/gnome-icons-noia-warm Author rights unclear +ICON-Iris* x11-themes/gnome-icons-iris Author rights unclear +ICON-Noia.* x11-themes/gnome-icons-noia-full Author rights unclear +ICON-NoiaWarm.* x11-themes/gnome-icons-noia-warm Author rights unclear ICON-Slick.* x11-themes/gnome-icons-slick Author rights unclear ICON-Snow-Apple.* x11-themes/gnome-icons-snow-apple Author rights unclear -ICON-Snowish.* x11-themes/gnome-icons-snowish Author rights unclear +SnowIsh-* x11-themes/gnome-icons-snowish Author rights unclear ICON-Stylish.* x11-themes/gnome-icons-stylish Author rights unclear ICON-Ximian-South-* x11-themes/gnome-icons-ximian-south Author rights unclear idea.V*.tar.Z security/idea A patented algorithm that @@ -303,7 +302,7 @@ invitationtoruby.tgz devel/invitation_to_ruby No commercial use install40.jar games/sfbol Commerical software. Licenses does not allow redistribution. -iperf-*-source.tar.gz benchmarks/iperf Cannot charge a fee for the +iperf-* benchmarks/iperf Cannot charge a fee for the software IPv6socket_scrub.tar net/ipv6socket_scrub Not redistributable, license agreement required @@ -320,7 +319,7 @@ binaries not permitted j2sdk-*-linux-i586.bin java/linux-sun-jdk14 Redistribution of repackaged binaries not permitted -j2sdk-*-rc1-linux-* java/linux-blackdown-jdk14 License does not allow +j2sdk-*-linux-i586.bin java/linux-blackdown-jdk14 License does not allow distribution with fee j2sdk-1_3_1-src.tar.gz java/jdk13 Redistribution of pre-compiled binaries is not permitted @@ -334,7 +333,7 @@ binaries is not permitted jdk-1_5_0-doc.* java/jdk15-doc This documentation is under license and export control -jdk-1_5_0-*-i586.bin java/linux-sun-jdk15 Redistribution of repackaged +jdk-1_5_0*-i586.bin java/linux-sun-jdk15 Redistribution of repackaged binaries not permitted j2sdkee-* java/j2sdkee13 For development and testing use only; redistribution prohibited @@ -364,11 +363,11 @@ jre118_v3-glibc-* java/linux-blackdown-jre11 License does not allow distribution with fee jsdk20-solaris2-sparc* java/jsdk No commercial use -jude-comunity-*.zip devel/jude-community License restrictions -kaffe-* java/kaffe Restrictive copyright +jude-community-*.zip devel/jude-community License restrictions +kaffe-* java/kaffe Restrictive copyright KASH3-* math/kash3 Not for commercial distribution or use -kde-icons-* x11-themes/kde-icons-* Unclear about licensing +KDE/ICONS-* x11-themes/kde-icons-* Unclear about licensing status ladder.tar games/ladder Possible copyright problems? lame* audio/lame May be patented @@ -378,12 +377,12 @@ libidea-* security/libidea Crypto; export-controlled 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 +LimeWireOther.zip 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-gtk2 x11-toolkits/linux-gtk2 LGPL binary, no source -linuxq3ademo-* games/linux-q3ademo Restrictive license by Loki Software +rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source +linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software l0phtcrack/* security/l0phtcrack Parts are under GPL, so binaries should not be distributed. Contains crypto @@ -411,14 +410,14 @@ mindfocus-* games/mindfocus Contains commercial character data mindterm-* security/mindterm-binary Do not sell for profit -mingw/OPENGL95.EXE devel/mingw-opengl-headers Not sure if we can redistribute it freely -miracl math/miracl Free for non-profit +mingw/Opengl95.exe devel/mingw-opengl-headers Not sure if we can redistribute it freely +miracl* math/miracl Free for non-profit use but a commercial license is required for all other usages mMosaic* www/mmosaic Do not sell (per NCSA). Do not distribute binary (GPL/BSD conflict) -mmv.tar.Z misc/mmv Restrictive/unclear copyright +mmv_* misc/mmv Restrictive/unclear copyright molden* biology/molden free for academic, non profit usage, do not re-distribute source and executable @@ -435,30 +434,28 @@ agreement required ncftpd-* ftp/ncftpd 30 day evaluation license netbeans-* java/netbeans Restrictive copyright -netcomponents-* java/netcomponents No redistribution except as part +NetComponents-* java/netcomponents No redistribution except as part of a substantially different product -netscape-*-us-* www/netscape* Crypto; export-controlled netshow_linux.gz multimedia/netshow Commercial software -nfbtr758.zip textproc/nfbtrans Unclear copyright status +nfbtr* textproc/nfbtrans Unclear copyright status nntpcache-* news/nntpcache Commercial or government use requires license nsc2ke.* math/nsc2ke No resale, contact author for commercial usage nte-1.* mbone/nte Crypto; export-controlled -nwrite-* misc/nwrite Ownership in dispute -MRONWnn6.tgz japanese/Wnn6 You should buy from Omron +OMRONWnn6.tgz japanese/Wnn6 You should buy from Omron Software Co., Ltd. oneko-*.tar.gz games/oneko-sakura Including derivatives from CARDCAPTOR SAKURA -onion-fec net/onion-fec Some uses of FEC +fec-* net/onion-fec Some uses of FEC technology are patent encumbered openssl-* security/openssl Crypto; export/import-controlled opera-* www/linux-opera No redistribution, commercial software -optimfrog-* audio/optimfrog No commercial use +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 +otojiro* japanese/otojiro-fpw The original dictionary is not free ovt-* science/ovt Registration is needed to download the tarball p-interp-*.tar.gz emulators/p-interp Redistribution rights for @@ -473,7 +470,6 @@ usage and distribution perforce/* devel/perforce Restricted distribution pgp* security/pgp* Various locality restrictions -pim6dd-*.tar.gz net/pim6dd Cannot be sold for profit platon* biology/platon US$ 5000 for commercial users, (free for academic) pmake-*.tar.Z devel/pmake Non-commercial use only @@ -484,8 +480,11 @@ hcwPVRP2.sys multimedia/pvr250 Driver is part of the CD-ROM distribution coming with the TV card +hcwPVRP2.sys multimedia/pvrxxx Driver is part of the CD-ROM + distribution coming with the + TV card qkmj95p5-freebsd games/qkmj Do not sell for profit -qmail-* mail/qmail-* Restricted binary distribution +qmail* mail/qmail-* Restricted binary distribution of modified versions qtools-* mail/qtools Possibly restricted binary distribution of modified @@ -499,10 +498,7 @@ ringtonetools-* misc/ringtonetools Not free for commercial organizations rkive3.1.tar.Z news/rkive Restrictive copyright rman-3.* textproc/rman Do not sell for profit -linux-realplayer-*.rpm multimedia/linux-realplayer Redistribution not allowed -rpm/i386/8.0/* emulators/linux_base-8 Binaries under GNU GPL - without accompanying source -rtplib-* devel/rtplib Limited use license +RealPlayer-*.rpm multimedia/linux-realplayer Redistribution not allowed ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled runrev/linux.tgz devel/linux-runrev Do not sell for profit savage/savage* games/linux-savage Savage is freeware, but i am @@ -525,8 +521,8 @@ sim*.zip emulators/sim No commercial use simpjava.tar.gz java/simplicity Restrictive license ski-*.i386.rpm emulators/ski Restrictive license -skype_ver-* net/skype Not for redistribution -SlimServer_v* audio/slimserver Version 6.0 and above contain +skype* net/skype Not for redistribution +slimserver/* audio/slimserver Version 6.0 and above contain non-redistributable firmware, images, and documentation. See License.txt in the distribution @@ -564,7 +560,6 @@ swing1_1_1* java/jfc Do not distribute without value-added application systemc-2*.tgz cad/systemc License agreement required. -tasks.zip www/tasks License prohibits redistribution tcetest_* games/linux-enemyterritory-tce Redistribution limited texcm-ttf-20010117/* x11-fonts/texcm-ttf Cannot be sold or distributed with any commercial product @@ -577,7 +572,7 @@ tools-for-freebsd-* emulators/vmware-tools2 Not sure if we can redistribute this tracker-*.tgz audio/tracker Non-redistributable beta -triangle.zip math/triangle No commercial use without prior +triangle-*/* math/triangle No commercial use without prior arrangement with the author Tripwire-*-1.tar.gz security/tripwire-131 Cannot be redistributed for more than the cost of @@ -585,7 +580,7 @@ tripwire-*.tar.gz security/tripwire12 Cannot be redistributed for more than the cost of duplication -ttf30.exe japanese/epson-ttfonts Cannot be redistributed, +epson/ttf30.exe japanese/epson-ttfonts Cannot be redistributed, cannot fetch outside from Japan, user must have Japanese version of Windows @@ -599,21 +594,21 @@ only uDrawGraph-* graphics/uDrawGraph binary under GNU LGPL without accompanying source -uppaal.zip devel/uppaal Downloading requires completion +uppaal-*.zip devel/uppaal Downloading requires completion of a license agreement upsmon* sysutils/upsmon Redistribute only with original source code -ut_linux_mgr_ sysutils/linux-megamgr Redistribution prohibited +ut_linux_mgr_* sysutils/linux-megamgr Redistribution prohibited urchin*.tar.gz www/urchin5 Commercial software, also comes bundled with Apache-SSL -unreal.tournament*.run games/linux-ut Redistribution limited +linux-ut/* games/linux-ut Redistribution limited ut2004-lnx-* games/linux-ut2004-demo Redistribution limited uzap.tar.gz editors/uzap Restrictive copyright vbsd440e.tar.Z security/vscan Commercial software vdesk-* x11/vdesk Distributed without license vice-* emulators/vice ROMs are copyrighted by Commodore Business Machines -visualworks/7.2/* lang/visualworks Do not redistribute +vwnc7.3.1/* lang/visualworks Do not redistribute vje30/* japanese/vje30 Commercial software VMware-*.tar.gz emulators/vmware2 Not sure if we can redistribute this vmware-freebsd-tools.* emulators/vmware-guestd3 Not sure if we can redistribute this @@ -628,8 +623,8 @@ VTK-* math/vtk Portions contain patented algorithms and may require a license for commercial use -waeiji*.txt japanese/waeijiro-fpw The original dictionary is not free -warsow_* games/linux-warsow Redistribution is limited, art +waeijiro-fpw-* japanese/waeijiro-fpw The original dictionary is not free +warsow/* games/linux-warsow Redistribution is limited, art is copyrighted webcopy-* www/webcopy Do not sell for profit webfonts/* x11-fonts/webfonts Restrictive copyright @@ -637,7 +632,6 @@ wgetpro* ftp/wgetpro U.S. Patent 6,041,345 win32/* multimedia/win32-codecs Licensing status of the codecs is unknown -xbarcode-*.tar.gz graphics/xbarcode Must not be sold xchada01.lzh games/xchadance Contains commercial character data xephem-* astro/xephem Personal use only @@ -649,11 +643,10 @@ xhime*.tgz games/xhime Contains commercial character data xinvaders-* games/xinvaders Do not sell for profit -xmame-* emulators/xmame Do not sell for fee +xmame/* emulators/xmame Do not sell for fee X-Plane-Net-Install.gz games/linux-x-plane-net-installer Redistribution prohibited -XLIN*.tar.bz2 games/linux-x-plane Redistribution prohibited +linux-x-plane-* games/linux-x-plane Redistribution prohibited xmdiary-* deskutils/xmdiary Do not sell for profit -xothello.tgz games/xothello Possible trademark infringement xrisk-* games/xrisk Copyright/trademark violation? xsmbrowser-* net/xsmbrowser Commercial software xteddy-* games/xteddy Do not sell for profit @@ -669,8 +662,6 @@ except media and/or shipping cost zangband/* japanese/zangband Possible copyright infringement -ZendOptimizer-*.tar.gz devel/ZendOptimizer Redistribution of pre-compiled - binaries is not permitted zh-moettf/* chinese/moettf Contact Taiwan Ministry of Education for commercial use NTU*.TTF chinese/ntuttf No commercial use @@ -678,7 +669,7 @@ copyright twelf-* lang/twelf License is currently indeterminate -pfpro-* finance/pfpro Only available for customers +pfpro* finance/pfpro Only available for customers subscribed to the VeriSign PayFlow Pro Service simian-* devel/simian Have to agree to ==== //depot/projects/soc2006/gabor_ports/MOVED#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1134 2006/09/11 18:06:11 vd Exp $ +# $FreeBSD: ports/MOVED,v 1.1168 2006/10/21 03:02:07 kris Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -290,7 +290,6 @@ japanese/ee||2003-05-05|port was broken with no sign of a fix japanese/kdevelop||2003-05-05|port was broken with no sign of a fix korean/byeoroo||2003-05-05|port was broken with no sign of a fix -lang/gpc||2003-05-05|port was broken with no sign of a fix misc/cassowary||2003-05-05|port was broken with no sign of a fix net/coda_client||2003-05-05|port was broken with no sign of a fix net/coda_server||2003-05-05|port was broken with no sign of a fix @@ -927,7 +926,6 @@ 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/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) japanese/vfxdvi240||2004-03-04|removed (obsolate) japanese/vfxdvi300||2004-03-04|removed (obsolate) @@ -1307,7 +1305,6 @@ print/txfonts||2004-12-19|already included in the teTeX distribution databases/sqlite|databases/sqlite2|2004-12-23|port renamed print/acroread5|print/acroread|2004-12-23|last Acrobat Reader port remaining -graphics/gimp-devel|graphics/gimp|2004-12-24|GIMP 2.2 is now stable x11-toolkits/xtermcontrol|x11/xtermcontrol|2004-12-25|new category multimedia/gstreamer-player||2004-12-26|Unmaintained by developers www/horde2|www/horde|2004-12-26|Resurrect www/horde @@ -1622,7 +1619,6 @@ devel/qtk||2005-10-18|master site disappeared devel/wizard||2005-10-18|master site disappeared, author stopped work 2002 devel/yacl||2005-10-18|master site disappeared, author stopped work 2002 -sysutils/cfengine|sysutils/cfengine2|2005-10-20|removed - use cfengine-2.x editors/joe-devel|editors/joe|2005-10-21|moved games/ctetris|games/ctris|2005-10-21|moved security/opensc-esteid|security/opensc|2005-10-30|functionality folded into master port @@ -1679,7 +1675,6 @@ ukrainian/ooodict-uk_UA||2005-11-01|localized version should be built via knob net/libicq0|net/libicq|2005-11-01|leaf port removed mail/ximian-connector|mail/evolution-exchange|2005-11-04|POOF! Now it's called evolution-exchange! -editors/gedit-plugins||2005-11-04|This component is unmaintained, and has succumbed to code rot www/pyphany||2005-11-04|Has been merged into epiphany editors/abiword-devel|editors/abiword|2005-11-04|Has been merged into abiword editors/abiword-plugins-devel|editors/abiword-plugins|2005-11-04|Has been merged into abiword-plugins @@ -2198,7 +2193,6 @@ audio/musicbrainz||2006-03-15|Remove expired port graphics/quickpics||2006-03-15|Remove expired port graphics/threeDS||2006-03-15|Remove expired port -graphics/vid||2006-03-15|Remove expired port graphics/smoke||2006-03-15|Remove expired port misc/globus2||2006-03-15|Remove expired port sysutils/prune||2006-03-15|Remove expired port @@ -2221,7 +2215,6 @@ net-mgmt/nfdump-devel|net-mgmt/nfdump|2006-04-02|Development port no longer needed devel/py-twistedXish|net-im/py-twistedWords|2006-04-05|Incorporated into net-im/py-twistedWords devel/upp602|devel/upp|2006-04-05|Was created in a bad directory -mail/mulberry||2006-04-06|Has expired: mastersite disappeared, no longer maintained by author textproc/pyenchant|textproc/py-enchant|2006-04-06|Rename to consistency with other Python ports security/skip||2006-04-06|Port has become obsolete mail/prom-mew||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author @@ -2448,7 +2441,6 @@ net/lam7|net/lam|2006-08-21|Replace lam-6 which was deprecated devel/py-ui||2006-08-25|Has expired: PyUI does not work with well with current versions of graphics/py-opengl and has not been developed in over two years. Python game development should be done with devel/py-game instead net-im/jabber-msn||2006-08-25|Has expired: Depends on broken net-im/jabber, please use net-im/jabber-pymsn instead -net-im/gaim-devel|net-im/gaim|2006-08-26|Remove since gaim's maintainer don't want to add it now graphics/GIFgraph|graphics/p5-GD-Graph|2006-08-27|broken, use graphics/p5-GD-Graph instead www/p5-Apache-SizeLimit||2006-09-02|unresolvable conflict with www/mod_perl www/firefox10|www/firefox|2006-09-02|Security vulnerabilities @@ -2464,3 +2456,37 @@ devel/linux_devtools||2006-09-11|Has expired: the dependcy is deprecated, please use a linux_dist port instead graphics/pecl-imagick||2006-09-11|Has expired: Project is dead and does not work korean/linux_locale||2006-09-11|Has expired: the dependency is scheduled for removal and a recent glib does not need this +net-im/jabber-aim||2006-09-18|This transport is deprecated, use net-im/jabber-pyaim instead +databases/firebird-devel|databases/firebird2-server|2006-09-18|firebird-devel is obsolete, use firebird2-server instead +audio/wmtune||2006-09-21|Has expired: mastersite disappeared, no longer maintained by author +palm/pilot-link-devel||2006-09-22|no longer needed, removed +japanese/dvi2ps|japanese/dvipsk|2006-09-23|Removed because no longer supported and dvipsk has enough compatibility +sysutils/xsearch|sysutils/searchmonkey|2006-09-30|The project has been renamed +textproc/p5-XML-LibXML-XPathContext|textproc/p5-XML-LibXML|2006-09-30|merged +devel/rtplib||2006-10-02|Has expired: Upstream codebase appears to be unmaintained +emulators/linux_base||2006-10-02|Has expired: unsupported by upstream, no security support anymore +emulators/linux_base-debian||2006-10-02|Has expired: unmaintained and does not comply to the linux_base invariants +emulators/linux_base-8||2006-10-02|Has expired: unsupported by upstream, no security support anymore +emulators/linux_base-rh-9||2006-10-02|Has expired: unsupported by upstream, no security support anymore +misc/pointless||2006-10-02|Has expired: No longer actively maintained +www/mediawiki14||2006-10-02|Has expired: No longer supported, please upgrade your wiki installation +comms/pstngw||2006-10-02|Has expired +net/openh323-112||2006-10-02|Has expired +devel/pwlib152||2006-10-02|Has expired +net/coda5_server||2006-10-05|Has expired: no longer available from mastersite +net/coda5_client||2006-10-05|Has expired: no longer available from mastersite +net/coda5_doc||2006-10-05|Has expired: coda5 removed +math/ufsparse|math/suitesparse|2006-10-05|portname has been changed +devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version +astro/gdesklets-goodweather||2006-10-07|Expired: no longer downloadable +deskutils/goats||2006-10-07|Expired: no longer downloadable +net-mgmt/arpwatch-devel|net-mgmt/arpwatch|2006-10-07|Devel port no longer needed +sysutils/gnomesu|security/libgnomesu|2006-10-08|Was broken, similar functionality provided by libgnomesu +databases/java-db||2006-10-08|Duplicate with java/berkeley-db +devel/cscout-devel||2006-10-09|Has expired: The (long overdue) release of 2.2 has made this port obsolete. Use devel/cscout +sysutils/cfengine2|sysutils/cfengine|2006-10-09|moved to systuils/cfengine +lang/python-devel|lang/python25|2006-10-09|moved to lang/python25 +multimedia/bmpx-devel||2006-10-09|Development version is not active +emulators/linux_base-suse-9.1||2006-10-20|Port expired and was removed +emulators/linux_base-suse-9.2||2006-10-20|Port expired and was removed +emulators/linux_base-suse-9.3||2006-10-20|Port expired and was removed ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.14 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.16 2006/10/07 10:22:24 miwi Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -51,33 +51,46 @@ # - Detected PostgreSQL version. ## # USE_BDB - Add Berkeley DB library dependency. -# If no version is given (by the maintainer via the port or -# by the user via defined variable), try to find the -# currently installed version. Fall back to default if -# necessary (db41+). -# INVALID_BDB_VER - This variable can be defined when the port doesn't -# support one or more versions of Berkeley DB. -# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always -# build this port with (overrides WITH_BDB_VER). -# WITH_BDB_VER - User defined global variable to set Berkeley DB version -# _WITH_BDB_VER - User defined port specific variable to set -# Berkeley DB version -# WITH_BDB_HIGHEST - Use the highest installed version of Berkeley DB -# BDB_LIB_NAME - This variable is automatically set to the name of the -# Berkeley DB library (default: db41) -# BDB_LIB_CXX_NAME - This variable is automatically set to the name of the -# Berkeley DB c++ library (default: db41_cxx) -# BDB_INCLUDE_DIR - This variable is automatically set to the location of -# the Berkeley DB include directory. -# (default: ${LOCALBASE}/include/db41) -# BDB_LIB_DIR - This variable is automatically set to the location of -# the Berkeley DB library directory. +# If no version is given (by the maintainer via the port or +# by the user via defined variable), try to find the +# currently installed version. Fall back to default if +# necessary (db41+). +# INVALID_BDB_VER +# - This variable can be defined when the port doesn't +# support one or more versions of Berkeley DB. +# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always +# build this port with (overrides WITH_BDB_VER). +# WITH_BDB_VER - User defined global variable to set Berkeley DB version +# _WITH_BDB_VER +# - User defined port specific variable to set +# Berkeley DB version +# WITH_BDB_HIGHEST +# - Use the highest installed version of Berkeley DB +# BDB_LIB_NAME - This variable is automatically set to the name of the +# Berkeley DB library (default: db41) +# BDB_LIB_CXX_NAME +# - This variable is automatically set to the name of the +# Berkeley DB c++ library (default: db41_cxx) +# BDB_INCLUDE_DIR +# - This variable is automatically set to the location of +# the Berkeley DB include directory. +# (default: ${LOCALBASE}/include/db41) +# BDB_LIB_DIR - This variable is automatically set to the location of +# the Berkeley DB library directory. # BDB_VER - Detected Berkeley DB version. ## # USE_SQLITE - Add dependency on sqlite library. Valid values are: # 3 and 2. If version is not specified directly then # sqlite3 is used (if USE_SQLITE= yes). -# SQLITE_VER - Detected sqlite version. +# SQLITE_VER - Detected sqlite version. +## +# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: +# 2 and 1. If no version is given by the maintainer (if +# USE_FIREBIRD= yes) and the user did not define +# WITH_FIREBIRD_VER variable, fall back to default "2". +# WITH_FIREBIRD_VER +# - User defined variable to set Firebird version. +# FIREBIRD_VER - Detected Firebird version. .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 50 @@ -378,4 +391,26 @@ .endif # defined(USE_SQLITE) +.if defined(USE_FIREBIRD) + +.if defined(WITH_FIREBIRD_VER) +USE_FIREBIRD= ${WITH_FIREBIRD_VER} +.endif + +.if ${USE_FIREBIRD:L} == "yes" +FIREBIRD_VER= 2 +.else +FIREBIRD_VER= ${USE_FIREBIRD} +.endif + +.if ${FIREBIRD_VER} == "2" +LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird2-client +.elif ${FIREBIRD_VER} == "1" +LIB_DEPENDS+= fbclient.1:${PORTSDIR}/databases/firebird-client +.else +IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} +.endif + +.endif # defined(USE_FIREBIRD) + .endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gcc.mk#3 (text+ko) ==== @@ -18,7 +18,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.8 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.9 2006/09/30 19:25:45 linimon Exp $ # GCC_Include_MAINTAINER= portmgr@FreeBSD.org @@ -127,26 +127,43 @@ # # Determine if the installed OS already has this GCCVERSION, and if not -# then set BUILD_DEPENDS, CC, CXX and F77 +# then set BUILD_DEPENDS, CC, CXX, F77, and FC. # .for v in ${GCCVERSIONS} . if ${_USE_GCC} == ${_GCCVERSION_${v}_V} . if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} -V:= ${_GCCVERSION_${v}_V:S/.//} +# If Fortran support is requested, regardless of the value of USE_GCC +# we need to use lang/gfortran, which is based on lang/gcc41 right now. +. if defined(WITH_FORTRAN) +V:= 41 +_GCC_BUILD_DEPENDS:= gfortran +_GCC_PORT_DEPENDS:= gfortran${V} +.else +V:= ${_GCCVERSION_${v}_V:S/.//} +_GCC_BUILD_DEPENDS:= gcc${V} +_GCC_PORT_DEPENDS:= gcc${V} +. endif CC:= gcc${V} CXX:= g++${V} +# Up to GCC 4.0, we had g77, g77-33, g77-34, and the like. Starting +# with GCC 4.0, we have gfortran, gfortran40, gfortran41, and the like. +. if ${_USE_GCC} < 4.0 F77:= g77-${V} -_GCC_BUILD_DEPENDS:= ${CC} +FC:= ${F77} +. else +FC:= gfortran${V} +F77:= ${FC} +. endif . endif . endif .endfor .undef V .if defined(_GCC_BUILD_DEPENDS) -BUILD_DEPENDS+= ${_GCC_BUILD_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} +BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif -MAKE_ENV+= CC="${CC}" CXX="${CXX}" +MAKE_ENV+= CC="${CC}" CXX="${CXX}" F77="${F77}" FC="${FC}" test-gcc: @echo USE_GCC=${USE_GCC} @@ -155,6 +172,7 @@ .else @echo Port cannot use later versions. .endif + @echo WITH_FORTRAN=${WITH_FORTRAN} .for v in ${GCCVERSIONS} @echo -n "GCC version: ${_GCCVERSION_${v}_V} " .if defined(_GCC_FOUND${v}) @@ -163,5 +181,5 @@ @echo "- OSVERSION from ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R}" # @echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V} .endfor - @echo Using GCC vesion ${_USE_GCC} - @echo CC:${CC} - CXX:${CXX} - F77:${F77} - BUILD_DEPENDS:${BUILD_DEPENDS} + @echo Using GCC version ${_USE_GCC} + @echo CC:${CC} - CXX:${CXX} - F77:${F77} - FC:${FC} - BUILD_DEPENDS:${BUILD_DEPENDS} ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#7 (text+ko) ==== @@ -1,9 +1,9 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.132 2006/08/14 13:24:18 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.135 2006/10/15 03:42:39 marcus Exp $ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.370 2006/04/27 01:40:22 ahze Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ # # Please view me with 4 column tabs! @@ -99,7 +99,7 @@ lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \ '/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|' -GNOME_MTREE_FILE?= ${X11BASE}/etc/mtree/BSD.gnome-x11.dist +GNOME_MTREE_FILE?= ${LOCALBASE}/etc/mtree/BSD.gnome.dist gnomehier_DETECT= ${GNOME_MTREE_FILE} gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier @@ -116,6 +116,9 @@ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier +.if !defined(WITHOUT_HACK) +gnomeprefix_PREFIX=${LOCALBASE} +.endif gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -135,7 +138,7 @@ glib12_DETECT= ${GLIB_CONFIG} glib12_USE_GNOME_IMPL= pkgconfig -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +GTK_CONFIG?= ${LOCALBASE}/bin/gtk12-config gtk12_LIB_DEPENDS= gtk-12.2:${PORTSDIR}/x11-toolkits/gtk12 gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" @@ -156,21 +159,21 @@ orbit_DETECT= ${ORBIT_CONFIG} orbit_USE_GNOME_IMPL= glib12 -GDK_PIXBUF_CONFIG?= ${X11BASE}/bin/gdk-pixbuf-config +GDK_PIXBUF_CONFIG?= ${LOCALBASE}/bin/gdk-pixbuf-config gdkpixbuf_LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf gdkpixbuf_CONFIGURE_ENV=GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" gdkpixbuf_MAKE_ENV= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" gdkpixbuf_DETECT= ${GDK_PIXBUF_CONFIG} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 21 16:27: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 3254516A5BD; Sat, 21 Oct 2006 16:27: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 D067016A5B5 for ; Sat, 21 Oct 2006 16:27:22 +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 CA42943DB0 for ; Sat, 21 Oct 2006 16:27: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 k9LGRBh6015721 for ; Sat, 21 Oct 2006 16:27:11 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 k9LGRBSL015718 for perforce@freebsd.org; Sat, 21 Oct 2006 16:27:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 21 Oct 2006 16:27:11 GMT Message-Id: <200610211627.k9LGRBSL015718@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 108236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 16:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=108236 Change 108236 by rwatson@rwatson_zoo on 2006/10/21 16:26:51 Remove new suser() added since last pass. Not present in RELENG_6. Affected files ... .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hvcons.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hvcons.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -118,7 +119,8 @@ ttyconsolemode(tp, 0); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { + } else if ((tp->t_state & TS_XCLUDE) && priv_check(td, + PRIV_TTY_EXCLUSIVE)) { return (EBUSY); } From owner-p4-projects@FreeBSD.ORG Sat Oct 21 20:07: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 8518F16A47B; Sat, 21 Oct 2006 20:07: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 4594216A415 for ; Sat, 21 Oct 2006 20:07: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 09B8F43D68 for ; Sat, 21 Oct 2006 20:07: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 k9LK7Bf3062532 for ; Sat, 21 Oct 2006 20:07:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9LK6pEb062512 for perforce@freebsd.org; Sat, 21 Oct 2006 20:06:51 GMT (envelope-from marcel@freebsd.org) Date: Sat, 21 Oct 2006 20:06:51 GMT Message-Id: <200610212006.k9LK6pEb062512@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 108241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 20:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=108241 Change 108241 by marcel@marcel_nfs on 2006/10/21 20:06:46 IFC @108240 Affected files ... .. //depot/projects/ia64/Makefile#52 integrate .. //depot/projects/ia64/Makefile.inc1#112 integrate .. //depot/projects/ia64/bin/cp/cp.1#12 integrate .. //depot/projects/ia64/bin/cp/cp.c#20 integrate .. //depot/projects/ia64/bin/ls/ls.1#31 integrate .. //depot/projects/ia64/bin/ls/print.c#21 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.c#9 integrate .. //depot/projects/ia64/bin/rm/rm.c#16 integrate .. //depot/projects/ia64/contrib/ncurses/man/MKterminfo.sh#3 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.8#7 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#10 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#72 integrate .. //depot/projects/ia64/etc/disktab#3 integrate .. //depot/projects/ia64/etc/libalias.conf#2 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#42 integrate .. //depot/projects/ia64/etc/rc.d/amd#14 integrate .. //depot/projects/ia64/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#12 integrate .. //depot/projects/ia64/etc/rc.d/idmapd#1 branch .. //depot/projects/ia64/games/fortune/datfiles/fortunes#59 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#19 integrate .. //depot/projects/ia64/gnu/lib/libgcc/Makefile#23 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.1#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#12 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#9 integrate .. //depot/projects/ia64/lib/csu/sparc64/crt1.c#10 integrate .. //depot/projects/ia64/lib/libalias/modules/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libalias/modules/cuseeme/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/dummy/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/ftp/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/irc/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/nbt/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/pptp/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/skinny/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/modules/smedia/Makefile#2 integrate .. //depot/projects/ia64/lib/libc/compat-43/killpg.2#4 integrate .. //depot/projects/ia64/lib/libc/gen/basename.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/dirname.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/getobjformat.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/msgsnd.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/tls.c#8 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#9 integrate .. //depot/projects/ia64/lib/libc/locale/wctype.3#6 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_emu.h#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/ia64/lib/libc/stdio/freopen.c#7 integrate .. //depot/projects/ia64/lib/libc/stdlib/getenv.3#5 integrate .. //depot/projects/ia64/lib/libc/string/ffs.3#6 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#27 integrate .. //depot/projects/ia64/lib/libc/sys/intro.2#16 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#14 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#15 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#15 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#5 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#11 integrate .. //depot/projects/ia64/lib/libdisk/Makefile#15 integrate .. //depot/projects/ia64/lib/libkvm/Makefile#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_sparc64.c#8 integrate .. //depot/projects/ia64/lib/libnetgraph/msg.c#7 integrate .. //depot/projects/ia64/lib/libnetgraph/sock.c#7 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.8#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#28 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/ia64/lib/libthread_db/thread_db.c#3 integrate .. //depot/projects/ia64/lib/libutil/login.conf.5#13 integrate .. //depot/projects/ia64/lib/msun/i387/fenv.h#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/reloc.c#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#162 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#4 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/install.sgml#4 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/layout.sgml#3 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#8 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate .. //depot/projects/ia64/release/scripts/package-split.py#8 integrate .. //depot/projects/ia64/sbin/Makefile#51 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#14 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#19 integrate .. //depot/projects/ia64/sbin/devd/devd.conf.5#8 integrate .. //depot/projects/ia64/sbin/dump/main.c#26 integrate .. //depot/projects/ia64/sbin/geom/class/mirror/geom_mirror.c#10 integrate .. //depot/projects/ia64/sbin/geom/class/raid3/geom_raid3.c#11 integrate .. //depot/projects/ia64/sbin/idmapd/Makefile#4 integrate .. //depot/projects/ia64/sbin/idmapd/idmapd.8#5 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#40 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#54 integrate .. //depot/projects/ia64/sbin/kldload/kldload.8#10 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#15 integrate .. //depot/projects/ia64/sbin/restore/restore.8#16 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#25 integrate .. //depot/projects/ia64/share/examples/etc/README.examples#7 integrate .. //depot/projects/ia64/share/man/man1/builtin.1#10 integrate .. //depot/projects/ia64/share/man/man3/pthread_schedparam.3#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#97 integrate .. //depot/projects/ia64/share/man/man4/ddb.4#13 integrate .. //depot/projects/ia64/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/ia64/share/man/man4/gre.4#6 integrate .. //depot/projects/ia64/share/man/man4/if_bridge.4#10 integrate .. //depot/projects/ia64/share/man/man4/ipfirewall.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ndis.4#6 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#17 integrate .. //depot/projects/ia64/share/man/man4/sis.4#9 integrate .. //depot/projects/ia64/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/ia64/share/man/man4/tun.4#6 integrate .. //depot/projects/ia64/share/man/man5/disktab.5#9 integrate .. //depot/projects/ia64/share/man/man5/hosts.equiv.5#6 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#75 integrate .. //depot/projects/ia64/share/man/man9/hash.9#3 integrate .. //depot/projects/ia64/share/man/man9/ktr.9#11 integrate .. //depot/projects/ia64/share/misc/iso3166#9 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#30 integrate .. //depot/projects/ia64/share/zoneinfo/africa#7 integrate .. //depot/projects/ia64/share/zoneinfo/asia#12 integrate .. //depot/projects/ia64/share/zoneinfo/australasia#11 integrate .. //depot/projects/ia64/share/zoneinfo/backward#9 integrate .. //depot/projects/ia64/share/zoneinfo/europe#12 integrate .. //depot/projects/ia64/share/zoneinfo/northamerica#12 integrate .. //depot/projects/ia64/share/zoneinfo/southamerica#13 integrate .. //depot/projects/ia64/share/zoneinfo/yearistype.sh#4 integrate .. //depot/projects/ia64/share/zoneinfo/zone.tab#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#20 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#40 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#25 integrate .. //depot/projects/ia64/sys/amd64/amd64/support.S#15 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#22 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#8 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic.c#12 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/ia64/sys/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#11 integrate .. //depot/projects/ia64/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/ia64/sys/arm/arm/fusu.S#8 integrate .. //depot/projects/ia64/sys/arm/arm/nexus_io.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#18 integrate .. //depot/projects/ia64/sys/arm/arm/undefined.c#11 integrate .. //depot/projects/ia64/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/ia64/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/ia64/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/ia64/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/ia64/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/ia64/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/ia64/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/ia64/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0.c#6 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#7 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irqhandler.c#6 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_ost.c#5 integrate .. //depot/projects/ia64/sys/boot/Makefile#19 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/p_string.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/ia64/sys/boot/common/help.common#18 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#33 integrate .. //depot/projects/ia64/sys/boot/forth/support.4th#4 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.c#8 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/ia64/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#19 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#44 integrate .. //depot/projects/ia64/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/ia64/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/ia64/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#18 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#46 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#20 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.h#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#105 integrate .. //depot/projects/ia64/sys/conf/files#145 integrate .. //depot/projects/ia64/sys/conf/files.amd64#40 integrate .. //depot/projects/ia64/sys/conf/files.i386#79 integrate .. //depot/projects/ia64/sys/conf/files.pc98#66 integrate .. //depot/projects/ia64/sys/conf/files.sun4v#2 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#62 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#40 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#55 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#25 integrate .. //depot/projects/ia64/sys/ddb/db_examine.c#7 integrate .. //depot/projects/ia64/sys/ddb/db_output.c#11 integrate .. //depot/projects/ia64/sys/ddb/db_output.h#5 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#55 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#22 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#16 integrate .. //depot/projects/ia64/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#70 integrate .. //depot/projects/ia64/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/ia64/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/ia64/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/ia64/sys/dev/mmc/bridge.h#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmc.c#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmcbr_if.m#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmcbrvar.h#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmcbus_if.m#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmcreg.h#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmcsd.c#1 branch .. //depot/projects/ia64/sys/dev/mmc/mmcvar.h#1 branch .. //depot/projects/ia64/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/ia64/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/ia64/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirm.c#11 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirm.h#7 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#58 integrate .. //depot/projects/ia64/sys/dev/pci/pci_if.m#6 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#30 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#14 integrate .. //depot/projects/ia64/sys/dev/pci/pcivar.h#16 integrate .. //depot/projects/ia64/sys/dev/ray/if_ray.c#22 integrate .. //depot/projects/ia64/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/ia64/sys/dev/sk/if_skreg.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/midi/sequencer.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#26 integrate .. //depot/projects/ia64/sys/dev/spibus/spibus.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/ia64/sys/dev/usb/if_axe.c#22 integrate .. //depot/projects/ia64/sys/dev/usb/if_udav.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#35 integrate .. //depot/projects/ia64/sys/dev/usb/uhci.c#34 integrate .. //depot/projects/ia64/sys/dev/usb/usb.c#29 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi.h#16 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs.h#17 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#21 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#48 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#25 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#21 integrate .. //depot/projects/ia64/sys/i386/acpica/Makefile#6 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#77 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/io_apic.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#55 integrate .. //depot/projects/ia64/sys/i386/i386/support.s#18 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#13 integrate .. //depot/projects/ia64/sys/i386/include/intr_machdep.h#9 integrate .. //depot/projects/ia64/sys/i386/isa/atpic.c#13 integrate .. //depot/projects/ia64/sys/i386/linux/linux.h#10 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#23 integrate .. //depot/projects/ia64/sys/i386/linux/linux_proto.h#20 integrate .. //depot/projects/ia64/sys/i386/linux/linux_syscall.h#20 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysent.c#21 integrate .. //depot/projects/ia64/sys/i386/linux/syscalls.master#19 integrate .. //depot/projects/ia64/sys/ia64/conf/NOTES#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#23 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#23 integrate .. //depot/projects/ia64/sys/ia64/ia64/support.S#8 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#55 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#93 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#22 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#51 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#42 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#38 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#56 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#57 integrate .. //depot/projects/ia64/sys/kern/systrace_args.c#2 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#57 integrate .. //depot/projects/ia64/sys/modules/aio/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/linux/Makefile#15 integrate .. //depot/projects/ia64/sys/modules/mem/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/mmc/Makefile#1 branch .. //depot/projects/ia64/sys/modules/mmcsd/Makefile#1 branch .. //depot/projects/ia64/sys/modules/uart/Makefile#11 integrate .. //depot/projects/ia64/sys/net/if_bridge.c#10 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#27 integrate .. //depot/projects/ia64/sys/net/if_vlan.c#32 integrate .. //depot/projects/ia64/sys/netgraph/netflow/netflow.c#12 integrate .. //depot/projects/ia64/sys/netgraph/netflow/ng_netflow.c#8 integrate .. //depot/projects/ia64/sys/netgraph/netgraph.h#19 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#31 integrate .. //depot/projects/ia64/sys/netgraph/ng_message.h#12 integrate .. //depot/projects/ia64/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#31 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.h#4 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#59 integrate .. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#13 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#64 integrate .. //depot/projects/ia64/sys/netinet/libalias/libalias.3#5 integrate .. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/ia64/sys/netinet6/in6_proto.c#16 integrate .. //depot/projects/ia64/sys/nfsclient/nfs.h#23 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#52 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#38 integrate .. //depot/projects/ia64/sys/pci/agp.c#30 integrate .. //depot/projects/ia64/sys/pci/agp_amd64.c#11 integrate .. //depot/projects/ia64/sys/pci/nfsmb.c#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#14 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/db_interface.c#5 integrate .. //depot/projects/ia64/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#9 integrate .. //depot/projects/ia64/sys/sparc64/conf/NOTES#18 integrate .. //depot/projects/ia64/sys/sparc64/include/asi.h#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib.c#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.c#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/db_interface.c#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#29 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/support.S#11 integrate .. //depot/projects/ia64/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/ia64/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/ia64/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/ia64/sys/sys/conf.h#44 integrate .. //depot/projects/ia64/sys/sys/elf32.h#6 integrate .. //depot/projects/ia64/sys/sys/elf64.h#7 integrate .. //depot/projects/ia64/sys/sys/rwlock.h#5 integrate .. //depot/projects/ia64/sys/sys/sem.h#6 integrate .. //depot/projects/ia64/sys/sys/syscall.h#55 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#55 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#58 integrate .. //depot/projects/ia64/sys/sys/systm.h#50 integrate .. //depot/projects/ia64/sys/sys/umtx.h#12 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#23 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#50 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#50 integrate .. //depot/projects/ia64/sys/ufs/ufs/inode.h#15 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#55 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#32 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#60 integrate .. //depot/projects/ia64/tools/regression/execve/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/execve/execve.t#2 integrate .. //depot/projects/ia64/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#14 integrate .. //depot/projects/ia64/usr.bin/expand/expand.1#7 integrate .. //depot/projects/ia64/usr.bin/find/find.1#24 integrate .. //depot/projects/ia64/usr.bin/jot/jot.1#6 integrate .. //depot/projects/ia64/usr.bin/lam/lam.1#4 integrate .. //depot/projects/ia64/usr.bin/make/str.c#18 integrate .. //depot/projects/ia64/usr.bin/rs/rs.1#5 integrate .. //depot/projects/ia64/usr.bin/systat/systat.1#16 integrate .. //depot/projects/ia64/usr.bin/tput/tput.c#8 integrate .. //depot/projects/ia64/usr.bin/tr/tr.1#11 integrate .. //depot/projects/ia64/usr.bin/unexpand/unexpand.c#9 integrate .. //depot/projects/ia64/usr.sbin/Makefile#80 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#23 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/bthidd/hid.c#5 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.c#19 integrate .. //depot/projects/ia64/usr.sbin/ndiscvt/ndiscvt.8#6 integrate .. //depot/projects/ia64/usr.sbin/pccard/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/ia64/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/ia64/usr.sbin/pccard/pccardd/Makefile#3 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.c#9 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.h#6 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/file.c#5 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/pccard.conf.5#7 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/pccardd.8#8 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/pccardd.c#4 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/server.c#3 delete .. //depot/projects/ia64/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/ia64/usr.sbin/pw/pw.8#11 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#24 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#17 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#22 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#17 integrate .. //depot/projects/ia64/usr.sbin/zic/zdump/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/zic/zic/Makefile#3 integrate Differences ... ==== //depot/projects/ia64/Makefile#52 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ +# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ # # The user-driven targets are: # @@ -266,7 +266,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 i386 ia64 pc98 sparc64 +.for target in amd64 i386 ia64 pc98 sparc64 sun4v KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/ia64/Makefile.inc1#112 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -98,7 +98,7 @@ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET= ${TARGET_ARCH} @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else ==== //depot/projects/ia64/bin/cp/cp.1#12 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $ .\" -.Dd August 24, 2006 +.Dd October 7, 2006 .Dt CP 1 .Os .Sh NAME @@ -252,8 +252,37 @@ .Fl r option. This implementation supports that option, however, its use is strongly -discouraged, as it does not correctly copy special files, symbolic links -or fifo's. +discouraged as its behavior is very implementation dependent. +In this version of +.Nm , +.Fl r +is just a synonym for +.Fl RL . +The +.Fl R +option gives the correct behavior while +.Fl L +preserves the sometimes-useful historical behavior of following symbolic links. +The +.Fl r +option is deprecated in +.Tn POSIX + and its behavior is likely to be different +in future versions of +.Nm +and its behavior is likely to be different +in future versions of +.Fx . +Previous versions of +.Nm +in +.Fx , +the +.Fl r +behavior was to not correctly copy special files, symbolic links +or fifos. +Symbolic links were followed, and the contents of special +files and fifos were copied to regular files. .Pp The .Fl v ==== //depot/projects/ia64/bin/cp/cp.c#20 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); /* * Cp copies source files to target files. @@ -138,7 +138,8 @@ pflag = 1; break; case 'r': - rflag = 1; + rflag = Lflag = 1; + Hflag = Pflag = 0; break; case 'v': vflag = 1; @@ -154,16 +155,10 @@ usage(); fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - if (rflag) { - if (Rflag) - errx(1, - "the -R and -r options may not be specified together."); - if (Hflag || Lflag || Pflag) - errx(1, - "the -H, -L, and -P options may not be specified with the -r option."); - fts_options &= ~FTS_PHYSICAL; - fts_options |= FTS_LOGICAL; - } + if (Rflag && rflag) + errx(1, "the -R and -r options may not be specified together"); + if (rflag) + Rflag = 1; if (Rflag) { if (Hflag) fts_options |= FTS_COMFOLLOW; @@ -227,12 +222,12 @@ * the initial mkdir(). */ if (r == -1) { - if (rflag || (Rflag && (Lflag || Hflag))) + if (Rflag && (Lflag || Hflag)) stat(*argv, &tmp_stat); else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag)) + if (S_ISDIR(tmp_stat.st_mode) && Rflag) type = DIR_TO_DNE; else type = FILE_TO_FILE; @@ -420,7 +415,7 @@ } break; case S_IFDIR: - if (!Rflag && !rflag) { + if (!Rflag) { warnx("%s is a directory (not copied).", curr->fts_path); (void)fts_set(ftsp, curr, FTS_SKIP); ==== //depot/projects/ia64/bin/ls/ls.1#31 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ .\" -.Dd March 24, 2006 +.Dd October 12, 2006 .Dt LS 1 .Os .Sh NAME @@ -68,7 +68,10 @@ The following options are available: .Bl -tag -width indent .It Fl A -List all entries except for +Include directory entries whose names begin with a +dot +.Pq Sq Pa \&. +except for .Pa \&. and .Pa .. . @@ -159,7 +162,7 @@ .It Fl a Include directory entries whose names begin with a dot -.Pq Pa \&. . +.Pq Sq Pa \&. . .It Fl b As .Fl B , @@ -364,6 +367,8 @@ follows: .Pp .Bl -tag -width 4n -offset indent -compact +.It Sy \- +Regular file. .It Sy b Block special file. .It Sy c @@ -372,12 +377,12 @@ Directory. .It Sy l Symbolic link. -.It Sy s -Socket link. .It Sy p .Tn FIFO . -.It Sy \- -Regular file. +.It Sy s +Socket. +.It Sy w +Whiteout. .El .Pp The next three fields ==== //depot/projects/ia64/bin/ls/print.c#21 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.75 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); #include #include @@ -628,9 +628,10 @@ p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since - * pathconf() and acl_get_file() both follow them. + * pathconf() and acl_get_file() both follow them. They also don't + * support whiteouts. */ - if (S_ISLNK(p->fts_statp->st_mode)) { + if (S_ISLNK(p->fts_statp->st_mode) || S_ISWHT(p->fts_statp->st_mode)) { *haveacls = 1; return; } ==== //depot/projects/ia64/bin/mkdir/mkdir.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $"); #include #include @@ -99,19 +99,19 @@ } for (exitval = 0; *argv != NULL; ++argv) { - success = 1; if (pflag) { - if (build(*argv, omode)) - success = 0; + success = build(*argv, omode); } else if (mkdir(*argv, omode) < 0) { if (errno == ENOTDIR || errno == ENOENT) warn("%s", dirname(*argv)); else warn("%s", *argv); success = 0; - } else if (vflag) - (void)printf("%s\n", *argv); - + } else { + success = 1; + if (vflag) + (void)printf("%s\n", *argv); + } if (!success) exitval = 1; /* @@ -119,9 +119,10 @@ * nine bits, so if you try to set a mode including the * sticky, setuid, setgid bits you lose them. Don't do * this unless the user has specifically requested a mode, - * as chmod will (obviously) ignore the umask. + * as chmod will (obviously) ignore the umask. Do this + * on newly created directories only. */ - if (success && mode != NULL && chmod(*argv, omode) == -1) { + if (success == 1 && mode != NULL && chmod(*argv, omode) == -1) { warn("%s", *argv); exitval = 1; } @@ -129,6 +130,11 @@ exit(exitval); } + +/* + * Returns 1 if a directory has been created, + * 2 if it already existed, and 0 on failure. + */ int build(char *path, mode_t omode) { @@ -139,7 +145,7 @@ p = path; oumask = 0; - retval = 0; + retval = 1; if (p[0] == '/') /* Skip leading '/'. */ ++p; for (first = 1, last = 0; !last ; ++p) { @@ -154,7 +160,7 @@ /* * POSIX 1003.2: * For each dir operand that does not name an existing - * directory, effects equivalent to those cased by the + * directory, effects equivalent to those caused by the * following command shall occcur: * * mkdir -p -m $(umask -S),u+wx $(dirname dir) && @@ -174,7 +180,7 @@ if (errno == EEXIST || errno == EISDIR) { if (stat(path, &sb) < 0) { warn("%s", path); - retval = 1; + retval = 0; break; } else if (!S_ISDIR(sb.st_mode)) { if (last) @@ -182,12 +188,14 @@ else errno = ENOTDIR; warn("%s", path); - retval = 1; + retval = 0; break; } + if (last) + retval = 2; } else { warn("%s", path); - retval = 1; + retval = 0; break; } } else if (vflag) ==== //depot/projects/ia64/bin/rm/rm.c#16 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.54 2006/04/15 09:26:23 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); #include #include @@ -347,7 +347,7 @@ if (!fflag && !S_ISWHT(sb.st_mode) && !check(f, f, &sb)) continue; rval = 0; - if (!uid && + if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); ==== //depot/projects/ia64/contrib/ncurses/man/MKterminfo.sh#3 (text+ko) ==== @@ -1,6 +1,10 @@ #!/bin/sh +# $Id: MKterminfo.sh,v 1.12 2003/01/11 21:42:12 tom Exp $ +# +# MKterminfo.sh -- generate terminfo.5 from Caps tabular data +# #*************************************************************************** -# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. * +# Copyright (c) 1998,2002,2003 Free Software Foundation, Inc. * # * # Permission is hereby granted, free of charge, to any person obtaining a * # copy of this software and associated documentation files (the * @@ -27,10 +31,6 @@ # authorization. * #*************************************************************************** # -# $Id: MKterminfo.sh,v 1.9 2001/09/01 23:06:18 tom Exp $ -# -# MKterminfo.sh -- generate terminfo.5 from Caps tabular data -# # This script takes terminfo.head and terminfo.tail and splices in between # them a table derived from the Caps data file. Besides avoiding having # the docs fall out of sync with the table, this also lets us set up tbl @@ -41,10 +41,13 @@ # had better be no s in the table source text. # # keep the order independent of locale: -LANGUAGE=C -LC_ALL=C -export LANGUAGE -export LC_ALL +if test "${LANGUAGE+set}" = set; then LANGUAGE=C; export LANGUAGE; fi +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi + # head=$1 caps=$2 @@ -66,11 +69,11 @@ sed -n <$caps "\ /%%-STOP-HERE-%%/q -/^#%/s///p +/^#%/s/#%//p /^#/d -s/[ ]\+/ /g +s/[ ][ ]*/ /g s/$/T}/ -s/ [A-Z0-9_()\-]\+ [0-9\-]\+ [Y\-][B\-][C\-][G\-][EK\-]\** / T{/ +s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]* [Y\-][B\-][C\-][G\-][EK\-]\** / T{/ s/ bool / /p s/ num / /p s/ str / /p ==== //depot/projects/ia64/contrib/traceroute/traceroute.8#7 (text+ko) ==== @@ -14,7 +14,7 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.14 2006/06/13 14:59:07 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ .\" .TH TRACEROUTE 8 "21 September 2000" .UC 6 @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-deFISdnrvx +.B \-dDeFISnrvx ] [ .B \-f .I first_ttl @@ -112,6 +112,18 @@ .B \-d Enable socket level debugging. .TP +.B \-D +When an ICMP response to our probe datagram is received, +print the differences between the transmitted packet and +the packet quoted by the ICMP response. +A key showing the location of fields within the transmitted packet is printed, +followed by the original packet in hex, +followed by the quoted packet in hex. +Bytes that are unchanged in the quoted packet are shown as underscores. +Note, +the IP checksum and the TTL of the quoted packet are not expected to match. +By default, only one probe per hop is sent with this option. +.TP .B \-g Specify a loose source route gateway (8 maximum). .TP @@ -163,7 +175,11 @@ to pick an unused port range. .TP .B \-q -Set the number of probes per hop (default is 3). +Set the number of probes per hop (default is 3, +unless +.B -D +is specified, +when it is 1). .TP .B \-r Bypass the normal routing tables and send directly to a host on an attached ==== //depot/projects/ia64/contrib/traceroute/traceroute.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.30 2006/06/13 14:59:07 dwmalone Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $"; #endif /* @@ -316,6 +316,9 @@ struct ip *outip; /* last output ip packet */ u_char *outp; /* last output inner protocol packet */ +struct ip *hip = NULL; /* Quoted IP header */ +int hiplen = 0; + /* loose source route gateway list (including room for final destination) */ u_int32_t gwlist[NGATEWAYS + 1]; @@ -337,7 +340,7 @@ char *device; static const char devnull[] = "/dev/null"; -int nprobes = 3; +int nprobes = -1; int max_ttl; int first_ttl = 1; u_short ident; @@ -354,6 +357,7 @@ #endif int optlen; /* length of ip options */ int fixedPort = 0; /* Use fixed destination port for TCP and UDP */ +int printdiff = 0; /* Print the difference between sent and quoted */ extern int optind; extern int opterr; @@ -380,6 +384,7 @@ void tvsub(struct timeval *, struct timeval *); void usage(void); int wait_for_reply(int, struct sockaddr_in *, const struct timeval *); +void pkt_compare(const u_char *, int, const u_char *, int); #ifndef HAVE_USLEEP int usleep(u_int); #endif @@ -398,6 +403,7 @@ /* Descriptor structure for each outgoing protocol we support */ struct outproto { char *name; /* name of protocol */ + const char *key; /* An ascii key for the bytes of the header */ u_char num; /* IP protocol number */ u_short hdrlen; /* max size of protocol header */ u_short port; /* default base protocol-specific "port" */ @@ -412,6 +418,7 @@ struct outproto protos[] = { { "udp", + "spt dpt len sum", IPPROTO_UDP, sizeof(struct udphdr), 32768 + 666, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 21 20: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 0814216A417; Sat, 21 Oct 2006 20: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 A0CED16A40F for ; Sat, 21 Oct 2006 20:40:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55EDD43D53 for ; Sat, 21 Oct 2006 20:40:54 +0000 (GMT) (envelope-from mjacob@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 k9LKeswr071530 for ; Sat, 21 Oct 2006 20:40:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9LKerfS071527 for perforce@freebsd.org; Sat, 21 Oct 2006 20:40:53 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 21 Oct 2006 20:40:53 GMT Message-Id: <200610212040.k9LKerfS071527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Oct 2006 20:40:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=108242 Change 108242 by mjacob@newisp on 2006/10/21 20:40:27 Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#21 edit .. //depot/projects/newisp/dev/isp/isp_target.c#9 edit .. //depot/projects/newisp/dev/isp/ispvar.h#9 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#21 (text+ko) ==== @@ -961,6 +961,7 @@ MEMZERO(&mbs, sizeof (mbs)); + mbs.timeout = 1000000; mbs.param[0] = MBOX_EXEC_FIRMWARE; if (IS_24XX(isp)) { mbs.param[1] = code_org >> 16; @@ -982,7 +983,6 @@ } mbs.logval = MBLOGALL; - mbs.timeout = 2000000; isp_mboxcmd(isp, &mbs); if (IS_2322(isp) || IS_24XX(isp)) { if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { @@ -993,7 +993,7 @@ /* * Give it a chance to finish starting up. */ - USEC_DELAY(1000); + USEC_DELAY(250000); if (IS_SCSI(isp)) { /* @@ -1043,7 +1043,7 @@ isp->isp_fwrev[2] = mbs.param[3]; } - isp_prt(isp, ISP_LOGCONFIG, + isp_prt(isp, ISP_LOGALL, "Board Type %s, Chip Revision 0x%x, %s F/W Revision %d.%d.%d", btype, isp->isp_revision, dodnld? "loaded" : "resident", isp->isp_fwrev[0], isp->isp_fwrev[1], isp->isp_fwrev[2]); @@ -2288,18 +2288,18 @@ return (0); case MBOX_COMMAND_ERROR: - isp_prt(isp, ISP_LOGERR, + isp_prt(isp, ISP_LOGINFO, "isp_port_login: error 0x%x in PLOGI to port 0x%06x", mbs.param[1], portid); return (MBOX_COMMAND_ERROR); case MBOX_ALL_IDS_USED: - isp_prt(isp, ISP_LOGERR, + isp_prt(isp, ISP_LOGINFO, "isp_port_login: all IDs used for fabric login"); return (MBOX_ALL_IDS_USED); default: - isp_prt(isp, ISP_LOGERR, + isp_prt(isp, ISP_LOGINFO, "isp_port_login: error 0x%x on port login of 0x%06x@0x%0x", mbs.param[0], portid, handle); return (mbs.param[0]); @@ -2384,12 +2384,12 @@ static uint64_t isp_get_portname(ispsoftc_t *isp, int loopid, int nodename) { - uint64_t wwn = 0; + uint64_t wwn = (uint64_t) -1; mbreg_t mbs; MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_GET_PORT_NAME; - if (FCPARAM(isp)->isp_2klogin) { + if (FCPARAM(isp)->isp_2klogin || IS_24XX(isp)) { mbs.param[1] = loopid; mbs.ibits = (1 << 10); if (nodename) { @@ -2402,8 +2402,22 @@ } } mbs.logval = MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR; + mbs.timeout = 30000; isp_mboxcmd(isp, &mbs); - if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + return (wwn); + } + if (IS_24XX(isp)) { + wwn = + (((uint64_t)(mbs.param[2] >> 8)) << 56) | + (((uint64_t)(mbs.param[2] & 0xff)) << 48) | + (((uint64_t)(mbs.param[3] >> 8)) << 40) | + (((uint64_t)(mbs.param[3] & 0xff)) << 32) | + (((uint64_t)(mbs.param[6] >> 8)) << 24) | + (((uint64_t)(mbs.param[6] & 0xff)) << 16) | + (((uint64_t)(mbs.param[7] >> 8)) << 8) | + (((uint64_t)(mbs.param[7] & 0xff))); + } else { wwn = (((uint64_t)(mbs.param[2] & 0xff)) << 56) | (((uint64_t)(mbs.param[2] >> 8)) << 48) | @@ -3713,7 +3727,7 @@ } if (i == lim) { - isp_prt(isp, ISP_LOGERR, "PLOGI 0x%06x failed", portid); + isp_prt(isp, ISP_LOGINFO, "PLOGI 0x%06x failed", portid); return (-1); } @@ -3734,7 +3748,7 @@ if (p->handle != handle || p->portid != portid) { isp_prt(isp, ISP_LOGERR, - "new device 0x%06x@0x%x changed (0x%06x@0x%0x", + "new device 0x%06x@0x%x changed (0x%06x@0x%0x)", portid, handle, p->portid, p->handle); return (-1); } @@ -4363,6 +4377,17 @@ } break; + case ISPCTL_GET_PORTNAME: + { + uint64_t *wwnp = arg; + int loopid = *wwnp; + *wwnp = isp_get_portname(isp, loopid, 0); + if (*wwnp == (uint64_t) -1) { + break; + } else { + return (0); + } + } case ISPCTL_RUN_MBOXCMD: isp_mboxcmd(isp, arg); ==== //depot/projects/newisp/dev/isp/isp_target.c#9 (text+ko) ==== @@ -183,7 +183,7 @@ len = at7iop->at_ta_len & 0xfffff; if (len > (QENTRY_LEN - 8)) { len -= (QENTRY_LEN - 8); - isp_prt(isp, ISP_LOGWARN, + isp_prt(isp, ISP_LOGINFO, "long IU length (%d) ignored", len); while (len > 0) { *optrp = ISP_NXT_QENTRY(*optrp, @@ -273,7 +273,7 @@ &local); break; default: - isp_prt(isp, ISP_LOGERR, + isp_prt(isp, ISP_LOGINFO, "isp_target_notify: unknown status (0x%x)", status); isp_notify_ack(isp, local); @@ -316,7 +316,7 @@ } break; case IN_RSRC_UNAVAIL: - isp_prt(isp, ISP_LOGWARN, "Firmware out of ATIOs"); + isp_prt(isp, ISP_LOGINFO, "Firmware out of ATIOs"); isp_notify_ack(isp, local); break; case IN_RESET: @@ -345,7 +345,7 @@ (void) isp_async(isp, ISPASYNC_TARGET_ACTION, &local); break; default: - isp_prt(isp, ISP_LOGERR, + isp_prt(isp, ISP_LOGINFO, "isp_target_notify: unknown status (0x%x)", status); isp_notify_ack(isp, local); @@ -363,7 +363,7 @@ (na_fcentry_24xx_t *) local); nack_24xx = (na_fcentry_24xx_t *) local; if (nack_24xx->na_status != NA_OK) { - level = ISP_LOGERR; + level = ISP_LOGINFO; } else { level = ISP_LOGTDEBUG1; } @@ -381,7 +381,7 @@ } nack_fcp = (na_fcentry_t *)local; if (nack_fcp->na_status != NA_OK) { - level = ISP_LOGERR; + level = ISP_LOGINFO; } else { level = ISP_LOGTDEBUG1; } @@ -392,7 +392,7 @@ isp_get_notify_ack(isp, nackp, (na_entry_t *)local); nackp = (na_entry_t *)local; if (nackp->na_status != NA_OK) { - level = ISP_LOGERR; + level = ISP_LOGINFO; } else { level = ISP_LOGTDEBUG1; } @@ -409,10 +409,11 @@ case RQSTYPE_ABTS_RSP: isp_get_abts_rsp(isp, abts_rsp, (abts_rsp_t *)local); abts_rsp = (abts_rsp_t *) local; - if (abts_rsp->abts_rsp_status) - level = ISP_LOGERR; - else + if (abts_rsp->abts_rsp_status) { + level = ISP_LOGINFO; + } else { level = ISP_LOGTDEBUG0; + } isp_prt(isp, level, "ABTS RSP response[0x%x]: status=0x%x sub=(0x%x 0x%x)", abts_rsp->abts_rsp_rxid_task, abts_rsp->abts_rsp_status, @@ -658,6 +659,10 @@ cto->rsp.m1.ct_resp[12] = (code >> 24) & 0xff; cto->rsp.m1.ct_resp[13] = (code >> 16) & 0xff; } + if (aep->at_cmnd.cdb_dl.sf.fcp_cmnd_dl) { + cto->ct_resid = aep->at_cmnd.cdb_dl.sf.fcp_cmnd_dl; + cto->ct_scsi_status |= CT2_DATA_UNDER; + } cto->ct_syshandle = hdl; } else if (IS_FC(isp)) { at2_entry_t *aep = arg; @@ -730,8 +735,8 @@ if (!IS_24XX(isp)) { return (-1); } - isp_prt(isp, ISP_LOGTDEBUG0, - "isp_terminate_cmd: tag 0x%0x is being terminated", + isp_prt(isp, ISP_LOGINFO, + "isp_terminate_cmd: [0x%0x] is being terminated", tmd->cd_tagval); MEMZERO(&local, sizeof (local)); cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; @@ -1738,7 +1743,7 @@ */ if (ct->ct_syshandle == 0) { if (ct->ct_flags & CT7_TERMINATE) { - isp_prt(isp, ISP_LOGALL, + isp_prt(isp, ISP_LOGINFO, "termination of 0x%x complete", ct->ct_rxid); } else if ((ct->ct_flags & CT7_SENDSTATUS) == 0) { ==== //depot/projects/newisp/dev/isp/ispvar.h#9 (text+ko) ==== @@ -755,6 +755,7 @@ ISPCTL_SCAN_LOOP, /* (Re)scan Local Loop */ ISPCTL_PDB_SYNC, /* Synchronize Port Database */ ISPCTL_SEND_LIP, /* Send a LIP */ + ISPCTL_GET_PORTNAME, /* get portname from an N-port handle */ ISPCTL_RUN_MBOXCMD, /* run a mailbox command */ ISPCTL_TOGGLE_TMODE, /* toggle target mode */ ISPCTL_GET_PDB /* get a single port database entry */