From owner-p4-projects@FreeBSD.ORG Sun Jan 18 09:33:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27A361065695; Sun, 18 Jan 2009 09:33:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D39381065693 for ; Sun, 18 Jan 2009 09:33:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6B5C8FC08 for ; Sun, 18 Jan 2009 09:33:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0I9XJuh036841 for ; Sun, 18 Jan 2009 09:33:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0I9XJb1036839 for perforce@freebsd.org; Sun, 18 Jan 2009 09:33:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 09:33:19 GMT Message-Id: <200901180933.n0I9XJb1036839@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 156317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 09:33:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=156317 Change 156317 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 09:32:53 Create the process descriptor a bit later so we have to handle fewer failure modes. Always fdrop() unconditionally in the parent process. fdclose() in the process descriptor in the child since we want the parent to have the only reference unless otherwise set up by the two processes. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -261,21 +261,6 @@ p1 = td->td_proc; -#ifdef PROCDESC - /* - * If required, create a process descriptor in the parent first; we - * will abandon it if something goes wrong. We don't finit() until - * later. - * - * XXXRW: How best to make it not visible in the child? - */ - if (flags & RFPROCDESC) { - error = falloc(td, &fp_procdesc, &fd_procdesc); - if (error) - return (error); - } -#endif - /* * Here we don't create a new process, but we divorce * certain parts of a process from itself. @@ -286,9 +271,6 @@ PROC_LOCK(p1); if (thread_single(SINGLE_BOUNDARY)) { PROC_UNLOCK(p1); -#ifdef PROCDESC - fdrop(fp_procdesc, td); -#endif return (ERESTART); } PROC_UNLOCK(p1); @@ -322,9 +304,6 @@ PROC_UNLOCK(p1); } *procp = NULL; -#ifdef PROCDESC - fdrop(fp_procdesc, td); -#endif return (error); } @@ -384,7 +363,24 @@ goto fail; } +#ifdef PROCDESC /* + * If required, create a process descriptor in the parent first; we + * will abandon it if something goes wrong. We don't finit() until + * later. + * + * XXXRW: How best to make it not visible in the child? + * + * XXXRW: What errno to return? + */ + if (flags & RFPROCDESC) { + error = falloc(td, &fp_procdesc, &fd_procdesc); + if (error) + goto fail; + } +#endif + + /* * Increment the count of procs running with this uid. Don't allow * a nonprivileged user to exceed their current limit. * @@ -604,6 +600,15 @@ else p2->p_sigparent = SIGCHLD; +#ifdef PROCDESC + /* + * We want only the parent to have a copy of the child's process + * descriptor, so close in the child. + */ + if (flags & RFPROCDESC) + fdclose(fd, fp_procdesc, fd_procdesc, td); +#endif + p2->p_textvp = p1->p_textvp; p2->p_fd = fd; p2->p_fdtol = fdtol; @@ -772,6 +777,7 @@ /* * Associate the process descriptor with the process before anything * can happen that might cause that process to need the descriptor. + * However, don't do this until after fork(2) can no longer fail. */ if (flags & RFPROCDESC) procdesc_new(p2, fp_procdesc); @@ -836,8 +842,10 @@ * number, rather than the chid pid, will be returned. */ #ifdef PROCDESC - if (flags & RFPROCDESC) + if (flags & RFPROCDESC) { td->td_retval[0] = fd_procdesc; + fdrop(fp_procdesc, td); + } #endif return (0); fail: @@ -854,7 +862,8 @@ vmspace_free(vm2); uma_zfree(proc_zone, newproc); #ifdef PROCDESC - fdrop(fp_procdesc, td); + if (flags & RFPROCDESC) + fdrop(fp_procdesc, td); #endif pause("fork", hz / 2); return (error); From owner-p4-projects@FreeBSD.ORG Sun Jan 18 10:40:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A4761065679; Sun, 18 Jan 2009 10:40:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A651106566B for ; Sun, 18 Jan 2009 10:40:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 172698FC25 for ; Sun, 18 Jan 2009 10:40:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IAeRMt042801 for ; Sun, 18 Jan 2009 10:40:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IAeRGT042799 for perforce@freebsd.org; Sun, 18 Jan 2009 10:40:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 10:40:27 GMT Message-Id: <200901181040.n0IAeRGT042799@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 156319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 10:40:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=156319 Change 156319 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 10:39:35 proc_reap() requires the process spinlock, so assert it, and acquire when calling it from procdesc_close(). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#8 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#8 (text+ko) ==== @@ -726,6 +726,7 @@ sx_assert(&proctree_lock, SA_XLOCKED); PROC_LOCK_ASSERT(p, MA_OWNED); + PROC_SLOCK_ASSERT(p, MA_OWNED); KASSERT(p->p_state == PRS_ZOMBIE, ("proc_reap: !PRS_ZOMBIE")); q = td->td_proc; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#3 (text+ko) ==== @@ -317,6 +317,7 @@ * the process descriptor when it calls back into * procdesc_reap(). */ + PROC_SLOCK(p); proc_reap(curthread, p, NULL, 0, NULL); } else { /* From owner-p4-projects@FreeBSD.ORG Sun Jan 18 10:43:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97E591065675; Sun, 18 Jan 2009 10:43:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 525EC1065673 for ; Sun, 18 Jan 2009 10:43:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F0418FC14 for ; Sun, 18 Jan 2009 10:43:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IAhVtp042997 for ; Sun, 18 Jan 2009 10:43:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IAhVX7042995 for perforce@freebsd.org; Sun, 18 Jan 2009 10:43:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 10:43:31 GMT Message-Id: <200901181043.n0IAhVX7042995@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 156320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 10:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=156320 Change 156320 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 10:43:07 Refine RFPROCDESC handling in fork1() a bit more: don't allow it to be used unless RFPROC is also used, since we need a process for there to be a descriptor. Close the process descriptor in the child immediately after the fdcopy() so that fdclose() doesn't acquire the filedesc lock while the proc lock is held (this makes more sense anyway). It's possible for the process descriptor to not yet be allocated when we reach the fail label, so initialize to NULL initially and then check for non-NULL before dropping it on failure. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#8 (text+ko) ==== @@ -250,7 +250,7 @@ struct sigacts *newsigacts; struct vmspace *vm2; #ifdef PROCDESC - struct file *fp_procdesc; + struct file *fp_procdesc = NULL; int fd_procdesc; #endif int error; @@ -259,6 +259,12 @@ if ((flags & (RFFDG|RFCFDG)) == (RFFDG|RFCFDG)) return (EINVAL); +#ifdef PROCDESC + /* Can't not create a process yet get a process descriptor. */ + if ((flags & RFPROCDESC) && ((flags & RFPROC) == 0)) + return (EINVAL); +#endif + p1 = td->td_proc; /* @@ -369,8 +375,6 @@ * will abandon it if something goes wrong. We don't finit() until * later. * - * XXXRW: How best to make it not visible in the child? - * * XXXRW: What errno to return? */ if (flags & RFPROCDESC) { @@ -533,6 +537,16 @@ } else if (flags & RFFDG) { fd = fdcopy(p1->p_fd); fdtol = NULL; +#ifdef PROCDESC + /* + * If the file descriptor table is copied, we only want the + * process descriptor to appear in the parent, so close in + * the child. + */ + if (flags & RFPROCDESC) + fdclose(fd, fp_procdesc, fd_procdesc, td); +#endif + } else { fd = fdshare(p1->p_fd); if (p1->p_fdtol == NULL) @@ -600,15 +614,6 @@ else p2->p_sigparent = SIGCHLD; -#ifdef PROCDESC - /* - * We want only the parent to have a copy of the child's process - * descriptor, so close in the child. - */ - if (flags & RFPROCDESC) - fdclose(fd, fp_procdesc, fd_procdesc, td); -#endif - p2->p_textvp = p1->p_textvp; p2->p_fd = fd; p2->p_fdtol = fdtol; @@ -862,7 +867,7 @@ vmspace_free(vm2); uma_zfree(proc_zone, newproc); #ifdef PROCDESC - if (flags & RFPROCDESC) + if ((flags & RFPROCDESC) && (fp_procdesc != NULL)) fdrop(fp_procdesc, td); #endif pause("fork", hz / 2); From owner-p4-projects@FreeBSD.ORG Sun Jan 18 11:11:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90F681065676; Sun, 18 Jan 2009 11:10:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A84F1065672 for ; Sun, 18 Jan 2009 11:10:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1CE4E8FC1A for ; Sun, 18 Jan 2009 11:10:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IBAw4v045890 for ; Sun, 18 Jan 2009 11:10:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IBAwm0045888 for perforce@freebsd.org; Sun, 18 Jan 2009 11:10:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 11:10:58 GMT Message-Id: <200901181110.n0IBAwm0045888@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 156321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 11:11:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=156321 Change 156321 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 11:10:39 Simply process descriptor regression test: exercise various orders of opening, etc, that have caused panics due to bugs so far. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/Makefile#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 18 12:23:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46182106567C; Sun, 18 Jan 2009 12:23:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F218E1065676 for ; Sun, 18 Jan 2009 12:23:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE8608FC29 for ; Sun, 18 Jan 2009 12:23:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ICNC7o052664 for ; Sun, 18 Jan 2009 12:23:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ICNCxr052662 for perforce@freebsd.org; Sun, 18 Jan 2009 12:23:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 12:23:12 GMT Message-Id: <200901181223.n0ICNCxr052662@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 156324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 12:23:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=156324 Change 156324 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 12:22:37 Export procdesc pid in filedesc sysctl so that procstat sees it; not exported by ofiledesc. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#14 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#14 (text+ko) ==== @@ -2643,7 +2643,6 @@ struct proc *p; struct tty *tp; int vfslocked; - pid_t pid; name = (int *)arg1; if ((p = pfind((pid_t)name[0])) == NULL) @@ -2675,7 +2674,6 @@ vp = NULL; so = NULL; tp = NULL; - pid = 0; kif->kf_fd = i; switch (fp->f_type) { case DTYPE_VNODE: @@ -2728,7 +2726,6 @@ break; case DTYPE_PROCDESC: - pid = ((struct procdesc *)fp->f_data)->pd_pid; kif->kf_type = KF_TYPE_PROCDESC; break; @@ -2905,7 +2902,6 @@ struct proc *p; struct tty *tp; int vfslocked; - pid_t pid; name = (int *)arg1; if ((p = pfind((pid_t)name[0])) == NULL) @@ -2987,8 +2983,8 @@ break; case DTYPE_PROCDESC: - pid = ((struct procdesc *)fp->f_data)->pd_pid; kif->kf_type = KF_TYPE_PROCDESC; + kif->kf_pid = ((struct procdesc *)fp->f_data)->pd_pid; break; default: From owner-p4-projects@FreeBSD.ORG Sun Jan 18 14:48:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 582391065673; Sun, 18 Jan 2009 14:48:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECA04106564A for ; Sun, 18 Jan 2009 14:48:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8AB98FC16 for ; Sun, 18 Jan 2009 14:48:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IEme1c075124 for ; Sun, 18 Jan 2009 14:48:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IEmege075120 for perforce@freebsd.org; Sun, 18 Jan 2009 14:48:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 14:48:40 GMT Message-Id: <200901181448.n0IEmege075120@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 156331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 14:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=156331 Change 156331 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 14:48:07 Add a mutex to struct procdesc, which will be used to synchronize event notifications using poll, select, kqueue, etc. Protect the pd_flags field using pd_lock. Add a new flag, PD_EXITED, so that procdesc contains explicit state tracking whether its process has died or not. Add pd_selinfo, PD_SELECTED, and implement poll/select for POLLHUP on process descriptors -- it is now possible to wait for a process to die using poll() on its descriptor. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#4 (text+ko) ==== @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -209,6 +210,7 @@ pd->pd_proc = p; pd->pd_pid = p->p_pid; p->p_procdesc = pd; + PROCDESC_LOCK_INIT(pd); /* * Process descriptors start out with two references: one from their @@ -230,6 +232,7 @@ KASSERT((pd->pd_flags & PD_CLOSED), ("procdesc_free: !PD_CLOSED")); + PROCDESC_LOCK_DESTROY(pd); uma_zfree(procdesc_zone, pd); } } @@ -250,9 +253,12 @@ pd = p->p_procdesc; + PROCDESC_LOCK(pd); KASSERT((pd->pd_flags & PD_CLOSED) == 0 || p->p_pptr == initproc, ("procdesc_exit: closed && parent not init")); + pd->pd_flags |= PD_EXITED; + /* * If the process descriptor has been closed, then we have nothing * to do; return 1 so that init will get SIGCHLD and do the reaping. @@ -260,15 +266,17 @@ * that reap. */ if (pd->pd_flags & PD_CLOSED) { + PROCDESC_UNLOCK(pd); pd->pd_proc = NULL; p->p_procdesc = NULL; procdesc_free(pd); return (1); } - - /* - * XXXRW: This is the bit where we'd do the select/kqueue thing. - */ + if (pd->pd_flags & PD_SELECTED) { + pd->pd_flags &= ~PD_SELECTED; + selwakeup(&pd->pd_selinfo); + } + PROCDESC_UNLOCK(pd); return (0); } @@ -305,11 +313,13 @@ pd = fp->f_data; fp->f_ops = &badfileops; fp->f_data = NULL; + PROCDESC_LOCK(pd); + pd->pd_flags |= PD_CLOSED; + PROCDESC_UNLOCK(pd); sx_xlock(&proctree_lock); p = pd->pd_proc; PROC_LOCK(p); - pd->pd_flags |= PD_CLOSED; if (p->p_state == PRS_ZOMBIE) { /* * If the process is already dead and just awaiting reaping, @@ -377,8 +387,20 @@ procdesc_poll(struct file *fp, int events, struct ucred *active_cred, struct thread *td) { + struct procdesc *pd; + int revents; - return (EOPNOTSUPP); + revents = 0; + pd = (struct procdesc *)fp->f_data; + PROCDESC_LOCK(pd); + if (pd->pd_flags & PD_EXITED) + revents |= POLLHUP; + if (revents == 0) { + selrecord(td, &pd->pd_selinfo); + pd->pd_flags |= PD_SELECTED; + } + PROCDESC_UNLOCK(pd); + return (revents); } static int ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#3 (text+ko) ==== @@ -35,6 +35,10 @@ #define _SYS_PROCDESC_H_ #ifdef _KERNEL +#include /* struct selinfo */ +#include +#include + /*- * struct procdesc describes a process descriptor, and essentially consists * of two pointers -- one to the file descriptor, and one to the process. @@ -43,28 +47,47 @@ * so a single file pointer will suffice. * * Locking key: - * (p) - Protected by the proctree_lock - * (r) - Reference count. + * (c) - Constant after initial setup. + * (p) - Protected by the process descriptor mutex. + * (r) - Atomic eference count. + * (s) - Protected by selinfo. + * (t) - Protected by the proctree_lock */ struct proc; -struct selinfo; struct sigio; struct procdesc { - struct proc *pd_proc; /* (p) Process. */ + /* + * Basic process descriptor state: the process, a cache of its pid to + * satisfy queries after the process exits, and process descriptor + * refcount. + */ + struct proc *pd_proc; /* (t) Process. */ pid_t pd_pid; /* (c) Cached pid. */ - int pd_flags; /* (p) PD_ flags. */ u_int pd_refcount; /* (r) Reference count. */ -#if 0 - struct selinfo pd_selinfo; - struct sigio *pd_sigio; -#endif + /* + * In-flight data and notification of events. + */ + int pd_flags; /* (p) PD_ flags. */ + struct selinfo pd_selinfo; /* (p) Event notification. */ + struct mtx pd_lock; /* Protect data + events. */ }; /* + * Locking macros for the procdesc itself. + */ +#define PROCDESC_LOCK_DESTROY(pd) mtx_destroy(&(pd)->pd_lock) +#define PROCDESC_LOCK_INIT(pd) mtx_init(&(pd)->pd_lock, "procdesc", NULL, \ + MTX_DEF) +#define PROCDESC_LOCK(pd) mtx_lock(&(pd)->pd_lock) +#define PROCDESC_UNLOCK(pd) mtx_unlock(&(pd)->pd_lock) + +/* * Flags for the pd_flags field. */ #define PD_CLOSED 0x00000001 /* Descriptor has closed. */ +#define PD_SELECTED 0x00000002 /* Issue selwakeup(). */ +#define PD_EXITED 0x00000004 /* Process exited. */ /* * In-kernel interfaces to process descriptors. From owner-p4-projects@FreeBSD.ORG Sun Jan 18 15:50:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE3751065676; Sun, 18 Jan 2009 15:50:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6990E1065672 for ; Sun, 18 Jan 2009 15:50:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3BE9D8FC1D for ; Sun, 18 Jan 2009 15:50:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IFoiJY083106 for ; Sun, 18 Jan 2009 15:50:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IFohGJ083104 for perforce@freebsd.org; Sun, 18 Jan 2009 15:50:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 15:50:43 GMT Message-Id: <200901181550.n0IFohGJ083104@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 156334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 15:50:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=156334 Change 156334 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 15:50:26 Update comments, implement a weak procdesc_stat() function that leaves quite a bit to be desired. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#5 (text+ko) ==== @@ -45,9 +45,9 @@ * - At most one process descriptor will exist for any process, although * references to that descriptor may be held from many processes (or even * be in flight between processes over a local domain socket). - * - Closing the process descriptor will terminate the process using SIGKILL - * and reparent it to init so that there's a process to reap it when it's - * done exiting. + * - Last close on the process descriptor will terminate the process using + * SIGKILL and reparent it to init so that there's a process to reap it + * when it's done exiting. * - If the process exits before the descriptor is closed, it will not * generate SIGCHLD on termination, or be picked up by waitpid(). * - The pdkill(2) system call may be used to deliver a signal to the process @@ -58,7 +58,7 @@ * Open questions: * * - How to handle ptrace(2)? - * - Will we want to add a pidtoprocdesc(2) system call to allow procee + * - Will we want to add a pidtoprocdesc(2) system call to allow process * descriptors to be created for processes without pfork(2)? */ @@ -78,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -414,8 +415,26 @@ procdesc_stat(struct file *fp, struct stat *sb, struct ucred *active_cred, struct thread *td) { + struct procdesc *pd; - return (EOPNOTSUPP); + /* + * XXXRW: Perhaps we should cache some more information from the + * process so that we can return it reliably here even after it has + * died. For example, caching its credential data. + */ + bzero(sb, sizeof(*sb)); + pd = (struct procdesc *)fp->f_data; + sx_slock(&proctree_lock); + if (pd->pd_proc != NULL) { + sb->st_mode = S_IFREG | S_IRWXU; + PROC_LOCK(pd->pd_proc); + sb->st_uid = pd->pd_proc->p_ucred->cr_ruid; + sb->st_gid = pd->pd_proc->p_ucred->cr_rgid; + PROC_UNLOCK(pd->pd_proc); + } else + sb->st_mode = S_IFREG; + sx_sunlock(&proctree_lock); + return (0); } #else /* !PROCDESC */ From owner-p4-projects@FreeBSD.ORG Sun Jan 18 17:38:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BD051065674; Sun, 18 Jan 2009 17:38:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6D141065672 for ; Sun, 18 Jan 2009 17:38:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4FF88FC18 for ; Sun, 18 Jan 2009 17:38:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IHcYZ6002856 for ; Sun, 18 Jan 2009 17:38:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IHcYdr002854 for perforce@freebsd.org; Sun, 18 Jan 2009 17:38:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 17:38:34 GMT Message-Id: <200901181738.n0IHcYdr002854@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 156338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 17:38:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=156338 Change 156338 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 17:38:12 Explicitly check process state to set sb_mode for stat. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#6 (text+ko) ==== @@ -426,8 +426,11 @@ pd = (struct procdesc *)fp->f_data; sx_slock(&proctree_lock); if (pd->pd_proc != NULL) { - sb->st_mode = S_IFREG | S_IRWXU; PROC_LOCK(pd->pd_proc); + if (pd->pd_proc->p_state != PRS_ZOMBIE) + sb->st_mode = S_IFREG | S_IRWXU; + else + sb->st_mode = S_IFREG; sb->st_uid = pd->pd_proc->p_ucred->cr_ruid; sb->st_gid = pd->pd_proc->p_ucred->cr_rgid; PROC_UNLOCK(pd->pd_proc); From owner-p4-projects@FreeBSD.ORG Sun Jan 18 17:43:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 109201065673; Sun, 18 Jan 2009 17:43:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C123D106564A for ; Sun, 18 Jan 2009 17:43:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A44FD8FC1B for ; Sun, 18 Jan 2009 17:43:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IHheI5003231 for ; Sun, 18 Jan 2009 17:43:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IHheOR003229 for perforce@freebsd.org; Sun, 18 Jan 2009 17:43:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 17:43:40 GMT Message-Id: <200901181743.n0IHheOR003229@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 156339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 17:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=156339 Change 156339 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 17:42:55 Check fstat() mode on process descriptors in regression test. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#2 (text+ko) ==== @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#2 $ */ #include #include +#include #include #include @@ -54,25 +55,37 @@ int main(int argc, char *argv[]) { - pid_t pid; + struct stat sb; + pid_t pid, realpid; int fd; printf("1. pdfork() and allow to exit before close().\n"); - pid = pdfork(&fd); - if (pid < 0) + realpid = pdfork(&fd); + if (realpid < 0) err(-1, "pdfork"); - if (pid == 0) { + if (realpid == 0) { if (execve(sleep_argv[0], sleep_argv, environ) < 0) err(-1, "%s", sleep_argv[0]); } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid before sleep: %d\n", pid); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != (S_IFREG | S_IRWXU)) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("before sleep: pid %d mode 0%05o\n", pid, sb.st_mode); sleep(10); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid after sleep: %d\n", pid); + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != S_IFREG) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("after sleep: pid %d mode %05o\n", pid, sb.st_mode); close(fd); } @@ -87,11 +100,19 @@ } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid before sleep: %d\n", pid); + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != (S_IFREG | S_IRWXU)) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("before sleep: pid %d mode %05o\n", pid, sb.st_mode); sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid after sleep: %d\n", pid); + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != (S_IFREG | S_IRWXU)) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("after sleep: pid %d mode %05o\n", pid, sb.st_mode); close(fd); } @@ -106,20 +127,29 @@ } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid before sleep: %d\n", pid); + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != (S_IFREG | S_IRWXU)) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("before sleep: pid %d mode %05o\n", pid, sb.st_mode); sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid after sleep: %d\n", pid); - + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != (S_IFREG | S_IRWXU)) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("after sleep: pid %d mode %05o\n", pid, sb.st_mode); if (pdkill(fd, SIGKILL) < 0) err(-1, "pdkill"); - sleep(1); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); - printf("pid after kill: %d\n", pid); - + if (fstat(fd, &sb) < 0) + err(-1, "fstat"); + if (sb.st_mode != S_IFREG) + errx(-1, "stat mode 0%05o", sb.st_mode); + printf("after kill: pid %d mode %05o\n", pid, sb.st_mode); close(fd); } From owner-p4-projects@FreeBSD.ORG Sun Jan 18 17:50:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A20AA1065678; Sun, 18 Jan 2009 17:50:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44CFD1065674 for ; Sun, 18 Jan 2009 17:50:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 298598FC18 for ; Sun, 18 Jan 2009 17:50:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IHomZF003768 for ; Sun, 18 Jan 2009 17:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IHom5g003766 for perforce@freebsd.org; Sun, 18 Jan 2009 17:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 17:50:48 GMT Message-Id: <200901181750.n0IHom5g003766@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 156340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 17:50:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=156340 Change 156340 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 17:50:41 Consistently check pid returned by pdgetpid() in regression test. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 $ */ #include @@ -81,6 +81,9 @@ sleep(10); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != S_IFREG) @@ -91,15 +94,18 @@ printf("2. pdfork() and close() before child exits itself.\n"); - pid = pdfork(&fd); - if (pid < 0) + realpid = pdfork(&fd); + if (realpid < 0) err(-1, "pdfork"); - if (pid == 0) { + if (realpid == 0) { if (execve(sleep_argv[0], sleep_argv, environ) < 0) err(-1, "%s", sleep_argv[0]); } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -108,6 +114,9 @@ sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -118,15 +127,18 @@ printf("3. pdfork() and pdkill() before child exits itself.\n"); - pid = pdfork(&fd); - if (pid < 0) + realpid = pdfork(&fd); + if (realpid < 0) err(-1, "pdfork"); - if (pid == 0) { + if (realpid == 0) { if (execve(sleep_argv[0], sleep_argv, environ) < 0) err(-1, "%s", sleep_argv[0]); } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -135,6 +147,9 @@ sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -145,6 +160,9 @@ sleep(1); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != S_IFREG) From owner-p4-projects@FreeBSD.ORG Sun Jan 18 18:11:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C7A21065674; Sun, 18 Jan 2009 18:11:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CB46106564A for ; Sun, 18 Jan 2009 18:11:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A22D8FC22 for ; Sun, 18 Jan 2009 18:11:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IIB8IP006248 for ; Sun, 18 Jan 2009 18:11:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IIB83L006246 for perforce@freebsd.org; Sun, 18 Jan 2009 18:11:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 18:11:08 GMT Message-Id: <200901181811.n0IIB83L006246@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 156341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 18:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=156341 Change 156341 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 18:10:56 Regression test to make sure that pdfork(2)-generated processes aren't visible using waitpid(2). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#4 (text+ko) ==== @@ -30,14 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#4 $ */ #include #include #include +#include #include +#include #include #include #include @@ -171,5 +173,22 @@ close(fd); } + printf("4. Confirm pdfork() process isn't visible to waitpid()\n"); + + realpid = pdfork(&fd); + if (realpid < 0) + err(-1, "pdfork"); + if (realpid == 0) { + if (execve(sleep_argv[0], sleep_argv, environ) < 0) + err(-1, "%s", sleep_argv[0]); + } else { + sleep(10); + pid = waitpid(realpid, NULL, 0); + if (pid >= 0) + errx(-1, "waitpid unexpectedly returned %d", pid); + if (errno != ECHILD) + err(-1, "waitpid unexpected error %d", errno); + } + exit(0); } From owner-p4-projects@FreeBSD.ORG Sun Jan 18 18:22:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4ECB1065670; Sun, 18 Jan 2009 18:22:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94E9B106564A for ; Sun, 18 Jan 2009 18:22:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 828758FC1A for ; Sun, 18 Jan 2009 18:22:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IIMKxY007145 for ; Sun, 18 Jan 2009 18:22:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IIMKN5007143 for perforce@freebsd.org; Sun, 18 Jan 2009 18:22:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 18:22:20 GMT Message-Id: <200901181822.n0IIMKN5007143@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 156342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 18:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=156342 Change 156342 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 18:22:04 The pointer from a process to its descriptor is protected by the proctree_lock, not the process lock. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/sys/proc.h#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/proc.h#8 (text+ko) ==== @@ -510,7 +510,7 @@ int p_boundary_count;/* (c) Num threads at user boundary */ int p_pendingcnt; /* how many signals are pending */ struct itimers *p_itimers; /* (c) POSIX interval timers. */ - struct procdesc *p_procdesc; /* (c) Process descriptor, if any. */ + struct procdesc *p_procdesc; /* (e) Process descriptor, if any. */ /* End area that is zeroed on creation. */ #define p_endzero p_magic From owner-p4-projects@FreeBSD.ORG Sun Jan 18 18:30:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 380091065673; Sun, 18 Jan 2009 18:30:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBAAD106564A for ; Sun, 18 Jan 2009 18:30:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D948D8FC08 for ; Sun, 18 Jan 2009 18:30:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IIUSxG007978 for ; Sun, 18 Jan 2009 18:30:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IIUS95007976 for perforce@freebsd.org; Sun, 18 Jan 2009 18:30:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 18:30:28 GMT Message-Id: <200901181830.n0IIUS95007976@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 156343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 18:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=156343 Change 156343 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 18:29:34 Clarify comment -- wait4() doesn't lead to procdesc_reap(), but close() may. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#7 (text+ko) ==== @@ -282,8 +282,8 @@ } /* - * When a process descriptor is reaped, typically by pdwait4() or wait4(), - * release the process's reference on the process descriptor. + * When a process descriptor is reaped, perhaps as a result of close() or + * pdwait4(), release the process's reference on the process descriptor. */ void procdesc_reap(struct proc *p) From owner-p4-projects@FreeBSD.ORG Sun Jan 18 21:16:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8F5B106568A; Sun, 18 Jan 2009 21:16:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D3891065678 for ; Sun, 18 Jan 2009 21:16:23 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B9908FC17 for ; Sun, 18 Jan 2009 21:16:23 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ILGNtu034049 for ; Sun, 18 Jan 2009 21:16:23 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ILGNUp034047 for perforce@freebsd.org; Sun, 18 Jan 2009 21:16:23 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 18 Jan 2009 21:16:23 GMT Message-Id: <200901182116.n0ILGNUp034047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 21:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=156352 Change 156352 by rene@rene_self on 2009/01/18 21:16:12 solid-state: 41% Major updates to en_US version required. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#6 (text+ko) ==== @@ -178,89 +178,101 @@ - <filename>rc.diskless</filename> and Read-Only Filesystems + <filename>rc.diskless</filename> en alleen-lezen + bestandssystemen - The post-boot initialization of an embedded FreeBSD system is - controlled by /etc/rc.diskless2 - (/etc/rc.diskless1 is for BOOTP diskless boot). - This initialization script is invoked by placing a line in - /etc/rc.conf as follows: + De post-boot-initialisatie van een embedded &os;-systeem wordt + beheerd door /etc/rc.diskless2 + (/etc/rc.diskless1 is voor BOOTP-schijfloos + opstarten). Dit initialisatiescript wordt aangeroepen door de + volgende regel in /etc/rc.conf te + plaatsen: diskless_mount=/etc/rc.diskless2 - rc.diskless2 mounts /var - as a memory filesystem, makes a configurable list of directories in - /var with the &man.mkdir.1; command, changes modes - on some of those directories, and extracts a list of device entries to - copy to a writable (again, a memory filesystem) - /dev partition. In the execution of - /etc/rc.diskless2, one other - rc.conf variable comes into play - - varsize. The /etc/rc.diskless2 - file creates a /var partition based on the value of - this variable in rc.conf: + rc.diskless2 koppelt + /var als een geheugenbestandssysteem aan, + maakt een instelbare lijst van mappen in /var + aan met het commando &man.mkdir.1;, verandert de modus van sommige + van deze mappen, en pakt een lijst van apparaatingangen uit naar + een schijfbare (weer als een geheugenbestandsysteem) partitie + /dev. Tijdens het uitvoeren van + /etc/rc.diskless2 is er nog een + rc.conf-variabele in het spel - + varsize. Het bestand + /etc/rc.diskless2 maakt een partitie + /var aan gebaseerd op de waarde van deze + variabele in rc.conf: varsize=8192 - Remember that this value is in sectors. The creation of the - /dev partition by - /etc/rc.diskless2, however, is governed by a - hard-coded value of 4096 sectors. It is trivial to change this entry in - the /etc/rc.diskless2 file itself, although you - should not need more space than that for - /dev. + Onthoud dat deze waarde in sectoren is. De creatie van de + partitie /dev door + /etc/rc.diskless2, wordt echter geregeerd + door een harde waarde van 4096 sectoren. Het is triviaal om deze + waarde in het bestand /etc/rc.diskless2 zelf + te wijzigen, alhoewel er niet meer ruimte voor + /dev dan dat nodig zou zijn. - It is important to remember that the - /etc/rc.diskless2 script assumes that you have - already removed your conventional /tmp partition - and replaced it with a symbolic link to /var/tmp. - Because tmp is one of the directories created in - /var by the /etc/rc.diskless2 - script, and because /var is a memory filesystem - (which is mounted read-write), /tmp will now be a - directory that is read-write as well. + Het is belangrijk om te herinneren dat het script + /etc/rc.diskless2 aanneemt dat de + conventionele partitie /tmp reeds door een + symbolische koppeling naar /var/tmp is + vervangen. Omdat tmp een van de mappen is + die in /var door het script + /etc/rc.diskless2 wordt aangemaakt, en omdat + /var een geheugenbestandssysteem is (dat als + lezen-schrijven is aangekoppeld), zal /tmp nu + ook een lees-schrijf map zijn. - The fact that /var and - /dev are read-write filesystems is an important - distinction, as the / partition (and any other - partitions you may have on your flash media) should be mounted - read-only. Remember that in we detailed the - limitations of flash memory - specifically the limited write capability. - The importance of not mounting filesystems on flash media read-write, - and the importance of not using a swap file, cannot be overstated. A - swap file on a busy system can burn through a piece of flash media in - less than one year. Heavy logging or temporary file creation and - destruction can do the same. Therefore, in addition to removing the - swap and /proc entries from your - /etc/fstab file, you should also change the Options - field for each filesystem to ro as follows: + Het feit dat /var en + /dev lees-schrijf bestandssystemen zijn is + een belangrijk verschil, aangezien de partitie + / (en alle andere partities die op uw + flash-medium kunnen staan) als alleen-lezen aangekoppeld dienen te + worden. In hebben we de beperkingen van + flash-geheugen uiteen gelegd - in bijzonder de beperkte + schrijfcapaciteit. Het belang van het niet als lezen-schrijven + aankoppelen van flash-media en het belang van het niet gebruiken + van een wisselbestand kunnen niet genoeg benadrukt worden. Een + wisselbestand op een druk systeem kan binnen een jaar een + flash-medium opmaken. Het uitgebreid loggen of aanmaken en + vernietigen van tijdelijke bestanden kan hetzelfde doen. Daarom + dient u, naast het verwijderen van de regels + swap en /proc uit het + bestand /etc/fstab, dient u ook de Options + van elk bestandssysteem als volgt op ro te + zetten: # Device Mountpoint FStype Options Dump Pass# /dev/ad0s1a / ufs ro 1 1 - A few applications in the average system will immediately begin to - fail as a result of this change. For instance, ports will not install - from the ports tree because the - /var/db/port.mkversion file does not exist. cron - will not run properly as a result of missing cron tabs in the - /var created by - /etc/rc.diskless2, and syslog and dhcp will - encounter problems as well as a result of the read-only filesystem and - missing items in the /var that - /etc/rc.diskless2 has created. These are only - temporary problems though, and are addressed, along with solutions to - the execution of other common software packages in - . + Op een gemiddeld systeem zullen enkele applicaties het + onmiddellijk niet meer doen als gevolg van deze verandering. + Ports bijvoorbeeld zullen niet installeren vanuit de portsboom + omdat /var/db/port.mkversion niet bestaat. + cron zal niet correct draaien vanwege ontbrekende crontabellen in + het /var dat door + /etc/rc.diskless2 is aangemaakt, en syslog en + DHCP zullen problemen ondervinden als gevolg van het alleen-lezen + bestandssysteem en ontbrekende items in het + /var dat + /etc/rc.diskless2 heeft aangemaakt. Dit zijn + slechts tijdelijke problemen, en worden tezamen met oplossingen + voor het uitvoeren van andere veelgebruikte softwarepakketten + behandeld in . - An important thing to remember is that a filesystem that was mounted - read-only with /etc/fstab can be made read-write at - any time by issuing the command: + Een belangrijk ding om te onthouden is dat een bestandssysteem + dat met /etc/fstab als alleen-lezen was + aangekoppeld ten alle tijde lezen-schrijven kan worden gemaakt + door dit commando te geven: - &prompt.root; /sbin/mount -uw partition + &prompt.root; /sbin/mount -uw partitie - and can be toggled back to read-only with the command: + en kan op alleen-lezen worden teruggezet met het + commando: - &prompt.root; /sbin/mount -ur partition + &prompt.root; /sbin/mount -ur partitie From owner-p4-projects@FreeBSD.ORG Sun Jan 18 23:12:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CB391065676; Sun, 18 Jan 2009 23:12:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBEE61065673 for ; Sun, 18 Jan 2009 23:12:21 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9ECE8FC0C for ; Sun, 18 Jan 2009 23:12:21 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0INCLLv046936 for ; Sun, 18 Jan 2009 23:12:21 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0INCKhP046934 for perforce@freebsd.org; Sun, 18 Jan 2009 23:12:20 GMT (envelope-from trasz@freebsd.org) Date: Sun, 18 Jan 2009 23:12:20 GMT Message-Id: <200901182312.n0INCKhP046934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 156354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jan 2009 23:12:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=156354 Change 156354 by trasz@trasz_victim7 on 2009/01/18 23:11:22 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/kenv/kenv.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ln/ln.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/NEWS#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/VERSION#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/libauditd.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/Makefile.am#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_domain.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_socket_type.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_audit.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_domain.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_domain.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_record.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/E2BIG_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EACCES_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EBADF_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EBUSY_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ECHILD_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EDEADLK_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EEXIST_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EFAULT_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EFBIG_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EINTR_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EINVAL_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EIO_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EISDIR_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EMFILE_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EMLINK_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENFILE_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENODEV_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOENT_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOEXEC_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOMEM_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOSPC_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTBLK_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTDIR_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTTY_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENXIO_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EPERM_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EPIPE_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EROFS_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ESPIPE_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ESRCH_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ETXTBSY_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EXDEV_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/data_token#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/socketex_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/socketex_token#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/zonename_record#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/regdomain.xml#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/freebsd-tips#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbsm/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/wcsftime.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/printfcommon.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vswscanf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/ffs.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/comsat/comsat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping/ping.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/route/route.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ath.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bce.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bge.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/gem.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/hme.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sdhci.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/USB2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/load.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/support.4th#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_domain.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_internal.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_record.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci_atmelarm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/atmegadci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/atmegadci.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg_atmelarm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_compat_linux.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_debug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_handle_request.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_mbuf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_sw_transfer.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2_reg.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdce2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/uscanner2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_defs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_standard.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/uhid2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ukbd2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ums2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/ufm2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uark2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubsa2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubser2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ucycom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ugensa2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uipaq2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ulpt2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umct2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umodem2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umoscom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvisor2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/ata-usb2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/urio2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_reg.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_inode.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/USB2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/msi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_synch.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/pmap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_atmegadci/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/vinet.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/support.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ktr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sched.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/conf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/misc.sh#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/jot/regress.wX.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/jot/regress.wX1.out#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/sched/schedgraph.py#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athrd/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athrd/athrd.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athrd/athrd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athrd/run.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/scripts/setup.tdma-master#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/scripts/setup.tdma-slave#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/wlantxtime/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/wlantxtime/wlantxtime.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/sysbuild/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/sysbuild/sysbuild.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/usb/print-usb-if-vids.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fetch/fetch.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gprof/gprof.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mail/aux.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mail/util.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/boot0cfg/boot0cfg.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.c#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#9 (text+ko) ==== @@ -1,10 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.614 2008/11/12 04:43:55 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.615 2009/01/15 04:19:03 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel @@ -697,6 +698,11 @@ # be set to cross-build, we have to make sure TARGET is set # properly. +.if defined(KERNFAST) +NO_KERNELCLEAN= t +NO_KERNELCONFIG= t +NO_KERNELDEPEND= t +.endif .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} KERNWARN= ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#16 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090115: + TCP Appropriate Byte Counting (RFC 3465) support added to kernel. + New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to + 800061. User space tools that rely on the size of struct tcpcb in + tcp_var.h (e.g. sockstat) need to be recompiled. + 20081225: ng_tty(4) module updated to match the new TTY subsystem. Due to API change, user-level applications must be updated. @@ -1201,4 +1207,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ +$FreeBSD: src/UPDATING,v 1.558 2009/01/15 06:44:22 lstewart Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/kenv/kenv.1#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.16 2009/01/13 18:25:56 maxim Exp $ .\" -.Dd September 13, 2005 +.Dd January 13, 2009 .Dt KENV 1 .Os .Sh NAME @@ -67,8 +67,28 @@ .Fl q option is set, warnings normally printed as a result of being unable to perform the requested operation will be suppressed. +.Pp +Variables can be added to the kernel environment using the +.Xr /boot/loader.conf +file, or also statically compiled into the kernel using the statement +.Pp +.Dl Ic env Ar filename +.Pp +in the kernel config file. +The file can contain lines of the form +.Pp +.Dl name = "value" # this is a comment +.Pp +where whitespace around name and '=', and +everything after a '#' character, are ignored. Almost any printable +character except '=' is acceptable as part of a name. Quotes +are optional and necessary only if the value contains +whitespace. +.Pp .Sh SEE ALSO .Xr kenv 2 , +.Xr config 5 , +.Xr loader.conf 5 , .Xr loader 8 .Sh HISTORY The ==== //depot/projects/soc2008/trasz_nfs4acl/bin/ln/ln.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.33 2008/06/06 08:27:59 keramida Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.34 2009/01/13 15:24:35 trhodes Exp $ .\" .Dd June 6, 2008 .Dt LN 1 @@ -38,7 +38,7 @@ .Sh NAME .Nm ln , .Nm link -.Nd make links +.Nd link files .Sh SYNOPSIS .Nm .Op Fl s Op Fl F @@ -57,8 +57,13 @@ .Sh DESCRIPTION The .Nm -utility creates a new directory entry (linked file) which has the -same modes as the original file. +utility creates a new directory entry (linked file) for the file name +specified by +.Ar target_file . +The +.Ar target_file +will be created with the same file modes as the +.Ar source_file . It is useful for maintaining multiple copies of a file in many places at once without using up storage for the .Dq copies ; @@ -148,7 +153,7 @@ A hard link to a file is indistinguishable from the original directory entry; any changes to a file are effectively independent of the name used to reference the file. -Hard links may not normally refer to directories and may not span file systems. +Directories may not be hardlinked, and hard links may not span file systems. .Pp A symbolic link contains the name of the file to which it is linked. ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 (text+ko) ==== @@ -1739,15 +1739,11 @@ * Arches which are 32-bit only just use the normal * library path. */ -#if defined(__i386__) - int use_32 = 1; /* use /usr/lib/... -sson */ -#else int use_32 = 0; #endif -#endif (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "":"32"); + use_32 ? "32":""); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_crypto.c#3 (text+ko) ==== @@ -1612,7 +1612,7 @@ */ EVP_VerifyInit(&ctx, peer->digest); EVP_VerifyUpdate(&ctx, (u_char *)&ep->tstamp, vallen + 12); - if (!EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey)) + if (EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey) <= 0) return (XEVNT_SIG); if (peer->crypto & CRYPTO_FLAG_VRFY) { ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/INSTALL#2 (text) ==== @@ -9,6 +9,12 @@ ./configure make +If doing development work on OpenBSM with gcc, the following invocation of +configure may be preferred in order to generate full compiler warnings and +force the compile to fail if a warning is found: + + CFLAGS="-Wall -Werror" ./configure + To install, use: make install ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/NEWS#3 (text) ==== @@ -1,5 +1,24 @@ OpenBSM Version History +OpenBSM 1.1 alpha 5 + +- Stub libauditd(3) man page added. +- All BSM error number constants with BSM_ERRNO_. +- Interfaces to convert between local and BSM socket types and protocol + families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3), + au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions + of constants in audit_domain.h and audit_socket_type.h. This improves + interoperability by converting local constant spaces, which vary by OS, to + and from Solaris constants (where available) or OpenBSM constants for + protocol domains not present in Solaris (a fair number). These routines + should be used when generating and interpreting extended socket tokens. +- Fix build warnings with full gcc warnings enabled on most supported + platforms. +- Don't compile error strings into bsm_errno.c when building it in the kernel + environment. +- When started by launchd, use the label com.apple.auditd rather than + org.trustedbsd.auditd. + OpenBSM 1.1 alpha 4 - With the addition of BSM error number mapping, we also need to map the @@ -393,4 +412,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/VERSION#4 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1_ALPHA_4 +OPENBSM_1_1_ALPHA_5 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.8#4 (text) ==== @@ -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. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $ .\" .Dd December 11, 2008 .Dt AUDITD 8 @@ -115,6 +115,7 @@ .Nm . .Sh SEE ALSO .Xr asl 3 , +.Xr libauditd 3 , .Xr audit 4 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.c#4 (text) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ */ #include @@ -252,7 +252,7 @@ */ err = auditd_read_dirs(audit_warn_soft, audit_warn_hard); if (err) { - auditd_log_err("auditd_read_dirs() %s: %m", + auditd_log_err("auditd_read_dirs(): %s", auditd_strerror(err)); if (err == ADE_HARDLIM) audit_warn_allhard(); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_darwin.c#2 (text) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $ */ #include @@ -83,7 +83,7 @@ #endif /* __BSM_INTERNAL_NOTIFY_KEY */ #ifndef __AUDIT_LAUNCHD_LABEL -#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd" +#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd" #endif /* __AUDIT_LAUNCHD_LABEL */ #define MAX_MSG_SIZE 4096 @@ -100,7 +100,7 @@ if (debug) opt = ASL_OPT_STDERR; - au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt); + au_aslclient = asl_open("auditd", "com.apple.auditd", opt); au_aslmsg = asl_new(ASL_TYPE_MSG); #ifdef ASL_KEY_READ_UID ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 (text) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#2 $ */ #include @@ -35,9 +35,11 @@ #include #include +#include #include +#include #include -#include +#include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditreduce/auditreduce.c#4 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#31 $ */ /* @@ -41,6 +41,9 @@ */ #include + +#define _GNU_SOURCE /* Required for strptime() on glibc2. */ + #ifdef HAVE_FULL_QUEUE_H #include #else ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/auditd_lib.h#2 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -57,7 +57,7 @@ * Path of auditd plist file for launchd. */ #define AUDITD_PLIST_FILE \ - "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist" + "/System/Library/LaunchDaemons/com.apple.auditd.plist" /* * Error return codes for auditd_lib functions. ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/libbsm.h#4 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#41 $ */ #ifndef _LIBBSM_H_ @@ -821,14 +821,22 @@ */ void au_print_xml_header(FILE *outfp); void au_print_xml_footer(FILE *outfp); -__END_DECLS /* - * Functions relating to BSM<->errno conversion. + * BSM library routines for converting between local and BSM constant spaces. + * (Note: some of these are replicated in audit_record.h for the benefit of + * the FreeBSD and Mac OS X kernels) */ -int au_bsm_to_errno(u_char bsm_error, int *errorp); -u_char au_errno_to_bsm(int error); -const char *au_strerror(u_char bsm_error); +int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); +int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_socket_type(u_short bsm_socket_type, + int *local_socket_typep); +u_short au_domain_to_bsm(int local_domain); +u_char au_errno_to_bsm(int local_errno); +u_short au_socket_type_to_bsm(int local_socket_type); + +const char *au_strerror(u_char bsm_error); +__END_DECLS /* * The remaining APIs are associated with Apple's BSM implementation, in ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure#4 (text) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha5. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1alpha4' -PACKAGE_STRING='OpenBSM 1.1alpha4' +PACKAGE_VERSION='1.1alpha5' +PACKAGE_STRING='OpenBSM 1.1alpha5' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1404,7 +1404,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha5:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1alpha4 +OpenBSM configure 1.1alpha5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1alpha4, which was +It was created by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -19076,7 +19076,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1alpha4 + VERSION=1.1alpha5 cat >>confdefs.h <<_ACEOF @@ -23584,7 +23584,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1alpha4, which was +This file was extended by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23637,7 +23637,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.1alpha4 +OpenBSM config.status 1.1alpha5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure.ac#4 (text) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $]) +AC_INIT([OpenBSM], [1.1alpha5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.am#2 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 $ # if USE_NATIVE_INCLUDES @@ -13,5 +13,5 @@ libauditd_la_SOURCES = \ auditd_lib.c -#man3_MANS = \ -# libauditd.3 +man3_MANS = \ + libauditd.3 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.in#2 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 $ # VPATH = @srcdir@ @@ -51,7 +51,7 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libauditd_la_LIBADD = @@ -71,6 +71,9 @@ $(LDFLAGS) -o $@ SOURCES = $(libauditd_la_SOURCES) DIST_SOURCES = $(libauditd_la_SOURCES) +man3dir = $(mandir)/man3 +NROFF = nroff +MANS = $(man3_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +191,9 @@ libauditd_la_SOURCES = \ auditd_lib.c +man3_MANS = \ + libauditd.3 + all: all-am .SUFFIXES: @@ -285,6 +291,51 @@ clean-libtool: -rm -rf .libs _libs +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 19 11:09:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FFA8106576F; Mon, 19 Jan 2009 11:09:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71078106579E for ; Mon, 19 Jan 2009 11:09:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 513DB8FC14 for ; Mon, 19 Jan 2009 11:09:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JB9Zba047956 for ; Mon, 19 Jan 2009 11:09:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JB9ZjJ047954 for perforce@freebsd.org; Mon, 19 Jan 2009 11:09:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 11:09:35 GMT Message-Id: <200901191109.n0JB9ZjJ047954@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 156379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 11:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=156379 Change 156379 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 11:09:12 Add a bit of a stub man page for pdfork(2) and friends. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Makefile.inc#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/fork.2#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#1 add Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Makefile.inc#5 (text+ko) ==== @@ -80,7 +80,8 @@ mq_close.2 mq_getattr.2 mq_notify.2 mq_open.2 mq_receive.2 mq_send.2 \ mq_setattr.2 \ msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \ - pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 ptrace.2 quotactl.2 \ + pathconf.2 pdfork.2 \ + pipe.2 poll.2 posix_openpt.2 profil.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 .if !defined(NO_P1003_1B) @@ -154,6 +155,9 @@ MLINKS+=ntp_adjtime.2 ntp_gettime.2 MLINKS+=open.2 openat.2 MLINKS+=pathconf.2 fpathconf.2 +MLINKS+=pdfork.2 pdgetpid.2 \ + pdfork.2 pdkill.2 \ + pdfork.2 pdwait4.2 MLINKS+=read.2 pread.2 read.2 preadv.2 read.2 readv.2 MLINKS+=readlink.2 readlinkat.2 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/fork.2#2 (text+ko) ==== @@ -122,6 +122,7 @@ .El .Sh SEE ALSO .Xr execve 2 , +.Xr pdfork 2 , .Xr rfork 2 , .Xr setitimer 2 , .Xr setrlimit 2 , From owner-p4-projects@FreeBSD.ORG Mon Jan 19 11:13:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 835B31065B58; Mon, 19 Jan 2009 11:13:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0449D1065B3D for ; Mon, 19 Jan 2009 11:13:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B73A28FC31 for ; Mon, 19 Jan 2009 11:13:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JBDdH4048308 for ; Mon, 19 Jan 2009 11:13:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JBDdmO048306 for perforce@freebsd.org; Mon, 19 Jan 2009 11:13:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 11:13:39 GMT Message-Id: <200901191113.n0JBDdmO048306@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 156381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 11:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=156381 Change 156381 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 11:13:20 More decisively call pdwait4() pdwait(). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#23 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#9 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#24 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#16 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#24 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#24 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#24 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#24 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#2 (text+ko) ==== @@ -52,7 +52,7 @@ .Ft int .Fn pdkill "int fd" "int signum" .Ft int -.Fn pdwait4 "int fd" "int *status" "int options" "struct rusage *rusage" +.Fn pdwait "int fd" "int *status" "int options" "struct rusage *rusage" .Sh DESCRIPTION Process descriptors are special file descriptors that represent processes, and are created using @@ -74,7 +74,7 @@ .Fa fd , rather than a PID. .Pp -.Fn pdwait4 +.Fn pdwait is currently unimplemented, but in the future will be functionally identical to .Xr wait4 , @@ -111,7 +111,7 @@ .Tn TrustedBSD Project. .Sh BUGS -.Fn pdwait4 +.Fn pdwait is not yet implemented. .Pp WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED ON IN ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#23 (text+ko) ==== @@ -541,5 +541,5 @@ { AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 510 = pdfork */ { AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 511 = pdkill */ { AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 512 = pdgetpid */ - { AS(pdwait4_args), (sy_call_t *)pdwait4, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 513 = pdwait4 */ + { AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 }, /* 513 = pdwait */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#9 (text+ko) ==== @@ -706,7 +706,7 @@ } int -pdwait4(struct thread *td, struct pdwait4_args *uap) +pdwait(struct thread *td, struct pdwait_args *uap) { /* XXXRW: Not yet. */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#24 (text+ko) ==== @@ -520,5 +520,5 @@ "pdfork", /* 510 = pdfork */ "pdkill", /* 511 = pdkill */ "pdgetpid", /* 512 = pdgetpid */ - "pdwait4", /* 513 = pdwait4 */ + "pdwait", /* 513 = pdwait */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#16 (text+ko) ==== @@ -913,7 +913,7 @@ 510 AUE_NULL STD { int pdfork(int *fdp); } 511 AUE_NULL STD { int pdkill(int fd, int signum); } 512 AUE_NULL STD { int pdgetpid(int fd, pid_t *pidp); } -513 AUE_NULL STD { int pdwait4(int fd, int *status, \ +513 AUE_NULL STD { int pdwait(int fd, int *status, \ int options, struct rusage *rusage); } ; Please copy any additions and changes to the following compatability tables: ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#24 (text+ko) ==== @@ -3091,9 +3091,9 @@ *n_args = 2; break; } - /* pdwait4 */ + /* pdwait */ case 513: { - struct pdwait4_args *p = params; + struct pdwait_args *p = params; iarg[0] = p->fd; /* int */ uarg[1] = (intptr_t) p->status; /* int * */ iarg[2] = p->options; /* int */ @@ -8206,7 +8206,7 @@ break; }; break; - /* pdwait4 */ + /* pdwait */ case 513: switch(ndx) { case 0: ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#19 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 $ */ /* ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#24 (text+ko) ==== @@ -428,5 +428,5 @@ #define SYS_pdfork 510 #define SYS_pdkill 511 #define SYS_pdgetpid 512 -#define SYS_pdwait4 513 +#define SYS_pdwait 513 #define SYS_MAXSYSCALL 514 ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#24 (text+ko) ==== @@ -377,4 +377,4 @@ pdfork.o \ pdkill.o \ pdgetpid.o \ - pdwait4.o + pdwait.o ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#24 (text+ko) ==== @@ -1650,7 +1650,7 @@ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char pidp_l_[PADL_(pid_t *)]; pid_t * pidp; char pidp_r_[PADR_(pid_t *)]; }; -struct pdwait4_args { +struct pdwait_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)]; char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; @@ -2017,7 +2017,7 @@ int pdfork(struct thread *, struct pdfork_args *); int pdkill(struct thread *, struct pdkill_args *); int pdgetpid(struct thread *, struct pdgetpid_args *); -int pdwait4(struct thread *, struct pdwait4_args *); +int pdwait(struct thread *, struct pdwait_args *); #ifdef COMPAT_43 @@ -2618,7 +2618,7 @@ #define SYS_AUE_pdfork AUE_NULL #define SYS_AUE_pdkill AUE_NULL #define SYS_AUE_pdgetpid AUE_NULL -#define SYS_AUE_pdwait4 AUE_NULL +#define SYS_AUE_pdwait AUE_NULL #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Mon Jan 19 12:27:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9D8A1065678; Mon, 19 Jan 2009 12:27:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76DAB1065673 for ; Mon, 19 Jan 2009 12:27:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6353F8FC22 for ; Mon, 19 Jan 2009 12:27:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JCRtKq054812 for ; Mon, 19 Jan 2009 12:27:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JCRtBD054810 for perforce@freebsd.org; Mon, 19 Jan 2009 12:27:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 12:27:55 GMT Message-Id: <200901191227.n0JCRtBD054810@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 156382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 12:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=156382 Change 156382 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 12:27:34 Attempt to sort capability rights alphabetically by name, rather than definition order, so that it's easier to find them as a reader. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2008 Robert N. M. Watson +.\" Copyright (c) 2008-2009 Robert N. M. Watson .\" All rights reserved. .\" .\" WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -98,75 +98,41 @@ .Sh RIGHTS The following rights may be specified in a new capability rights mask: .Bl -tag -width CAP_EXTATTR_DELETE -.It Dv CAP_READ -Allow -.Xr aio_read 2 , -.Xr pread 2 , -.Xr read 2 , -.Xr recv 2 , -.Xr recvfrom 2 , -.Xr recvmsg 2 , -and related system calls. -.Pp -For files and other seekable objects, -.Dv CAP_SEEK -may also be required. -.Pp -.It Dv CAP_WRITE -Allow -.Xr aio_write 2 , -.Xr pwrite 2 , -.Xr send 2 , -.Xr sendmsg 2 , -.Xr sendto 2 , -.Xr write 2 , -and related system calls. -.Pp -For files and other seekable objects, -.Dv CAP_SEEK -may also be required. -.Pp -For -.Xr sendto 2 -with a non-NULL connection address, -.Dv CAP_CONNECT -is also required. -.It Dv CAP_SEEK -Permit operations that seek on the file descriptor, such as -.Xr lseek 2 , -but also required for I/O system calls that modify the file offset, such as -.Xr read 2 -and -.Xr write 2 . -.It Dv CAP_GETPEERNAME +.It Dv CAP_ACCEPT Permit -.Xr getpeername 2 . -.It Dv CAP_GETSOCKNAME +.Xr accept 2 . +.It Dv CAP_ACL_CHECK +Permit checking of an ACL on a file descriptor; there is no cross-reference +for this system call. +.It Dv CAP_ACL_DELETE Permit -.Xr getsockname 2 . -.It Dv CAP_FCHFLAGS +.Xr acl_delete_fd_np 2 . +.It Dv CAP_ACL_GET Permit -.Xr fchflags 2 . -.It Dv CAP_IOCTL +.Xr acl_get_fd 2 +and +.Xr acl_get_fd_np 2 . +.It Dv CAP_ACL_SET Permit -.Xr ioctl 2 . -Be aware that this system call has enourmous scope, including potentially -global scope for some objects. -.It Dv CAP_FSTAT +.Xr acl_set_fd 2 +and +.Xr acl_set_fd_np 2 . +.It Dv CAP_BIND Permit -.Xr fstat 2 . -.It Dv CAP_MMAP -Permit -.Xr mmap 2 ; -specific invocations may also require -.Dv CAP_READ +.Xr bind 2 . +Note that sockets can also become bound implicitly as a result of +.Xr connect 2 or -.Dv CAP_WRITE . -.It Dv CAP_FCNTL +.Xr send 2 , +and that socket options set with +.Xr setsockopt 2 +may also affect binding behavior. +.It Dv CAP_CONNECT Permit -.Xr fcntl 2 ; -be aware that this call provides indirect access to other operations, such as -.Xr flock 2 . +.Xr connect 2 ; +also required for +.Xr sendto 2 +with a non-NULL destination address. .It Dv CAP_EVENT Permit .Xr select 2 , @@ -174,116 +140,81 @@ and .Xr kevent 2 to be used in monitoring the file descriptor for events. -.It Dv CAP_FSYNC +.It Dv CAP_FEXECVE +Permit +.Xr fexecve 2 ; +.Dv CAP_READ +will also be required. +.It Dv CAP_EXTATTR_DELETE +Permit +.Xr extattr_delete_fd 2 . +.It Dv CAP_EXTATTR_GET +Permit +.Xr extattr_get_fd 2 . +.It Dv CAP_EXTATTR_LIST +Permit +.Xr extattr_list_fd 2 . +.It Dv CAP_EXTATTR_SET Permit -.Xr aio_fsync 2 -and -.Xr fsync 2 . -.Pp -.It Dv CAP_FCHOWN +.Xr extattr_set_fd 2 . +.It Dv CAP_FCHFLAGS Permit -.Xr fchown 2 . +.Xr fchflags 2 . .It Dv CAP_FCHMOD Permit .Xr fchmod 2 . -.It Dv CAP_FTRUNCATE +.It Dv CAP_FCHOWN +Permit +.Xr fchown 2 . +.It Dv CAP_FCNTL Permit -.Xr ftruncate 2 . +.Xr fcntl 2 ; +be aware that this call provides indirect access to other operations, such as +.Xr flock 2 . .It Dv CAP_FLOCK Permit .Xr flock 2 and related calls. -.It Dv CAP_FSTATFS -Permit -.Xr fstatfs 2 . -.It Dv CAP_REVOKE -Permit -.Xr frevoke 2 -in certain ABI compatibility modes that support this system call. -.It Dv CAP_FEXECVE -Permit -.Xr fexecve 2 ; -.Dv CAP_READ -will also be required. .It Dv CAP_FPATHCONF Permit .Xr fpathconf 2 . -.It Dv CAP_FUTIMES +.It Dv CAP_FSTAT Permit -.Xr futimes 2 . -.It Dv CAP_ACL_GET +.Xr fstat 2 . +.It Dv CAP_FSTATFS Permit -.Xr acl_get_fd 2 -and -.Xr acl_get_fd_np 2 . -.It Dv CAP_ACL_SET +.Xr fstatfs 2 . +.It Dv CAP_FSYNC Permit -.Xr acl_set_fd 2 +.Xr aio_fsync 2 and -.Xr acl_set_fd_np 2 . -.It Dv CAP_ACL_DELETE +.Xr fsync 2 . +.Pp +.It Dv CAP_FTRUNCATE Permit -.Xr acl_delete_fd_np 2 . -.It Dv CAP_ACL_CHECK -Permit checking of an ACL on a file descriptor; there is no cross-reference -for this system call. -.It Dv CAP_EXTATTR_GET +.Xr ftruncate 2 . +.It Dv CAP_FUTIMES Permit -.Xr extattr_get_fd 2 . -.It Dv CAP_EXTATTR_SET +.Xr futimes 2 . +.It Dv CAP_GETPEERNAME Permit -.Xr extattr_set_fd 2 . -.It Dv CAP_EXTATTR_DELETE +.Xr getpeername 2 . +.It Dv CAP_GETSOCKNAME Permit -.Xr extattr_delete_fd 2 . -.It Dv CAP_EXTATTR_LIST -Permit -.Xr extattr_list_fd 2 . -.It Dv CAP_MAC_GET -Permit -.Xr mac_get_fd 2 . -.It Dv CAP_MAC_SET -Permit -.Xr mac_set_fd 2 . -.It Dv CAP_ACCEPT -Permit -.Xr accept 2 . -.It Dv CAP_CONNECT -Permit -.Xr connect 2 ; -also required for -.Xr sendto 2 -with a non-NULL destination address. -.It Dv CAP_BIND -Permit -.Xr bind 2 . -Note that sockets can also become bound implicitly as a result of -.Xr connect 2 -or -.Xr send 2 , -and that socket options set with -.Xr setsockopt 2 -may also affect binding behavior. +.Xr getsockname 2 . .It Dv CAP_GETSOCKOPT Permit .Xr getsockopt 2 . -.It Dv CAP_SETSOCKOPT +.It Dv CAP_IOCTL Permit -.Xr setsockopt 2 ; -this controls various aspects of socket behavior and may affect binding, -connecting, and other behaviors with global scope. +.Xr ioctl 2 . +Be aware that this system call has enourmous scope, including potentially +global scope for some objects. .It Dv CAP_LISTEN Permit .Xr listen 2 ; not much use (generally) without .Dv CAP_BIND . -.It Dv CAP_SHUTDOWN -Permit explicit -.Xr shutdown 2 ; -closing the socket will also generally shut down any connections on it. -.It Dv CAP_PEELOFF -Permit -.Xr sctp_peeloff 2 . .It Dv CAP_LOOKUP Permit the file descriptor to be used as a starting directory for calls such as @@ -295,6 +226,50 @@ a global name space; see .Xr cap_enter 2 for details. +.It Dv CAP_MAC_GET +Permit +.Xr mac_get_fd 2 . +.It Dv CAP_MAC_SET +Permit +.Xr mac_set_fd 2 . +.It Dv CAP_MMAP +Permit +.Xr mmap 2 ; +specific invocations may also require +.Dv CAP_READ +or +.Dv CAP_WRITE . +.Pp +.It Dv CAP_PEELOFF +Permit +.Xr sctp_peeloff 2 . +.It Dv CAP_READ +Allow +.Xr aio_read 2 , +.Xr pread 2 , +.Xr read 2 , +.Xr recv 2 , +.Xr recvfrom 2 , +.Xr recvmsg 2 , +and related system calls. +.Pp +For files and other seekable objects, +.Dv CAP_SEEK +may also be required. +.It Dv CAP_REVOKE +Permit +.Xr frevoke 2 +in certain ABI compatibility modes that support this system call. +.It Dv CAP_SEEK +Permit operations that seek on the file descriptor, such as +.Xr lseek 2 , +but also required for I/O system calls that modify the file offset, such as +.Xr read 2 +and +.Xr write 2 . +.It Dv CAP_SEM_GETVALUE +Permit +.Xr sem_getvalue 3 . .It Dv CAP_SEM_POST Permit .Xr sem_post 3 . @@ -303,9 +278,34 @@ .Xr sem_wait 3 and .Xr sem_trywait 3 . -.It Dv CAP_SEM_GETVALUE +.It Dv CAP_SETSOCKOPT Permit -.Xr sem_getvalue 3 . +.Xr setsockopt 2 ; +this controls various aspects of socket behavior and may affect binding, +connecting, and other behaviors with global scope. +.It Dv CAP_SHUTDOWN +Permit explicit +.Xr shutdown 2 ; +closing the socket will also generally shut down any connections on it. +.It Dv CAP_WRITE +Allow +.Xr aio_write 2 , +.Xr pwrite 2 , +.Xr send 2 , +.Xr sendmsg 2 , +.Xr sendto 2 , +.Xr write 2 , +and related system calls. +.Pp +For files and other seekable objects, +.Dv CAP_SEEK +may also be required. +.Pp +For +.Xr sendto 2 +with a non-NULL connection address, +.Dv CAP_CONNECT +is also required. .El .Sh CAVEAT The From owner-p4-projects@FreeBSD.ORG Mon Jan 19 12:32:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2608C1065672; Mon, 19 Jan 2009 12:32:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D88B1106564A for ; Mon, 19 Jan 2009 12:31:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C66908FC17 for ; Mon, 19 Jan 2009 12:31:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JCVxgF055181 for ; Mon, 19 Jan 2009 12:31:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JCVxoI055179 for perforce@freebsd.org; Mon, 19 Jan 2009 12:31:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 12:31:59 GMT Message-Id: <200901191231.n0JCVxoI055179@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 156383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 12:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=156383 Change 156383 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 12:31:10 Add process descriptor capability definitions and cross-references, as well as a previously-missed description of CAP_KEVENT. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#7 (text+ko) ==== @@ -210,6 +210,12 @@ .Xr ioctl 2 . Be aware that this system call has enourmous scope, including potentially global scope for some objects. +.It Dv CAP_KEVENT +Permit +.Xr kevent 2 ; +.Dv CAP_EVENT +may also be required on file descriptors to be monitored using +.Xr kevent 2 . .It Dv CAP_LISTEN Permit .Xr listen 2 ; @@ -240,6 +246,15 @@ or .Dv CAP_WRITE . .Pp +.It Dv CAP_PDGETPID +Permit +.Xr pdgetpid 2 . +.It Dv CAP_PDKILL +Permit +.Xr pdkill 2 . +.It Dv CAP_PDWAIT +Permit +.Xr pdwait 2 . .It Dv CAP_PEELOFF Permit .Xr sctp_peeloff 2 . @@ -402,6 +417,9 @@ .Xr mq_open 2 , .Xr open 2 , .Xr openat 2 , +.Xr pdgetpid 2 , +.Xr pdkill 2 , +.Xr pdwait 2 , .Xr pipe 2 , .Xr poll 2 , .Xr pread 2 , From owner-p4-projects@FreeBSD.ORG Mon Jan 19 12:58:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 025331065675; Mon, 19 Jan 2009 12:58:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B310D1065673 for ; Mon, 19 Jan 2009 12:58:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A03E08FC1B for ; Mon, 19 Jan 2009 12:58:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JCwQgc067158 for ; Mon, 19 Jan 2009 12:58:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JCwQ1K067156 for perforce@freebsd.org; Mon, 19 Jan 2009 12:58:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 12:58:26 GMT Message-Id: <200901191258.n0JCwQ1K067156@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 156384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 12:58:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=156384 Change 156384 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 12:57:29 Update procstat(1) man page for capabilities and process descriptors. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.1#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.1#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007-2008 Robert N. M. Watson +.\" Copyright (c) 2007-2009 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -133,14 +133,18 @@ .It PRO network protocol .It NAME -file path or socket addresses (if available) +file path, process ID, or socket addresses (if available) .El .Pp The following file descriptor types may be displayed: .Pp .Bl -tag -width X -compact +.It a +capability .It c crypto +.It e +semaphore .It f fifo .It h @@ -151,6 +155,8 @@ message queue .It p pipe +.It P +process descriptor .It s socket .It t From owner-p4-projects@FreeBSD.ORG Mon Jan 19 13:34:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 140771065676; Mon, 19 Jan 2009 13:34:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8151106564A for ; Mon, 19 Jan 2009 13:34:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B60A78FC17 for ; Mon, 19 Jan 2009 13:34:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JDY7G6073819 for ; Mon, 19 Jan 2009 13:34:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JDY7Bu073817 for perforce@freebsd.org; Mon, 19 Jan 2009 13:34:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 13:34:07 GMT Message-Id: <200901191334.n0JDY7Bu073817@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 156385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 13:34:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156385 Change 156385 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 13:33:39 Don't need to cast f_data, it's a void * pointer. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#8 (text+ko) ==== @@ -156,7 +156,7 @@ error = EBADF; goto out; } - pd = (struct procdesc *)fp->f_data; + pd = fp->f_data; sx_slock(&proctree_lock); if (td->td_proc != NULL) { *p = pd->pd_proc; @@ -185,7 +185,7 @@ if (error) return (error); if (fp->f_type == DTYPE_PROCDESC) { - pd = (struct procdesc *)fp->f_data; + pd = fp->f_data; pid = pd->pd_pid; AUDIT_ARG(pid, pid); } else @@ -392,7 +392,7 @@ int revents; revents = 0; - pd = (struct procdesc *)fp->f_data; + pd = fp->f_data; PROCDESC_LOCK(pd); if (pd->pd_flags & PD_EXITED) revents |= POLLHUP; @@ -423,7 +423,7 @@ * died. For example, caching its credential data. */ bzero(sb, sizeof(*sb)); - pd = (struct procdesc *)fp->f_data; + pd = fp->f_data; sx_slock(&proctree_lock); if (pd->pd_proc != NULL) { PROC_LOCK(pd->pd_proc); From owner-p4-projects@FreeBSD.ORG Mon Jan 19 14:56:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C5B11065756; Mon, 19 Jan 2009 14:56:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09201106574A for ; Mon, 19 Jan 2009 14:56:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9AC98FC19 for ; Mon, 19 Jan 2009 14:56:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JEuVZv081219 for ; Mon, 19 Jan 2009 14:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JEuVHc081217 for perforce@freebsd.org; Mon, 19 Jan 2009 14:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 14:56:31 GMT Message-Id: <200901191456.n0JEuVHc081217@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 156386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 14:56:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=156386 Change 156386 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 14:55:40 Add kf_cap_rights to struct kinfo_filedesc, although need to check alignment. Add utility function cap_rights(), which the filedesc sysctl will use to export capability rights. Add utility function procdesc_pid(), which the filedesc sysctl will now use to export capability rights, instead of reaching inside struct procdesc. Rename fp to fp_procdesc for procdesc_new to make it clear what the file pointer is for in the prototype. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#15 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#9 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#15 (text+ko) ==== @@ -2980,11 +2980,12 @@ case DTYPE_CAPABILITY: kif->kf_type = KF_TYPE_CAPABILITY; + kif->kf_cap_rights = cap_rights(fp); break; case DTYPE_PROCDESC: kif->kf_type = KF_TYPE_PROCDESC; - kif->kf_pid = ((struct procdesc *)fp->f_data)->pd_pid; + kif->kf_pid = procdesc_pid(fp); break; default: ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#21 (text+ko) ==== @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#20 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#21 $"); #include #include @@ -184,6 +184,23 @@ } /* + * Extract rights from a capability for monitoring purposes -- not for use in + * any other way, as we want to keep all capability permission evaluation in + * this one file. + */ +cap_rights_t +cap_rights(struct file *fp_cap) +{ + struct capability *c; + + KASSERT(fp_cap->f_type == DTYPE_CAPABILITY, + ("cap_rights: !capability")); + + c = fp_cap->f_data; + return (c->cap_rights); +} + +/* * System call to enter capability mode for the process. */ int ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#9 (text+ko) ==== @@ -170,6 +170,22 @@ } /* + * Function to be used by procstat(1) sysctls when returning procdesc + * information. + */ +pid_t +procdesc_pid(struct file *fp_procdesc) +{ + struct procdesc *pd; + + KASSERT(fp_procdesc->f_type == DTYPE_PROCDESC, + ("procdesc_pid: !procdesc")); + + pd = fp_procdesc->f_data; + return (pd->pd_pid); +} + +/* * System call to return the pid of a process given its process descriptor. */ int @@ -203,7 +219,7 @@ * point, so procdesc_new() must succeed. */ void -procdesc_new(struct proc *p, struct file *fp) +procdesc_new(struct proc *p, struct file *fp_procdesc) { struct procdesc *pd; @@ -220,7 +236,8 @@ refcount_init(&pd->pd_refcount, 2); /* XXXRW: Why these flags? */ - finit(fp, FREAD | FWRITE, DTYPE_PROCDESC, pd, &procdesc_ops); + finit(fp_procdesc, FREAD | FWRITE, DTYPE_PROCDESC, pd, + &procdesc_ops); } static void ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#21 $ */ /* @@ -143,6 +143,14 @@ int cap_fextract(struct file *fp_cap, cap_rights_t rights, struct file **fpp); +/* + * For the purposes of procstat(1) and similar tools, allow kern_descrip.c to + * extract the rights from a capability. However, this should not be used by + * kernel code generally, instead cap_fextract() should be used in order to + * keep all access control in one place. + */ +cap_rights_t cap_rights(struct file *fp_cap); + #else /* !_KERNEL */ /* ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#4 (text+ko) ==== @@ -95,8 +95,9 @@ int procdesc_exit(struct proc *p); int procdesc_find(struct thread *td, int fd, cap_rights_t rights, struct proc **p); -void procdesc_new(struct proc *p, struct file *fp); -void procdesc_reap(struct proc *p); +void procdesc_new(struct proc *p, struct file *fp_procdesc); +pid_t procdesc_pid(struct file *fp_procdesc); +void procdesc_reap(struct proc *p); #else /* !_KERNEL */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#10 (text+ko) ==== @@ -327,7 +327,8 @@ struct sockaddr_storage kf_sa_local; /* Socket address. */ struct sockaddr_storage kf_sa_peer; /* Peer address. */ pid_t kf_pid; /* Process identifier. */ - int _kf_ispare[15]; /* Space for more stuff. */ + cap_rights_t kf_cap_rights; /* Capabiity rights. */ + int _kf_ispare[13]; /* Space for more stuff. */ /* Truncated before copyout in sysctl */ char kf_path[PATH_MAX]; /* Path to file, if any. */ }; From owner-p4-projects@FreeBSD.ORG Mon Jan 19 14:56:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AC610657C3; Mon, 19 Jan 2009 14:56:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 440001065754 for ; Mon, 19 Jan 2009 14:56:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16C678FC1A for ; Mon, 19 Jan 2009 14:56:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JEuVGc081224 for ; Mon, 19 Jan 2009 14:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JEuVEY081222 for perforce@freebsd.org; Mon, 19 Jan 2009 14:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 14:56:31 GMT Message-Id: <200901191456.n0JEuVEY081222@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 156387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 14:56:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=156387 Change 156387 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 14:55:53 Teach procstat to print out the mask of rights on a capability in file descriptor mode. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#10 (text+ko) ==== @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -131,6 +132,74 @@ printf("%s", addr); } +static struct cap_desc { + cap_rights_t cd_right; + const char *cd_desc; +} cap_desc[] = { + { CAP_READ, "rd" }, + { CAP_WRITE, "wr" }, + { CAP_SEEK, "se" }, + { CAP_GETPEERNAME, "pn" }, + { CAP_GETSOCKNAME, "sn" }, + { CAP_FCHFLAGS, "cf" }, + { CAP_IOCTL, "io" }, + { CAP_FSTAT, "fs" }, + { CAP_MMAP, "mm" }, + { CAP_FCNTL, "fc" }, + { CAP_EVENT, "ev" }, + { CAP_FSYNC, "fy" }, + { CAP_FCHOWN, "cn" }, + { CAP_FCHMOD, "cm" }, + { CAP_FTRUNCATE, "ft" }, + { CAP_FLOCK, "fl" }, + { CAP_FSTATFS, "sf" }, + { CAP_REVOKE, "rv" }, + { CAP_FEXECVE, "fe" }, + { CAP_FPATHCONF, "fp" }, + { CAP_FUTIMES, "fu" }, + { CAP_ACL_GET, "ag" }, + { CAP_ACL_SET, "as" }, + { CAP_ACL_DELETE, "ad" }, + { CAP_ACL_CHECK, "ac" }, + { CAP_EXTATTR_GET, "eg" }, + { CAP_EXTATTR_SET, "es" }, + { CAP_EXTATTR_DELETE, "ed" }, + { CAP_EXTATTR_LIST, "el" }, + { CAP_MAC_GET, "mg" }, + { CAP_MAC_SET, "ms" }, + { CAP_ACCEPT, "at" }, + { CAP_BIND, "bd" }, + { CAP_GETSOCKOPT, "gs" }, + { CAP_SETSOCKOPT, "ss" }, + { CAP_LISTEN, "ln" }, + { CAP_SHUTDOWN, "sh" }, + { CAP_PEELOFF, "pf" }, + { CAP_LOOKUP, "lo" }, + { CAP_SEM_POST, "sp" }, + { CAP_SEM_WAIT, "sw" }, + { CAP_SEM_GETVALUE, "sg" }, + { CAP_KEVENT, "ke" }, + { CAP_PDGETPID, "pg" }, + { CAP_PDWAIT, "pw" }, + { CAP_PDKILL, "pk" }, +}; +static const int cap_desc_count = sizeof(cap_desc) / + sizeof(cap_desc[0]); + +static void +print_capability(cap_rights_t rights) +{ + int count, i; + + count = 0; + for (i = 0; i < cap_desc_count; i++) { + if (rights & cap_desc[i].cd_right) { + printf("%s%s", count ? "," : "", cap_desc[i].cd_desc); + count++; + } + } +} + void procstat_files(pid_t pid, struct kinfo_proc *kipp) { @@ -323,6 +392,11 @@ } break; + case KF_TYPE_CAPABILITY: + printf("%-4s ", "-"); + print_capability(kif->kf_cap_rights); + break; + case KF_TYPE_PROCDESC: printf("%-3s %d", "-", kif->kf_pid); break; From owner-p4-projects@FreeBSD.ORG Mon Jan 19 15:15:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286D61065672; Mon, 19 Jan 2009 15:15:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D161A1065679 for ; Mon, 19 Jan 2009 15:15:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD0228FC1C for ; Mon, 19 Jan 2009 15:15:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JFFpYD083589 for ; Mon, 19 Jan 2009 15:15:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JFFpiL083585 for perforce@freebsd.org; Mon, 19 Jan 2009 15:15:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 15:15:51 GMT Message-Id: <200901191515.n0JFFpiL083585@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 156388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 15:15:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=156388 Change 156388 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 15:15:21 fork(), wait(), and kill() syscalls no longer required in capability mode, since we have process descriptor variations on these that are capability-centric. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#14 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#24 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#25 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#25 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#25 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#25 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#25 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#14 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#13 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#14 $ ## ## @@ -191,11 +191,6 @@ flock ## -## Allow fork(2). -## -fork - -## ## Allow fpathconf(2), subject to capability rights. ## fpathconf @@ -356,15 +351,6 @@ kmq_timedsend ## -## For now, don't allow kill(2) and friends, but in the future we will need -## something here to allow inter-process signalling and control. -## -## XXXRW: Revisit. -## -#kill -#killpg - -## ## Allow kqueue(2), we will control use. ## kqueue @@ -530,11 +516,6 @@ recvmsg ## -## Allow rfork(2). -## -rfork - -## ## Allow real-time scheduling primitives to be used. ## ## XXXRW: These require scoping. @@ -743,19 +724,6 @@ uuidgen ## -## Allow vfork(2). -## -vfork - -## -## For now, allow wait(2), wait4(2), etc. -## -## XXXRW: These require scoping. -## -wait -wait4 - -## ## Allow I/O-related file descriptors, subject to capability rights. ## write ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#24 (text+ko) ==== @@ -30,12 +30,12 @@ struct sysent sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = syscall */ { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED }, /* 2 = fork */ + { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = fork */ { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 3 = read */ { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 4 = write */ { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = open */ { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED }, /* 6 = close */ - { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, SYF_CAPENABLED }, /* 7 = wait4 */ + { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = wait4 */ { compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = old creat */ { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = link */ { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = unlink */ @@ -94,7 +94,7 @@ { compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0 }, /* 63 = old getkerninfo */ { compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 64 = old getpagesize */ { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 65 = msync */ - { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, SYF_CAPENABLED }, /* 66 = vfork */ + { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, 0 }, /* 66 = vfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = obsolete vwrite */ { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED }, /* 69 = sbrk */ @@ -112,7 +112,7 @@ { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED }, /* 81 = getpgrp */ { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 82 = setpgid */ { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 83 = setitimer */ - { compat(0,wait), AUE_WAIT4, NULL, 0, 0, SYF_CAPENABLED }, /* 84 = old wait */ + { compat(0,wait), AUE_WAIT4, NULL, 0, 0, 0 }, /* 84 = old wait */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 85 = swapon */ { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 86 = getitimer */ { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 87 = old gethostname */ @@ -279,7 +279,7 @@ { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 248 = ntp_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = nosys */ { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED }, /* 250 = minherit */ - { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, SYF_CAPENABLED }, /* 251 = rfork */ + { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, 0 }, /* 251 = rfork */ { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 252 = openbsd_poll */ { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED }, /* 253 = issetugid */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 254 = lchown */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#25 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#25 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#25 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#25 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#25 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 19 18:52:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A87C91065677; Mon, 19 Jan 2009 18:52:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35FF11065674 for ; Mon, 19 Jan 2009 18:52:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16F8C8FC14 for ; Mon, 19 Jan 2009 18:52:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JIqWqg013964 for ; Mon, 19 Jan 2009 18:52:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JIqWBH013962 for perforce@freebsd.org; Mon, 19 Jan 2009 18:52:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 18:52:32 GMT Message-Id: <200901191852.n0JIqWBH013962@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 156399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 18:52:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=156399 Change 156399 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 18:51:57 For better or worse, we really need sysarch() on amd64 and i386 in order to allow segment registers to be changed. Allow it in capability mode, but specifically disallow certain sysarch functions when in capability mode. This is a less robust approach since it requires carefully watching what gets adding to sysarch(). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/sys_machdep.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/sys_machdep.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/sys_machdep.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#15 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#25 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/sys_machdep.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/sys_machdep.c#2 (text+ko) ==== @@ -63,6 +63,10 @@ uint32_t i386base; uint64_t a64base; + /* + * XXXRW: As new operations are added here, check that they are safe + * in capability mode. + */ switch(uap->op) { case I386_GET_FSBASE: i386base = pcb->pcb_fsbase; ==== //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/sys_machdep.c#2 (text+ko) ==== @@ -104,6 +104,10 @@ { int error; + /* + * XXXRW: As new operations are added here, check that they are safe + * in capability mode. + */ switch (uap->op) { case ARM_SYNC_ICACHE : error = arm32_sync_icache(td, uap->parms); ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/sys_machdep.c#5 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.118 2008/10/23 15:53:51 des Exp $"); #include "opt_kstack_pages.h" +#include "opt_capabilities.h" #include "opt_mac.h" #include @@ -128,6 +129,10 @@ break; } + /* + * XXXRW: As new operations are added here, check that they are safe + * in capability mode. + */ switch(uap->op) { case I386_GET_LDT: error = i386_get_ldt(td, &kargs.largs); @@ -160,6 +165,10 @@ error = i386_set_ioperm(td, &kargs.iargs); break; case I386_VM86: +#ifdef CAPABILITIES + if (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) + return (EPERM); +#endif error = vm86_sysarch(td, uap->parms); break; case I386_GET_FSBASE: @@ -317,6 +326,10 @@ int i, error; char *iomap; +#ifdef CAPABILITIES + if (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) + return (EPERM); +#endif if ((error = priv_check(td, PRIV_IO)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#15 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#14 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#15 $ ## ## @@ -686,6 +686,13 @@ sys_exit ## +## sysarch(2) does rather diverse things, but is required on at least i386 +## in order to configure per-thread data. As such, it's scoped on each +## architecture. +## +sysarch + +## ## Allow thread operations operating only on current process. ## thr_create ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#25 (text+ko) ==== @@ -193,7 +193,7 @@ { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 162 = old getdomainname */ { compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 163 = old setdomainname */ { compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0, 0 }, /* 164 = old uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, 0 }, /* 165 = sysarch */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, SYF_CAPENABLED }, /* 165 = sysarch */ { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED }, /* 166 = rtprio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 168 = nosys */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/sys_machdep.c#2 (text+ko) ==== @@ -53,6 +53,10 @@ { int error; + /* + * XXXRW: As new operations are added here, check that they are safe + * in capability mode. + */ mtx_lock(&Giant); switch (uap->op) { case SPARC_SIGTRAMP_INSTALL: From owner-p4-projects@FreeBSD.ORG Mon Jan 19 18:54:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D14061065679; Mon, 19 Jan 2009 18:54:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EEAE1065672 for ; Mon, 19 Jan 2009 18:54:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61C1B8FC0A for ; Mon, 19 Jan 2009 18:54:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JIsZDX014109 for ; Mon, 19 Jan 2009 18:54:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0JIsZaP014107 for perforce@freebsd.org; Mon, 19 Jan 2009 18:54:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 18:54:35 GMT Message-Id: <200901191854.n0JIsZaP014107@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 156400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jan 2009 18:54:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=156400 Change 156400 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 18:53:48 Since we have CAP_IOCTL, allow ioctl() in capability mode, subject to the capability being set. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#26 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#15 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 $ ## ## @@ -326,7 +326,7 @@ ## ## XXXRW: This needs to be revisited. ## -#ioctl +ioctl ## ## Allow querying current process credential state. ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#26 (text+ko) ==== @@ -82,7 +82,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ + { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#26 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jan 20 09:33:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD8A61065672; Tue, 20 Jan 2009 09:33:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 643A6106566B for ; Tue, 20 Jan 2009 09:33:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3732E8FC0A for ; Tue, 20 Jan 2009 09:33:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0K9XUYa047480 for ; Tue, 20 Jan 2009 09:33:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0K9XUsU047478 for perforce@freebsd.org; Tue, 20 Jan 2009 09:33:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 20 Jan 2009 09:33:30 GMT Message-Id: <200901200933.n0K9XUsU047478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 09:33:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=156420 Change 156420 by hselasky@hselasky_laptop001 on 2009/01/20 09:33:13 Add USB quirk from "Andre Guibert de Bruet". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#38 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#24 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#24 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#38 (text+ko) ==== @@ -1504,6 +1504,7 @@ /* Ituner networks products */ product ITUNERNET USBLCD2X20 0x0002 USB-LCD 2x20 +product ITUNERNET USBLCD4X20 0xc001 USB-LCD 4x20 /* Jablotron products */ product JABLOTRON PC60B 0x0001 PC-60B ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#24 (text+ko) ==== @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: head/sys/dev/usb/usbdevs 187163 2009-01-13 19:01:25Z thompsa + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.393 2009/01/13 19:01:25 thompsa Exp */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ @@ -1511,6 +1511,7 @@ /* Ituner networks products */ #define USB_PRODUCT_ITUNERNET_USBLCD2X20 0x0002 /* USB-LCD 2x20 */ +#define USB_PRODUCT_ITUNERNET_USBLCD4X20 0xc001 /* USB-LCD 4x20 */ /* Jablotron products */ #define USB_PRODUCT_JABLOTRON_PC60B 0x0001 /* PC-60B */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#24 (text+ko) ==== @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: head/sys/dev/usb/usbdevs 187163 2009-01-13 19:01:25Z thompsa + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.393 2009/01/13 19:01:25 thompsa Exp */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ @@ -3401,6 +3401,12 @@ "USB-LCD 2x20", }, { + USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD4X20, + 0, + "I-Tuner Networks", + "USB-LCD 4x20", + }, + { USB_VENDOR_JABLOTRON, USB_PRODUCT_JABLOTRON_PC60B, 0, "Jablotron", ==== //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#12 (text+ko) ==== @@ -95,6 +95,7 @@ {USB_QUIRK_ENTRY(USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, {USB_QUIRK_ENTRY(USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, {USB_QUIRK_ENTRY(USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD4X20, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, {USB_QUIRK_ENTRY(USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, {USB_QUIRK_ENTRY(USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, {USB_QUIRK_ENTRY(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, From owner-p4-projects@FreeBSD.ORG Tue Jan 20 10:35:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8303B1065676; Tue, 20 Jan 2009 10:35:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40B7F1065673 for ; Tue, 20 Jan 2009 10:35:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 255CA8FC12 for ; Tue, 20 Jan 2009 10:35:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KAZXQI053307 for ; Tue, 20 Jan 2009 10:35:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KAZWgw053305 for perforce@freebsd.org; Tue, 20 Jan 2009 10:35:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Jan 2009 10:35:32 GMT Message-Id: <200901201035.n0KAZWgw053305@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 156422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 10:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=156422 Change 156422 by rwatson@rwatson_freebsd_capabilities on 2009/01/20 10:35:17 Remove no-obsolete KSE system calls from capability mode-enabled set, re-disable ioctl while I cogitate on it more. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#17 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#27 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#27 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#27 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#27 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#27 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#27 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#17 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#17 $ ## ## @@ -326,7 +326,7 @@ ## ## XXXRW: This needs to be revisited. ## -ioctl +#ioctl ## ## Allow querying current process credential state. @@ -356,18 +356,6 @@ kqueue ## -## Allow threading-related system calls. -## -## XXXRW: These are obsolete, remove? -## -kse_create -kse_exit -kse_release -kse_switchin -kse_thr_interrupt -kse_wakeup - -## ## Allow managing per-process timers. ## ktimer_create ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#27 (text+ko) ==== @@ -82,7 +82,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 54 = ioctl */ + { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#27 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#27 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#27 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#27 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#27 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jan 20 11:05:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AFEE1065672; Tue, 20 Jan 2009 11:05:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2390410656C4 for ; Tue, 20 Jan 2009 11:05:03 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1121C8FC1F for ; Tue, 20 Jan 2009 11:05:03 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KB52rD056504 for ; Tue, 20 Jan 2009 11:05:02 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KB5220056501 for perforce@freebsd.org; Tue, 20 Jan 2009 11:05:02 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 20 Jan 2009 11:05:02 GMT Message-Id: <200901201105.n0KB5220056501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 11:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=156423 Change 156423 by weongyo@weongyo_ws on 2009/01/20 11:04:42 add knobs to set or read `contry code' and `regdomain'. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uath.c#7 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uath.c#7 (text+ko) ==== @@ -112,9 +112,18 @@ #include #include +SYSCTL_NODE(_hw_usb, OID_AUTO, uath, CTLFLAG_RW, 0, "USB Atheros"); + +static int uath_countrycode = CTRY_DEFAULT; /* country code */ +SYSCTL_INT(_hw_usb_uath, OID_AUTO, countrycode, CTLFLAG_RW, &uath_countrycode, + 0, "country code"); +TUNABLE_INT("hw.usb.uath.countrycode", &uath_countrycode); +static int uath_regdomain = 0; /* regulatory domain */ +SYSCTL_INT(_hw_usb_uath, OID_AUTO, regdomain, CTLFLAG_RD, &uath_regdomain, + 0, "regulatory domain"); + #ifdef UATH_DEBUG int uath_debug = 0; -SYSCTL_NODE(_hw_usb, OID_AUTO, uath, CTLFLAG_RW, 0, "USB Atheros"); SYSCTL_INT(_hw_usb_uath, OID_AUTO, debug, CTLFLAG_RW, &uath_debug, 0, "uath debug level"); TUNABLE_INT("hw.usb.uath.debug", &uath_debug); @@ -415,6 +424,9 @@ IEEE80211_C_SHSLOT | /* short slot time supported */ IEEE80211_C_WPA; /* 802.11i */ + /* put a regulatory domain to reveal informations. */ + uath_regdomain = sc->sc_devcap.regDomain; + bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G); From owner-p4-projects@FreeBSD.ORG Tue Jan 20 11:16:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A78B3106566B; Tue, 20 Jan 2009 11:16:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60EC51065674 for ; Tue, 20 Jan 2009 11:16:18 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EAB78FC1C for ; Tue, 20 Jan 2009 11:16:18 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KBGHrD057344 for ; Tue, 20 Jan 2009 11:16:17 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KBGHsu057342 for perforce@freebsd.org; Tue, 20 Jan 2009 11:16:17 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 20 Jan 2009 11:16:17 GMT Message-Id: <200901201116.n0KBGHsu057342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 11:16:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=156424 Change 156424 by weongyo@weongyo_ws on 2009/01/20 11:16:02 add wireless modes supportted. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uathvar.h#4 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uathvar.h#4 (text+ko) ==== @@ -100,6 +100,11 @@ uint32_t numTxQueues; uint32_t connectionIdMax; uint32_t wirelessModes; +#define UATH_WIRELESS_MODE_11A 0x01 +#define UATH_WIRELESS_MODE_TURBO 0x02 +#define UATH_WIRELESS_MODE_11B 0x04 +#define UATH_WIRELESS_MODE_11G 0x08 +#define UATH_WIRELESS_MODE_108G 0x10 uint32_t chanSpreadSupport; uint32_t compressSupport; uint32_t burstSupport; From owner-p4-projects@FreeBSD.ORG Tue Jan 20 21:14:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A57DE1065674; Tue, 20 Jan 2009 21:14:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C4391065672 for ; Tue, 20 Jan 2009 21:14:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 497048FC17 for ; Tue, 20 Jan 2009 21:14:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KLEgie057895 for ; Tue, 20 Jan 2009 21:14:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KLEgKP057893 for perforce@freebsd.org; Tue, 20 Jan 2009 21:14:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Jan 2009 21:14:42 GMT Message-Id: <200901202114.n0KLEgKP057893@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 156442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 21:14:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=156442 Change 156442 by rwatson@rwatson_cinnamon_macosx on 2009/01/20 21:14:26 Correct typo. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#17 $ */ #include @@ -494,7 +494,7 @@ #else ERRNO_NO_LOCAL_MAPPING, #endif - ES("Malfored Macho file") }, + ES("Malformed Macho file") }, { BSM_ERRNO_EPOLICY, #ifdef EPOLICY EPOLICY, From owner-p4-projects@FreeBSD.ORG Tue Jan 20 22:57:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71E3710656D8; Tue, 20 Jan 2009 22:57:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23E29106566B for ; Tue, 20 Jan 2009 22:57:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12B6D8FC21 for ; Tue, 20 Jan 2009 22:57:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KMvQJh068525 for ; Tue, 20 Jan 2009 22:57:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KMvQ1t068523 for perforce@freebsd.org; Tue, 20 Jan 2009 22:57:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 20 Jan 2009 22:57:26 GMT Message-Id: <200901202257.n0KMvQ1t068523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 22:57:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=156447 Change 156447 by hselasky@hselasky_laptop001 on 2009/01/20 22:56:53 Add quirk for a mass storage device I've got. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#39 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#25 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#25 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#39 (text+ko) ==== @@ -1797,6 +1797,7 @@ /* Myson products */ product MYSON HEDEN 0x8818 USB-IDE +product MYSON STARREADER 0x9920 USB flash card adapter /* National Semiconductor */ product NATIONAL BEARPAW1200 0x1000 BearPaw 1200 ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#25 (text+ko) ==== @@ -1804,6 +1804,7 @@ /* Myson products */ #define USB_PRODUCT_MYSON_HEDEN 0x8818 /* USB-IDE */ +#define USB_PRODUCT_MYSON_STARREADER 0x9920 /* USB flash card adapter */ /* National Semiconductor */ #define USB_PRODUCT_NATIONAL_BEARPAW1200 0x1000 /* BearPaw 1200 */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#25 (text+ko) ==== @@ -4607,6 +4607,12 @@ "USB-IDE", }, { + USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, + 0, + "Myson Technology", + "USB flash card adapter", + }, + { USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200, 0, "National Semiconductor", ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#23 (text+ko) ==== @@ -612,6 +612,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_INQUIRY | IGNORE_RESIDUE }, + {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_SYNCHRONIZE_CACHE + }, {USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3260, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, FORCE_SHORT_INQUIRY From owner-p4-projects@FreeBSD.ORG Tue Jan 20 23:33:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0A2C1065673; Tue, 20 Jan 2009 23:33:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C271106566B for ; Tue, 20 Jan 2009 23:33:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A82F8FC17 for ; Tue, 20 Jan 2009 23:33:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KNX3CR072287 for ; Tue, 20 Jan 2009 23:33:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KNX3iK072285 for perforce@freebsd.org; Tue, 20 Jan 2009 23:33:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Jan 2009 23:33:03 GMT Message-Id: <200901202333.n0KNX3iK072285@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 156451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 23:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156451 Change 156451 by rwatson@rwatson_freebsd_capabilities on 2009/01/20 23:32:12 If a capability-mode process manages to get into namei(), print a stack trace if KDB is compiled into the kernel. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#6 (text+ko) ==== @@ -37,6 +37,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.117 2008/12/18 11:58:12 kib Exp $"); +#include "opt_kdb.h" #include "opt_ktrace.h" #include "opt_mac.h" @@ -54,6 +55,9 @@ #include #include #include +#ifdef KDB +#include +#endif #ifdef KTRACE #include #endif @@ -128,6 +132,14 @@ struct proc *p = td->td_proc; int vfslocked; +#ifdef KDB + if (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) { + printf("namei: pid %d proc %s performed namei in capability " + "mode\n", p->p_pid, p->p_comm); + kdb_backtrace(); + } +#endif + KASSERT((cnp->cn_flags & MPSAFE) != 0 || mtx_owned(&Giant) != 0, ("NOT MPSAFE and Giant not held")); ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_thread->td_ucred; From owner-p4-projects@FreeBSD.ORG Tue Jan 20 23:34:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D35961065674; Tue, 20 Jan 2009 23:34:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90584106566C for ; Tue, 20 Jan 2009 23:34:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7EAAA8FC12 for ; Tue, 20 Jan 2009 23:34:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KNY4CC072383 for ; Tue, 20 Jan 2009 23:34:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0KNY4GG072381 for perforce@freebsd.org; Tue, 20 Jan 2009 23:34:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Jan 2009 23:34:04 GMT Message-Id: <200901202334.n0KNY4GG072381@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 156452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jan 2009 23:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=156452 Change 156452 by rwatson@rwatson_freebsd_capabilities on 2009/01/20 23:33:35 When fexecve(2) is called on a dynamically linked ELF binary in capability mode, disallow access to the globally named interpreter, or specially crafted binaries may be able to gain access to files outside of the sandbox. For now we'll handle only statically linked code in capability mode, but later we'll do something more useful. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#4 (text+ko) ==== @@ -492,9 +492,14 @@ imgp->object = NULL; imgp->execlabel = NULL; + vfslocked = 0; + if (curthread->td_ucred->cr_flags & CRED_FLAG_CAPMODE) { + nd->ni_vp = NULL; + error = EPERM; + goto fail; + } NDINIT(nd, LOOKUP, MPSAFE|LOCKLEAF|FOLLOW, UIO_SYSSPACE, file, curthread); - vfslocked = 0; if ((error = namei(nd)) != 0) { nd->ni_vp = NULL; goto fail; From owner-p4-projects@FreeBSD.ORG Wed Jan 21 00:26:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6ACE1065793; Wed, 21 Jan 2009 00:26:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CE3D106575A for ; Wed, 21 Jan 2009 00:26:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 680578FC16 for ; Wed, 21 Jan 2009 00:26:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0L0Qwsf077926 for ; Wed, 21 Jan 2009 00:26:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0L0Qwra077924 for perforce@freebsd.org; Wed, 21 Jan 2009 00:26:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Jan 2009 00:26:58 GMT Message-Id: <200901210026.n0L0Qwra077924@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 156454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 00:27:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=156454 Change 156454 by rwatson@rwatson_freebsd_capabilities on 2009/01/21 00:26:55 When exporting file descriptor data via the filedesc sysctl for procstat, rather than exporting the capability, export the underlying object information and just set a flag indicating it is wrapped by a capability. Export the rights mask as well. Modify procstat to handle this by adding a new file descriptor flag field; for now, don't print capability rights as that is really too wide for the -f display by default, but in the future we may want to add a -C to enable capability mask printing. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#16 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#11 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#16 (text+ko) ==== @@ -2675,6 +2675,17 @@ so = NULL; tp = NULL; kif->kf_fd = i; + + /* + * When reporting a capability, most fields will be from the + * underlying object, but do mark as a capability. With + * ofiledesc, we don't have a field to export the + * cap_rights_t, but we do with the new filedesc. + */ + if (fp->f_type == DTYPE_CAPABILITY) { + kif->kf_flags |= KF_FLAG_CAPABILITY; + (void)cap_fextract(fp, 0, &fp); + } switch (fp->f_type) { case DTYPE_VNODE: kif->kf_type = KF_TYPE_VNODE; @@ -2721,10 +2732,6 @@ tp = fp->f_data; break; - case DTYPE_CAPABILITY: - kif->kf_type = KF_TYPE_CAPABILITY; - break; - case DTYPE_PROCDESC: kif->kf_type = KF_TYPE_PROCDESC; break; @@ -2933,6 +2940,17 @@ so = NULL; tp = NULL; kif->kf_fd = i; + + /* + * When reporting a capability, most fields will be from the + * underlying object, but do mark as a capability and export + * the capability rights mask. + */ + if (fp->f_type == DTYPE_CAPABILITY) { + kif->kf_flags |= KF_FLAG_CAPABILITY; + kif->kf_cap_rights = cap_rights(fp); + (void)cap_fextract(fp, 0, &fp); + } switch (fp->f_type) { case DTYPE_VNODE: kif->kf_type = KF_TYPE_VNODE; @@ -2977,10 +2995,6 @@ case DTYPE_PTS: kif->kf_type = KF_TYPE_PTS; tp = fp->f_data; - - case DTYPE_CAPABILITY: - kif->kf_type = KF_TYPE_CAPABILITY; - kif->kf_cap_rights = cap_rights(fp); break; case DTYPE_PROCDESC: ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#11 (text+ko) ==== @@ -252,7 +252,6 @@ #define KF_TYPE_SHM 8 #define KF_TYPE_SEM 9 #define KF_TYPE_PTS 10 -#define KF_TYPE_CAPABILITY 11 #define KF_TYPE_PROCDESC 12 #define KF_TYPE_UNKNOWN 255 @@ -279,6 +278,7 @@ #define KF_FLAG_NONBLOCK 0x00000020 #define KF_FLAG_DIRECT 0x00000040 #define KF_FLAG_HASLOCK 0x00000080 +#define KF_FLAG_CAPABILITY 0x00000100 /* * Old format. Has variable hidden padding due to alignment. ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#11 (text+ko) ==== @@ -132,6 +132,7 @@ printf("%s", addr); } +#if notyet static struct cap_desc { cap_rights_t cd_right; const char *cd_desc; @@ -199,6 +200,7 @@ } } } +#endif void procstat_files(pid_t pid, struct kinfo_proc *kipp) @@ -208,7 +210,7 @@ const char *str; if (!hflag) - printf("%5s %-16s %4s %1s %1s %-8s %3s %7s %-3s %-12s\n", + printf("%5s %-16s %4s %1s %1s %-9s %3s %7s %-3s %-12s\n", "PID", "COMM", "FD", "T", "V", "FLAGS", "REF", "OFFSET", "PRO", "NAME"); @@ -278,15 +280,6 @@ str = "e"; break; - case KF_TYPE_CAPABILITY: - /* - * XXXRW: Ideally, we'd display detailed information - * on the object behind the capability, and the - * rights on the capability. - */ - str = "a"; - break; - case KF_TYPE_PROCDESC: str = "P"; break; @@ -348,7 +341,8 @@ printf("%s", kif->kf_flags & KF_FLAG_FSYNC ? "f" : "-"); printf("%s", kif->kf_flags & KF_FLAG_NONBLOCK ? "n" : "-"); printf("%s", kif->kf_flags & KF_FLAG_DIRECT ? "d" : "-"); - printf("%s ", kif->kf_flags & KF_FLAG_HASLOCK ? "l" : "-"); + printf("%s", kif->kf_flags & KF_FLAG_HASLOCK ? "l" : "-"); + printf("%s ", kif->kf_flags & KF_FLAG_CAPABILITY ? "c" : "-"); if (kif->kf_ref_count > -1) printf("%3d ", kif->kf_ref_count); else @@ -392,11 +386,6 @@ } break; - case KF_TYPE_CAPABILITY: - printf("%-4s ", "-"); - print_capability(kif->kf_cap_rights); - break; - case KF_TYPE_PROCDESC: printf("%-3s %d", "-", kif->kf_pid); break; From owner-p4-projects@FreeBSD.ORG Wed Jan 21 11:58:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F27151065677; Wed, 21 Jan 2009 11:58:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B13A5106564A for ; Wed, 21 Jan 2009 11:58:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D0898FC1F for ; Wed, 21 Jan 2009 11:58:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LBwkj1084292 for ; Wed, 21 Jan 2009 11:58:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0LBwkLY084290 for perforce@freebsd.org; Wed, 21 Jan 2009 11:58:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Jan 2009 11:58:46 GMT Message-Id: <200901211158.n0LBwkLY084290@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 156463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 11:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=156463 Change 156463 by rwatson@rwatson_freebsd_capabilities on 2009/01/21 11:58:03 Teach procstat(1) how to print out, when an optional -C flag is specified, the capability mask associated with a file descriptor. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.1#6 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .Nd get detailed process information .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl hC .Op Fl w Ar interval .Op Fl b | c | f | k | s | t | v .Op Fl a | Ar pid ... @@ -83,6 +83,11 @@ .Fl w flag is not specified, the output will not repeat. .Pp +The +.Fl C +flag requests the printing of additional capability information in the file +descriptor view. +.Pp Some information, such as VM and file descriptor information, is available only to the owner of a process or the superuser. .Ss Binary Information @@ -111,7 +116,8 @@ Display detailed information about each file descriptor referenced by a process, including the process ID, command, file descriptor number, and per-file descriptor object information, such as object type and file system -path: +path. +By default, the following information will be printed: .Pp .Bl -tag -width indent -compact .It PID @@ -203,7 +209,17 @@ direct I/O .It l lock held +.It C +descriptor is a capability .El +.Pp +If the +.Fl C +flag is specified, the vnode type, reference count, and offset fields will be +omitted, and a new capabilities field will be included listing capabilities, +as described in +.Xr cap_new 2 , +present for each capability descriptor. .Ss Kernel Thread Stacks Display kernel thread stacks for a process, allowing further interpretation of thread wait channels. @@ -345,6 +361,7 @@ .Xr fstat 1 , .Xr ps 1 , .Xr sockstat 1 , +.Xr cap_new 2 , .Xr ddb 4 , .Xr stack 9 .Sh AUTHORS ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.c#4 (text+ko) ==== @@ -39,14 +39,14 @@ #include "procstat.h" static int aflag, bflag, cflag, fflag, kflag, sflag, tflag, vflag; -int hflag; +int hflag, Cflag; static void usage(void) { - fprintf(stderr, "usage: procstat [-h] [-w interval] [-b | -c | -f | " - "-k | -s | -t | -v]\n"); + fprintf(stderr, "usage: procstat [-hC] [-w interval] [-b | -c | -f " + " | -k | -s | -t | -v]\n"); fprintf(stderr, " [-a | pid ...]\n"); exit(EX_USAGE); } @@ -109,7 +109,7 @@ char *dummy; interval = 0; - while ((ch = getopt(argc, argv, "abcfkhstvw:")) != -1) { + while ((ch = getopt(argc, argv, "abcfkhstvw:C")) != -1) { switch (ch) { case 'a': aflag++; @@ -156,6 +156,10 @@ interval = l; break; + case 'C': + Cflag++; + break; + case '?': default: usage(); @@ -178,6 +182,10 @@ if (!(aflag == 1 && argc == 0) && !(aflag == 0 && argc > 0)) usage(); + /* Only allow -C with -f. */ + if (Cflag && !fflag) + usage(); + do { if (aflag) { name[0] = CTL_KERN; ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef PROCSTAT_H #define PROCSTAT_H -extern int hflag; +extern int hflag, Cflag; struct kinfo_proc; void kinfo_proc_sort(struct kinfo_proc *kipp, int count); ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#12 (text+ko) ==== @@ -132,7 +132,6 @@ printf("%s", addr); } -#if notyet static struct cap_desc { cap_rights_t cd_right; const char *cd_desc; @@ -184,42 +183,96 @@ { CAP_PDWAIT, "pw" }, { CAP_PDKILL, "pk" }, }; -static const int cap_desc_count = sizeof(cap_desc) / +static const u_int cap_desc_count = sizeof(cap_desc) / sizeof(cap_desc[0]); +static u_int +width_capability(cap_rights_t rights) +{ + u_int count, i, width; + + count = 0; + width = 0; + for (i = 0; i < cap_desc_count; i++) { + if (rights & cap_desc[i].cd_right) { + width += strlen(cap_desc[i].cd_desc); + if (count) + width++; + count++; + } + } + return (width); +} + static void -print_capability(cap_rights_t rights) +print_capability(cap_rights_t rights, u_int capwidth) { - int count, i; + u_int count, i, width; count = 0; + width = 0; + for (i = width_capability(rights); i < capwidth; i++) { + if (rights || i != (capwidth - 1)) + printf(" "); + else + printf("-"); + } for (i = 0; i < cap_desc_count; i++) { if (rights & cap_desc[i].cd_right) { printf("%s%s", count ? "," : "", cap_desc[i].cd_desc); + width += strlen(cap_desc[i].cd_desc); + if (count) + width++; count++; } } } -#endif void procstat_files(pid_t pid, struct kinfo_proc *kipp) { struct kinfo_file *freep, *kif; + u_int capwidth, width; int i, cnt; const char *str; - if (!hflag) - printf("%5s %-16s %4s %1s %1s %-9s %3s %7s %-3s %-12s\n", - "PID", "COMM", "FD", "T", "V", "FLAGS", "REF", "OFFSET", - "PRO", "NAME"); + /* + * To print the header in capability mode, we need to know the width + * of the widest capability string. Even if we get no processes + * back, we will print the header, so we defer aborting due to a lack + * of processes until after the header logic. + */ + capwidth = 0; + freep = kinfo_getfile(pid, &cnt); + if (freep != NULL && Cflag) { + for (i = 0; i < cnt; i++) { + kif = &freep[i]; + width = width_capability(kif->kf_cap_rights); + if (width > capwidth) + capwidth = width; + } + if (capwidth < strlen("CAPABILITIES")) + capwidth = strlen("CAPABILITIES"); + } + printf("capwidth: %d\n", capwidth); + + if (!hflag) { + if (Cflag) + printf("%5s %-16s %4s %1s %9s %-*s " + "%-3s %-12s\n", "PID", "COMM", "FD", "T", + "FLAGS", capwidth, "CAPABILITIES", "PRO", + "NAME"); + else + printf("%5s %-16s %4s %1s %1s %-9s %3s %7s %-3s " + "%-12s\n", "PID", "COMM", "FD", "T", "V", + "FLAGS", "REF", "OFFSET", "PRO", "NAME"); + } - freep = kinfo_getfile(pid, &cnt); if (freep == NULL) return; for (i = 0; i < cnt; i++) { kif = &freep[i]; - + printf("%5d ", pid); printf("%-16s ", kipp->ki_comm); switch (kif->kf_fd) { @@ -291,49 +344,51 @@ break; } printf("%1s ", str); - str = "-"; - if (kif->kf_type == KF_TYPE_VNODE) { - switch (kif->kf_vnode_type) { - case KF_VTYPE_VREG: - str = "r"; - break; + if (!Cflag) { + str = "-"; + if (kif->kf_type == KF_TYPE_VNODE) { + switch (kif->kf_vnode_type) { + case KF_VTYPE_VREG: + str = "r"; + break; - case KF_VTYPE_VDIR: - str = "d"; - break; + case KF_VTYPE_VDIR: + str = "d"; + break; - case KF_VTYPE_VBLK: - str = "b"; - break; + case KF_VTYPE_VBLK: + str = "b"; + break; - case KF_VTYPE_VCHR: - str = "c"; - break; + case KF_VTYPE_VCHR: + str = "c"; + break; - case KF_VTYPE_VLNK: - str = "l"; - break; + case KF_VTYPE_VLNK: + str = "l"; + break; - case KF_VTYPE_VSOCK: - str = "s"; - break; + case KF_VTYPE_VSOCK: + str = "s"; + break; - case KF_VTYPE_VFIFO: - str = "f"; - break; + case KF_VTYPE_VFIFO: + str = "f"; + break; - case KF_VTYPE_VBAD: - str = "x"; - break; + case KF_VTYPE_VBAD: + str = "x"; + break; - case KF_VTYPE_VNON: - case KF_VTYPE_UNKNOWN: - default: - str = "?"; - break; + case KF_VTYPE_VNON: + case KF_VTYPE_UNKNOWN: + default: + str = "?"; + break; + } } + printf("%1s ", str); } - printf("%1s ", str); printf("%s", kif->kf_flags & KF_FLAG_READ ? "r" : "-"); printf("%s", kif->kf_flags & KF_FLAG_WRITE ? "w" : "-"); printf("%s", kif->kf_flags & KF_FLAG_APPEND ? "a" : "-"); @@ -343,27 +398,50 @@ printf("%s", kif->kf_flags & KF_FLAG_DIRECT ? "d" : "-"); printf("%s", kif->kf_flags & KF_FLAG_HASLOCK ? "l" : "-"); printf("%s ", kif->kf_flags & KF_FLAG_CAPABILITY ? "c" : "-"); - if (kif->kf_ref_count > -1) - printf("%3d ", kif->kf_ref_count); - else - printf("%3c ", '-'); - if (kif->kf_offset > -1) - printf("%7jd ", (intmax_t)kif->kf_offset); - else - printf("%7c ", '-'); + if (!Cflag) { + if (kif->kf_ref_count > -1) + printf("%3d ", kif->kf_ref_count); + else + printf("%3c ", '-'); + if (kif->kf_offset > -1) + printf("%7jd ", (intmax_t)kif->kf_offset); + else + printf("%7c ", '-'); + } + + if (Cflag) { + print_capability(kif->kf_cap_rights, capwidth); + printf(" "); + } switch (kif->kf_type) { case KF_TYPE_VNODE: case KF_TYPE_FIFO: case KF_TYPE_PTS: printf("%-3s ", "-"); - printf("%-18s", kif->kf_path); break; case KF_TYPE_SOCKET: printf("%-3s ", protocol_to_string(kif->kf_sock_domain, kif->kf_sock_type, kif->kf_sock_protocol)); + break; + + case KF_TYPE_PROCDESC: + printf("%-3s %d", "-", kif->kf_pid); + break; + + default: + printf("%-3s ", "-"); + } + + switch (kif->kf_type) { + case KF_TYPE_VNODE: + case KF_TYPE_FIFO: + case KF_TYPE_PTS: + printf("%-18s", kif->kf_path); + + case KF_TYPE_SOCKET: /* * While generally we like to print two addresses, * local and peer, for sockets, it turns out to be @@ -387,11 +465,10 @@ break; case KF_TYPE_PROCDESC: - printf("%-3s %d", "-", kif->kf_pid); + printf("%d", kif->kf_pid); break; default: - printf("%-3s ", "-"); printf("%-18s", "-"); } From owner-p4-projects@FreeBSD.ORG Wed Jan 21 14:59:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC2A510656BA; Wed, 21 Jan 2009 14:59:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CBA81065689 for ; Wed, 21 Jan 2009 14:59:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 891058FC18 for ; Wed, 21 Jan 2009 14:59:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LExuoG014093 for ; Wed, 21 Jan 2009 14:59:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0LExu6F014091 for perforce@freebsd.org; Wed, 21 Jan 2009 14:59:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 21 Jan 2009 14:59:56 GMT Message-Id: <200901211459.n0LExu6F014091@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 156469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 14:59:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156469 Change 156469 by rwatson@rwatson_freebsd_capabilities on 2009/01/21 14:59:39 Update TODO -- a few things done, a few more things to do. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#10 (text+ko) ==== @@ -13,11 +13,11 @@ user databases, libraries, etc, with a POSIX interface within the capability mode process. -- Implement scoping for pid-based system calls, tracking a new "inheritence" - relationship to authorize such calls. Unclear what the most efficient way - to do this is, but it only matters for processes actually in capability - mode so won't affect general performance, just capability mode performance - until optimizations are found. +- Get shared objects working in capability mode by creating a cap_ld-elf.so + that will take the binary to run as a file descriptor argument in order + to avoid needing to run the interpreter directly from the fexecve(2) + context. Consider carefully the implications on creating binaries, ELF, + etc. - ... bigger and better things ... @@ -45,7 +45,3 @@ maxprot. - MAC control of capability facility. - -- fxecve(2) may allow eluding capability mode control due to evaluating - script interpreter entries on script file descriptors; when in capability - mode we must disallow script behavior. From owner-p4-projects@FreeBSD.ORG Wed Jan 21 16:53:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B97110656CA; Wed, 21 Jan 2009 16:53:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C79E610656C4 for ; Wed, 21 Jan 2009 16:53:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9487E8FC20 for ; Wed, 21 Jan 2009 16:53:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LGrtCL038954 for ; Wed, 21 Jan 2009 16:53:55 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0LGrtBr038952 for perforce@freebsd.org; Wed, 21 Jan 2009 16:53:55 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 21 Jan 2009 16:53:55 GMT Message-Id: <200901211653.n0LGrtBr038952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 16:53:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=156477 Change 156477 by rene@rene_self on 2009/01/21 16:53:02 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/www/en/gnome/images/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-1-tn.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-1.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-2-tn.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-2.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-3-tn.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-3.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-4-tn.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss222-4.png#2 delete .. //depot/projects/docproj_nl/www/en/gnome/images/ss224-1-tn.png#1 branch .. //depot/projects/docproj_nl/www/en/gnome/images/ss224-1.png#1 branch .. //depot/projects/docproj_nl/www/en/gnome/images/ss224-2-tn.png#1 branch .. //depot/projects/docproj_nl/www/en/gnome/images/ss224-2.png#1 branch .. //depot/projects/docproj_nl/www/en/gnome/screenshots.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/internal/machines.sgml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#26 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#13 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -1521,7 +1521,7 @@ questions. In particular, ports shown as maintained by - freebsd-ports@FreeBSD.org are + ports@FreeBSD.org are actually not maintained by anyone. Fixes and support, if any, come from the general community who subscribe to that mailing list. More volunteers are always needed! ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ + 7.1-STABLE after cpuctl(4) support + added. + 701102 + + + 8.0-CURRENT. Separating wide and single byte ctype. 800000 @@ -12386,6 +12392,10 @@ 8.0-CURRENT after the addition of makefs. 800060 + + 8.0-CURRENT after TCP Appropriate Byte Counting. + 800061 + @@ -12553,16 +12563,11 @@ If your port requires a certain user to be on the installed system, let the pkg-install script call pw to create it automatically. Look at - net/cvsup-mirror for an example. - Please note that this is strongly discouraged, please register - user/group ID numbers as stated below. - - If your port must use the same user/group ID number when it is - installed as a binary package as when it was compiled, then you must + sysutils/symon for an example. + Your port must use a fixed user/group ID number. You must choose a free UID from 50 to 999 and register it either in ports/UIDs (for users) or in - ports/GIDs (for groups). Look at - japanese/Wnn6 for an example. + ports/GIDs (for groups). Make sure you do not use a UID already used by the system or other ports. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1638,8 +1638,8 @@ In het bijzonder worden ports die geregistreerd staan als onderhouden door freebsd-ports@FreeBSD.org helemaal - niet onderhouden. Reparaties en ondersteuning, als die al + role="nolink">ports@FreeBSD.org helemaal niet + onderhouden. Reparaties en ondersteuning, als dat al beschikbaar is, komt vanuit de gemeenschap die is geabonneerd op die mailinglijst. Meer vrijwilligers zijn altijd nodig! From owner-p4-projects@FreeBSD.ORG Wed Jan 21 20:55:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CF1F10656FA; Wed, 21 Jan 2009 20:55:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F396310656F7 for ; Wed, 21 Jan 2009 20:55:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCD428FC1B for ; Wed, 21 Jan 2009 20:55:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LKt3Oo074596 for ; Wed, 21 Jan 2009 20:55:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0LKt3dI074585 for perforce@freebsd.org; Wed, 21 Jan 2009 20:55:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 21 Jan 2009 20:55:03 GMT Message-Id: <200901212055.n0LKt3dI074585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 156495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 20:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=156495 Change 156495 by gonzo@gonzo_pd on 2009/01/21 20:54:57 Create playground for FreeBSD/avr32 port Affected files ... .. //depot/projects/avr32/doc/Makefile#1 branch .. //depot/projects/avr32/doc/README#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/avr32/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/avr32/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/avr32/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/greek-language-support/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/linux-users/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/Makefile.inc#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/faq/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/faq/book.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/dtrace/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/filesystems/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/flyer/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/flyer/flyer.tex#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/books.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/translators.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/sgml/urls.ent#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/tools/checkupdate/Makefile#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#1 branch .. //depot/projects/avr32/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/cups/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/cups/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/gjournal-desktop/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/ldap-auth/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/ldap-auth/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/linux-emulation/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/linux-emulation/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/linux-users/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/remote-install/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/dtrace/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/filesystems/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-more-information.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/avr32/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fdp-es/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/updating/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/avr32/doc/es_ES.ISO8859-1/share/tools/checkupdate/notify#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/avr32/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/Makefile.inc#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/cups/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/laptop/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/laptop/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/linux-users/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/multi-os/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/multi-os/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/version-guide/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/Makefile.inc#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/faq/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/faq/book.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/fdp-primer/Makefile#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/avr32/doc/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 21 21:06:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0702E1065677; Wed, 21 Jan 2009 21:06:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 954931065670 for ; Wed, 21 Jan 2009 21:06:26 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe15.swipnet.se [212.247.155.193]) by mx1.freebsd.org (Postfix) with ESMTP id 2E8128FC14 for ; Wed, 21 Jan 2009 21:06:25 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=ZXpBrxmBn2QA:10 a=6I5d2MoRAAAA:8 a=3FYKAGVB4tU5DECQCigA:9 a=wBhnhNIM2Ztliv1T-GRaPNcal0YA:4 a=LY0hPdMaydYA:10 Received: from [85.19.218.115] (account mc467741@c2i.net HELO [10.37.1.92]) by mailfe15.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 437968064; Wed, 21 Jan 2009 22:06:24 +0100 From: Hans Petter Selasky To: Oleksandr Tymoshenko Date: Wed, 21 Jan 2009 22:08:38 +0100 User-Agent: KMail/1.9.7 References: <200901212055.n0LKt3dI074585@repoman.freebsd.org> In-Reply-To: <200901212055.n0LKt3dI074585@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901212208.39108.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 156495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 21:06:27 -0000 On Wednesday 21 January 2009, Oleksandr Tymoshenko wrote: > http://perforce.freebsd.org/chv.cgi?CH=156495 > > Change 156495 by gonzo@gonzo_pd on 2009/01/21 20:54:57 > > Create playground for FreeBSD/avr32 port > > Affected files ... > Hi, This is simply great news! Hope you get something compiling soon. I have my AVR-32 evaluation board waiting with regard to the USB bit ... --HPS From owner-p4-projects@FreeBSD.ORG Wed Jan 21 21:10:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40724106566C; Wed, 21 Jan 2009 21:10:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 004A51065670 for ; Wed, 21 Jan 2009 21:10:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1F528FC19 for ; Wed, 21 Jan 2009 21:10:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LLALGp077077 for ; Wed, 21 Jan 2009 21:10:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0LLAJBl077074 for perforce@freebsd.org; Wed, 21 Jan 2009 21:10:19 GMT (envelope-from jhb@freebsd.org) Date: Wed, 21 Jan 2009 21:10:19 GMT Message-Id: <200901212110.n0LLAJBl077074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 21:10:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=156498 Change 156498 by jhb@jhb_jhbbsd on 2009/01/21 21:09:25 IFC @156496 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#22 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#71 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#11 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/smpng/sys/conf/NOTES#159 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#23 integrate .. //depot/projects/smpng/sys/conf/options#159 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#21 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate .. //depot/projects/smpng/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/smpng/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/smpng/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/smpng/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/smpng/sys/dev/iicbus/iic.c#17 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#13 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#8 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#14 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#8 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#2 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#103 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#69 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#37 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#23 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#122 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#30 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2.c#4 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2_var.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_auereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdcereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cuereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_ruereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udavreg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydreg.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_fs.h#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_fs_sb.h#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_inode.c#6 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#19 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#103 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#127 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#88 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#91 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#176 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#61 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#160 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#91 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#39 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#3 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/smpng/sys/net/rtsock.c#67 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_deflate.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#34 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_pred1.c#4 integrate .. //depot/projects/smpng/sys/netinet/in.c#47 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#28 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#79 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#49 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#16 integrate .. //depot/projects/smpng/sys/powerpc/powermac/kiic.c#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pcpu.h#7 integrate .. //depot/projects/smpng/sys/sys/ktr.h#26 integrate .. //depot/projects/smpng/sys/sys/lock.h#52 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#23 integrate .. //depot/projects/smpng/sys/sys/sched.h#31 integrate .. //depot/projects/smpng/sys/sys/vnode.h#93 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#31 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#62 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#30 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#34 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#73 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#72 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#22 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.165 2009/01/20 12:07:49 kib Exp $ */ #include @@ -199,6 +199,7 @@ cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ +restore_fsbase: movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx @@ -281,7 +282,7 @@ movl PCB_DS(%r8),%ds movl PCB_ES(%r8),%es movl PCB_FS(%r8),%fs - jmp done_load_seg + jmp restore_fsbase /* Restore userland %gs while preserving kernel gsbase */ 2: movq PCPU(GS32P),%rax movq PCB_GS32SD(%r8),%rcx ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#71 (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.513 2009/01/13 12:35:33 luigi Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.518 2009/01/19 15:33:06 sobomax Exp $ cpu HAMMER ident GENERIC @@ -28,7 +28,7 @@ # through getenv() (or kenv(1) in userland). The format of the file # is 'variable=value', see kenv(1) # -# env "GENERIC.env" +# env "GENERIC.env" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -47,7 +47,6 @@ options NFSSERVER # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options NTFS # NT File System options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) @@ -69,8 +68,8 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -138,6 +137,8 @@ # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID device arcmsr # Areca SATA II RAID +#XXX it is not 64-bit clean, -scottl +#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x @@ -230,6 +231,7 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) +device stge # Sundance/Tamarack TC9021 gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet @@ -249,8 +251,8 @@ # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG # enable debug msgs -options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's +options IEEE80211_DEBUG # enable debug msgs +options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.11 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $"); #include #include @@ -199,9 +199,12 @@ goto out; } sc->host.f_min = 375000; - sc->host.f_max = 30000000; + sc->host.f_max = at91_master_clock / 2; /* Typically 30MHz */ sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; - sc->host.caps = MMC_CAP_4_BIT_DATA; + if (sc->wire4) + sc->host.caps = MMC_CAP_4_BIT_DATA; + else + sc->host.caps = 0; child = device_add_child(dev, "mmc", 0); device_set_ivars(dev, &sc->host); err = bus_generic_attach(dev); @@ -294,7 +297,7 @@ else clkdiv = (at91_master_clock / ios->clock) / 2; } - if (ios->bus_width == bus_width_4 && sc->wire4) + if (ios->bus_width == bus_width_4) WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS); else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); @@ -643,6 +646,9 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; + case MMCBR_IVAR_CAPS: + *(int *)result = sc->host.caps; + break; case MMCBR_IVAR_MAX_DATA: *(int *)result = 1; break; @@ -683,6 +689,7 @@ sc->host.ios.vdd = value; break; /* These are read-only */ + case MMCBR_IVAR_CAPS: case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: ==== //depot/projects/smpng/sys/arm/xscale/i8134x/i81342_mcu.c#2 (text+ko) ==== @@ -25,14 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_mcu.c,v 1.1 2007/07/27 14:50:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_mcu.c,v 1.2 2009/01/16 19:31:27 cognet Exp $"); #include #include #include #include #include -#include #include #include ==== //depot/projects/smpng/sys/conf/NOTES#159 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1521 2009/01/11 11:36:00 maxim Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1524 2009/01/20 02:08:21 sobomax Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -942,7 +942,12 @@ options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server options NFSLOCKD #Network Lock Manager -options NTFS #NT File System + +# NT File System. Read-mostly, see mount_ntfs(8) for details. +# For a full read-write NTFS support consider sysutils/fusefs-ntfs +# port/package. +options NTFS + options NULLFS #NULL filesystem # Broken (depends on NCP): #options NWFS #NetWare filesystem @@ -1370,6 +1375,10 @@ # 0x80 Put the video card in the VESA 800x600 dots, 16 color mode # 0x100 Probe for a keyboard device periodically if one is not present +# Enable experimental features of the syscons terminal emulator (teken). +options TEKEN_UTF8 # UTF-8 output handling +options TEKEN_XTERM # xterm-style terminal emulation + # # Optional devices: # ==== //depot/projects/smpng/sys/conf/newvers.sh#23 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.78 2008/10/03 10:08:36 bz Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.80 2009/01/20 21:37:41 thompsa Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -91,6 +91,9 @@ if [ -x "${dir}/svnversion" ]; then svnversion=${dir}/svnversion SRCDIR=${d##*obj} + if [ -n "$MACHINE" ]; then + SRCDIR=${SRCDIR##/$MACHINE} + fi SRCDIR=${SRCDIR%%/sys/*} break fi ==== //depot/projects/smpng/sys/conf/options#159 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.656 2009/01/12 11:24:32 qingli Exp $ +# $FreeBSD: src/sys/conf/options,v 1.657 2009/01/17 16:37:13 ed Exp $ # # On the handling of kernel options # @@ -726,6 +726,10 @@ SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +# teken terminal emulator options +TEKEN_UTF8 opt_teken.h +TEKEN_XTERM opt_teken.h + # options for printf PRINTF_BUFR_SIZE opt_printf.h ==== //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.15 2008/12/02 21:37:28 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.16 2009/01/21 20:44:42 jkim Exp $ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ /* @@ -910,7 +910,7 @@ if (status != 0) return; -#if (__FreeBSD_version >= 800050) && (defined(__amd64__) || defined(__i386__)) +#if (__FreeBSD_version >= 701102) && (defined(__amd64__) || defined(__i386__)) /* If TSC is P-state invariant, don't do anything. */ if (tsc_is_invariant) return; ==== //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.26 2007/11/20 18:35:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.27 2009/01/17 17:40:44 mav Exp $"); #include "opt_acpi.h" #include @@ -197,7 +197,7 @@ * is 0 (due to some error reading the battery), skip this * conversion. */ - if (bif->units == ACPI_BIF_UNITS_MA && bif->dvol != 0) { + if (bif->units == ACPI_BIF_UNITS_MA && bif->dvol != 0 && dev == NULL) { bst[i].rate = (bst[i].rate * bif->dvol) / 1000; bst[i].cap = (bst[i].cap * bif->dvol) / 1000; bif->lfcap = (bif->lfcap * bif->dvol) / 1000; ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_regdomain.c,v 1.24 2008/11/27 22:29:27 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_regdomain.c,v 1.2 2009/01/16 20:44:45 sam Exp $ */ #include "opt_ah.h" @@ -1231,9 +1231,18 @@ {.regDmnEnum = DEBUG_REG_DMN, .conformanceTestLimit = FCC, .dfsMask = DFS_FCC3, - .chan11a = BM3(F1_5120_5240, F1_5260_5700, F1_5745_5825), - .chan11a_half = BM3(F2_5120_5240, F2_5260_5700, F7_5745_5825), - .chan11a_quarter = BM3(F3_5120_5240, F3_5260_5700, F8_5745_5825), + .chan11a = BM4(F1_4950_4980, + F1_5120_5240, + F1_5260_5700, + F1_5745_5825), + .chan11a_half = BM4(F1_4945_4985, + F2_5120_5240, + F2_5260_5700, + F7_5745_5825), + .chan11a_quarter = BM4(F1_4942_4987, + F3_5120_5240, + F3_5260_5700, + F8_5745_5825), .chan11a_turbo = BM8(T1_5130_5210, T1_5250_5330, T1_5370_5490, ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_misc.c,v 1.7 2008/11/27 22:29:52 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c,v 1.2 2009/01/21 02:53:00 sam Exp $ */ #include "opt_ah.h" @@ -432,7 +432,7 @@ } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } } ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c,v 1.2 2008/12/11 04:03:50 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c,v 1.3 2009/01/21 02:53:00 sam Exp $ */ #include "opt_ah.h" @@ -453,7 +453,7 @@ } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } } ==== //depot/projects/smpng/sys/dev/iicbus/iic.c#17 (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/dev/iicbus/iic.c,v 1.41 2009/01/06 17:23:37 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.42 2009/01/15 23:14:59 nwhitehorn Exp $ * */ #include @@ -110,14 +110,18 @@ { if (device_find_child(parent, "iic", -1) == NULL) - BUS_ADD_CHILD(parent, 0, "iic", 0); + BUS_ADD_CHILD(parent, 0, "iic", -1); } static int iic_probe(device_t dev) { + if (iicbus_get_addr(dev) > 0) + return (ENXIO); + device_set_desc(dev, "I2C generic I/O"); - return (BUS_PROBE_NOWILDCARD); + + return (0); } static int ==== //depot/projects/smpng/sys/dev/iicbus/iicbus.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.27 2009/01/15 02:46:43 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.28 2009/01/20 00:05:43 nwhitehorn Exp $"); /* * Autoconfiguration and support routines for the Philips serial I2C bus @@ -55,7 +55,7 @@ device_set_desc(dev, "Philips I2C bus"); /* Allow other subclasses to override this driver. */ - return (-1000); + return (BUS_PROBE_GENERIC); } #if SCAN_IICBUS ==== //depot/projects/smpng/sys/dev/mmc/mmc.c#8 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.28 2008/12/06 21:41:27 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.32 2009/01/21 17:49:23 imp Exp $"); #include #include @@ -340,7 +340,9 @@ memset(cmd->resp, 0, sizeof(cmd->resp)); cmd->retries = retries; mreq.cmd = cmd; -/* printf("CMD: %x ARG %x\n", cmd->opcode, cmd->arg); */ + if (bootverbose) + device_printf(sc->dev, "CMD: %#x ARG %#x\n", cmd->opcode, + cmd->arg); mmc_wait_for_req(sc, &mreq); return (cmd->error); } @@ -584,11 +586,11 @@ static int mmc_set_card_bus_width(struct mmc_softc *sc, uint16_t rca, int width) { + struct mmc_command cmd; int err; + uint8_t value; if (mmcbr_get_mode(sc->dev) == mode_sd) { - struct mmc_command cmd; - memset(&cmd, 0, sizeof(struct mmc_command)); cmd.opcode = ACMD_SET_BUS_WIDTH; cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; @@ -604,8 +606,6 @@ } err = mmc_wait_for_app_cmd(sc, rca, &cmd, CMD_RETRIES); } else { - uint8_t value; - switch (width) { case bus_width_1: value = EXT_CSD_BUS_WIDTH_1; @@ -619,7 +619,8 @@ default: return (MMC_ERR_INVALID); } - err = mmc_switch(sc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH, value); + err = mmc_switch(sc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH, + value); } return (err); } @@ -629,6 +630,7 @@ { int err; uint8_t value; + u_char switch_res[64]; switch (timing) { case bus_timing_normal: @@ -640,14 +642,11 @@ default: return (MMC_ERR_INVALID); } - if (mmcbr_get_mode(sc->dev) == mode_sd) { - u_char switch_res[64]; - + if (mmcbr_get_mode(sc->dev) == mode_sd) err = mmc_sd_switch(sc, 1, 0, value, switch_res); - } else { + else err = mmc_switch(sc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, value); - } return (err); } @@ -1119,6 +1118,7 @@ mmc_app_send_scr(sc, ivar->rca, ivar->raw_scr); mmc_app_decode_scr(ivar->raw_scr, &ivar->scr); /* Get card switch capabilities. */ + ivar->timing = bus_timing_normal; if ((ivar->scr.sda_vsn >= 1) && (ivar->csd.ccc & (1<<10))) { mmc_sd_switch(sc, 0, 0, 0xF, switch_res); @@ -1255,8 +1255,12 @@ mmcbr_set_mode(dev, mode_sd); mmc_power_up(sc); mmcbr_set_bus_mode(dev, pushpull); + if (bootverbose) + device_printf(sc->dev, "Idle cards for SD probe\n"); mmc_idle_cards(sc); err = mmc_send_if_cond(sc, 1); + if (bootverbose) + device_printf(sc->dev, "SD: SEND_IF_CONF %d\n", err); if (mmc_send_app_op_cond(sc, err ? 0 : MMC_OCR_CCS, &ocr) != MMC_ERR_NONE) { /* @@ -1326,7 +1330,7 @@ max_timing = ivar->timing; if (ivar->tran_speed < max_dtr) max_dtr = ivar->tran_speed; - if (ivar->hs_tran_speed < max_dtr) + if (ivar->hs_tran_speed < max_hs_dtr) max_hs_dtr = ivar->hs_tran_speed; } for (i = 0; i < nkid; i++) { ==== //depot/projects/smpng/sys/dev/msk/if_msk.c#14 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.37 2009/01/14 05:08:52 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.38 2009/01/16 08:06:55 yongari Exp $"); #include #include @@ -291,6 +291,11 @@ static void msk_setvlan(struct msk_if_softc *, struct ifnet *); static void msk_setpromisc(struct msk_if_softc *); +static void msk_stats_clear(struct msk_if_softc *); +static void msk_stats_update(struct msk_if_softc *); +static int msk_sysctl_stat32(SYSCTL_HANDLER_ARGS); +static int msk_sysctl_stat64(SYSCTL_HANDLER_ARGS); +static void msk_sysctl_node(struct msk_if_softc *); static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int, int); static int sysctl_hw_msk_proc_limit(SYSCTL_HANDLER_ARGS); @@ -1435,6 +1440,7 @@ callout_init_mtx(&sc_if->msk_tick_ch, &sc_if->msk_softc->msk_mtx, 0); TASK_INIT(&sc_if->msk_link_task, 0, msk_link_task, sc_if); + msk_sysctl_node(sc_if); /* Disable jumbo frame for Yukon FE. */ if (sc_if->msk_softc->msk_hw_id == CHIP_ID_YUKON_FE) @@ -3544,15 +3550,8 @@ /* Dummy read the Interrupt Source Register. */ CSR_READ_1(sc, MR_ADDR(sc_if->msk_port, GMAC_IRQ_SRC)); - /* Set MIB Clear Counter Mode. */ - gmac = GMAC_READ_2(sc, sc_if->msk_port, GM_PHY_ADDR); - GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac | GM_PAR_MIB_CLR); - /* Read all MIB Counters with Clear Mode set. */ - for (i = 0; i < GM_MIB_CNT_SIZE; i++) - GMAC_READ_2(sc, sc_if->msk_port, GM_MIB_CNT_BASE + 8 * i); - /* Clear MIB Clear Counter Mode. */ - gmac &= ~GM_PAR_MIB_CLR; - GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac); + /* Clear MIB stats. */ + msk_stats_clear(sc_if); /* Disable FCS. */ GMAC_WRITE_2(sc, sc_if->msk_port, GM_RX_CTRL, GM_RXCR_CRC_DIS); @@ -3838,6 +3837,8 @@ GMAC_WRITE_2(sc, sc_if->msk_port, GM_GP_CTRL, val); /* Read again to ensure writing. */ GMAC_READ_2(sc, sc_if->msk_port, GM_GP_CTRL); + /* Update stats and clear counters. */ + msk_stats_update(sc_if); /* Stop Tx BMU. */ CSR_WRITE_4(sc, Q_ADDR(sc_if->msk_txq, Q_CSR), BMU_STOP); @@ -3953,6 +3954,295 @@ sc_if->msk_link = 0; } +/* + * When GM_PAR_MIB_CLR bit of GM_PHY_ADDR is set, reading lower + * counter clears high 16 bits of the counter such that accessing + * lower 16 bits should be the last operation. + */ +#define MSK_READ_MIB32(x, y) \ + (((uint32_t)GMAC_READ_2(sc, x, (y) + 4)) << 16) + \ + (uint32_t)GMAC_READ_2(sc, x, y) +#define MSK_READ_MIB64(x, y) \ + (((uint64_t)MSK_READ_MIB32(x, (y) + 8)) << 32) + \ + (uint64_t)MSK_READ_MIB32(x, y) + +static void +msk_stats_clear(struct msk_if_softc *sc_if) +{ + struct msk_softc *sc; + uint32_t reg; + uint16_t gmac; + int i; + + MSK_IF_LOCK_ASSERT(sc_if); + + sc = sc_if->msk_softc; + /* Set MIB Clear Counter Mode. */ + gmac = GMAC_READ_2(sc, sc_if->msk_port, GM_PHY_ADDR); + GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac | GM_PAR_MIB_CLR); + /* Read all MIB Counters with Clear Mode set. */ + for (i = GM_RXF_UC_OK; i <= GM_TXE_FIFO_UR; i++) + reg = MSK_READ_MIB32(sc_if->msk_port, i); + /* Clear MIB Clear Counter Mode. */ + gmac &= ~GM_PAR_MIB_CLR; + GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac); +} + +static void +msk_stats_update(struct msk_if_softc *sc_if) +{ + struct msk_softc *sc; + struct ifnet *ifp; + struct msk_hw_stats *stats; + uint16_t gmac; + uint32_t reg; + + MSK_IF_LOCK_ASSERT(sc_if); + + ifp = sc_if->msk_ifp; + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + return; + sc = sc_if->msk_softc; + stats = &sc_if->msk_stats; + /* Set MIB Clear Counter Mode. */ + gmac = GMAC_READ_2(sc, sc_if->msk_port, GM_PHY_ADDR); + GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac | GM_PAR_MIB_CLR); + + /* Rx stats. */ + stats->rx_ucast_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_UC_OK); + stats->rx_bcast_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_BC_OK); + stats->rx_pause_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_MPAUSE); + stats->rx_mcast_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_MC_OK); + stats->rx_crc_errs += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_FCS_ERR); + reg = MSK_READ_MIB32(sc_if->msk_port, GM_RXF_SPARE1); + stats->rx_good_octets += + MSK_READ_MIB64(sc_if->msk_port, GM_RXO_OK_LO); + stats->rx_bad_octets += + MSK_READ_MIB64(sc_if->msk_port, GM_RXO_ERR_LO); + stats->rx_runts += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_SHT); + stats->rx_runt_errs += + MSK_READ_MIB32(sc_if->msk_port, GM_RXE_FRAG); + stats->rx_pkts_64 += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_64B); + stats->rx_pkts_65_127 += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_127B); + stats->rx_pkts_128_255 += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_255B); + stats->rx_pkts_256_511 += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_511B); + stats->rx_pkts_512_1023 += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_1023B); + stats->rx_pkts_1024_1518 += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_1518B); + stats->rx_pkts_1519_max += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_MAX_SZ); + stats->rx_pkts_too_long += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_LNG_ERR); + stats->rx_pkts_jabbers += + MSK_READ_MIB32(sc_if->msk_port, GM_RXF_JAB_PKT); + reg = MSK_READ_MIB32(sc_if->msk_port, GM_RXF_SPARE2); + stats->rx_fifo_oflows += + MSK_READ_MIB32(sc_if->msk_port, GM_RXE_FIFO_OV); + reg = MSK_READ_MIB32(sc_if->msk_port, GM_RXF_SPARE3); + + /* Tx stats. */ + stats->tx_ucast_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_UC_OK); + stats->tx_bcast_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_BC_OK); + stats->tx_pause_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_MPAUSE); + stats->tx_mcast_frames += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_MC_OK); + stats->tx_octets += + MSK_READ_MIB64(sc_if->msk_port, GM_TXO_OK_LO); + stats->tx_pkts_64 += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_64B); + stats->tx_pkts_65_127 += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_127B); + stats->tx_pkts_128_255 += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_255B); + stats->tx_pkts_256_511 += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_511B); + stats->tx_pkts_512_1023 += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_1023B); + stats->tx_pkts_1024_1518 += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_1518B); + stats->tx_pkts_1519_max += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_MAX_SZ); + reg = MSK_READ_MIB32(sc_if->msk_port, GM_TXF_SPARE1); + stats->tx_colls += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_COL); + stats->tx_late_colls += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_LAT_COL); + stats->tx_excess_colls += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_ABO_COL); + stats->tx_multi_colls += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_MUL_COL); + stats->tx_single_colls += + MSK_READ_MIB32(sc_if->msk_port, GM_TXF_SNG_COL); + stats->tx_underflows += + MSK_READ_MIB32(sc_if->msk_port, GM_TXE_FIFO_UR); + /* Clear MIB Clear Counter Mode. */ + gmac &= ~GM_PAR_MIB_CLR; + GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac); +} + +static int +msk_sysctl_stat32(SYSCTL_HANDLER_ARGS) +{ + struct msk_softc *sc; + struct msk_if_softc *sc_if; + uint32_t result, *stat; + int off; + + sc_if = (struct msk_if_softc *)arg1; + sc = sc_if->msk_softc; + off = arg2; + stat = (uint32_t *)((uint8_t *)&sc_if->msk_stats + off); + + MSK_IF_LOCK(sc_if); + result = MSK_READ_MIB32(sc_if->msk_port, GM_MIB_CNT_BASE + off * 2); + result += *stat; + MSK_IF_UNLOCK(sc_if); + + return (sysctl_handle_int(oidp, &result, 0, req)); +} + +static int +msk_sysctl_stat64(SYSCTL_HANDLER_ARGS) +{ + struct msk_softc *sc; + struct msk_if_softc *sc_if; + uint64_t result, *stat; + int off; + + sc_if = (struct msk_if_softc *)arg1; + sc = sc_if->msk_softc; + off = arg2; + stat = (uint64_t *)((uint8_t *)&sc_if->msk_stats + off); + + MSK_IF_LOCK(sc_if); + result = MSK_READ_MIB64(sc_if->msk_port, GM_MIB_CNT_BASE + off * 2); + result += *stat; + MSK_IF_UNLOCK(sc_if); + + return (sysctl_handle_quad(oidp, &result, 0, req)); +} + +#undef MSK_READ_MIB32 +#undef MSK_READ_MIB64 + +#define MSK_SYSCTL_STAT32(sc, c, o, p, n, d) \ + SYSCTL_ADD_PROC(c, p, OID_AUTO, o, CTLTYPE_UINT | CTLFLAG_RD, \ + sc, offsetof(struct msk_hw_stats, n), msk_sysctl_stat32, \ + "IU", d) +#define MSK_SYSCTL_STAT64(sc, c, o, p, n, d) \ + SYSCTL_ADD_PROC(c, p, OID_AUTO, o, CTLTYPE_UINT | CTLFLAG_RD, \ + sc, offsetof(struct msk_hw_stats, n), msk_sysctl_stat64, \ + "Q", d) + +static void +msk_sysctl_node(struct msk_if_softc *sc_if) +{ + struct sysctl_ctx_list *ctx; + struct sysctl_oid_list *child, *schild; + struct sysctl_oid *tree; + + ctx = device_get_sysctl_ctx(sc_if->msk_if_dev); + child = SYSCTL_CHILDREN(device_get_sysctl_tree(sc_if->msk_if_dev)); + + tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD, + NULL, "MSK Statistics"); + schild = child = SYSCTL_CHILDREN(tree); + tree = SYSCTL_ADD_NODE(ctx, schild, OID_AUTO, "rx", CTLFLAG_RD, + NULL, "MSK RX Statistics"); + child = SYSCTL_CHILDREN(tree); + MSK_SYSCTL_STAT32(sc_if, ctx, "ucast_frames", + child, rx_ucast_frames, "Good unicast frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "bcast_frames", + child, rx_bcast_frames, "Good broadcast frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "pause_frames", + child, rx_pause_frames, "Pause frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "mcast_frames", + child, rx_mcast_frames, "Multicast frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "crc_errs", + child, rx_crc_errs, "CRC errors"); + MSK_SYSCTL_STAT64(sc_if, ctx, "good_octets", + child, rx_good_octets, "Good octets"); + MSK_SYSCTL_STAT64(sc_if, ctx, "bad_octets", + child, rx_bad_octets, "Bad octets"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_64", + child, rx_pkts_64, "64 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_65_127", + child, rx_pkts_65_127, "65 to 127 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_128_255", + child, rx_pkts_128_255, "128 to 255 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_256_511", + child, rx_pkts_256_511, "256 to 511 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_512_1023", + child, rx_pkts_512_1023, "512 to 1023 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_1024_1518", + child, rx_pkts_1024_1518, "1024 to 1518 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_1519_max", + child, rx_pkts_1519_max, "1519 to max frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_too_long", + child, rx_pkts_too_long, "frames too long"); + MSK_SYSCTL_STAT32(sc_if, ctx, "jabbers", + child, rx_pkts_jabbers, "Jabber errors"); + MSK_SYSCTL_STAT32(sc_if, ctx, "jabbers", + child, rx_fifo_oflows, "FIFO overflows"); + + tree = SYSCTL_ADD_NODE(ctx, schild, OID_AUTO, "tx", CTLFLAG_RD, + NULL, "MSK TX Statistics"); + child = SYSCTL_CHILDREN(tree); + MSK_SYSCTL_STAT32(sc_if, ctx, "ucast_frames", + child, tx_ucast_frames, "Unicast frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "bcast_frames", + child, tx_bcast_frames, "Broadcast frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "pause_frames", + child, tx_pause_frames, "Pause frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "mcast_frames", + child, tx_mcast_frames, "Multicast frames"); + MSK_SYSCTL_STAT64(sc_if, ctx, "octets", + child, tx_octets, "Octets"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_64", + child, tx_pkts_64, "64 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_65_127", + child, tx_pkts_65_127, "65 to 127 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_128_255", + child, tx_pkts_128_255, "128 to 255 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_256_511", + child, tx_pkts_256_511, "256 to 511 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_512_1023", + child, tx_pkts_512_1023, "512 to 1023 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_1024_1518", + child, tx_pkts_1024_1518, "1024 to 1518 bytes frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "frames_1519_max", + child, tx_pkts_1519_max, "1519 to max frames"); + MSK_SYSCTL_STAT32(sc_if, ctx, "colls", + child, tx_colls, "Collisions"); + MSK_SYSCTL_STAT32(sc_if, ctx, "late_colls", + child, tx_late_colls, "Late collisions"); + MSK_SYSCTL_STAT32(sc_if, ctx, "excess_colls", + child, tx_excess_colls, "Excessive collisions"); + MSK_SYSCTL_STAT32(sc_if, ctx, "multi_colls", + child, tx_multi_colls, "Multiple collisions"); + MSK_SYSCTL_STAT32(sc_if, ctx, "single_colls", + child, tx_single_colls, "Single collisions"); + MSK_SYSCTL_STAT32(sc_if, ctx, "underflows", + child, tx_underflows, "FIFO underflows"); +} + +#undef MSK_SYSCTL_STAT32 +#undef MSK_SYSCTL_STAT64 + static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int high) { ==== //depot/projects/smpng/sys/dev/msk/if_mskreg.h#8 (text+ko) ==== @@ -93,7 +93,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 21 21:12:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 824221065672; Wed, 21 Jan 2009 21:12:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42615106566B for ; Wed, 21 Jan 2009 21:12:24 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3039A8FC0C for ; Wed, 21 Jan 2009 21:12:24 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LLCOKA077249 for ; Wed, 21 Jan 2009 21:12:24 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0LLCOtu077247 for perforce@freebsd.org; Wed, 21 Jan 2009 21:12:24 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 21 Jan 2009 21:12:24 GMT Message-Id: <200901212112.n0LLCOtu077247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 21:12:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=156500 Change 156500 by rene@rene_self on 2009/01/21 21:12:09 committers-guide: phase 1 of converting CVS to CVS + SVN * comment out CVS commands specific to src, they are to be replaced by their SVN equivalents. src committers welcome to review. * Don't mention ncvs as a commit host anymore, modifying ncvs is strictly forbidden since SVN. * Mention that src converted to SVN in June 2008. * Mention that the SVN repository is automatically exported for CVSup * use 'VCS' (Version Control System) or nothing at all for texts where CVS was used generically. * Mention the SVN equivalents of the Noteworthy CVS tags * No more RELENG_5, change some RELENG_6 to stable/7 * No need for 'vcs status' except for the src tree * Add 2009. Maybe &a.cvsadm; should be changed, it now expands to "CVS Repository Meisters" While here, fix a language nit. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#15 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#15 (text+ko) ==== @@ -26,6 +26,7 @@ 2006 2007 2008 + 2009 The FreeBSD Documentation Project @@ -75,7 +76,7 @@ Main CVSROOT - ncvs.FreeBSD.org:/home/ncvs (although also see ). + ncvs.FreeBSD.org:/home/ncvs (although also see ). @@ -115,11 +116,16 @@ Noteworthy CVS Tags - RELENG_5 (5.X-STABLE), + RELENG_6 (6.X-STABLE), RELENG_7 (7.X-STABLE), HEAD (-CURRENT) + + These tags correspond to the SVN tags + stable/6, stable/7, + and head respectively. + @@ -140,7 +146,7 @@ Commit Bit Types - The FreeBSD CVS repository has a number of components which, + The FreeBSD repository has a number of components which, when combined, support the basic operating system source, documentation, third party application ports infrastructure, and various maintained utilities. When FreeBSD commit bits are @@ -228,20 +234,23 @@ - - CVS Operations + + Version Control System Operations It is assumed that you are already familiar with the basic operation - of CVS. + of the version control systems in use. Traditionally this was + CVS, but as of June 2008 Subversion is used for the src tree. The + generic term VCS (or none at all) will be used + unless the text is specific to CVS or SVN. - The &a.cvsadm; are the owners of the CVS repository and + The &a.cvsadm; are the owners of the repository and are responsible for direct modification of it for the purposes of - cleanup or fixing some grievous abuse of CVS by a committer. - Should you cause some repository accident, say a bad cvs - import or cvs tag operation, mail the + cleanup or fixing some grievous abuse of VCS by a committer. + Should you cause some repository accident, say a bad vcs + import or vcs tag operation, mail the responsible part of &a.cvsadm;, as stated in the table below, (or call one of them) and report the problem. - For very important issues affecting the entire CVS tree—not + For very important issues affecting the entire tree—not just a specific area—you can contact the &a.cvsadm;. Please do not contact the &a.cvsadm; for repocopies or other things that the more specific teams can handle. @@ -251,16 +260,12 @@ no login shells available on the repository machines, except to the repomeisters. - Depending on the affected area of the CVS repository, + Depending on the affected area of the repository, you should send your request for a repocopy to one of the following email addresses. Email sent to these addresses will be forwarded to the appropriate repomeisters. - ncvs@ - regarding - /home/ncvs, the src - repository - pcvs@ - regarding /home/pcvs, the ports repository @@ -275,11 +280,13 @@ - The CVS tree is currently split into four distinct repositories, + The tree is currently split into four distinct repositories, namely doc, ports, projects and src. These are combined under a single CVSROOT when distributed - via CVSup for the convenience of our users. + via CVSup for the convenience of our users. + The src tree is automatically exported to + CVSup. Note that the www module containing sources for the FreeBSD website is @@ -323,12 +330,6 @@ projcvs.FreeBSD.org /home/projcvs - - - src - ncvs.FreeBSD.org - /home/ncvs - @@ -336,7 +337,7 @@ CVS operations are done remotely by setting the CVSROOT environment variable to the appropriate host and top-level directory (for example, - ncvs.FreeBSD.org:/home/ncvs), + dcvs.FreeBSD.org:/home/dcvs), and doing the appropriate check-out/check-in operations. Many committers define aliases which expand to the correct cvs @@ -346,14 +347,13 @@ alias dcvs cvs -d user@dcvs.FreeBSD.org:/home/dcvs alias pcvs cvs -d user@pcvs.FreeBSD.org:/home/pcvs -alias projcvs cvs -d user@projcvs.FreeBSD.org:/home/projcvs -alias scvs cvs -d user@ncvs.FreeBSD.org:/home/ncvs +alias projcvs cvs -d user@projcvs.FreeBSD.org:/home/projcvs This way they can do all CVS operations locally and use Xcvs commit for committing to the official CVS tree. If you wish to add - something which is wholly new (like contrib-ified - sources, etc), cvs import should be used. + something which is wholly new + cvs import should be used. Refer to the &man.cvs.1; manual page for usage. @@ -384,7 +384,7 @@ to their new name and/or location and let you know when it is done. The purpose of a repository copy is to preserve file change history, or logs. We in the FreeBSD Project greatly - value the change history that CVS gives to the project. + value the change history that a VCS gives to the project. CVS reference information, tutorials, and FAQs can be found at: . @@ -438,6 +438,7 @@ Practical FreeBSD examples: + Note that cvs stores metadata in subdirectories named CVS. @@ -597,7 +598,7 @@ This updates the file shazam or the contents of the shazam directory to the latest version along the branch you checked out. If you - checked out a point in time, does nothing + checked out a point in time, it does nothing unless the tags have moved in the repository or some other weird stuff is going on. @@ -616,11 +617,12 @@ Update to head of main branch. - + @@ -722,6 +724,7 @@ > signs and the revision number you updated to. +FreeBSD$) + $FreeBSD$) lines, so you will have to edit the file to resolve the conflict (remove the marker lines and the second $Id$ line, leaving the original $Id$ line intact). +--> @@ -941,7 +945,8 @@ verify which branch you are committing to, using - cvs status. + svn status. This is only needed for + the src tree, as the other trees are not branched. @@ -952,7 +957,7 @@ Also, ALWAYS specify which files to commit explicitly on the command line, so you do not accidentally commit other files - than the ones you intended - cvs commit + than the ones you intended - vcs commit without any arguments will commit every modification in your current working directory and every subdirectory. @@ -1058,9 +1063,7 @@ ssh connection to the repository machine. First, put this configuration into your ~/.ssh/config: - Host ncvs.FreeBSD.org - ControlPath /home/user/.ssh/cvs.cpath -Host dcvs.FreeBSD.org + Host dcvs.FreeBSD.org ControlPath /home/user/.ssh/cvs.cpath Host projcvs.FreeBSD.org ControlPath /home/user/.ssh/cvs.cpath @@ -1325,14 +1328,14 @@ areas, to our shame), the same applies. If, however, you are about to modify something which is clearly being actively maintained by someone else (and it is only by watching the - cvs-committers mailing list that you can + repository-committers mailing list that you can really get a feel for just what is and is not) then consider sending the change to them instead, just as you would have before becoming a committer. For ports, you should contact the listed MAINTAINER in the Makefile. For other parts of the repository, if you are unsure who the active maintainer might - be, it may help to scan the output of cvs log + be, it may help to scan the output of vcs log to see who has committed changes in the past. &a.fenner; has written a nice shell script that can help determine who the active maintainer might be. It lists each person who has @@ -1346,10 +1349,10 @@ If you are unsure about a commit for any reason at all, have it reviewed by -hackers before committing. Better to have it flamed then and there - rather than when it is part of the CVS repository. If you do + rather than when it is part of the repository. If you do happen to commit something which results in controversy erupting, you may also wish to consider backing the change out - again until the matter is settled. Remember – with CVS we + again until the matter is settled. Remember – with VCS we can always change it back. Do not impugn the intentions of someone you disagree with. @@ -1627,7 +1630,7 @@ &a.committers; - cvs-committers is the entity that CVS uses to send you all your + repository-committers is the entity that VCS uses to send you all your commit messages. You should never send email directly to this list. You should only send replies to this list when they are short and are directly related to a commit. @@ -1976,7 +1979,7 @@ Discuss any significant change before committing. - The CVS repository is not where changes should be + The VCS repository is not where changes should be initially submitted for correctness or argued over, that should happen first in the mailing lists and the commit should only happen once something resembling consensus has @@ -2013,7 +2016,7 @@ maintainer need to be reviewed by at least one other maintainer. In cases where the maintainer-ship of something is not clear, - you can also look at the CVS logs for the file(s) in + you can also look at the VCS logs for the file(s) in question and see if someone has been working recently or predominantly in that area. @@ -2035,7 +2038,7 @@ This may be hard to swallow in times of conflict (when each side is convinced that they are in the right, of - course) but CVS makes it unnecessary to have an ongoing + course) but VCS makes it unnecessary to have an ongoing dispute raging when it is far easier to simply reverse the disputed change, get everyone calmed down again and then try to figure out what is the best way to proceed. If the change @@ -2265,7 +2268,7 @@ Do not mix style fixes with new functionality. A style fix is any change which does not modify the functionality of the code. Mixing the changes obfuscates the functionality - change when using cvs diff, which can hide + change when using vcs diff, which can hide any new bugs. Do not include whitespace changes with content changes in commits to doc/ or www/. The extra clutter in the diffs @@ -3239,7 +3242,7 @@ and dedication in working on Problem Reports. Almost all of this document will apply to these developers as - well (except things specific to CVS commits and the mailing list + well (except things specific to VCS commits and the mailing list memberships that go with them). In particular, we recommend that you read: @@ -3357,18 +3360,19 @@ - How do I add a new file to a CVS branch? + How do I add a new file to a VCS branch? To add a file onto a branch, simply checkout or update to the branch you want to add to and then add the file using - cvs add as you normally would. For + vcs add as you normally would. For example, if you wanted to MFC the file - src/sys/alpha/include/smp.h from HEAD - to RELENG_6 and it does not exist in RELENG_6 yet, you would + src/sys/alpha/include/smp.h from head + to stable/7 and it does not exist in stable/7 yet, you would use the following steps: + From owner-p4-projects@FreeBSD.ORG Wed Jan 21 23:39:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7E811065672; Wed, 21 Jan 2009 23:39:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D2011065670 for ; Wed, 21 Jan 2009 23:39:16 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from core.tav.kiev.ua (tavex.colocall.com [62.149.10.42]) by mx1.freebsd.org (Postfix) with ESMTP id A9DCF8FC13 for ; Wed, 21 Jan 2009 23:39:14 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from [209.52.235.211] (helo=[10.80.5.136]) by core.tav.kiev.ua with esmtpsa (SSLv3:AES256-SHA:256) (Exim 4.52 (FreeBSD)) id 1LPlx4-000DBC-Ar; Thu, 22 Jan 2009 00:53:39 +0200 Message-ID: <4977A6F8.6070404@bluezbox.com> Date: Wed, 21 Jan 2009 14:51:36 -0800 From: Oleksandr Tymoshenko User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Hans Petter Selasky References: <200901212055.n0LKt3dI074585@repoman.freebsd.org> <200901212208.39108.hselasky@c2i.net> In-Reply-To: <200901212208.39108.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Core-Spam-Level: ---- X-Core-Spam-Report: Spam detection software, running on the system "core.tav.kiev.ua", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hans Petter Selasky wrote: > On Wednesday 21 January 2009, Oleksandr Tymoshenko wrote: >> http://perforce.freebsd.org/chv.cgi?CH=156495 >> >> Change 156495 by gonzo@gonzo_pd on 2009/01/21 20:54:57 >> >> Create playground for FreeBSD/avr32 port >> >> Affected files ... >> > > Hi, > > This is simply great news! Hope you get something compiling soon. I have my > AVR-32 evaluation board waiting with regard to the USB bit ... Thanks to Arnar Mar Sig kernel is compiling. I hope to join development in a week or so when I'll get my board. [...] Content analysis details: (-4.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] 0.1 AWL AWL: From: address is in the auto white-list Cc: Perforce Change Reviews Subject: Re: PERFORCE change 156495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2009 23:39:17 -0000 Hans Petter Selasky wrote: > On Wednesday 21 January 2009, Oleksandr Tymoshenko wrote: >> http://perforce.freebsd.org/chv.cgi?CH=156495 >> >> Change 156495 by gonzo@gonzo_pd on 2009/01/21 20:54:57 >> >> Create playground for FreeBSD/avr32 port >> >> Affected files ... >> > > Hi, > > This is simply great news! Hope you get something compiling soon. I have my > AVR-32 evaluation board waiting with regard to the USB bit ... Thanks to Arnar Mar Sig kernel is compiling. I hope to join development in a week or so when I'll get my board. From owner-p4-projects@FreeBSD.ORG Thu Jan 22 12:24:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E67641065672; Thu, 22 Jan 2009 12:23:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A383106564A for ; Thu, 22 Jan 2009 12:23:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 713EB8FC12 for ; Thu, 22 Jan 2009 12:23:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MCNxTS097975 for ; Thu, 22 Jan 2009 12:23:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MCNxj2097973 for perforce@freebsd.org; Thu, 22 Jan 2009 12:23:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 22 Jan 2009 12:23:59 GMT Message-Id: <200901221223.n0MCNxj2097973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 12:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=156515 Change 156515 by hselasky@hselasky_laptop001 on 2009/01/22 12:23:01 Patch from "Daichi GOTO" to fix an IOCTL. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#27 (text+ko) ==== @@ -223,7 +223,7 @@ #define USB_DEVICEENUMERATE _IOW ('U', 6, int) /* Generic HID device */ -#define USB_GET_REPORT_DESC _IOR ('U', 21, struct usb2_gen_descriptor) +#define USB_GET_REPORT_DESC _IOWR('U', 21, struct usb2_gen_descriptor) #define USB_SET_IMMED _IOW ('U', 22, int) #define USB_GET_REPORT _IOWR('U', 23, struct usb2_gen_descriptor) #define USB_SET_REPORT _IOW ('U', 24, struct usb2_gen_descriptor) From owner-p4-projects@FreeBSD.ORG Thu Jan 22 15:17:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 335F41065670; Thu, 22 Jan 2009 15:17:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5D6F106566B for ; Thu, 22 Jan 2009 15:17:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D3C048FC0C for ; Thu, 22 Jan 2009 15:17:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MFH1DG025152 for ; Thu, 22 Jan 2009 15:17:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MFH1na025150 for perforce@freebsd.org; Thu, 22 Jan 2009 15:17:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 22 Jan 2009 15:17:01 GMT Message-Id: <200901221517.n0MFH1na025150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 15:17:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=156521 Change 156521 by hselasky@hselasky_laptop001 on 2009/01/22 15:16:39 U3G regression issue. Patch to support multiple modem instances per logical USB interface. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#7 (text+ko) ==== @@ -93,9 +93,9 @@ struct u3g_softc { struct usb2_com_super_softc sc_super_ucom; - struct usb2_com_softc sc_ucom; + struct usb2_com_softc sc_ucom[U3G_MAXPORTS]; - struct usb2_xfer *sc_xfer[U3G_N_TRANSFER]; + struct usb2_xfer *sc_xfer[U3G_MAXPORTS][U3G_N_TRANSFER]; struct usb2_device *sc_udev; uint8_t sc_iface_no; /* interface number */ @@ -382,8 +382,11 @@ static int u3g_attach(device_t dev) { + struct usb2_config u3g_config_tmp[U3G_N_TRANSFER]; struct usb2_attach_arg *uaa = device_get_ivars(dev); struct u3g_softc *sc = device_get_softc(dev); + uint8_t n; + uint8_t m; int error; DPRINTF("sc=%p\n", sc); @@ -391,6 +394,10 @@ if (sc == NULL) { return (ENOMEM); } + /* copy in USB config */ + for (n = 0; n != U3G_N_TRANSFER; n++) + u3g_config_tmp[n] = u3g_config[n]; + device_set_usb2_desc(dev); sc->sc_udev = uaa->device; @@ -398,23 +405,41 @@ sc->sc_iface_index = uaa->info.bIfaceIndex; sc->sc_speed = u3g_speeds[U3G_GET_SPEED(uaa)]; - error = usb2_transfer_setup(uaa->device, &sc->sc_iface_index, - sc->sc_xfer, u3g_config, U3G_N_TRANSFER, sc, &Giant); + for (m = 0; m != U3G_MAXPORTS; m++) { + + /* update BULK endpoint index */ + for (n = 0; n != U3G_N_TRANSFER; n++) + u3g_config_tmp[n].ep_index = m; + + /* try to allocate a set of BULK endpoints */ + error = usb2_transfer_setup(uaa->device, &sc->sc_iface_index, + sc->sc_xfer[m], u3g_config_tmp, U3G_N_TRANSFER, + &sc->sc_ucom[m], &Giant); - if (error) { - DPRINTF("could not allocate all pipes\n"); - goto detach; + if (error) { + if (m != 0) + break; /* end of endpoints */ + DPRINTF("could not allocate all pipes\n"); + goto detach; + } + /* set stall by default */ + usb2_transfer_set_stall(sc->sc_xfer[m][U3G_BULK_WR]); + usb2_transfer_set_stall(sc->sc_xfer[m][U3G_BULK_RD]); } - /* set stall by default */ - usb2_transfer_set_stall(sc->sc_xfer[U3G_BULK_WR]); - usb2_transfer_set_stall(sc->sc_xfer[U3G_BULK_RD]); + + sc->sc_numports = m; - error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, - &u3g_callback, &Giant); + error = usb2_com_attach(&sc->sc_super_ucom, sc->sc_ucom, + sc->sc_numports, sc, &u3g_callback, &Giant); if (error) { DPRINTF("usb2_com_attach failed\n"); goto detach; } + if (sc->sc_numports != 1) { + /* be verbose */ + device_printf(dev, "Found %u ports.\n", + (unsigned int)sc->sc_numports); + } return (0); detach: @@ -426,12 +451,15 @@ u3g_detach(device_t dev) { struct u3g_softc *sc = device_get_softc(dev); + uint8_t m; DPRINTF("sc=%p\n", sc); - usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); + /* NOTE: It is not dangerous to detach more ports than attached! */ + usb2_com_detach(&sc->sc_super_ucom, sc->sc_ucom, U3G_MAXPORTS); - usb2_transfer_unsetup(sc->sc_xfer, U3G_N_TRANSFER); + for (m = 0; m != U3G_MAXPORTS; m++) + usb2_transfer_unsetup(sc->sc_xfer[m], U3G_N_TRANSFER); return (0); } @@ -442,7 +470,7 @@ struct u3g_softc *sc = ucom->sc_parent; /* start read endpoint */ - usb2_transfer_start(sc->sc_xfer[U3G_BULK_RD]); + usb2_transfer_start(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_RD]); return; } @@ -452,7 +480,7 @@ struct u3g_softc *sc = ucom->sc_parent; /* stop read endpoint */ - usb2_transfer_stop(sc->sc_xfer[U3G_BULK_RD]); + usb2_transfer_stop(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_RD]); return; } @@ -461,7 +489,7 @@ { struct u3g_softc *sc = ucom->sc_parent; - usb2_transfer_start(sc->sc_xfer[U3G_BULK_WR]); + usb2_transfer_start(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_WR]); return; } @@ -470,21 +498,21 @@ { struct u3g_softc *sc = ucom->sc_parent; - usb2_transfer_stop(sc->sc_xfer[U3G_BULK_WR]); + usb2_transfer_stop(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_WR]); return; } static void u3g_write_callback(struct usb2_xfer *xfer) { - struct u3g_softc *sc = xfer->priv_sc; + struct usb2_com_softc *ucom = xfer->priv_sc; uint32_t actlen; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: case USB_ST_SETUP: tr_setup: - if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers, 0, + if (usb2_com_get_data(ucom, xfer->frbuffers, 0, U3G_BSIZE, &actlen)) { xfer->frlengths[0] = actlen; usb2_start_hardware(xfer); @@ -505,11 +533,11 @@ static void u3g_read_callback(struct usb2_xfer *xfer) { - struct u3g_softc *sc = xfer->priv_sc; + struct usb2_com_softc *ucom = xfer->priv_sc; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers, 0, xfer->actlen); + usb2_com_put_data(ucom, xfer->frbuffers, 0, xfer->actlen); case USB_ST_SETUP: tr_setup: From owner-p4-projects@FreeBSD.ORG Thu Jan 22 15:19:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F7B91065670; Thu, 22 Jan 2009 15:19:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BF6B106564A for ; Thu, 22 Jan 2009 15:19:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FEEE8FC0C for ; Thu, 22 Jan 2009 15:19:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MFJ3Nw025270 for ; Thu, 22 Jan 2009 15:19:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MFJ3tp025268 for perforce@freebsd.org; Thu, 22 Jan 2009 15:19:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 22 Jan 2009 15:19:03 GMT Message-Id: <200901221519.n0MFJ3tp025268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 15:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156522 Change 156522 by hselasky@hselasky_laptop001 on 2009/01/22 15:18:06 UHCI SOF Quirk. Makes some broken USB devices work again. Reported by several people. Patch made by me. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#23 (text+ko) ==== @@ -3320,7 +3320,13 @@ flags = bus->hw_power_state; + /* + * WARNING: Some FULL speed USB devices require periodic SOF messages! + * If any USB devices are connected through the UHCI, power + * save will be disabled! + */ if (flags & (USB_HW_POWER_CONTROL | + USB_HW_POWER_NON_ROOT_HUB | USB_HW_POWER_BULK | USB_HW_POWER_INTERRUPT | USB_HW_POWER_ISOC)) { ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#11 (text+ko) ==== @@ -84,6 +84,11 @@ * are active: */ #define USB_HW_POWER_ISOC 0x08 + /* + * The following flag is set if one or more non-root-HUB devices + * are present on the given USB bus: + */ +#define USB_HW_POWER_NON_ROOT_HUB 0x10 /* USB Device mode only - Mandatory */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#34 (text+ko) ==== @@ -1503,7 +1503,7 @@ unsigned int temp; unsigned int limit; unsigned int mintime; - uint32_t type_refs[4]; + uint32_t type_refs[5]; uint8_t x; uint8_t rem_wakeup; @@ -1564,6 +1564,7 @@ type_refs[1] = 0; type_refs[2] = 0; type_refs[3] = 0; + type_refs[4] = 0; /* Re-loop all the devices to get the actual state */ @@ -1574,6 +1575,9 @@ if (udev == NULL) continue; + /* we found a non-Root-Hub USB device */ + type_refs[4] += 1; + /* "last_xfer_time" can be updated by a resume */ temp = ticks - udev->pwr_save.last_xfer_time; @@ -1604,6 +1608,8 @@ bus->hw_power_state |= USB_HW_POWER_INTERRUPT; if (type_refs[UE_ISOCHRONOUS] != 0) bus->hw_power_state |= USB_HW_POWER_ISOC; + if (type_refs[4] != 0) + bus->hw_power_state |= USB_HW_POWER_NON_ROOT_HUB; } USB_BUS_UNLOCK(bus); From owner-p4-projects@FreeBSD.ORG Thu Jan 22 16:36:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE77D1065678; Thu, 22 Jan 2009 16:36:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87FC21065672 for ; Thu, 22 Jan 2009 16:36:23 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 793D88FC1D for ; Thu, 22 Jan 2009 16:36:23 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MGaNi9037239 for ; Thu, 22 Jan 2009 16:36:23 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MGaNPc037237 for perforce@freebsd.org; Thu, 22 Jan 2009 16:36:23 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 22 Jan 2009 16:36:23 GMT Message-Id: <200901221636.n0MGaNPc037237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 156529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 16:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=156529 Change 156529 by sson@sson_amd64 on 2009/01/22 16:36:21 Fix bug in printing data in hex so it prints leading "0". Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#60 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 $ */ #include @@ -193,7 +193,7 @@ if (len > 0) { fprintf(fp, "0x"); for (i = 0; i < len; i++) - fprintf(fp, "%x", data[i]); + fprintf(fp, "%02x", data[i]); } } From owner-p4-projects@FreeBSD.ORG Thu Jan 22 17:09:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BF531065670; Thu, 22 Jan 2009 17:09:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFC97106564A for ; Thu, 22 Jan 2009 17:09:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2B398FC19 for ; Thu, 22 Jan 2009 17:09:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MH9vEE050812 for ; Thu, 22 Jan 2009 17:09:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MH9vgq050810 for perforce@freebsd.org; Thu, 22 Jan 2009 17:09:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 22 Jan 2009 17:09:57 GMT Message-Id: <200901221709.n0MH9vgq050810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 17:09:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=156530 Change 156530 by hselasky@hselasky_laptop001 on 2009/01/22 17:09:44 Improve my UHCI SOF patch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#24 (text+ko) ==== @@ -2396,6 +2396,24 @@ else return (USB_ERR_IOERROR); + /* + * Before we do anything, turn on SOF messages on the USB + * BUS. Some USB devices do not cope without them! + */ + if (!(UREAD2(sc, UHCI_CMD) & UHCI_CMD_RS)) { + + DPRINTF("Activating SOFs!\n"); + + UHCICMD(sc, (UHCI_CMD_MAXP | UHCI_CMD_RS)); + + /* wait a little bit */ + if (use_polling) { + DELAY(10000); + } else { + usb2_pause_mtx(&sc->sc_bus.bus_mtx, 10); + } + } + x = URWMASK(UREAD2(sc, port)); UWRITE2(sc, port, x | UHCI_PORTSC_PR); @@ -3321,9 +3339,9 @@ flags = bus->hw_power_state; /* - * WARNING: Some FULL speed USB devices require periodic SOF messages! - * If any USB devices are connected through the UHCI, power - * save will be disabled! + * WARNING: Some FULL speed USB devices require periodic SOF + * messages! If any USB devices are connected through the + * UHCI, power save will be disabled! */ if (flags & (USB_HW_POWER_CONTROL | USB_HW_POWER_NON_ROOT_HUB | From owner-p4-projects@FreeBSD.ORG Thu Jan 22 17:16:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B748F1065672; Thu, 22 Jan 2009 17:16:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77863106564A for ; Thu, 22 Jan 2009 17:16:04 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AB238FC1D for ; Thu, 22 Jan 2009 17:16:04 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MHG4R2051343 for ; Thu, 22 Jan 2009 17:16:04 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MHG4RJ051341 for perforce@freebsd.org; Thu, 22 Jan 2009 17:16:04 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 22 Jan 2009 17:16:04 GMT Message-Id: <200901221716.n0MHG4RJ051341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 156532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 17:16:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156532 Change 156532 by sson@sson_amd64 on 2009/01/22 17:15:06 Add pread()/pwrite() to audit events. Remove duplicate *_extended() kernel events. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#36 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#35 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#36 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -551,6 +551,8 @@ 43189:AUE_CAP_GETMODE:cap_getmode(2):pc 43190:AUE_POSIX_SPAWN:posix_spawn(2):pc 43191:AUE_FSGETPATH:fsgetpath(2):ot +43192:AUE_PREAD:pread(2):no +43193:AUE_PWRITE:pwrite(2):no # # Solaris userspace events. # ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -586,6 +586,8 @@ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ #define AUE_POSIX_SPAWN 43190 /* Darwin. */ #define AUE_FSGETPATH 43191 /* Darwin. */ +#define AUE_PREAD 43192 /* Darwin/FreeBSD. */ +#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -657,7 +659,6 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ -#define AUE_ACCESSEXTENDED AUE_NULL #define AUE_ATGETMSG AUE_NULL #define AUE_ATPUTMSG AUE_NULL #define AUE_ATSOCKET AUE_NULL @@ -668,11 +669,9 @@ #define AUE_BSDTHREADCREATE AUE_NULL #define AUE_BSDTHREADTERMINATE AUE_NULL #define AUE_BSDTHREADREGISTER AUE_NULL -#define AUE_CHMODEXTENDED AUE_NULL #define AUE_CHUD AUE_NULL #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL -#define AUE_FCHMODEXTENDED AUE_NULL #define AUE_FDATASYNC AUE_NULL #define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL @@ -682,11 +681,10 @@ #define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL -#define AUE_FSTATEXTENDED AUE_NULL #define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSTAT64 AUE_NULL -#define AUE_FSTAT64EXTENDED AUE_NULL +#define AUE_FSTAT64_EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL @@ -720,21 +718,15 @@ #define AUE_ISSETUGID AUE_NULL #define AUE_LIOLISTIO AUE_NULL #define AUE_LISTXATTR AUE_NULL -#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_LSTAT64 AUE_NULL -#define AUE_LSTAT64EXTENDED AUE_NULL +#define AUE_LSTAT64_EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MKDIREXTENDED AUE_NULL -#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_OPENEXTENDED AUE_NULL -#define AUE_PREAD AUE_NULL -#define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL #define AUE_PROCINFO AUE_NULL #define AUE_PTHREADCANCELED AUE_NULL @@ -778,15 +770,13 @@ #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL #define AUE_STACKSNAPSHOT AUE_NULL -#define AUE_STATEXTENDED AUE_NULL #define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL #define AUE_STAT64 AUE_NULL -#define AUE_STAT64EXTENDED AUE_NULL +#define AUE_STAT64_EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL -#define AUE_UMASKEXTENDED AUE_NULL #define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WAITID AUE_NULL From owner-p4-projects@FreeBSD.ORG Thu Jan 22 18:07:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF871106567A; Thu, 22 Jan 2009 18:07:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FBC91065677 for ; Thu, 22 Jan 2009 18:07:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D4328FC18 for ; Thu, 22 Jan 2009 18:07:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MI7vDp056309 for ; Thu, 22 Jan 2009 18:07:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0MI7vYr056307 for perforce@freebsd.org; Thu, 22 Jan 2009 18:07:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 22 Jan 2009 18:07:57 GMT Message-Id: <200901221807.n0MI7vYr056307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2009 18:07:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156533 Change 156533 by hselasky@hselasky_laptop001 on 2009/01/22 18:07:20 IFC @ 156531 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#9 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#9 integrate .. //depot/projects/usb/src/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/usb/src/sys/conf/NOTES#26 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#7 integrate .. //depot/projects/usb/src/sys/conf/options#18 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/usb/src/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/usb/src/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/usb/src/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/usb/src/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#8 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#13 integrate .. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/usb/src/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpbb.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#9 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.h#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/pps.c#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/vpo.c#7 integrate .. //depot/projects/usb/src/sys/dev/ppbus/vpoio.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#20 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_demo.c#3 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr.h#3 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#41 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#40 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_auereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdcereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cuereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_ruereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udavreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#26 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#26 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydreg.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode.c#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/smist.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#15 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#13 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#15 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#11 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_mppc.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pred1.c#3 integrate .. //depot/projects/usb/src/sys/netinet/in.c#16 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/usb/src/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/kiic.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/include/pcpu.h#6 integrate .. //depot/projects/usb/src/sys/sys/ktr.h#2 integrate .. //depot/projects/usb/src/sys/sys/lock.h#8 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#8 integrate .. //depot/projects/usb/src/sys/sys/sched.h#6 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#14 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_inode.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#7 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#13 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#9 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.165 2009/01/20 12:07:49 kib Exp $ */ #include @@ -199,6 +199,7 @@ cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ +restore_fsbase: movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx @@ -281,7 +282,7 @@ movl PCB_DS(%r8),%ds movl PCB_ES(%r8),%es movl PCB_FS(%r8),%fs - jmp done_load_seg + jmp restore_fsbase /* Restore userland %gs while preserving kernel gsbase */ 2: movq PCPU(GS32P),%rax movq PCB_GS32SD(%r8),%rcx ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#20 (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.513 2009/01/13 12:35:33 luigi Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.518 2009/01/19 15:33:06 sobomax Exp $ cpu HAMMER ident GENERIC @@ -28,7 +28,7 @@ # through getenv() (or kenv(1) in userland). The format of the file # is 'variable=value', see kenv(1) # -# env "GENERIC.env" +# env "GENERIC.env" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -47,7 +47,6 @@ options NFSSERVER # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options NTFS # NT File System options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) @@ -69,8 +68,8 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -138,6 +137,8 @@ # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID device arcmsr # Areca SATA II RAID +#XXX it is not 64-bit clean, -scottl +#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x @@ -230,6 +231,7 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) +device stge # Sundance/Tamarack TC9021 gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet @@ -249,8 +251,8 @@ # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG # enable debug msgs -options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's +options IEEE80211_DEBUG # enable debug msgs +options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support ==== //depot/projects/usb/src/sys/arm/at91/at91_mci.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.11 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $"); #include #include @@ -199,9 +199,12 @@ goto out; } sc->host.f_min = 375000; - sc->host.f_max = 30000000; + sc->host.f_max = at91_master_clock / 2; /* Typically 30MHz */ sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; - sc->host.caps = MMC_CAP_4_BIT_DATA; + if (sc->wire4) + sc->host.caps = MMC_CAP_4_BIT_DATA; + else + sc->host.caps = 0; child = device_add_child(dev, "mmc", 0); device_set_ivars(dev, &sc->host); err = bus_generic_attach(dev); @@ -294,7 +297,7 @@ else clkdiv = (at91_master_clock / ios->clock) / 2; } - if (ios->bus_width == bus_width_4 && sc->wire4) + if (ios->bus_width == bus_width_4) WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS); else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); @@ -643,6 +646,9 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; + case MMCBR_IVAR_CAPS: + *(int *)result = sc->host.caps; + break; case MMCBR_IVAR_MAX_DATA: *(int *)result = 1; break; @@ -683,6 +689,7 @@ sc->host.ios.vdd = value; break; /* These are read-only */ + case MMCBR_IVAR_CAPS: case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: ==== //depot/projects/usb/src/sys/arm/include/vmparam.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.12 2007/12/27 16:45:38 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.13 2009/01/22 15:36:11 cognet Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -97,6 +97,13 @@ #define VM_MIN_ADDRESS (0x00001000) #ifdef ARM_USE_SMALL_ALLOC +/* + * ARM_KERN_DIRECTMAP is used to make sure there's enough space between + * VM_MAXUSER_ADDRESS and KERNBASE to map the whole memory. + * It has to be a compile-time constant, even if arm_init_smallalloc(), + * which will do the mapping, gets the real amount of memory at runtime, + * because VM_MAXUSER_ADDRESS is a constant. + */ #ifndef ARM_KERN_DIRECTMAP #define ARM_KERN_DIRECTMAP 512 * 1024 * 1024 /* 512 MB */ #endif ==== //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 (text+ko) ==== @@ -25,14 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_mcu.c,v 1.1 2007/07/27 14:50:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_mcu.c,v 1.2 2009/01/16 19:31:27 cognet Exp $"); #include #include #include #include #include -#include #include #include ==== //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#14 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.133 2008/12/29 12:45:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.134 2009/01/22 17:06:33 jkim Exp $"); #include #include @@ -276,11 +276,17 @@ sbuf_cat(sb, "flags\t\t:"); - if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) { - flags[16] = "fcmov"; - } else if (!strcmp(cpu_vendor, "CyrixInstead")) { +#ifdef __i386__ + switch (cpu_vendor_id) { + case CPU_VENDOR_AMD: + if (class < 6) + flags[16] = "fcmov"; + break; + case CPU_VENDOR_CYRIX: flags[24] = "cxmmx"; + break; } +#endif for (i = 0; i < 32; i++) if (cpu_feature & (1 << i)) ==== //depot/projects/usb/src/sys/conf/NOTES#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1521 2009/01/11 11:36:00 maxim Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1524 2009/01/20 02:08:21 sobomax Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -942,7 +942,12 @@ options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server options NFSLOCKD #Network Lock Manager -options NTFS #NT File System + +# NT File System. Read-mostly, see mount_ntfs(8) for details. +# For a full read-write NTFS support consider sysutils/fusefs-ntfs +# port/package. +options NTFS + options NULLFS #NULL filesystem # Broken (depends on NCP): #options NWFS #NetWare filesystem @@ -1370,6 +1375,10 @@ # 0x80 Put the video card in the VESA 800x600 dots, 16 color mode # 0x100 Probe for a keyboard device periodically if one is not present +# Enable experimental features of the syscons terminal emulator (teken). +options TEKEN_UTF8 # UTF-8 output handling +options TEKEN_XTERM # xterm-style terminal emulation + # # Optional devices: # ==== //depot/projects/usb/src/sys/conf/newvers.sh#7 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.78 2008/10/03 10:08:36 bz Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.80 2009/01/20 21:37:41 thompsa Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -91,6 +91,9 @@ if [ -x "${dir}/svnversion" ]; then svnversion=${dir}/svnversion SRCDIR=${d##*obj} + if [ -n "$MACHINE" ]; then + SRCDIR=${SRCDIR##/$MACHINE} + fi SRCDIR=${SRCDIR%%/sys/*} break fi ==== //depot/projects/usb/src/sys/conf/options#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.656 2009/01/12 11:24:32 qingli Exp $ +# $FreeBSD: src/sys/conf/options,v 1.657 2009/01/17 16:37:13 ed Exp $ # # On the handling of kernel options # @@ -726,6 +726,10 @@ SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +# teken terminal emulator options +TEKEN_UTF8 opt_teken.h +TEKEN_XTERM opt_teken.h + # options for printf PRINTF_BUFR_SIZE opt_printf.h ==== //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.15 2008/12/02 21:37:28 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.16 2009/01/21 20:44:42 jkim Exp $ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ /* @@ -910,7 +910,7 @@ if (status != 0) return; -#if (__FreeBSD_version >= 800050) && (defined(__amd64__) || defined(__i386__)) +#if (__FreeBSD_version >= 701102) && (defined(__amd64__) || defined(__i386__)) /* If TSC is P-state invariant, don't do anything. */ if (tsc_is_invariant) return; ==== //depot/projects/usb/src/sys/dev/acpica/acpi_battery.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.26 2007/11/20 18:35:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.27 2009/01/17 17:40:44 mav Exp $"); #include "opt_acpi.h" #include @@ -197,7 +197,7 @@ * is 0 (due to some error reading the battery), skip this * conversion. */ - if (bif->units == ACPI_BIF_UNITS_MA && bif->dvol != 0) { + if (bif->units == ACPI_BIF_UNITS_MA && bif->dvol != 0 && dev == NULL) { bst[i].rate = (bst[i].rate * bif->dvol) / 1000; bst[i].cap = (bst[i].cap * bif->dvol) / 1000; bif->lfcap = (bif->lfcap * bif->dvol) / 1000; ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_regdomain.c,v 1.24 2008/11/27 22:29:27 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_regdomain.c,v 1.2 2009/01/16 20:44:45 sam Exp $ */ #include "opt_ah.h" @@ -1231,9 +1231,18 @@ {.regDmnEnum = DEBUG_REG_DMN, .conformanceTestLimit = FCC, .dfsMask = DFS_FCC3, - .chan11a = BM3(F1_5120_5240, F1_5260_5700, F1_5745_5825), - .chan11a_half = BM3(F2_5120_5240, F2_5260_5700, F7_5745_5825), - .chan11a_quarter = BM3(F3_5120_5240, F3_5260_5700, F8_5745_5825), + .chan11a = BM4(F1_4950_4980, + F1_5120_5240, + F1_5260_5700, + F1_5745_5825), + .chan11a_half = BM4(F1_4945_4985, + F2_5120_5240, + F2_5260_5700, + F7_5745_5825), + .chan11a_quarter = BM4(F1_4942_4987, + F3_5120_5240, + F3_5260_5700, + F8_5745_5825), .chan11a_turbo = BM8(T1_5130_5210, T1_5250_5330, T1_5370_5490, ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_misc.c,v 1.7 2008/11/27 22:29:52 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c,v 1.2 2009/01/21 02:53:00 sam Exp $ */ #include "opt_ah.h" @@ -432,7 +432,7 @@ } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } } ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c,v 1.2 2008/12/11 04:03:50 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c,v 1.3 2009/01/21 02:53:00 sam Exp $ */ #include "opt_ah.h" @@ -453,7 +453,7 @@ } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } } ==== //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.27 2009/01/15 02:46:43 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.28 2009/01/20 00:05:43 nwhitehorn Exp $"); /* * Autoconfiguration and support routines for the Philips serial I2C bus @@ -55,7 +55,7 @@ device_set_desc(dev, "Philips I2C bus"); /* Allow other subclasses to override this driver. */ - return (-1000); + return (BUS_PROBE_GENERIC); } #if SCAN_IICBUS ==== //depot/projects/usb/src/sys/dev/mmc/mmc.c#6 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.28 2008/12/06 21:41:27 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.32 2009/01/21 17:49:23 imp Exp $"); #include #include @@ -340,7 +340,9 @@ memset(cmd->resp, 0, sizeof(cmd->resp)); cmd->retries = retries; mreq.cmd = cmd; -/* printf("CMD: %x ARG %x\n", cmd->opcode, cmd->arg); */ + if (bootverbose) + device_printf(sc->dev, "CMD: %#x ARG %#x\n", cmd->opcode, + cmd->arg); mmc_wait_for_req(sc, &mreq); return (cmd->error); } @@ -584,11 +586,11 @@ static int mmc_set_card_bus_width(struct mmc_softc *sc, uint16_t rca, int width) { + struct mmc_command cmd; int err; + uint8_t value; if (mmcbr_get_mode(sc->dev) == mode_sd) { - struct mmc_command cmd; - memset(&cmd, 0, sizeof(struct mmc_command)); cmd.opcode = ACMD_SET_BUS_WIDTH; cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; @@ -604,8 +606,6 @@ } err = mmc_wait_for_app_cmd(sc, rca, &cmd, CMD_RETRIES); } else { - uint8_t value; - switch (width) { case bus_width_1: value = EXT_CSD_BUS_WIDTH_1; @@ -619,7 +619,8 @@ default: return (MMC_ERR_INVALID); } - err = mmc_switch(sc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH, value); + err = mmc_switch(sc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH, + value); } return (err); } @@ -629,6 +630,7 @@ { int err; uint8_t value; + u_char switch_res[64]; switch (timing) { case bus_timing_normal: @@ -640,14 +642,11 @@ default: return (MMC_ERR_INVALID); } - if (mmcbr_get_mode(sc->dev) == mode_sd) { - u_char switch_res[64]; - + if (mmcbr_get_mode(sc->dev) == mode_sd) err = mmc_sd_switch(sc, 1, 0, value, switch_res); - } else { + else err = mmc_switch(sc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, value); - } return (err); } @@ -1119,6 +1118,7 @@ mmc_app_send_scr(sc, ivar->rca, ivar->raw_scr); mmc_app_decode_scr(ivar->raw_scr, &ivar->scr); /* Get card switch capabilities. */ + ivar->timing = bus_timing_normal; if ((ivar->scr.sda_vsn >= 1) && (ivar->csd.ccc & (1<<10))) { mmc_sd_switch(sc, 0, 0, 0xF, switch_res); @@ -1255,8 +1255,12 @@ mmcbr_set_mode(dev, mode_sd); mmc_power_up(sc); mmcbr_set_bus_mode(dev, pushpull); + if (bootverbose) + device_printf(sc->dev, "Idle cards for SD probe\n"); mmc_idle_cards(sc); err = mmc_send_if_cond(sc, 1); + if (bootverbose) + device_printf(sc->dev, "SD: SEND_IF_CONF %d\n", err); if (mmc_send_app_op_cond(sc, err ? 0 : MMC_OCR_CCS, &ocr) != MMC_ERR_NONE) { /* @@ -1326,7 +1330,7 @@ max_timing = ivar->timing; if (ivar->tran_speed < max_dtr) max_dtr = ivar->tran_speed; - if (ivar->hs_tran_speed < max_dtr) + if (ivar->hs_tran_speed < max_hs_dtr) max_hs_dtr = ivar->hs_tran_speed; } for (i = 0; i < nkid; i++) { ==== //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_iicbus.c,v 1.1 2009/01/15 02:46:43 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_iicbus.c,v 1.2 2009/01/20 14:06:30 nwhitehorn Exp $"); #include #include @@ -78,8 +78,8 @@ static devclass_t ofwiicbus_devclass; -DEFINE_CLASS_1(iicbus, ofw_iicbus_driver, ofw_iicbus_methods, 1 /* no softc */, - iicbus_driver); +DEFINE_CLASS_1(iicbus, ofw_iicbus_driver, ofw_iicbus_methods, + sizeof(struct iicbus_softc), iicbus_driver); DRIVER_MODULE(ofw_iicbus, iichb, ofw_iicbus_driver, ofwiicbus_devclass, 0, 0); MODULE_VERSION(ofw_iicbus, 1); MODULE_DEPEND(ofw_iicbus, iicbus, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/pci/pci.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.366 2008/11/13 19:57:33 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.368 2009/01/20 00:05:43 nwhitehorn Exp $"); #include "opt_bus.h" @@ -2291,9 +2291,27 @@ struct resource *res; map = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); + + /* + * Disable decoding via the command register before + * determining the BARs length since we will be placing them + * in a weird state. + */ + cmd = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_COMMAND, 2); + PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, + cmd & ~(PCI_BAR_MEM(map) ? PCIM_CMD_MEMEN : PCIM_CMD_PORTEN), 2); + + /* + * Determine the BAR's length by writing all 1's. The bottom + * log_2(size) bits of the BAR will stick as 0 when we read + * the value back. + */ PCIB_WRITE_CONFIG(pcib, b, s, f, reg, 0xffffffff, 4); testval = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); + + /* Restore the BAR and command register. */ PCIB_WRITE_CONFIG(pcib, b, s, f, reg, map, 4); + PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2); if (PCI_BAR_MEM(map)) type = SYS_RES_MEMORY; @@ -2626,7 +2644,7 @@ device_set_desc(dev, "PCI bus"); /* Allow other subclasses to override this driver. */ - return (-1000); + return (BUS_PROBE_GENERIC); } static int ==== //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.49 2008/11/16 17:42:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.50 2009/01/21 23:10:06 jhb Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from @@ -152,8 +152,12 @@ int sc_iferrs; struct resource *res_irq; + void *sc_intr_cookie; }; +static struct mtx lp_tables_lock; +MTX_SYSINIT(lp_tables, &lp_tables_lock, "plip tables", MTX_DEF); + /* Tables for the lp# interface */ static u_char *txmith; #define txmitl (txmith + (1 * LPIPTBLSIZE)) @@ -170,13 +174,41 @@ static int lpioctl(struct ifnet *, u_long, caddr_t); static int lpoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); +static void lpstop(struct lp_data *); static void lp_intr(void *); +static int lp_module_handler(module_t, int, void *); #define DEVTOSOFTC(dev) \ ((struct lp_data *)device_get_softc(dev)) static devclass_t lp_devclass; +static int +lp_module_handler(module_t mod, int what, void *arg) +{ + + switch (what) { + case MOD_UNLOAD: + mtx_lock(&lp_tables_lock); + if (txmith != NULL) { + free(txmith, M_DEVBUF); + txmith = NULL; + } + if (ctxmith != NULL) { + free(ctxmith, M_DEVBUF); + ctxmith = NULL; + } + mtx_unlock(&lp_tables_lock); + break; + case MOD_LOAD: + case MOD_QUIESCE: + break; + default: + return (EOPNOTSUPP); + } + return (0); +} + static void lp_identify(driver_t *driver, device_t parent) { @@ -201,7 +233,7 @@ { struct lp_data *lp = DEVTOSOFTC(dev); struct ifnet *ifp; - int rid = 0; + int error, rid = 0; lp->sc_dev = dev; @@ -224,8 +256,7 @@ ifp->if_softc = lp; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = LPMTU; - ifp->if_flags = IFF_SIMPLEX | IFF_POINTOPOINT | IFF_MULTICAST | - IFF_NEEDSGIANT; + ifp->if_flags = IFF_SIMPLEX | IFF_POINTOPOINT | IFF_MULTICAST; ifp->if_ioctl = lpioctl; ifp->if_output = lpoutput; ifp->if_hdrlen = 0; @@ -235,8 +266,39 @@ bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); + /* + * Attach our interrupt handler. It is only called while we + * own the ppbus. + */ + error = bus_setup_intr(dev, lp->res_irq, INTR_TYPE_NET | INTR_MPSAFE, + NULL, lp_intr, lp, &lp->sc_intr_cookie); + if (error) { + bpfdetach(ifp); + if_detach(ifp); + bus_release_resource(dev, SYS_RES_IRQ, 0, lp->res_irq); + device_printf(dev, "Unable to register interrupt handler\n"); + return (error); + } + + return (0); +} + +static int +lp_detach(device_t dev) +{ + struct lp_data *sc = device_get_softc(dev); + device_t ppbus = device_get_parent(dev); + + ppb_lock(ppbus); + lpstop(sc); + ppb_unlock(ppbus); + bpfdetach(sc->sc_ifp); + if_detach(sc->sc_ifp); + bus_teardown_intr(dev, sc->res_irq, sc->sc_intr_cookie); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->res_irq); return (0); } + /* * Build the translation tables for the LPIP (BSD unix) protocol. * We don't want to calculate these nasties in our tight loop, so we @@ -247,17 +309,22 @@ { int i; + mtx_lock(&lp_tables_lock); if (txmith == NULL) txmith = malloc(4 * LPIPTBLSIZE, M_DEVBUF, M_NOWAIT); - if (txmith == NULL) + if (txmith == NULL) { + mtx_unlock(&lp_tables_lock); return (1); + } if (ctxmith == NULL) ctxmith = malloc(4 * LPIPTBLSIZE, M_DEVBUF, M_NOWAIT); - if (ctxmith == NULL) + if (ctxmith == NULL) { + mtx_unlock(&lp_tables_lock); return (1); + } for (i = 0; i < LPIPTBLSIZE; i++) { ctxmith[i] = (i & 0xF0) >> 4; @@ -272,10 +339,61 @@ trecvh[i] = ((~i) & 0x80) | ((i & 0x38) << 1); trecvl[i] = (((~i) & 0x80) >> 4) | ((i & 0x38) >> 3); } + mtx_unlock(&lp_tables_lock); return (0); } +static void +lpstop(struct lp_data *sc) +{ + device_t ppbus = device_get_parent(sc->sc_dev); + + ppb_assert_locked(ppbus); + ppb_wctr(ppbus, 0x00); + sc->sc_ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + free(sc->sc_ifbuf, M_DEVBUF); + sc->sc_ifbuf = NULL; + + /* IFF_UP is not set, try to release the bus anyway */ + ppb_release_bus(ppbus, sc->sc_dev); +} + +static int +lpinit_locked(struct ifnet *ifp) +{ + struct lp_data *sc = ifp->if_softc; + device_t dev = sc->sc_dev; + device_t ppbus = device_get_parent(dev); + int error; + + ppb_assert_locked(ppbus); + error = ppb_request_bus(ppbus, dev, PPB_DONTWAIT); + if (error) + return (error); + + /* Now IFF_UP means that we own the bus */ + ppb_set_mode(ppbus, PPB_COMPATIBLE); + + if (lpinittables()) { + ppb_release_bus(ppbus, dev); + return (ENOBUFS); + } + + sc->sc_ifbuf = malloc(sc->sc_ifp->if_mtu + MLPIPHDRLEN, + M_DEVBUF, M_NOWAIT); + if (sc->sc_ifbuf == NULL) { + ppb_release_bus(ppbus, dev); + return (ENOBUFS); + } + + ppb_wctr(ppbus, IRQENABLE); + + ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + return (0); +} + /* * Process an ioctl request. */ @@ -288,7 +406,6 @@ struct ifaddr *ifa = (struct ifaddr *)data; struct ifreq *ifr = (struct ifreq *)data; u_char *ptr; - void *ih; int error; switch (cmd) { @@ -301,67 +418,32 @@ ifp->if_flags |= IFF_UP; /* FALLTHROUGH */ case SIOCSIFFLAGS: + error = 0; + ppb_lock(ppbus); if ((!(ifp->if_flags & IFF_UP)) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) { + (ifp->if_drv_flags & IFF_DRV_RUNNING)) + lpstop(sc); + else if (((ifp->if_flags & IFF_UP)) && + (!(ifp->if_drv_flags & IFF_DRV_RUNNING))) + error = lpinit_locked(ifp); + ppb_unlock(ppbus); + return (error); - ppb_wctr(ppbus, 0x00); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - - /* IFF_UP is not set, try to release the bus anyway */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 23 13:28:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 246031065691; Fri, 23 Jan 2009 13:28:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2F2B1065680 for ; Fri, 23 Jan 2009 13:28:06 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C02A18FC16 for ; Fri, 23 Jan 2009 13:28:06 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NDS6Ep030560 for ; Fri, 23 Jan 2009 13:28:06 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NDS4ZF030556 for perforce@freebsd.org; Fri, 23 Jan 2009 13:28:04 GMT (envelope-from zec@icir.org) Date: Fri, 23 Jan 2009 13:28:04 GMT Message-Id: <200901231328.n0NDS4ZF030556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 156563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 13:28:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=156563 Change 156563 by zec@zec_amdx2 on 2009/01/23 13:27:20 IFC @ 156561 Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#4 integrate .. //depot/projects/vimage/src/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ae.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ath.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/bce.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/bge.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/cd.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/gem.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/hme.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ndis.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sdhci.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/urtw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/vimage/src/share/man/man7/build.7#2 integrate .. //depot/projects/vimage/src/share/man/man7/ports.7#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/domain.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/insmntque.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/redzone.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/style.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#11 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#8 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#24 integrate .. //depot/projects/vimage/src/sys/amd64/conf/USB2#1 branch .. //depot/projects/vimage/src/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#13 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#8 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91.c#9 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#12 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twireg.h#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#11 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#10 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/vimage/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/EP80219#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/IQ31244#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/NSLU#5 integrate .. //depot/projects/vimage/src/sys/arm/include/armreg.h#5 integrate .. //depot/projects/vimage/src/sys/arm/include/cpufunc.h#6 integrate .. //depot/projects/vimage/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/ieee.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/intr.h#8 integrate .. //depot/projects/vimage/src/sys/arm/include/vmparam.h#6 integrate .. //depot/projects/vimage/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/files.mv#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/obio.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#7 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npevar.h#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/vimage/src/sys/boot/common/load.c#2 delete .. //depot/projects/vimage/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/vimage/src/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/support.4th#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/vimage/src/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/vimage/src/sys/boot/uboot/common/main.c#4 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfsimpl.c#4 integrate .. //depot/projects/vimage/src/sys/bsm/audit.h#8 integrate .. //depot/projects/vimage/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/vimage/src/sys/bsm/audit_errno.h#1 branch .. //depot/projects/vimage/src/sys/bsm/audit_internal.h#8 integrate .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#9 integrate .. //depot/projects/vimage/src/sys/bsm/audit_record.h#8 integrate .. //depot/projects/vimage/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/vimage/src/sys/cam/cam_periph.c#6 integrate .. //depot/projects/vimage/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/vimage/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/vimage/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#32 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#28 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.arm#9 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#41 integrate .. //depot/projects/vimage/src/sys/conf/files#53 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#17 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#24 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#7 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#16 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#15 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#9 integrate .. //depot/projects/vimage/src/sys/conf/kern.post.mk#7 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#14 integrate .. //depot/projects/vimage/src/sys/conf/newvers.sh#7 integrate .. //depot/projects/vimage/src/sys/conf/options#41 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#9 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#14 integrate .. //depot/projects/vimage/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#14 integrate .. //depot/projects/vimage/src/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/vimage/src/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/vimage/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#10 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/vimage/src/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vimage/src/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/onoe/onoe.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#26 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#11 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#19 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#23 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#20 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#8 integrate .. //depot/projects/vimage/src/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/vimage/src/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/vimage/src/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/vimage/src/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#9 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/ad7418.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/icee.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#11 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#9 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#16 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#13 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#16 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#9 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/vimage/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/vimage/src/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#18 integrate .. //depot/projects/vimage/src/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpt.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppi.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/pps.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpoio.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_isa.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppcvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#21 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/au88x0.c#5 delete .. //depot/projects/vimage/src/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/vimage/src/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#26 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/vimage/src/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#6 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_urtw.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#15 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/atmegadci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/controller/atmegadci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_defs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#22 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#9 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#13 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#8 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_inode.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#9 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/vimage/src/sys/i386/conf/USB2#1 branch .. //depot/projects/vimage/src/sys/i386/conf/XEN#7 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#9 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/smist.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/genassym.c#10 integrate .. //depot/projects/vimage/src/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/vimage/src/sys/i386/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/evtchn.h#4 delete .. //depot/projects/vimage/src/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/xen/xen_intr.h#3 delete .. //depot/projects/vimage/src/sys/i386/include/xen/xenfunc.h#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#5 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/vimage/src/sys/i386/xen/clock.c#4 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#12 integrate .. //depot/projects/vimage/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpu.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#27 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#14 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#25 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#28 integrate .. //depot/projects/vimage/src/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_prf.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#21 integrate .. //depot/projects/vimage/src/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#29 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/vimage/src/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#17 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#10 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#26 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#23 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#10 integrate .. //depot/projects/vimage/src/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/vimage/src/sys/mips/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/mips/include/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/mips/malta/gt_pci.c#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#38 integrate .. //depot/projects/vimage/src/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#9 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/urtw/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/usb2/controller_atmegadci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#10 integrate .. //depot/projects/vimage/src/sys/net/if.c#62 integrate .. //depot/projects/vimage/src/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#36 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#20 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#36 integrate .. //depot/projects/vimage/src/sys/net/if_media.h#7 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#14 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#27 integrate .. //depot/projects/vimage/src/sys/net/pfil.c#3 integrate .. //depot/projects/vimage/src/sys/net/radix.c#4 integrate .. //depot/projects/vimage/src/sys/net/route.c#40 integrate .. //depot/projects/vimage/src/sys/net/route.h#8 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#26 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#26 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_acl.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_tkip.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_wep.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#18 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#17 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_power.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#10 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#19 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_deflate.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#19 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#18 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_mppc.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#11 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pred1.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#26 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#64 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_ftp.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#49 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#71 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#31 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#46 integrate .. //depot/projects/vimage/src/sys/netinet/udp_var.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#43 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#39 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#17 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#33 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#34 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#46 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6protosw.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#43 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#15 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#34 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#38 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#38 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#13 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#34 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#24 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#23 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/vimage/src/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#13 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#18 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/locore.S#5 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/interrupt.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/support.S#2 delete .. //depot/projects/vimage/src/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#10 integrate .. //depot/projects/vimage/src/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/param.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pcpu.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/vimage/src/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/nexus.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/grackle.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/gracklevar.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorth.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorthvar.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#10 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#12 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#11 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#11 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#16 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#13 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_ifoff/mac_ifoff.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#15 integrate .. //depot/projects/vimage/src/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#11 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#15 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#15 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/DEFAULTS#5 integrate .. //depot/projects/vimage/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/ofw_bus.h#2 delete .. //depot/projects/vimage/src/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/tlb.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.h#5 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#8 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#14 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/sbus.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/ofw_bus.c#2 delete .. //depot/projects/vimage/src/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/support.S#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/vimage/src/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/ofw_bus.h#2 delete .. //depot/projects/vimage/src/sys/sun4v/include/ofw_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#8 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/vimage/src/sys/sys/buf_ring.h#3 integrate .. //depot/projects/vimage/src/sys/sys/copyright.h#6 integrate .. //depot/projects/vimage/src/sys/sys/elf64.h#2 integrate .. //depot/projects/vimage/src/sys/sys/elf_common.h#5 integrate .. //depot/projects/vimage/src/sys/sys/elf_generic.h#2 integrate .. //depot/projects/vimage/src/sys/sys/file.h#8 integrate .. //depot/projects/vimage/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/vimage/src/sys/sys/kobj.h#2 integrate .. //depot/projects/vimage/src/sys/sys/ktr.h#2 integrate .. //depot/projects/vimage/src/sys/sys/link_elf.h#4 integrate .. //depot/projects/vimage/src/sys/sys/lock.h#10 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#15 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#16 integrate .. //depot/projects/vimage/src/sys/sys/param.h#39 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#9 integrate .. //depot/projects/vimage/src/sys/sys/protosw.h#7 integrate .. //depot/projects/vimage/src/sys/sys/sched.h#12 integrate .. //depot/projects/vimage/src/sys/sys/soundcard.h#2 integrate .. //depot/projects/vimage/src/sys/sys/tree.h#4 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#16 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#8 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#8 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#12 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.h#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#18 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#20 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.h#10 integrate .. //depot/projects/vimage/src/sys/xen/evtchn.h#1 branch .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn_dev.c#3 integrate .. //depot/projects/vimage/src/sys/xen/features.c#2 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.c#6 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.h#5 integrate .. //depot/projects/vimage/src/sys/xen/hypervisor.h#1 branch .. //depot/projects/vimage/src/sys/xen/xen_intr.h#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_client.c#4 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_comms.c#4 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_comms.h#4 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_dev.c#4 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#5 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe_backend.c#4 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#6 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbusvar.h#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.438 2008/12/15 13:19:11 bz Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.441 2009/01/23 05:53:49 weongyo Exp $ MAN= aac.4 \ acpi.4 \ @@ -229,6 +229,7 @@ ng_eiface.4 \ ng_etf.4 \ ng_ether.4 \ + ng_ether_echo.4 \ ng_fec.4 \ ng_frame_relay.4 \ ng_gif.4 \ @@ -316,6 +317,7 @@ screen.4 \ scsi.4 \ sctp.4 \ + sdhci.4 \ sem.4 \ ses.4 \ sf.4 \ @@ -417,6 +419,7 @@ uplcom.4 \ ural.4 \ urio.4 \ + ${_urtw.4} \ usb.4 \ uscanner.4 \ uslcom.4 \ @@ -568,6 +571,7 @@ MLINKS+=udav.4 if_udav.4 MLINKS+=upgt.4 if_upgt.4 MLINKS+=ural.4 if_ural.4 +MLINKS+=${_urtw.4} ${_if_urtw.4} MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 MLINKS+=vpo.4 imm.4 @@ -601,6 +605,7 @@ _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 _if_nxge.4= if_nxge.4 +_if_urtw.4= if_urtw.4 _if_wpi.4= if_wpi.4 _ipmi.4= ipmi.4 _io.4= io.4 @@ -614,6 +619,7 @@ _rr232x.4= rr232x.4 _speaker.4= speaker.4 _spkr.4= spkr.4 +_urtw.4= urtw.4 _wpi.4= wpi.4 .endif ==== //depot/projects/vimage/src/share/man/man4/acpi_asus.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi_asus.4,v 1.3 2008/08/21 00:40:55 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_asus.4,v 1.4 2008/12/17 20:24:34 thompsa Exp $ .\" -.Dd August 20, 2008 +.Dd December 17, 2008 .Dt ACPI_ASUS 4 i386 .Os .Sh NAME @@ -56,7 +56,8 @@ state. Hotkey events are passed to .Xr devd 8 -for easy handling in userspace. +for easy handling in userspace with the default configuration in +.Pa /etc/devd/asus.conf . .Pp Currently, the following Asus laptops are fully supported: .Pp ==== //depot/projects/vimage/src/share/man/man4/ae.4#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/share/man/man4/ae.4,v 1.2 2008/10/04 16:21:04 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ae.4,v 1.3 2009/01/04 15:48:38 stas Exp $ .\" .Dd October 4, 2008 .Dt AE 4 @@ -121,8 +121,7 @@ .It "ae%d: reset timeout." The card reset operation has been timed out. .It "ae%d: Generating random ethernet address." -No valid ethernet address was found neither in the controller registers not in -NVRAM. +No valid Ethernet address was found in the controller NVRAM and registers. Random locally administered address with ASUS OUI identifier will be used instead. .El @@ -135,8 +134,8 @@ .Xr vlan 4 , .Xr ifconfig 8 .Sh BUGS -The Attansic L2 FastEthernet contoller supports DMA but do not use a descriptor -based transfer mechanism via scatter-gather DMA. +The Attansic L2 FastEthernet contoller supports DMA but does not use a +descriptor based transfer mechanism via scatter-gather DMA. Thus the data should be copied to/from the controller memory on each transmit/receive. Furthermore, a lot of data alignment restrictions apply. @@ -150,4 +149,4 @@ .An Stanislav Sedov .Aq stas@FreeBSD.org . It first appeared in -.Fx 8.0 . +.Fx 7.1 . ==== //depot/projects/vimage/src/share/man/man4/ath.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002-2008 Sam Leffler, Errno Consulting +.\" Copyright (c) 2002-2009 Sam Leffler, Errno Consulting .\" All rights reserved. .\"" .\" Redistribution and use in source and binary forms, with or without @@ -26,9 +26,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.45 2008/04/20 20:35:45 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.46 2009/01/13 23:57:15 sam Exp $ .\"/ -.Dd April 13, 2008 +.Dd January 13, 2009 .Dt ATH 4 .Os .Sh NAME @@ -41,6 +41,7 @@ .Bd -ragged -offset indent .Cd "device ath" .Cd "device ath_hal" +.Cd "options AH_SUPPORT_AR5416" .Cd "device ath_rate_sample" .Cd "device wlan" .Ed @@ -55,14 +56,14 @@ The .Nm driver provides support for wireless network adapters based on >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 23 16:08:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F14F106567D; Fri, 23 Jan 2009 16:08:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F4F51065693 for ; Fri, 23 Jan 2009 16:08:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B1748FC29 for ; Fri, 23 Jan 2009 16:08:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NG8nNC054024 for ; Fri, 23 Jan 2009 16:08:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NG8nYu054022 for perforce@freebsd.org; Fri, 23 Jan 2009 16:08:49 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 23 Jan 2009 16:08:49 GMT Message-Id: <200901231608.n0NG8nYu054022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 16:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=156566 Change 156566 by rene@rene_self on 2009/01/23 16:08:08 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/share/pgpkeys/beech.key#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#4 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.33 2009/01/21 23:52:53 pgj Exp $ --> 2006 2007 2008 + 2009 DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.33 2009/01/21 23:52:53 pgj Exp $ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.33 2009/01/21 23:52:53 pgj Exp $ &bookinfo.legalnotice; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml,v 1.17 2006/01/05 20:03:35 delphij Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml,v 1.18 2009/01/21 23:38:07 pgj Exp $ --> @@ -90,12 +90,12 @@ - My first chapter + My First Chapter This is the first chapter in my book. - My first section + My First Section This is the first section in my book. @@ -114,7 +114,7 @@
- An example article + An Example Article Your first name @@ -135,12 +135,12 @@ - My first section + My First Section This is the first section in my article. - My first sub-section + My First Sub-Section This is the first sub-section in my article. @@ -150,7 +150,7 @@ - Producing formatted output + Producing Formatted Output This section assumes that you have installed the software listed in the textproc/docproj port, either by hand, or by @@ -171,37 +171,37 @@ -c /usr/local/share/sgml/docbook/catalog \ -c /usr/local/share/sgml/jade/catalog \ -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.sgml > file.html + -t sgml file.sgml > file.html Specifies the nochunks parameter to the stylesheets, forcing all output to be written to - STDOUT (using Norm Walsh's stylesheets). + the standard output (using Norm Walsh's stylesheets). - Specifies the catalogs that Jade will need to process. + Specifies the catalogs that Jade will need to process. Three catalogs are required. The first is a catalog that contains information about the DSSSL stylesheets. The second contains information about the DocBook DTD. The third contains - information specific to Jade. + information specific to Jade. - Specifies the full path to the DSSSL stylesheet that Jade + Specifies the full path to the DSSSL stylesheet that Jade will use when processing the document. - Instructs Jade to perform a + Instructs Jade to perform a transformation from one DTD to another. In this case, the input is being transformed from the DocBook DTD to the HTML DTD. - Specifies the file that Jade should process, and redirects + Specifies the file that Jade should process, and redirects output to the specified .html file. @@ -219,7 +219,7 @@ - Specifies the catalogs that Jade will need to process. + Specifies the catalogs that Jade will need to process. Three catalogs are required. The first is a catalog that contains information about the DSSSL stylesheets. The second contains information about the DocBook DTD. The third contains @@ -227,19 +227,19 @@ - Specifies the full path to the DSSSL stylesheet that Jade + Specifies the full path to the DSSSL stylesheet that Jade will use when processing the document. - Instructs Jade to perform a + Instructs Jade to perform a transformation from one DTD to another. In this case, the input is being transformed from the DocBook DTD to the HTML DTD. - Specifies the file that Jade should process. The + Specifies the file that Jade should process. The stylesheets determine how the individual HTML files will be named, and the name of the root file (i.e., the one that contains the start of the document. @@ -256,7 +256,7 @@ The source SGML file must be converted to a &tex; file. - &prompt.user; jade -Vtex-backend \ + &prompt.user; jade -V tex-backend \ -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ -c /usr/local/share/sgml/docbook/catalog \ -c /usr/local/share/sgml/jade/catalog \ @@ -270,7 +270,7 @@ - Specifies the catalogs that Jade will need to process. Three + Specifies the catalogs that Jade will need to process. Three catalogs are required. The first is a catalog that contains information about the DSSSL stylesheets. The second contains information about the DocBook DTD. The third contains @@ -279,11 +279,11 @@ Specifies the full path to the DSSSL stylesheet that - Jade will use when processing the document. + Jade will use when processing the document. - Instructs Jade to convert the output to &tex;. + Instructs Jade to convert the output to &tex;. @@ -300,8 +300,8 @@ on. Do not be alarmed if you see warning messages such as - LaTeX Warning: Reference `136' on page 5 undefined on input - line 728. at this point. + LaTeX Warning: Reference `136' on page 5 undefined on input + line 728. at this point. The second run reprocesses the document now that certain pieces of information are known (such as the document's page length). This @@ -328,7 +328,7 @@ linkend="examples-docbook-postscript">). When the .tex file has been generated you - run pdfTeX. However, use the &pdfjadetex macro package + run pdfTeX. However, use the &pdfjadetex macro package instead. &prompt.user; pdftex "&pdfjadetex" file.tex ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 (text+ko) ==== @@ -27,15 +27,15 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml,v 1.10 2005/09/24 23:15:42 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml,v 1.11 2009/01/21 23:41:25 pgj Exp $ --> Using <literal>sgml-mode</literal> with <application>Emacs</application> - Recent versions of Emacs or XEmacs (available from the ports - collection) contain a very useful package called PSGML. Automatically + Recent versions of Emacs or XEmacs (available from the Ports + Collection) contain a very useful package called PSGML (can be installed from editors/psgml). Automatically invoked when a file with the .sgml extension is loaded, or by typing M-x sgml-mode, it is a major mode for dealing with SGML files, elements and attributes. @@ -48,9 +48,9 @@ C-c C-e - Runs sgml-insert-element. You will be + Runs sgml-insert-element. You will be prompted for the name of the element to insert at the current point. - You can use the TAB key to complete the element. Elements that are + You can use the Tab key to complete the element. Elements that are not valid at the current point will be disallowed. The start and end tags for the element will be inserted. If the @@ -63,7 +63,7 @@ C-c = - Runs sgml-change-element-name. Place the + Runs sgml-change-element-name. Place the point within an element and run this command. You will be prompted for the name of the element to change to. Both the start and end tags of the current element will be changed to the new @@ -75,8 +75,8 @@ C-c C-r - Runs sgml-tag-region. Select some text (move - to start of text, C-space, move to end of text, C-space) and then + Runs sgml-tag-region. Select some text (move + to start of text, C-space, move to end of text, C-space) and then run this command. You will be prompted for the element to use. This element will then be inserted immediately before and after your marked region. @@ -87,7 +87,7 @@ C-c - - Runs sgml-untag-element. Place the point + Runs sgml-untag-element. Place the point within the start or end tag of an element you want to remove, and run this command. The element's start and end tags will be removed. @@ -98,7 +98,7 @@ C-c C-q - Runs sgml-fill-element. Will recursively fill + Runs sgml-fill-element. Will recursively fill (i.e., reformat) content from the current element in. The filling will affect content in which whitespace is significant, such as within programlisting @@ -110,9 +110,9 @@ C-c C-a - Runs sgml-edit-attributes. Opens a second + Runs sgml-edit-attributes. Opens a second buffer containing a list of all the attributes for the closest - enclosing element, and their current values. Use TAB to navigate + enclosing element, and their current values. Use Tab to navigate between attributes, C-k to remove an existing value and replace it with a new one, C-c C-c to close this buffer and return to the main document. @@ -123,7 +123,7 @@ C-c C-v - Runs sgml-validate. Prompts you to save the + Runs sgml-validate. Prompts you to save the current document (if necessary) and then runs an SGML validator. The output from the validator is captured into a new buffer, and you can then navigate from one troublespot to the next, fixing markup errors @@ -135,7 +135,7 @@ C-c / - Runs sgml-insert-end-tag. Inserts the + Runs sgml-insert-end-tag. Inserts the end tag for the current open element. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml,v 1.13 2004/08/05 10:04:29 den Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml,v 1.15 2009/01/22 12:08:03 pgj Exp $ --> @@ -64,7 +64,7 @@ Gentle introduction to SGML + url="http://www-sul.stanford.edu/tools/tutorials/html2.0/gentle.html">Gentle introduction to SGML @@ -97,14 +97,14 @@ DocBook: The Definitive Guide, the online documentation for the DocBook - DTD. + DTD The DocBook Open Repository contains DSSSL stylesheets and other resources - for people using DocBook. + for people using DocBook @@ -114,7 +114,7 @@ - The Linux Documentation + The Linux Documentation Project web pages ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.18 2008/12/07 02:05:09 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.19 2009/01/21 23:44:40 pgj Exp $ --> @@ -238,13 +238,13 @@ In earlier versions of the Handbook the files were stored in the same directory as book.sgml, and named after the value of the id attribute on the - file's chapter element. Moving them into - separate directories prepares for future plans for the Handbook. - Specifically, it will soon be possible to include images in each - chapter. It makes more sense for each image to be stored in a - directory with the text for the chapter than to try to keep the - text for all the chapters, and all the images, in one large - directory. Namespace collisions would be inevitable, and it is + file's chapter element. + Now, it is possible to include images in each + chapter. Images for each Handbook chapter are stored within + share/images/books/handbook. + Note that localized version of these images should be placed in the same + directory as the SGML sources for each chapter. + Namespace collisions would be inevitable, and it is easier to work with several directories with a few files in them than it is to work with one directory that has many files in it. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#4 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml,v 1.26 2008/08/06 22:03:49 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml,v 1.27 2009/01/21 23:46:32 pgj Exp $ --> @@ -86,7 +86,7 @@ - Simple method: Using <command>csup</command> + Simple Method: Using <command>csup</command> The csup command is part of the base system and already used extensively by most people for updating the @@ -145,8 +145,8 @@ - Advanced method: Maintaining a local - <application>CVS</application> doc/www repository + Advanced Method: Maintaining a Local + <application>CVS</application> doc/www Repository This method will give you more advanced options, but will require you to install the @@ -245,7 +245,7 @@ - Build the web pages from scratch + Build the Web Pages from Scratch Having completed either of the two methods, you will be ready to start the website build. In our example, the build directory is @@ -273,7 +273,7 @@ - Install the web pages into your web server + Install the Web Pages into Your Web Server @@ -305,7 +305,7 @@ - Environment variables + Environment Variables @@ -349,8 +349,8 @@ WEB_ONLY - If set and not empty, the makefiles will build and install - only the HTML pages from the www directory. All documents from + If set and not empty, the Makefiles will build and install + only the HTML pages from the www directory. All documents from the doc directory (Handbook, FAQ, Tutorials) will be ignored. E.g.: @@ -359,18 +359,31 @@ + WEB_LANG + + + If set, the Makefiles will build and install only for + the languages specified by this variable inside the + www directory. All + other languages except English will be ignored. E.g.: + + &prompt.root; make WEB_LANG="el es hu nl" all install + + + + NOPORTSCVS - If set, the makefiles will not checkout files from the ports - cvs repository. Instead, it will copy the files from + If set, the Makefiles will not checkout files from the ports + CVS repository. Instead, it will copy the files from /usr/ports (or where the variable PORTSBASE points to). - WEB_ONLY, ENGLISH_ONLY and + WEB_ONLY, WEB_LANG, ENGLISH_ONLY and NOPORTSCVS are make variables. You can set the variables in /etc/make.conf, Makefile.inc, as environment variables on the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 (text+ko) ==== @@ -27,11 +27,11 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v 1.48 2005/09/12 16:47:36 yar Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v 1.49 2009/01/21 23:49:33 pgj Exp $ --> - Writing style + Writing Style In order to promote consistency between the myriad authors of the FreeBSD documentation, some guidelines have been drawn up for authors to @@ -39,7 +39,7 @@ - Use American English spelling + Use American English Spelling There are several variants of English, with different spellings @@ -166,16 +166,16 @@ Style, by William Strunk. - Style guide + Style Guide - To keep the source for the Handbook consistent when many different + To keep the source for the documentation consistent when many different people are editing it, please follow these style conventions. - Letter case + Letter Case - Tags are entered in lower case, <para>, - not <PARA>. + Tags are entered in lower case, para, + not PARA. Text that appears in SGML contexts is generally written in upper case, <!ENTITY…>, and @@ -188,16 +188,16 @@ Acronyms Acronyms should generally be spelled out the first time - they appear in a book, as in: "Network Time Protocol (NTP)." After the + they appear in a document, as in: Network Time Protocol (NTP). After the acronym has been defined, you should generally use the acronym only (not the whole term, unless it makes more sense contextually to use the whole term). Usually, acronyms are - defined only one per book. But if you prefer, you can also + defined only one per document. But if you prefer, you can also define them the first time they appear in each chapter. The first three uses of an acronym should be enclosed in - <acronym> tags, with a role attribute + acronym tags, with a role attribute with the full term defined. This allows a link to the glossary to be created, and for mouseovers to be rendered with the fully expanded term. @@ -263,10 +263,10 @@ - Tag style + Tag Style - Tag spacing + Tag Spacing Tags that start at the same indent as a previous tag should be separated by a blank line, and those that are not @@ -302,7 +302,7 @@ - Separating tags + Separating Tags Tags like itemizedlist which will always have further tags inside them, and in fact do not take @@ -332,13 +332,13 @@ - White space changes + White Space Changes When committing changes, do not commit changes to the content at the same time as changes to the formatting. - This is so that the teams that convert the Handbook to other + This is so that the teams that convert the documentation to other languages can quickly see what content has actually changed in your commit, without having to decide whether a line has changed because of the content, or just because it has been refilled. @@ -352,7 +352,7 @@ - Nonbreaking space + Non-Breaking Space Avoid line breaks in places where they look ugly or make it difficult to follow a sentence. Line breaks depend @@ -364,7 +364,7 @@ GB. Hardware compression … The general entity &nbsp; prohibits - line breaks between parts belonging together. Use nonbreaking + line breaks between parts belonging together. Use non-breaking spaces in the following places: @@ -389,7 +389,7 @@ - Word list + Word List The following is a small list of words spelled the way they should be used in the FreeBSD Documentation Project. If the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -899,6 +899,16 @@ server to use when updating. + + + DOCDIR + + + Where to install the documentation. It defaults to + /usr/share/doc. + + For more make variables supported as system-wide options in ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -376,6 +376,11 @@ + &a.mono.name; + Mono and C# applications on FreeBSD + + + &a.mozilla.name; Porting Mozilla to FreeBSD @@ -1343,6 +1348,23 @@ + &a.mono.name; + + + Mono and C# applications on + FreeBSD + + This is a list for discussions related to the Mono + development framework on &os;. This is a technical + mailing list. It is for individuals actively working on + porting Mono or C# applications to &os;, to bring up + problems or discuss alternative solutions. Individuals + interested in following the technical discussion are also + welcome. + + + + &a.openoffice.name; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -263,6 +263,10 @@ FreeBSD laptop computer mailing list"> freebsd-mobile"> + +Mono and C# applications on FreeBSD"> +freebsd-mono"> + FreeBSD port of the Mozilla browser mailing list"> freebsd-mozilla"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ + -sub 1024g/5D7681A3 2007-06-08 +sub 2048g/9F3B61BF 2009-01-23 ]]> From owner-p4-projects@FreeBSD.ORG Fri Jan 23 16:15:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75D6E10657BC; Fri, 23 Jan 2009 16:15:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32D7510657BB for ; Fri, 23 Jan 2009 16:15:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2103E8FC13 for ; Fri, 23 Jan 2009 16:15:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NGFunk054675 for ; Fri, 23 Jan 2009 16:15:56 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NGFu9U054673 for perforce@freebsd.org; Fri, 23 Jan 2009 16:15:56 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 23 Jan 2009 16:15:56 GMT Message-Id: <200901231615.n0NGFu9U054673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 16:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156567 Change 156567 by rene@rene_self on 2009/01/23 16:15:55 MFen handbook/cutting-edge 1.236 -> 1.237 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#16 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.236 + %SRCID% 1.237 --> @@ -978,6 +978,16 @@ server die gebruikt wordt tijdens het bijwerken. + + + DOCDIR + + + Waar de documentatie te installeren. Dit staat + standaard op /usr/share/doc. + + Bekijk &man.make.conf.5; voor meer make-variabelen die als From owner-p4-projects@FreeBSD.ORG Fri Jan 23 16:35:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5632C10656D3; Fri, 23 Jan 2009 16:35:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0111310656CD for ; Fri, 23 Jan 2009 16:35:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA57A8FC22 for ; Fri, 23 Jan 2009 16:35:16 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NGZGKC066841 for ; Fri, 23 Jan 2009 16:35:16 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NGZGSA066839 for perforce@freebsd.org; Fri, 23 Jan 2009 16:35:16 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 23 Jan 2009 16:35:16 GMT Message-Id: <200901231635.n0NGZGSA066839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 16:35:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=156569 Change 156569 by rene@rene_self on 2009/01/23 16:34:45 MFen the mono list: handbook/eresoruces 1.196 -> 1.197 mailing-lists.ent 1.66 -> 1.67 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#16 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#16 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.196 + %SRCID% 1.197 --> @@ -450,6 +450,12 @@ + &a.mono.name; + + Mono en C# applicaties op &os; + + + &a.mozilla.name; Porten van Mozilla naar @@ -1549,6 +1555,24 @@ + &a.mono.name; + + + Mono en C# applicaties op + &os; + + Dit is een lijst voor discussies met betrekking tot + het Mono-ontwikkelraamwerk op &os;. Dit is een technische + mailinglijst. Het is bedoeld voor individuen die actief + werken aan het overbrengen van Mono of C# applicaties naar + &os;, om problemen naar voren te brengen of alternatieve + oplossingen te bespreken. Individuen die + geïnteresseerd zijn in het volgen van de technische + discussie zijn ook welkom. + + + + &a.openoffice.name; ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#12 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.66 + %SRCID% 1.67 --> @@ -268,6 +268,10 @@ FreeBSD laptop computer mailinglijst"> freebsd-mobile"> + +Mono en C# applicaties op &os;"> +freebsd-mono"> + FreeBSD port van de Mozilla browser mailinglijst"> freebsd-mozilla"> From owner-p4-projects@FreeBSD.ORG Fri Jan 23 19:06:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6139C1065672; Fri, 23 Jan 2009 19:06:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AFDE106567F for ; Fri, 23 Jan 2009 19:06:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 064608FC1B for ; Fri, 23 Jan 2009 19:06:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NJ60TH090660 for ; Fri, 23 Jan 2009 19:06:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NJ5xaB090658 for perforce@freebsd.org; Fri, 23 Jan 2009 19:05:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 23 Jan 2009 19:05:59 GMT Message-Id: <200901231905.n0NJ5xaB090658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 19:06:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=156577 Change 156577 by hselasky@hselasky_laptop001 on 2009/01/23 19:05:38 Fix issues with USB bluetooth negraph node and detach. - Cleanup code. - Reduce the number of mutexes. - Needs review by Maksim. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#15 (text+ko) ==== @@ -37,22 +37,12 @@ * driver will *NOT* create traditional /dev/ enties, only Netgraph * node. * - * NOTE ON LOCKS USED: ng_ubt2 drives uses 3 locks (mutexes) + * NOTE ON LOCKS USED: ng_ubt2 drives uses 1 lock * - * 1) sc_if_mtx[0] - lock for device's interface #0. This lock is used - * by USB2 for any USB request going over device's interface #0, i.e. - * interrupt, control and bulk transfers. - * - * 2) sc_if_mtx[1] - lock for device's interface #1. This lock is used - * by USB2 for any USB request going over device's interface #1, i.e - * isoc. transfers. - * - * 3) sc_mbufq_mtx - lock for mbufq and task flags. This lock is used - * to protect device's outgoing mbuf queues and task flags. This lock - * *SHOULD NOT* be grabbed for a long time. In fact, think of it as a - * spin lock. + * The "sc_mtx" lock protects both USB and Netgraph data. The "sc_mtx" + * lock should not be grabbed for a long time. * - * NOTE ON LOCKING STRATEGY: ng_ubt2 driver operates in 3 different contexts. + * NOTE ON LOCKING STRATEGY: ng_ubt2 driver operates in 2 different contexts. * * 1) USB context. This is where all the USB related stuff happens. All * callbacks run in this context. All callbacks are called (by USB2) with @@ -67,26 +57,6 @@ * grab any long-sleep lock in the Netgraph context. In fact, the only * lock that is allowed in the Netgraph context is the sc_mbufq_mtx lock. * - * 3) Taskqueue context. This is where ubt_task runs. Since we are NOT allowed - * to grab any locks in the Netgraph context, and, USB2 requires us to - * grab interface lock before doing things with transfers, we need to - * transition from the Netgraph context to the Taskqueue context before - * we can call into USB2 subsystem. - * - * So, to put everything together, the rules are as follows. - * It is OK to call from the USB context or the Taskqueue context into - * the Netgraph context (i.e. call NG_SEND_xxx functions). In other words - * it is allowed to call into the Netgraph context with locks held. - * Is it *NOT* OK to call from the Netgraph context into the USB context, - * because USB2 requires us to grab interface locks and we can not do that. - * To avoid this, we set task flags to indicate which actions we want to - * perform and schedule ubt_task which would run in the Taskqueue context. - * Is is OK to call from the Taskqueue context into the USB context, - * and, ubt_task does just that (i.e. grabs appropriate interface locks - * before calling into USB2). - * Access to the outgoing queues and task flags is controlled by the - * sc_mbufq_mtx lock. It is an unavoidable evil. Again, sc_mbufq_mtx should - * really be a spin lock. * All USB callbacks accept Netgraph node pointer as private data. To * ensure that Netgraph node pointer remains valid for the duration of the * transfer, we grab a referrence to the node. In other words, if transfer is @@ -111,7 +81,6 @@ #include #include -#include #include #include @@ -128,10 +97,6 @@ static device_attach_t ubt_attach; static device_detach_t ubt_detach; -static int ubt_task_schedule(ubt_softc_p, int); -static task_fn_t ubt_task; -static void ubt_xfer_start(ubt_softc_p, int); - /* Netgraph methods */ static ng_constructor_t ng_ubt_constructor; static ng_shutdown_t ng_ubt_shutdown; @@ -279,6 +244,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, + .if_index = 0, .mh.bufsize = UBT_BULK_WRITE_BUFFER_SIZE, .mh.flags = { .pipe_bof = 1, }, .mh.callback = &ubt_bulk_write_callback, @@ -288,6 +254,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, + .if_index = 0, .mh.bufsize = UBT_BULK_READ_BUFFER_SIZE, .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, .mh.callback = &ubt_bulk_read_callback, @@ -297,6 +264,7 @@ .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, + .if_index = 0, .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, .mh.bufsize = UBT_INTR_BUFFER_SIZE, .mh.callback = &ubt_intr_read_callback, @@ -306,6 +274,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, + .if_index = 0, .mh.bufsize = UBT_CTRL_BUFFER_SIZE, .mh.callback = &ubt_ctrl_write_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -315,6 +284,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, + .if_index = 0, .mh.bufsize = sizeof(struct usb2_device_request), .mh.callback = &ubt_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ @@ -325,6 +295,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, + .if_index = 0, .mh.bufsize = sizeof(struct usb2_device_request), .mh.callback = &ubt_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ @@ -338,6 +309,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, + .if_index = 0, .mh.bufsize = sizeof(struct usb2_device_request), .mh.callback = &ubt_intr_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ @@ -353,6 +325,7 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, + .if_index = 1, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ .mh.frames = UBT_ISOC_NFRAMES, .mh.flags = { .short_xfer_ok = 1, }, @@ -363,6 +336,7 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, + .if_index = 1, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ .mh.frames = UBT_ISOC_NFRAMES, .mh.flags = { .short_xfer_ok = 1, }, @@ -373,6 +347,7 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, + .if_index = 1, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ .mh.frames = UBT_ISOC_NFRAMES, .mh.flags = { .short_xfer_ok = 1, }, @@ -383,6 +358,7 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, + .if_index = 1, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ .mh.frames = UBT_ISOC_NFRAMES, .mh.flags = { .short_xfer_ok = 1, }, @@ -450,7 +426,8 @@ struct ubt_softc *sc = device_get_softc(dev); struct usb2_endpoint_descriptor *ed; uint16_t wMaxPacketSize; - uint8_t alt_index, iface_index, i, j; + uint8_t alt_index, i, j; + uint8_t iface_index[2]; device_set_usb2_desc(dev); @@ -483,28 +460,22 @@ /* state */ sc->sc_debug = NG_UBT_WARN_LEVEL; - sc->sc_flags = 0; + UBT_STAT_RESET(sc); /* initialize locks */ - mtx_init(&sc->sc_mbufq_mtx, "ubt mbufq", NULL, MTX_DEF); - mtx_init(&sc->sc_if_mtx[0], "ubt if0", NULL, MTX_DEF | MTX_RECURSE); - mtx_init(&sc->sc_if_mtx[1], "ubt if1", NULL, MTX_DEF | MTX_RECURSE); + mtx_init(&sc->sc_mtx, "UBT", NULL, MTX_DEF | MTX_RECURSE); /* initialize packet queues */ NG_BT_MBUFQ_INIT(&sc->sc_cmdq, UBT_DEFAULT_QLEN); NG_BT_MBUFQ_INIT(&sc->sc_aclq, UBT_DEFAULT_QLEN); NG_BT_MBUFQ_INIT(&sc->sc_scoq, UBT_DEFAULT_QLEN); - /* initialize glue task */ - sc->sc_task_flags = 0; - TASK_INIT(&sc->sc_task, 0, ubt_task, sc->sc_node); - /* * Configure Bluetooth USB device. Discover all required USB * interfaces and endpoints. * - * Device is expected to be a high-speed device. + * Device is expected to be a full-speed device. * * USB device must present two interfaces: * 1) Interface 0 that has 3 endpoints @@ -520,20 +491,11 @@ * configurations with different packet size. */ - bzero(&sc->sc_xfer, sizeof(sc->sc_xfer)); - /* * Interface 0 */ - iface_index = 0; - if (usb2_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, - ubt_config, UBT_IF_0_N_TRANSFER, - sc->sc_node, &sc->sc_if_mtx[0])) { - device_printf(dev, "could not allocate transfers for " \ - "interface 0!\n"); - goto detach; - } + iface_index[0] = 0; /* * Interface 1 @@ -580,13 +542,11 @@ goto detach; } - iface_index = 1; - if (usb2_transfer_setup(uaa->device, &iface_index, - &sc->sc_xfer[UBT_IF_0_N_TRANSFER], - &ubt_config[UBT_IF_0_N_TRANSFER], UBT_IF_1_N_TRANSFER, - sc->sc_node, &sc->sc_if_mtx[1])) { - device_printf(dev, "could not allocate transfers for " \ - "interface 1!\n"); + iface_index[1] = 1; + if (usb2_transfer_setup(uaa->device, iface_index, + sc->sc_xfer, ubt_config, UBT_N_TRANSFER, + sc->sc_node, &sc->sc_mtx)) { + device_printf(dev, "could not allocate transfers\n"); goto detach; } @@ -594,6 +554,10 @@ for (i = 1; usb2_get_iface(uaa->device, i) != NULL; i ++) usb2_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex); + UBT_LOCK(sc); + sc->sc_flags |= UBT_FLAG_READY; + UBT_UNLOCK(sc); + return (0); /* success */ detach: @@ -612,17 +576,29 @@ { struct ubt_softc *sc = device_get_softc(dev); node_p node = sc->sc_node; + uint8_t i; + UBT_LOCK(sc); + sc->sc_flags &= ~UBT_FLAG_READY; + UBT_UNLOCK(sc); + + /* make sure that all USB transfers are stopped! */ + for (i = 0; i != UBT_N_TRANSFER; i++) + usb2_transfer_drain(sc->sc_xfer[i]); + /* Destroy Netgraph node */ if (node != NULL) { sc->sc_node = NULL; - NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_REALLY_DIE(node); - NG_NODE_REF(node); ng_rmnode_self(node); + + /* Need to wait until Netgraph has shutdown the node! */ + UBT_LOCK(sc); + while (!(sc->sc_flags & UBT_FLAG_SHUTDOWN)) + usb2_pause_mtx(&sc->sc_mtx, 100); + UBT_UNLOCK(sc); } - /* Free USB transfers, if any */ usb2_transfer_unsetup(sc->sc_xfer, UBT_N_TRANSFER); @@ -630,15 +606,13 @@ NG_NODE_UNREF(node); /* Destroy queues */ - UBT_MBUFQ_LOCK(sc); + UBT_LOCK(sc); NG_BT_MBUFQ_DESTROY(&sc->sc_cmdq); NG_BT_MBUFQ_DESTROY(&sc->sc_aclq); NG_BT_MBUFQ_DESTROY(&sc->sc_scoq); - UBT_MBUFQ_UNLOCK(sc); + UBT_UNLOCK(sc); - mtx_destroy(&sc->sc_if_mtx[0]); - mtx_destroy(&sc->sc_if_mtx[1]); - mtx_destroy(&sc->sc_mbufq_mtx); + mtx_destroy(&sc->sc_mtx); return (0); } /* ubt_detach */ @@ -657,37 +631,25 @@ struct usb2_device_request req; struct mbuf *m; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->error != 0) - UBT_STAT_OERROR(sc); - else { - UBT_INFO(sc, "sent %d bytes to control pipe\n", - xfer->actlen); + UBT_INFO(sc, "sent %d bytes to control pipe\n", + xfer->actlen); + + UBT_STAT_BYTES_SENT(sc, xfer->actlen); + UBT_STAT_PCKTS_SENT(sc); - UBT_STAT_BYTES_SENT(sc, xfer->actlen); - UBT_STAT_PCKTS_SENT(sc); - } /* FALLTHROUGH */ case USB_ST_SETUP: send_next: /* Get next command mbuf, if any */ - UBT_MBUFQ_LOCK(sc); NG_BT_MBUFQ_DEQUEUE(&sc->sc_cmdq, m); - UBT_MBUFQ_UNLOCK(sc); - if (m == NULL) { UBT_INFO(sc, "HCI command queue is empty\n"); - NG_NODE_UNREF(node); - return; + break; } /* Initialize a USB control request and then schedule it */ @@ -719,8 +681,6 @@ UBT_STAT_OERROR(sc); goto send_next; } - - NG_NODE_UNREF(node); /* cancelled */ break; } } /* ubt_ctrl_write_callback */ @@ -740,19 +700,8 @@ ng_hci_event_pkt_t *hdr; int error; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); - if ((sc->sc_hook == NULL) || NG_HOOK_NOT_VALID(sc->sc_hook)) { - UBT_INFO(sc, "no upstream hook\n"); - NG_NODE_UNREF(node); - return; /* upstream hook is gone */ - } - m = NULL; switch (USB_GET_STATE(xfer)) { @@ -836,8 +785,7 @@ /* Try to clear stall first */ sc->sc_flags |= UBT_FLAG_INTR_STALL; usb2_transfer_start(sc->sc_xfer[UBT_IF_0_INTR_CS_RD]); - } else - NG_NODE_UNREF(node); /* cancelled */ + } break; } } /* ubt_intr_read_callback */ @@ -855,11 +803,6 @@ struct ubt_softc *sc; struct usb2_xfer *xfer_other; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); xfer_other = sc->sc_xfer[UBT_IF_0_INTR_DT_RD]; @@ -867,8 +810,7 @@ DPRINTF("stall cleared\n"); sc->sc_flags &= ~UBT_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); - } else - NG_NODE_UNREF(node); /* cant clear stall */ + } } /* ubt_intr_read_clear_stall_callback */ /* @@ -887,19 +829,7 @@ uint16_t len; int error; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); - - if ((sc->sc_hook == NULL) || NG_HOOK_NOT_VALID(sc->sc_hook)) { - UBT_INFO(sc, "no upstream hook\n"); - NG_NODE_UNREF(node); - return; /* upstream hook is gone */ - } - m = NULL; switch (USB_GET_STATE(xfer)) { @@ -983,8 +913,7 @@ /* Try to clear stall first */ sc->sc_flags |= UBT_FLAG_READ_STALL; usb2_transfer_start(sc->sc_xfer[UBT_IF_0_BULK_CS_RD]); - } else - NG_NODE_UNREF(node); /* cancelled */ + } break; } } /* ubt_bulk_read_callback */ @@ -1002,11 +931,6 @@ struct ubt_softc *sc; struct usb2_xfer *xfer_other; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); xfer_other = sc->sc_xfer[UBT_IF_0_BULK_DT_RD]; @@ -1014,8 +938,7 @@ DPRINTF("stall cleared\n"); sc->sc_flags &= ~UBT_FLAG_READ_STALL; usb2_transfer_start(xfer_other); - } else - NG_NODE_UNREF(node); /* cant clear stall */ + } } /* ubt_bulk_read_clear_stall_callback */ /* @@ -1031,36 +954,24 @@ struct ubt_softc *sc; struct mbuf *m; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->error != 0) - UBT_STAT_OERROR(sc); - else { - UBT_INFO(sc, "sent %d bytes to bulk-out pipe\n", - xfer->actlen); + UBT_INFO(sc, "sent %d bytes to bulk-out pipe\n", + xfer->actlen); + + UBT_STAT_BYTES_SENT(sc, xfer->actlen); + UBT_STAT_PCKTS_SENT(sc); - UBT_STAT_BYTES_SENT(sc, xfer->actlen); - UBT_STAT_PCKTS_SENT(sc); - } /* FALLTHROUGH */ case USB_ST_SETUP: /* Get next mbuf, if any */ - UBT_MBUFQ_LOCK(sc); NG_BT_MBUFQ_DEQUEUE(&sc->sc_aclq, m); - UBT_MBUFQ_UNLOCK(sc); - if (m == NULL) { UBT_INFO(sc, "ACL data queue is empty\n"); - NG_NODE_UNREF(node); - return; /* transfer completed */ + break; } /* @@ -1089,8 +1000,7 @@ /* try to clear stall first */ sc->sc_flags |= UBT_FLAG_WRITE_STALL; usb2_transfer_start(sc->sc_xfer[UBT_IF_0_BULK_CS_WR]); - } else - NG_NODE_UNREF(node); /* cancelled */ + } break; } } /* ubt_bulk_write_callback */ @@ -1108,11 +1018,6 @@ struct ubt_softc *sc; struct usb2_xfer *xfer_other; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); xfer_other = sc->sc_xfer[UBT_IF_0_BULK_DT_WR]; @@ -1120,8 +1025,7 @@ DPRINTF("stall cleared\n"); sc->sc_flags &= ~UBT_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); - } else - NG_NODE_UNREF(node); /* cant clear stall */ + } } /* ubt_bulk_write_clear_stall_callback */ /* @@ -1137,19 +1041,8 @@ struct ubt_softc *sc; int n; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); - if ((sc->sc_hook == NULL) || NG_HOOK_NOT_VALID(sc->sc_hook)) { - UBT_INFO(sc, "no upstream hook\n"); - NG_NODE_UNREF(node); - return; /* upstream hook is gone */ - } - switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: for (n = 0; n < xfer->nframes; n ++) @@ -1171,8 +1064,6 @@ goto read_next; /* NOT REACHED */ } - - NG_NODE_UNREF(node); /* cancelled */ break; } } /* ubt_isoc_read_callback */ @@ -1277,24 +1168,16 @@ struct mbuf *m; int n, space, offset; - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - sc = NG_NODE_PRIVATE(node); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->error) - UBT_STAT_OERROR(sc); - else { - UBT_INFO(sc, "sent %d bytes to isoc-out pipe\n", - xfer->actlen); + UBT_INFO(sc, "sent %d bytes to isoc-out pipe\n", + xfer->actlen); + + UBT_STAT_BYTES_SENT(sc, xfer->actlen); + UBT_STAT_PCKTS_SENT(sc); - UBT_STAT_BYTES_SENT(sc, xfer->actlen); - UBT_STAT_PCKTS_SENT(sc); - } /* FALLTHROUGH */ case USB_ST_SETUP: @@ -1305,10 +1188,7 @@ while (space > 0) { if (m == NULL) { - UBT_MBUFQ_LOCK(sc); NG_BT_MBUFQ_DEQUEUE(&sc->sc_scoq, m); - UBT_MBUFQ_UNLOCK(sc); - if (m == NULL) break; } @@ -1328,9 +1208,7 @@ /* Put whatever is left from mbuf back on queue */ if (m != NULL) { - UBT_MBUFQ_LOCK(sc); NG_BT_MBUFQ_PREPEND(&sc->sc_scoq, m); - UBT_MBUFQ_UNLOCK(sc); } /* @@ -1355,174 +1233,12 @@ goto send_next; /* NOT REACHED */ } - - NG_NODE_UNREF(node); /* cancelled */ break; } } /**************************************************************************** **************************************************************************** - ** Glue - **************************************************************************** - ****************************************************************************/ - -/* - * Schedule glue task. Should be called with sc_mbufq_mtx held. - * Netgraph context. - */ - -static int -ubt_task_schedule(ubt_softc_p sc, int action) -{ - mtx_assert(&sc->sc_mbufq_mtx, MA_OWNED); - - if ((sc->sc_task_flags & action) == 0) { - /* - * Try to handle corner case when "start all" and "stop all" - * actions can both be set before task is executed. - * - * Assume the following: - * 1) "stop all" after "start all" cancels "start all", and, - * keeps "stop all" - * - * 2) "start all" after "stop all" is fine because task is - * executing "stop all" first - */ - - if (action == UBT_FLAG_T_STOP_ALL && - (sc->sc_task_flags & UBT_FLAG_T_START_ALL) != 0) - sc->sc_task_flags &= ~UBT_FLAG_T_START_ALL; - - sc->sc_task_flags |= action; - } - - if (sc->sc_task_flags & UBT_FLAG_T_PENDING) - return (1); - - if (taskqueue_enqueue(taskqueue_swi, &sc->sc_task) == 0) { - NG_NODE_REF(sc->sc_node); - sc->sc_task_flags |= UBT_FLAG_T_PENDING; - return (1); - } - - /* XXX: i think this should never happen */ - - return (0); -} /* ubt_task_schedule */ - -/* - * Glue task. Examines sc_task_flags and does things depending on it. - * Taskqueue context. - */ - -static void -ubt_task(void *context, int pending) -{ - node_p node = context; - ubt_softc_p sc; - int task_flags; - - if (NG_NODE_NOT_VALID(node)) { - NG_NODE_UNREF(node); - return; /* netgraph node is gone */ - } - - sc = NG_NODE_PRIVATE(node); - - UBT_MBUFQ_LOCK(sc); - task_flags = sc->sc_task_flags; - sc->sc_task_flags = 0; - UBT_MBUFQ_UNLOCK(sc); - - /* Stop all USB transfers */ - if (task_flags & UBT_FLAG_T_STOP_ALL) { - int i; - - /* - * Interface #0 - */ - - mtx_lock(&sc->sc_if_mtx[0]); - - for (i = UBT_IF_0_BULK_DT_WR; i < UBT_IF_0_N_TRANSFER; i ++) - usb2_transfer_stop(sc->sc_xfer[i]); - - mtx_unlock(&sc->sc_if_mtx[0]); - - /* - * Interface #1 - */ - - mtx_lock(&sc->sc_if_mtx[1]); - - for (i = UBT_IF_1_ISOC_DT_RD1; i < UBT_N_TRANSFER; i ++) - usb2_transfer_stop(sc->sc_xfer[i]); - - mtx_unlock(&sc->sc_if_mtx[1]); - } - - /* Start all incoming USB transfers */ - if (task_flags & UBT_FLAG_T_START_ALL) { - /* - * Interface #0 - */ - - mtx_lock(&sc->sc_if_mtx[0]); - ubt_xfer_start(sc, UBT_IF_0_INTR_DT_RD); - ubt_xfer_start(sc, UBT_IF_0_BULK_DT_RD); - mtx_unlock(&sc->sc_if_mtx[0]); - - /* - * Interface #1 - * Start both read and write isoc. transfers by default. - * Get them going all the time even if we have nothing - * to send to avoid any delays. - */ - - mtx_lock(&sc->sc_if_mtx[1]); - ubt_xfer_start(sc, UBT_IF_1_ISOC_DT_RD1); - ubt_xfer_start(sc, UBT_IF_1_ISOC_DT_RD2); - ubt_xfer_start(sc, UBT_IF_1_ISOC_DT_WR1); - ubt_xfer_start(sc, UBT_IF_1_ISOC_DT_WR2); - mtx_unlock(&sc->sc_if_mtx[1]); - } - - /* Start outgoing control transfer */ - if (task_flags & UBT_FLAG_T_START_CTRL) { - mtx_lock(&sc->sc_if_mtx[0]); - ubt_xfer_start(sc, UBT_IF_0_CTRL_DT_WR); - mtx_unlock(&sc->sc_if_mtx[0]); - } - - /* Start outgoing bulk transfer */ - if (task_flags & UBT_FLAG_T_START_BULK) { - mtx_lock(&sc->sc_if_mtx[0]); - ubt_xfer_start(sc, UBT_IF_0_BULK_DT_WR); - mtx_unlock(&sc->sc_if_mtx[0]); - } - - NG_NODE_UNREF(node); -} /* ubt_task */ - -/* - * Start USB transfer. - * Helper function called from ubt_task. Must be called with appropriate - * interface lock held. - * Taskqueue context. - */ - -static void -ubt_xfer_start(ubt_softc_p sc, int transfer) -{ - if (!usb2_transfer_pending(sc->sc_xfer[transfer])) { - NG_NODE_REF(sc->sc_node); - usb2_transfer_start(sc->sc_xfer[transfer]); - } -} /* ubt_xfer_start */ - -/**************************************************************************** - **************************************************************************** ** Netgraph specific **************************************************************************** ****************************************************************************/ @@ -1546,13 +1262,18 @@ static int ng_ubt_shutdown(node_p node) { + struct ubt_softc *sc = NG_NODE_PRIVATE(node); + if (node->nd_flags & NGF_REALLY_DIE) { /* * We came here because the USB device is being * detached, so stop being persistant. */ + UBT_LOCK(sc); + sc->sc_flags |= UBT_FLAG_SHUTDOWN; + UBT_UNLOCK(sc); + NG_NODE_SET_PRIVATE(node, NULL); - NG_NODE_UNREF(node); } else NG_NODE_REVIVE(node); /* tell ng_rmnode we are persisant */ @@ -1592,9 +1313,21 @@ NG_HOOK_FORCE_QUEUE(NG_HOOK_PEER(hook)); - UBT_MBUFQ_LOCK(sc); - ubt_task_schedule(sc, UBT_FLAG_T_START_ALL); - UBT_MBUFQ_UNLOCK(sc); + if (!(sc->sc_flags & UBT_FLAG_READY)) { + /* called too early */ + return (EINVAL); + } + + NG_NODE_REF(sc->sc_node); + + UBT_LOCK(sc); + usb2_transfer_start(sc->sc_xfer[UBT_IF_0_INTR_DT_RD]); + usb2_transfer_start(sc->sc_xfer[UBT_IF_0_BULK_DT_RD]); + usb2_transfer_start(sc->sc_xfer[UBT_IF_1_ISOC_DT_RD1]); + usb2_transfer_start(sc->sc_xfer[UBT_IF_1_ISOC_DT_RD2]); + usb2_transfer_start(sc->sc_xfer[UBT_IF_1_ISOC_DT_WR1]); + usb2_transfer_start(sc->sc_xfer[UBT_IF_1_ISOC_DT_WR2]); + UBT_UNLOCK(sc); return (0); } /* ng_ubt_connect */ @@ -1609,6 +1342,7 @@ { node_p node = NG_HOOK_NODE(hook); struct ubt_softc *sc; + uint8_t i; if (NG_NODE_NOT_VALID(node)) return (0); @@ -1618,19 +1352,25 @@ if (hook != sc->sc_hook) return (EINVAL); + /* + * Synchronously drain all USB transfers: + * Can take some milliseconds! + */ + for (i = 0; i != UBT_N_TRANSFER; i++) + usb2_transfer_drain(sc->sc_xfer[i]); + sc->sc_hook = NULL; - UBT_MBUFQ_LOCK(sc); + UBT_LOCK(sc); /* Drain queues */ NG_BT_MBUFQ_DRAIN(&sc->sc_cmdq); NG_BT_MBUFQ_DRAIN(&sc->sc_aclq); NG_BT_MBUFQ_DRAIN(&sc->sc_scoq); - /* Kick off task to stop all USB xfers */ - ubt_task_schedule(sc, UBT_FLAG_T_STOP_ALL); + UBT_UNLOCK(sc); - UBT_MBUFQ_UNLOCK(sc); + NG_NODE_UNREF(node); return (0); } /* ng_ubt_disconnect */ @@ -1664,7 +1404,6 @@ "Refs: %d\n" \ "Hook: %s\n" \ "Flags: %#x\n" \ - "Task flags: %#x\n" \ "Debug: %d\n" \ "CMD queue: [have:%d,max:%d]\n" \ "ACL queue: [have:%d,max:%d]\n" \ @@ -1672,7 +1411,6 @@ node->nd_refs, (sc->sc_hook != NULL) ? NG_UBT_HOOK:"", sc->sc_flags, - sc->sc_task_flags, sc->sc_debug, sc->sc_cmdq.len, sc->sc_cmdq.maxlen, @@ -1823,7 +1561,8 @@ struct ubt_softc *sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); struct mbuf *m; struct ng_bt_mbufq *q; - int action, error = 0; + int error = 0; + uint8_t xfer_action; if (hook != sc->sc_hook) { error = EINVAL; @@ -1853,7 +1592,7 @@ UBT_CTRL_BUFFER_SIZE, m->m_pkthdr.len); q = &sc->sc_cmdq; - action = UBT_FLAG_T_START_CTRL; + xfer_action = UBT_IF_0_CTRL_DT_WR; break; case NG_HCI_ACL_DATA_PKT: @@ -1863,12 +1602,12 @@ UBT_BULK_WRITE_BUFFER_SIZE, m->m_pkthdr.len); q = &sc->sc_aclq; - action = UBT_FLAG_T_START_BULK; + xfer_action = UBT_IF_0_BULK_DT_WR; break; case NG_HCI_SCO_DATA_PKT: q = &sc->sc_scoq; - action = 0; + xfer_action = 255; break; default: @@ -1881,10 +1620,10 @@ /* NOT REACHED */ } - UBT_MBUFQ_LOCK(sc); + UBT_LOCK(sc); if (NG_BT_MBUFQ_FULL(q)) { NG_BT_MBUFQ_DROP(q); - UBT_MBUFQ_UNLOCK(sc); + UBT_UNLOCK(sc); UBT_ERR(sc, "Dropping HCI frame 0x%02x, len=%d. Queue full\n", *mtod(m, uint8_t *), m->m_pkthdr.len); @@ -1894,9 +1633,9 @@ /* Loose HCI packet type, enqueue mbuf and kick off task */ m_adj(m, sizeof(uint8_t)); NG_BT_MBUFQ_ENQUEUE(q, m); - ubt_task_schedule(sc, action); - - UBT_MBUFQ_UNLOCK(sc); + if (xfer_action != 255) + usb2_transfer_start(sc->sc_xfer[xfer_action]); + UBT_UNLOCK(sc); } done: NG_FREE_ITEM(item); @@ -1962,4 +1701,3 @@ MODULE_DEPEND(ng_ubt, ng_hci, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION); MODULE_DEPEND(ng_ubt, usb2_bluetooth, 1, 1, 1); MODULE_DEPEND(ng_ubt, usb2_core, 1, 1, 1); - ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#7 (text+ko) ==== @@ -47,8 +47,8 @@ #define UBT_WARN(...) UBT_DEBUG(NG_UBT_WARN_LEVEL, __VA_ARGS__) #define UBT_INFO(...) UBT_DEBUG(NG_UBT_INFO_LEVEL, __VA_ARGS__) -#define UBT_MBUFQ_LOCK(sc) mtx_lock(&(sc)->sc_mbufq_mtx) -#define UBT_MBUFQ_UNLOCK(sc) mtx_unlock(&(sc)->sc_mbufq_mtx) +#define UBT_LOCK(sc) mtx_lock(&(sc)->sc_mtx) +#define UBT_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) /* Bluetooth USB control request type */ #define UBT_HCI_REQUEST 0x20 @@ -65,17 +65,14 @@ UBT_IF_0_BULK_CS_WR, UBT_IF_0_BULK_CS_RD, UBT_IF_0_INTR_CS_RD, - UBT_IF_0_N_TRANSFER, /* number of interface 0's transfers */ /* Interface #1 transfers */ - UBT_IF_1_ISOC_DT_RD1 = UBT_IF_0_N_TRANSFER, + UBT_IF_1_ISOC_DT_RD1, UBT_IF_1_ISOC_DT_RD2, UBT_IF_1_ISOC_DT_WR1, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 23 19:16:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E79011065672; Fri, 23 Jan 2009 19:16:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A06A5106564A for ; Fri, 23 Jan 2009 19:16:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D76B8FC0C for ; Fri, 23 Jan 2009 19:16:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NJGA7B091432 for ; Fri, 23 Jan 2009 19:16:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NJGAe1091430 for perforce@freebsd.org; Fri, 23 Jan 2009 19:16:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 23 Jan 2009 19:16:10 GMT Message-Id: <200901231916.n0NJGAe1091430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 19:16:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=156579 Change 156579 by hselasky@hselasky_laptop001 on 2009/01/23 19:15:18 Make sure that all node refs are gone. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#16 (text+ko) ==== @@ -598,6 +598,10 @@ while (!(sc->sc_flags & UBT_FLAG_SHUTDOWN)) usb2_pause_mtx(&sc->sc_mtx, 100); UBT_UNLOCK(sc); + + /* Check if there is a leftover hook */ + if (sc->sc_hook != NULL) + NG_NODE_UNREF(node); } /* Free USB transfers, if any */ usb2_transfer_unsetup(sc->sc_xfer, UBT_N_TRANSFER); From owner-p4-projects@FreeBSD.ORG Fri Jan 23 22:25:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1F111065674; Fri, 23 Jan 2009 22:25:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C8541065672 for ; Fri, 23 Jan 2009 22:25:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4063C8FC1F for ; Fri, 23 Jan 2009 22:25:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NMPNlP022404 for ; Fri, 23 Jan 2009 22:25:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NMPNHd022402 for perforce@freebsd.org; Fri, 23 Jan 2009 22:25:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 23 Jan 2009 22:25:23 GMT Message-Id: <200901232225.n0NMPNHd022402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 22:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=156586 Change 156586 by hselasky@hselasky_laptop001 on 2009/01/23 22:24:32 Fix: USB calls inside Netgraph callbacks must be non-blocking. Reported by: Maksim Yevmenkin Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#17 (text+ko) ==== @@ -54,14 +54,7 @@ * Netgraph point of view). Any variable that is only modified from the * Netgraph context does not require any additonal locking. It is generally * *NOT* allowed to grab *ANY* additional lock. Whatever you do, *DO NOT* - * grab any long-sleep lock in the Netgraph context. In fact, the only - * lock that is allowed in the Netgraph context is the sc_mbufq_mtx lock. - * - * All USB callbacks accept Netgraph node pointer as private data. To - * ensure that Netgraph node pointer remains valid for the duration of the - * transfer, we grab a referrence to the node. In other words, if transfer is - * pending, then we should have a referrence on the node. NG_NODE_[NOT_]VALID - * macro is used to check if node is still present and pointer is valid. + * grab any long-sleep lock in the Netgraph context. */ #include @@ -598,10 +591,6 @@ while (!(sc->sc_flags & UBT_FLAG_SHUTDOWN)) usb2_pause_mtx(&sc->sc_mtx, 100); UBT_UNLOCK(sc); - - /* Check if there is a leftover hook */ - if (sc->sc_hook != NULL) - NG_NODE_UNREF(node); } /* Free USB transfers, if any */ usb2_transfer_unsetup(sc->sc_xfer, UBT_N_TRANSFER); @@ -621,6 +610,33 @@ return (0); } /* ubt_detach */ +/* + * The following function will get the UBT softc pointer by the USB + * transfer pointer. This function returns NULL when the NODE is no + * longer accessible. + */ +static struct ubt_softc * +ubt_get_node_private(struct usb2_xfer *xfer) +{ + node_p node = xfer->priv_sc; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + case USB_ST_SETUP: + /* + * Due to atomicity inside the USB stack we know that + * the node private is still in this state! + */ + return (NG_NODE_PRIVATE(node)); + + default: /* error case */ + if (xfer->error == USB_ERR_CANCELLED) + return (NULL); /* node is gone */ + else + return (NG_NODE_PRIVATE(node)); + } +} + /* * Called when outgoing control request (HCI command) has completed, i.e. * HCI command was sent to the device. @@ -630,12 +646,11 @@ static void ubt_ctrl_write_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct usb2_device_request req; struct mbuf *m; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -698,13 +713,12 @@ static void ubt_intr_read_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct mbuf *m; ng_hci_event_pkt_t *hdr; int error; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); m = NULL; @@ -803,13 +817,14 @@ static void ubt_intr_read_clear_stall_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct usb2_xfer *xfer_other; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); + if (sc == NULL) + return; + xfer_other = sc->sc_xfer[UBT_IF_0_INTR_DT_RD]; - if (usb2_clear_stall_callback(xfer, xfer_other)) { DPRINTF("stall cleared\n"); sc->sc_flags &= ~UBT_FLAG_INTR_STALL; @@ -826,14 +841,14 @@ static void ubt_bulk_read_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct mbuf *m; ng_hci_acldata_pkt_t *hdr; uint16_t len; int error; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); + m = NULL; switch (USB_GET_STATE(xfer)) { @@ -931,13 +946,14 @@ static void ubt_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct usb2_xfer *xfer_other; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); + if (sc == NULL) + return; + xfer_other = sc->sc_xfer[UBT_IF_0_BULK_DT_RD]; - if (usb2_clear_stall_callback(xfer, xfer_other)) { DPRINTF("stall cleared\n"); sc->sc_flags &= ~UBT_FLAG_READ_STALL; @@ -954,11 +970,10 @@ static void ubt_bulk_write_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct mbuf *m; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -1018,13 +1033,14 @@ static void ubt_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct usb2_xfer *xfer_other; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); + if (sc == NULL) + return; + xfer_other = sc->sc_xfer[UBT_IF_0_BULK_DT_WR]; - if (usb2_clear_stall_callback(xfer, xfer_other)) { DPRINTF("stall cleared\n"); sc->sc_flags &= ~UBT_FLAG_WRITE_STALL; @@ -1041,11 +1057,10 @@ static void ubt_isoc_read_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; int n; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -1167,12 +1182,11 @@ static void ubt_isoc_write_callback(struct usb2_xfer *xfer) { - node_p node = xfer->priv_sc; struct ubt_softc *sc; struct mbuf *m; int n, space, offset; - sc = NG_NODE_PRIVATE(node); + sc = ubt_get_node_private(xfer); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -1322,8 +1336,6 @@ return (EINVAL); } - NG_NODE_REF(sc->sc_node); - UBT_LOCK(sc); usb2_transfer_start(sc->sc_xfer[UBT_IF_0_INTR_DT_RD]); usb2_transfer_start(sc->sc_xfer[UBT_IF_0_BULK_DT_RD]); @@ -1356,17 +1368,21 @@ if (hook != sc->sc_hook) return (EINVAL); - /* - * Synchronously drain all USB transfers: - * Can take some milliseconds! + UBT_LOCK(sc); + + /* + * Netgraph cannot sleep! + * + * Asynchronously stop all USB transfers like an atomic + * operation. If an USB transfer is pending the USB transfer + * will be cancelled and not complete! This operation is + * atomic within the "sc->sc_mtx" mutex. */ for (i = 0; i != UBT_N_TRANSFER; i++) - usb2_transfer_drain(sc->sc_xfer[i]); + usb2_transfer_stop(sc->sc_xfer[i]); sc->sc_hook = NULL; - UBT_LOCK(sc); - /* Drain queues */ NG_BT_MBUFQ_DRAIN(&sc->sc_cmdq); NG_BT_MBUFQ_DRAIN(&sc->sc_aclq); @@ -1374,8 +1390,6 @@ UBT_UNLOCK(sc); - NG_NODE_UNREF(node); - return (0); } /* ng_ubt_disconnect */ From owner-p4-projects@FreeBSD.ORG Fri Jan 23 22:58:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AB2A1065679; Fri, 23 Jan 2009 22:58:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B57761065675 for ; Fri, 23 Jan 2009 22:58:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2AA88FC27 for ; Fri, 23 Jan 2009 22:58:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NMwvIQ028128 for ; Fri, 23 Jan 2009 22:58:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0NMwvQ5028126 for perforce@freebsd.org; Fri, 23 Jan 2009 22:58:57 GMT (envelope-from jhb@freebsd.org) Date: Fri, 23 Jan 2009 22:58:57 GMT Message-Id: <200901232258.n0NMwvQ5028126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2009 22:58:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156589 Change 156589 by jhb@jhb_jhbbsd on 2009/01/23 22:58:19 IFC @156588 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#32 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#17 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#12 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#13 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twireg.h#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/smpng/sys/arm/at91/uart_bus_at91usart.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#18 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#11 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#57 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#28 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#52 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#18 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#72 integrate .. //depot/projects/smpng/sys/conf/files.amd64#60 integrate .. //depot/projects/smpng/sys/conf/files.i386#117 integrate .. //depot/projects/smpng/sys/conf/files.pc98#94 integrate .. //depot/projects/smpng/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#63 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#24 integrate .. //depot/projects/smpng/sys/dev/ppbus/immio.c#6 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpbb.c#10 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#23 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#16 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppb_1284.c#5 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppb_base.c#5 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppb_msq.c#7 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#11 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.h#7 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#20 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#24 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#15 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpoio.c#8 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#23 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_puc.c#6 integrate .. //depot/projects/smpng/sys/dev/ppc/ppcreg.h#6 integrate .. //depot/projects/smpng/sys/dev/ppc/ppcvar.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_urtw.c#1 branch .. //depot/projects/smpng/sys/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usbdevs#123 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/smpng/sys/i386/cpufreq/smist.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#102 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#57 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#84 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#47 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#161 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#140 integrate .. //depot/projects/smpng/sys/modules/Makefile#153 integrate .. //depot/projects/smpng/sys/modules/agp/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/urtw/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#110 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_regdomain.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#65 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#53 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#37 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#32 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.170 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.171 2009/01/22 21:04:46 jkim Exp $"); #include "opt_cpu.h" @@ -392,7 +392,8 @@ break; case CPU_VENDOR_CENTAUR: if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + AMD64_CPU_MODEL(cpu_id) >= 0xf && + (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; } ==== //depot/projects/smpng/sys/arm/at91/at91.c#17 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.21 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $"); #include #include @@ -50,6 +50,8 @@ static void at91_eoi(void *); +uint32_t at91_master_clock = AT91C_MASTER_CLOCK; + static int at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp) ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.16 2009/01/23 00:51:25 imp Exp $"); #include #include @@ -67,6 +67,9 @@ struct at91_mci_softc { void *intrhand; /* Interrupt handle */ device_t dev; + int sc_cap; +#define CAP_HAS_4WIRE 1 /* Has 4 wire bus */ +#define CAP_NEEDS_BOUNCE 2 /* broken hardware needing bounce */ int flags; #define CMD_STARTED 1 #define STOP_STARTED 2 @@ -77,7 +80,6 @@ bus_dmamap_t map; int mapped; struct mmc_host host; - int wire4; int bus_busy; struct mmc_request *req; struct mmc_command *curcmd; @@ -167,6 +169,7 @@ device_t child; sc->dev = dev; + sc->sc_cap = CAP_NEEDS_BOUNCE; err = at91_mci_activate(dev); if (err) goto out; @@ -201,7 +204,7 @@ sc->host.f_min = 375000; sc->host.f_max = at91_master_clock / 2; /* Typically 30MHz */ sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; - if (sc->wire4) + if (sc->sc_cap & CAP_HAS_4WIRE) sc->host.caps = MMC_CAP_4_BIT_DATA; else sc->host.caps = 0; @@ -277,7 +280,6 @@ static int at91_mci_update_ios(device_t brdev, device_t reqdev) { - uint32_t at91_master_clock = AT91C_MASTER_CLOCK; struct at91_mci_softc *sc; struct mmc_host *host; struct mmc_ios *ios; @@ -302,6 +304,7 @@ else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv); + /* Do we need a settle time here? */ /* XXX We need to turn the device on/off here with a GPIO pin */ return (0); } @@ -314,7 +317,6 @@ int i; struct mmc_data *data; struct mmc_request *req; - size_t block_size = 1 << 9; // Fixed, per mmc/sd spec for 2GB cards void *vaddr; bus_addr_t paddr; @@ -356,19 +358,21 @@ // Set block size and turn on PDC mode for dma xfer and disable // PDC until we're ready. mr = RD4(sc, MCI_MR) & ~MCI_MR_BLKLEN; - WR4(sc, MCI_MR, mr | (block_size << 16) | MCI_MR_PDCMODE); + WR4(sc, MCI_MR, mr | (data->len << 16) | MCI_MR_PDCMODE); WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS); if (cmdr & MCI_CMDR_TRCMD_START) { if (cmdr & MCI_CMDR_TRDIR) vaddr = cmd->data->data; else { - if (data->len != BBSZ) - panic("Write multiblock write support"); - vaddr = sc->bounce_buffer; - src = (uint32_t *)cmd->data->data; - dst = (uint32_t *)vaddr; - for (i = 0; i < data->len / 4; i++) - dst[i] = bswap32(src[i]); + if (sc->sc_cap & CAP_NEEDS_BOUNCE) { + vaddr = sc->bounce_buffer; + src = (uint32_t *)cmd->data->data; + dst = (uint32_t *)vaddr; + for (i = 0; i < data->len / 4; i++) + dst[i] = bswap32(src[i]); + } + else + vaddr = cmd->data->data; } data->xfer_len = 0; if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, data->len, @@ -499,10 +503,12 @@ bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->dmatag, sc->map); sc->mapped--; - walker = (uint32_t *)cmd->data->data; - len = cmd->data->len / 4; - for (i = 0; i < len; i++) - walker[i] = bswap32(walker[i]); + if (sc->sc_cap & CAP_NEEDS_BOUNCE) { + walker = (uint32_t *)cmd->data->data; + len = cmd->data->len / 4; + for (i = 0; i < len; i++) + walker[i] = bswap32(walker[i]); + } // Finish up the sequence... WR4(sc, MCI_IDR, MCI_SR_ENDRX); WR4(sc, MCI_IER, MCI_SR_RXBUFF); ==== //depot/projects/smpng/sys/arm/at91/at91_twi.c#13 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.13 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.14 2009/01/22 21:55:37 imp Exp $"); #include #include @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -128,7 +129,7 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / TWI_FASTEST_CLOCK) | + sc->cwgr = TWI_CWGR_CKDIV(8 * at91_master_clock / TWI_FASTEST_CLOCK) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); ==== //depot/projects/smpng/sys/arm/at91/at91_twireg.h#4 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.4 2009/01/22 21:55:37 imp Exp $ */ #ifndef ARM_AT91_AT91_TWIREG_H #define ARM_AT91_AT91_TWIREG_H @@ -63,7 +63,7 @@ #define TWI_CWGR_CKDIV(x) ((x) << 16) /* Clock Divider */ #define TWI_CWGR_CHDIV(x) ((x) << 8) /* Clock High Divider */ #define TWI_CWGR_CLDIV(x) ((x) << 0) /* Clock Low Divider */ -#define TWI_CWGR_DIV(rate) ((AT91C_MASTER_CLOCK /(4*(rate))) - 2) +#define TWI_CWGR_DIV(rate) ((at91_master_clock /(4*(rate))) - 2) /* TWI_SR */ /* TWI_IER */ ==== //depot/projects/smpng/sys/arm/at91/at91var.h#3 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.3 2008/11/25 18:40:40 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.4 2009/01/22 21:54:26 imp Exp $ */ #ifndef _AT91VAR_H_ #define _AT91VAR_H_ @@ -43,4 +43,6 @@ struct resource_list resources; }; +extern uint32_t at91_master_clock; + #endif /* _AT91VAR_H_ */ ==== //depot/projects/smpng/sys/arm/at91/uart_bus_at91usart.c#4 (text) ==== @@ -26,7 +26,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.4 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.5 2009/01/22 21:56:41 imp Exp $"); #include #include @@ -38,13 +38,12 @@ #include #include -#include - #include #include #include #include +#include #include "uart_if.h" @@ -103,6 +102,8 @@ break; } sc->sc_class = &at91_usart_class; + if (sc->sc_class->uc_rclk == 0) + sc->sc_class->uc_rclk = at91_master_clock; return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev))); } ==== //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 (text) ==== @@ -29,18 +29,22 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.6 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.7 2009/01/22 21:56:41 imp Exp $"); #include #include #include #include +#include +#include #include #include +#include #include #include +#include bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; @@ -60,6 +64,8 @@ struct uart_class *class; class = &at91_usart_class; + if (class->uc_rclk == 0) + class->uc_rclk = at91_master_clock; di->ops = uart_getops(class); di->bas.chan = 0; di->bas.bst = &at91_bs_tag; ==== //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#18 (text) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.18 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.19 2009/01/22 21:56:41 imp Exp $"); #include "opt_comconsole.h" @@ -45,10 +45,11 @@ #include #include #include +#include #include "uart_if.h" -#define DEFAULT_RCLK AT91C_MASTER_CLOCK +#define DEFAULT_RCLK at91_master_clock #define USART_BUFFER_SIZE 128 /* @@ -684,6 +685,5 @@ at91_usart_methods, sizeof(struct at91_usart_softc), .uc_ops = &at91_usart_ops, - .uc_range = 8, - .uc_rclk = DEFAULT_RCLK + .uc_range = 8 }; ==== //depot/projects/smpng/sys/arm/include/vmparam.h#11 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.12 2007/12/27 16:45:38 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.13 2009/01/22 15:36:11 cognet Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -97,6 +97,13 @@ #define VM_MIN_ADDRESS (0x00001000) #ifdef ARM_USE_SMALL_ALLOC +/* + * ARM_KERN_DIRECTMAP is used to make sure there's enough space between + * VM_MAXUSER_ADDRESS and KERNBASE to map the whole memory. + * It has to be a compile-time constant, even if arm_init_smallalloc(), + * which will do the mapping, gets the real amount of memory at runtime, + * because VM_MAXUSER_ADDRESS is a constant. + */ #ifndef ARM_KERN_DIRECTMAP #define ARM_KERN_DIRECTMAP 512 * 1024 * 1024 /* 512 MB */ #endif ==== //depot/projects/smpng/sys/boot/forth/loader.conf#57 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.135 2008/11/12 09:52:06 yongari Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.136 2009/01/23 05:56:09 weongyo Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,6 +278,7 @@ if_udav_load="NO" # Davicom DM9601 USB Ethernet if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless if_ural_load="NO" # Ralink Technology USB wireless +if_urtw_load="NO" # Realtek 8187L USB wireless if_vr_load="NO" # VIA Rhine I and Rhine II if_vx_load="NO" # 3Com 3C590 family if_wb_load="NO" # Winbond W89C840F ==== //depot/projects/smpng/sys/cam/cam_periph.c#28 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.74 2008/12/19 14:31:40 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.75 2009/01/23 21:03:59 trasz Exp $"); #include #include @@ -171,6 +171,10 @@ break; } xpt_unlock_buses(); + if (p_drv == NULL) { + printf("cam_periph_alloc: invalid periph name '%s'\n", name); + return (CAM_REQ_INVALID); + } sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); ==== //depot/projects/smpng/sys/cam/cam_xpt.c#52 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.206 2009/01/14 21:29:20 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.208 2009/01/23 21:08:00 trasz Exp $"); #include #include @@ -4177,7 +4177,10 @@ { struct sbuf sb; - mtx_assert(path->bus->sim->mtx, MA_OWNED); +#ifdef INVARIANTS + if (path != NULL && path->bus != NULL && path->bus->sim != NULL) + mtx_assert(path->bus->sim->mtx, MA_OWNED); +#endif sbuf_new(&sb, str, str_len, 0); @@ -5191,6 +5194,11 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT); + if (scan_info == NULL) { + request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; + xpt_done(request_ccb); + return; + } scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.c#18 (text+ko) ==== @@ -2,7 +2,7 @@ /* $NetBSD$ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29 2007/06/17 05:55:54 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.30 2009/01/23 21:06:16 trasz Exp $"); #define SCSI_LOW_STATICS #define SCSI_LOW_DEBUG @@ -966,16 +966,16 @@ struct scsi_low_softc *slp; { struct cam_path *path; - union ccb *ccb = xpt_alloc_ccb(); + union ccb *ccb; cam_status status; - bzero(ccb, sizeof(union ccb)); - status = xpt_create_path(&path, xpt_periph, cam_sim_path(slp->sl_si.sim), -1, 0); if (status != CAM_REQ_CMP) return; + ccb = xpt_alloc_ccb(); + bzero(ccb, sizeof(union ccb)); xpt_setup_ccb(&ccb->ccb_h, path, 5); ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = scsi_low_cam_rescan_callback; ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#72 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.133 2008/12/29 12:45:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.134 2009/01/22 17:06:33 jkim Exp $"); #include #include @@ -276,11 +276,17 @@ sbuf_cat(sb, "flags\t\t:"); - if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) { - flags[16] = "fcmov"; - } else if (!strcmp(cpu_vendor, "CyrixInstead")) { +#ifdef __i386__ + switch (cpu_vendor_id) { + case CPU_VENDOR_AMD: + if (class < 6) + flags[16] = "fcmov"; + break; + case CPU_VENDOR_CYRIX: flags[24] = "cxmmx"; + break; } +#endif for (i = 0; i < 32; i++) if (cpu_feature & (1 << i)) ==== //depot/projects/smpng/sys/conf/files.amd64#60 (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.128 2009/01/12 19:23:46 jkim Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.129 2009/01/23 17:48:18 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -132,9 +132,10 @@ crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/acpica/acpi_if.m standard -dev/agp/agp_amd64.c optional agp -dev/agp/agp_i810.c optional agp -dev/agp/agp_intel.c optional agp +dev/agp/agp_amd64.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_via.c optional agp dev/arcmsr/arcmsr.c optional arcmsr pci dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/smpng/sys/conf/files.i386#117 (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.612 2009/01/01 13:26:53 ed Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.613 2009/01/23 17:48:18 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -118,15 +118,15 @@ crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/advansys/adv_isa.c optional adv isa -dev/agp/agp_ali.c optional agp -dev/agp/agp_amd.c optional agp -dev/agp/agp_amd64.c optional agp -dev/agp/agp_ati.c optional agp -dev/agp/agp_i810.c optional agp -dev/agp/agp_intel.c optional agp +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_amd64.c optional agp +dev/agp/agp_ati.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp dev/agp/agp_nvidia.c optional agp -dev/agp/agp_sis.c optional agp -dev/agp/agp_via.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_isa.c optional aic isa dev/arcmsr/arcmsr.c optional arcmsr pci dev/ar/if_ar.c optional ar ==== //depot/projects/smpng/sys/conf/files.pc98#94 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.370 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.371 2009/01/23 17:48:18 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -77,13 +77,13 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb -dev/agp/agp_ali.c optional agp -dev/agp/agp_amd.c optional agp -dev/agp/agp_i810.c optional agp -dev/agp/agp_intel.c optional agp +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp dev/agp/agp_nvidia.c optional agp -dev/agp/agp_sis.c optional agp -dev/agp/agp_via.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_cbus.c optional aic isa dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci ==== //depot/projects/smpng/sys/dev/agp/agp_via.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.26 2007/11/12 21:51:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.27 2009/01/23 17:48:18 jkim Exp $"); #include "opt_bus.h" @@ -85,8 +85,14 @@ return ("VIA 3296 (P4M800) host to PCI bridge"); case 0x03051106: return ("VIA 82C8363 (Apollo KT133x/KM133) host to PCI bridge"); + case 0x03141106: + return ("VIA 3314 (P4M800CE) host to PCI bridge"); case 0x03241106: return ("VIA VT3324 (CX700) host to PCI bridge"); + case 0x03271106: + return ("VIA 3327 (P4M890) host to PCI bridge"); + case 0x03641106: + return ("VIA 3364 (P4M900) host to PCI bridge"); case 0x03911106: return ("VIA 8371 (Apollo KX133) host to PCI bridge"); case 0x05011106: @@ -168,7 +174,10 @@ case 0x02591106: case 0x02691106: case 0x02961106: + case 0x03141106: case 0x03241106: + case 0x03271106: + case 0x03641106: case 0x31231106: case 0x31681106: case 0x31891106: ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210_reset.c,v 1.8 2008/11/11 17:25:16 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c,v 1.2 2009/01/23 05:33:48 sam Exp $ */ #include "opt_ah.h" @@ -296,7 +296,7 @@ return AH_TRUE; bad: - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_reset.c,v 1.9 2008/11/27 22:29:52 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c,v 1.2 2009/01/23 05:33:48 sam Exp $ */ #include "opt_ah.h" @@ -552,7 +552,7 @@ return AH_TRUE; bad: - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_reset.c,v 1.20 2008/11/27 22:30:00 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c,v 1.2 2009/01/23 05:33:48 sam Exp $ */ #include "opt_ah.h" @@ -692,7 +692,7 @@ RESTORE_CCK(ah, chan, isBmode); OS_MARK(ah, AH_MARK_RESET_DONE, ecode); - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5312_reset.c,v 1.10 2008/11/22 07:41:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c,v 1.2 2009/01/23 05:33:48 sam Exp $ */ #include "opt_ah.h" @@ -597,7 +597,7 @@ return AH_TRUE; bad: OS_MARK(ah, AH_MARK_RESET_DONE, ecode); - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5416_reset.c,v 1.27 2008/11/27 22:30:08 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.2 2009/01/23 05:33:48 sam Exp $ */ #include "opt_ah.h" @@ -470,7 +470,7 @@ return AH_TRUE; bad: OS_MARK(ah, AH_MARK_RESET_DONE, ecode); - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL ==== //depot/projects/smpng/sys/dev/ath/if_ath.c#63 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.224 2009/01/08 17:12:47 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.225 2009/01/23 03:15:28 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -5793,9 +5793,12 @@ struct ath_softc *sc = arg; struct ath_hal *ah = sc->sc_ah; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; HAL_BOOL longCal, isCalDone; int nextcal; + if (ic->ic_flags & IEEE80211_F_SCAN) /* defer, off channel */ + goto restart; longCal = (ticks - sc->sc_lastlongcal >= ath_longcalinterval*hz); if (longCal) { sc->sc_stats.ast_per_cal++; @@ -5833,6 +5836,7 @@ sc->sc_stats.ast_per_calfail++; } if (!isCalDone) { +restart: /* * Use a shorter interval to potentially collect multiple * data samples required to complete calibration. Once ==== //depot/projects/smpng/sys/dev/ppbus/if_plip.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.49 2008/11/16 17:42:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.50 2009/01/21 23:10:06 jhb Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from @@ -152,8 +152,12 @@ int sc_iferrs; struct resource *res_irq; + void *sc_intr_cookie; }; +static struct mtx lp_tables_lock; +MTX_SYSINIT(lp_tables, &lp_tables_lock, "plip tables", MTX_DEF); + /* Tables for the lp# interface */ static u_char *txmith; #define txmitl (txmith + (1 * LPIPTBLSIZE)) @@ -170,13 +174,41 @@ static int lpioctl(struct ifnet *, u_long, caddr_t); static int lpoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); +static void lpstop(struct lp_data *); static void lp_intr(void *); +static int lp_module_handler(module_t, int, void *); #define DEVTOSOFTC(dev) \ ((struct lp_data *)device_get_softc(dev)) static devclass_t lp_devclass; +static int +lp_module_handler(module_t mod, int what, void *arg) +{ + + switch (what) { + case MOD_UNLOAD: + mtx_lock(&lp_tables_lock); + if (txmith != NULL) { + free(txmith, M_DEVBUF); + txmith = NULL; + } + if (ctxmith != NULL) { + free(ctxmith, M_DEVBUF); + ctxmith = NULL; + } + mtx_unlock(&lp_tables_lock); + break; + case MOD_LOAD: + case MOD_QUIESCE: + break; + default: + return (EOPNOTSUPP); + } + return (0); +} + static void lp_identify(driver_t *driver, device_t parent) { @@ -201,7 +233,7 @@ { struct lp_data *lp = DEVTOSOFTC(dev); struct ifnet *ifp; - int rid = 0; + int error, rid = 0; lp->sc_dev = dev; @@ -224,8 +256,7 @@ ifp->if_softc = lp; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = LPMTU; - ifp->if_flags = IFF_SIMPLEX | IFF_POINTOPOINT | IFF_MULTICAST | - IFF_NEEDSGIANT; + ifp->if_flags = IFF_SIMPLEX | IFF_POINTOPOINT | IFF_MULTICAST; ifp->if_ioctl = lpioctl; ifp->if_output = lpoutput; ifp->if_hdrlen = 0; @@ -235,8 +266,39 @@ bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); + /* + * Attach our interrupt handler. It is only called while we + * own the ppbus. + */ + error = bus_setup_intr(dev, lp->res_irq, INTR_TYPE_NET | INTR_MPSAFE, + NULL, lp_intr, lp, &lp->sc_intr_cookie); + if (error) { + bpfdetach(ifp); + if_detach(ifp); + bus_release_resource(dev, SYS_RES_IRQ, 0, lp->res_irq); + device_printf(dev, "Unable to register interrupt handler\n"); + return (error); + } + + return (0); +} + +static int +lp_detach(device_t dev) +{ + struct lp_data *sc = device_get_softc(dev); + device_t ppbus = device_get_parent(dev); + + ppb_lock(ppbus); + lpstop(sc); + ppb_unlock(ppbus); + bpfdetach(sc->sc_ifp); + if_detach(sc->sc_ifp); + bus_teardown_intr(dev, sc->res_irq, sc->sc_intr_cookie); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->res_irq); return (0); } + /* * Build the translation tables for the LPIP (BSD unix) protocol. * We don't want to calculate these nasties in our tight loop, so we @@ -247,17 +309,22 @@ { int i; + mtx_lock(&lp_tables_lock); if (txmith == NULL) txmith = malloc(4 * LPIPTBLSIZE, M_DEVBUF, M_NOWAIT); - if (txmith == NULL) + if (txmith == NULL) { + mtx_unlock(&lp_tables_lock); return (1); + } if (ctxmith == NULL) ctxmith = malloc(4 * LPIPTBLSIZE, M_DEVBUF, M_NOWAIT); - if (ctxmith == NULL) + if (ctxmith == NULL) { + mtx_unlock(&lp_tables_lock); return (1); + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 24 09:58:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72EFE1065744; Sat, 24 Jan 2009 09:58:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D286106571C for ; Sat, 24 Jan 2009 09:58:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5540F8FC19 for ; Sat, 24 Jan 2009 09:58:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0O9wEw5042324 for ; Sat, 24 Jan 2009 09:58:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0O9wEZh042322 for perforce@freebsd.org; Sat, 24 Jan 2009 09:58:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 24 Jan 2009 09:58:14 GMT Message-Id: <200901240958.n0O9wEZh042322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 09:58:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=156599 Change 156599 by hselasky@hselasky_laptop001 on 2009/01/24 09:57:15 Add missing node unref. Explained by: Maksim Yevmenkin Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#18 (text+ko) ==== @@ -1292,6 +1292,7 @@ UBT_UNLOCK(sc); NG_NODE_SET_PRIVATE(node, NULL); + NG_NODE_UNREF(node); } else NG_NODE_REVIVE(node); /* tell ng_rmnode we are persisant */ From owner-p4-projects@FreeBSD.ORG Sat Jan 24 10:13:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3957C1065670; Sat, 24 Jan 2009 10:13:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBC18106564A for ; Sat, 24 Jan 2009 10:13:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA48B8FC0A for ; Sat, 24 Jan 2009 10:13:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OADTGF044321 for ; Sat, 24 Jan 2009 10:13:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OADTvb044319 for perforce@freebsd.org; Sat, 24 Jan 2009 10:13:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 24 Jan 2009 10:13:29 GMT Message-Id: <200901241013.n0OADTvb044319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 10:13:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=156600 Change 156600 by hselasky@hselasky_laptop001 on 2009/01/24 10:12:35 Revert last USB bluetooth change. It is not correct. Print out node refs outstanding in detach so that we don't get into any trouble! Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#19 (text+ko) ==== @@ -595,8 +595,14 @@ /* Free USB transfers, if any */ usb2_transfer_unsetup(sc->sc_xfer, UBT_N_TRANSFER); - if (node != NULL) + if (node != NULL) { + if (node->nd_refs != 1) { + device_printf(dev, "WARNING: Node " + "reference(%d) is not one!\n", + (int)(node->nd_refs)); + } NG_NODE_UNREF(node); + } /* Destroy queues */ UBT_LOCK(sc); @@ -1292,7 +1298,6 @@ UBT_UNLOCK(sc); NG_NODE_SET_PRIVATE(node, NULL); - NG_NODE_UNREF(node); } else NG_NODE_REVIVE(node); /* tell ng_rmnode we are persisant */ From owner-p4-projects@FreeBSD.ORG Sat Jan 24 14:51:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA31E1065672; Sat, 24 Jan 2009 14:51:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C1531065674 for ; Sat, 24 Jan 2009 14:51:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4898A8FC19 for ; Sat, 24 Jan 2009 14:51:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OEpCMV094424 for ; Sat, 24 Jan 2009 14:51:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OEpClr094422 for perforce@freebsd.org; Sat, 24 Jan 2009 14:51:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 14:51:12 GMT Message-Id: <200901241451.n0OEpClr094422@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 156608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 14:51:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=156608 Change 156608 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 14:50:19 We'll use a modified rtld-elf (ld-elf.so) to allow dynamic linking of capability mode executables, so integrate the existing Makefile from rtld-elf and hook up it up to the build. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/Makefile#3 edit .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#1 branch Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/Makefile#3 (text+ko) ==== @@ -24,6 +24,7 @@ rpc.sprayd \ ${_rshd} \ ${_rtld-elf} \ + ${_rtld-elf-cap} \ save-entropy \ ${_smrsh} \ talkd \ @@ -56,6 +57,7 @@ .if !defined(NO_PIC) && !defined(NO_RTLD) _rtld-elf= rtld-elf +_rtld-elf-cap= rtld-elf-cap .endif .if ${MK_RCMDS} != "no" From owner-p4-projects@FreeBSD.ORG Sat Jan 24 16:04:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 288971065676; Sat, 24 Jan 2009 16:04:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8977106566B for ; Sat, 24 Jan 2009 16:04:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AAC068FC1B for ; Sat, 24 Jan 2009 16:04:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OG4RIQ005069 for ; Sat, 24 Jan 2009 16:04:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OG4Rq2005067 for perforce@freebsd.org; Sat, 24 Jan 2009 16:04:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 16:04:27 GMT Message-Id: <200901241604.n0OG4Rq2005067@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 156610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 16:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=156610 Change 156610 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 16:04:10 Build ld-elf-cap.so using regular ld-elf.so sources. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 (text+ko) ==== @@ -1,27 +1,27 @@ -# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.42 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 $ WITHOUT_SSP= .include -PROG?= ld-elf.so.1 +PROG?= ld-elf-cap.so.1 SRCS= rtld_start.S \ reloc.c rtld.c rtld_lock.c map_object.c \ malloc.c xmalloc.c debug.c libmap.c -MAN= rtld.1 +NO_MAN= CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} +CFLAGS+= -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf LDFLAGS+= -nostdlib -e .rtld_start INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec SYMLINKS= ${BINDIR}/${PROG} /usr/libexec/${PROG} -MLINKS= rtld.1 ld-elf.so.1.1 \ - rtld.1 ld.so.1 CFLAGS+= -fpic -DPIC LDFLAGS+= -shared -Wl,-Bsymbolic + DPADD= ${LIBC_PIC} LDADD= -lc_pic @@ -29,20 +29,20 @@ .if ${MK_SYMVER} == "yes" LIBCDIR= ${.CURDIR}/../../lib/libc VERSION_DEF= ${LIBCDIR}/Versions.def -SYMBOL_MAPS= ${.CURDIR}/Symbol.map +SYMBOL_MAPS= ${.CURDIR}/../rtld-elf/Symbol.map VERSION_MAP= Version.map LDFLAGS+= -Wl,--version-script=${VERSION_MAP} ${PROG}: ${VERSION_MAP} -.if exists(${.CURDIR}/${MACHINE_ARCH}/Symbol.map) -SYMBOL_MAPS+= ${.CURDIR}/${MACHINE_ARCH}/Symbol.map +.if exists(${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Symbol.map) +SYMBOL_MAPS+= ${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Symbol.map .endif .endif .endif -.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.if exists(${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Makefile.inc" .endif # Since moving rtld-elf to /libexec, we need to create a symlink. @@ -52,7 +52,9 @@ -chflags noschg ${DESTDIR}/usr/libexec/${PROG} .endif -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ../rtld-elf +.PATH: ${.CURDIR}/../rtld-elf/${MACHINE_ARCH} + .include .include From owner-p4-projects@FreeBSD.ORG Sat Jan 24 20:04:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B098B1065679; Sat, 24 Jan 2009 20:04:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 697C01065675 for ; Sat, 24 Jan 2009 20:04:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B9E98FC14 for ; Sat, 24 Jan 2009 20:04:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OK4VuM054350 for ; Sat, 24 Jan 2009 20:04:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OK4Vtg054348 for perforce@freebsd.org; Sat, 24 Jan 2009 20:04:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 20:04:31 GMT Message-Id: <200901242004.n0OK4Vtg054348@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 156616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 20:04:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=156616 Change 156616 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 20:04:25 Make a copy of elf_i386_fbsd.xs for use in building ld-elf-cap, since we require a modified linking procedure. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.xs#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 24 20:06:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F38C01065676; Sat, 24 Jan 2009 20:06:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2D091065673 for ; Sat, 24 Jan 2009 20:06:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F7C08FC1A for ; Sat, 24 Jan 2009 20:06:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OK6XmP054551 for ; Sat, 24 Jan 2009 20:06:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OK6XLI054549 for perforce@freebsd.org; Sat, 24 Jan 2009 20:06:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 20:06:33 GMT Message-Id: <200901242006.n0OK6XLI054549@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 156617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 20:06:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=156617 Change 156617 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 20:05:55 Use rtld-elf-cap linker script. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#3 $ WITHOUT_SSP= @@ -13,7 +13,7 @@ CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD CFLAGS+= -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf -LDFLAGS+= -nostdlib -e .rtld_start +LDFLAGS+= -nostdlib -e .rtld_start -T rtld-elf-cap.xs INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec From owner-p4-projects@FreeBSD.ORG Sat Jan 24 20:11:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B3111065677; Sat, 24 Jan 2009 20:11:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C29D1065675 for ; Sat, 24 Jan 2009 20:11:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08B598FC12 for ; Sat, 24 Jan 2009 20:11:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OKBcCL054960 for ; Sat, 24 Jan 2009 20:11:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OKBc78054958 for perforce@freebsd.org; Sat, 24 Jan 2009 20:11:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 20:11:38 GMT Message-Id: <200901242011.n0OKBc78054958@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 156620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 20:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=156620 Change 156620 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 20:11:00 Set the starting address for ld-elf-cap.so.1 to 0x04000000 so that fexecve(2) on it will map it in a useful place for running (i.e., not 0x00000000) but not at an address that collides with the dynamic binary that ld-elf-cap.so will be doing runtime linking for. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.xs#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.xs#2 (text+ko) ==== @@ -9,7 +9,7 @@ SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0 + SIZEOF_HEADERS; + . = 0x04000000 + SIZEOF_HEADERS; .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) } From owner-p4-projects@FreeBSD.ORG Sat Jan 24 20:29:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B7921065680; Sat, 24 Jan 2009 20:29:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCA911065673 for ; Sat, 24 Jan 2009 20:29:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A926D8FC14 for ; Sat, 24 Jan 2009 20:29:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OKTvus057413 for ; Sat, 24 Jan 2009 20:29:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OKTv8Y057411 for perforce@freebsd.org; Sat, 24 Jan 2009 20:29:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 20:29:57 GMT Message-Id: <200901242029.n0OKTv8Y057411@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 156621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 20:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156621 Change 156621 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 20:29:54 Add stub _rtld_cap_start, which will be the point of entry for capability-mode execution. Nothing here yet. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#4 (text+ko) ==== @@ -527,6 +527,23 @@ return (func_ptr_type) obj_main->entry; } +#ifdef IN_RTLD_CAP +/* + * If we are ld-elf-cap.so, then we are directly executed using fexecve(2) + * and will need to behave a bit differently: + * + * (1) The ELF auxilary arguments are for our own binary. + * (2) The main binary we want to execute will be passed as a file descriptor + * so we'll mock up AT_COUNT. + */ +int +_rtld_cap_start(int argc, char *argv[]) +{ + + _exit(0); +} +#endif + Elf_Addr _rtld_bind(Obj_Entry *obj, Elf_Size reloff) { From owner-p4-projects@FreeBSD.ORG Sat Jan 24 21:45:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 542AF1065748; Sat, 24 Jan 2009 21:45:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 024D91065733 for ; Sat, 24 Jan 2009 21:45:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E19948FC18 for ; Sat, 24 Jan 2009 21:45:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OLjDMT077905 for ; Sat, 24 Jan 2009 21:45:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OLjDBp077903 for perforce@freebsd.org; Sat, 24 Jan 2009 21:45:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 21:45:13 GMT Message-Id: <200901242145.n0OLjDBp077903@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 156622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 21:45:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=156622 Change 156622 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 21:45:03 After much suffering, remember to use -Wl, for linker arguments on the gcc command line. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#3 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#4 $ WITHOUT_SSP= @@ -11,9 +11,9 @@ malloc.c xmalloc.c debug.c libmap.c NO_MAN= CSTD?= gnu99 -CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD +CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP CFLAGS+= -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf -LDFLAGS+= -nostdlib -e .rtld_start -T rtld-elf-cap.xs +LDFLAGS+= -nostdlib -Wl,-e,_rtld_cap_start -Wl,-T,rtld-elf-cap.xs INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec From owner-p4-projects@FreeBSD.ORG Sat Jan 24 21:52:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91A341065672; Sat, 24 Jan 2009 21:52:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5120B106564A for ; Sat, 24 Jan 2009 21:52:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D76A8FC0A for ; Sat, 24 Jan 2009 21:52:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OLqLXw079716 for ; Sat, 24 Jan 2009 21:52:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OLqLMs079714 for perforce@freebsd.org; Sat, 24 Jan 2009 21:52:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 21:52:21 GMT Message-Id: <200901242152.n0OLqLMs079714@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 156623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 21:52:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=156623 Change 156623 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 21:52:09 Fix a bug in the base FreeBSD rtld Makefile -- linker arguments to gcc must be escaped with -Wl,. Due to good luck, this worked: rtld_start.S was the first SRCS entry, and .rtld_start was the first symbol in that file. Wee. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/Makefile#3 (text+ko) ==== @@ -12,7 +12,7 @@ CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} -LDFLAGS+= -nostdlib -e .rtld_start +LDFLAGS+= -nostdlib -Wl,-e,.rtld_start INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec From owner-p4-projects@FreeBSD.ORG Sat Jan 24 22:33:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDF791065672; Sat, 24 Jan 2009 22:33:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88B03106566C for ; Sat, 24 Jan 2009 22:33:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74B718FC1B for ; Sat, 24 Jan 2009 22:33:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OMX29b087798 for ; Sat, 24 Jan 2009 22:33:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OMX2f1087796 for perforce@freebsd.org; Sat, 24 Jan 2009 22:33:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 22:33:02 GMT Message-Id: <200901242233.n0OMX2f1087796@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 156624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 22:33:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=156624 Change 156624 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 22:33:02 After much faldarah, we do want to use rtld_start not rtld_cap_start. Do use debugging symbols for now. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#5 $ WITHOUT_SSP= @@ -11,9 +11,9 @@ malloc.c xmalloc.c debug.c libmap.c NO_MAN= CSTD?= gnu99 -CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP +CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g CFLAGS+= -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf -LDFLAGS+= -nostdlib -Wl,-e,_rtld_cap_start -Wl,-T,rtld-elf-cap.xs +LDFLAGS+= -nostdlib -Wl,-e,_rtld_start -Wl,-T,rtld-elf-cap.xs INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec From owner-p4-projects@FreeBSD.ORG Sat Jan 24 22:35:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B66110656CF; Sat, 24 Jan 2009 22:35:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D455910656CC for ; Sat, 24 Jan 2009 22:35:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A48A48FC16 for ; Sat, 24 Jan 2009 22:35:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OMZ4dk087986 for ; Sat, 24 Jan 2009 22:35:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OMZ4nv087984 for perforce@freebsd.org; Sat, 24 Jan 2009 22:35:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 24 Jan 2009 22:35:04 GMT Message-Id: <200901242235.n0OMZ4nv087984@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 156625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2009 22:35:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=156625 Change 156625 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 22:34:21 The capability-mode rtld-elf behaves a bit differently: we pass the binary to execute as file descriptor 3, which rtld will map and then execute. Do this by mocking up an AT_EXECFD ELF auxiliary argument -- let's see if this long-unused code in rtld works. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#5 (text+ko) ==== @@ -304,6 +304,10 @@ func_ptr_type _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) { +#ifdef IN_RTLD_CAP + struct stat sb; + Elf_Auxinfo aux_execfd; +#endif Elf_Auxinfo *aux_info[AT_COUNT]; int i; int argc; @@ -342,10 +346,32 @@ aux_info[auxp->a_type] = auxp; } +#ifdef IN_RTLD_CAP + /* + * In capability mode, the kernel has executed ld-elf-cap.so directly, + * and the parent has passed the executable it wants us to run as a file + * descriptor. The kernel doesn't know this, so rewrite our auxilary + * arguments so the remainder of rtld thinks the kernel passed the file + * descriptor using AT_EXECFD. + */ + if (aux_info[AT_EXECFD] == NULL) { + bzero(&aux_execfd, sizeof(aux_execfd)); + aux_execfd.a_type = AT_EXECFD; + aux_execfd.a_un.a_val = 3; + aux_info[AT_EXECFD] = &aux_execfd; + if (fstat(3, &sb) < 0) { + __progname = "ld-elf-cap.so"; + _rtld_error("executable file descriptor unusable"); + die(); + } + } +#endif + /* Initialize and relocate ourselves. */ assert(aux_info[AT_BASE] != NULL); init_rtld((caddr_t) aux_info[AT_BASE]->a_un.a_ptr); + /* XXXRW: Need to do something about program names in capability mode. */ __progname = obj_rtld.path; argv0 = argv[0] != NULL ? argv[0] : "(null)"; environ = env; @@ -527,23 +553,6 @@ return (func_ptr_type) obj_main->entry; } -#ifdef IN_RTLD_CAP -/* - * If we are ld-elf-cap.so, then we are directly executed using fexecve(2) - * and will need to behave a bit differently: - * - * (1) The ELF auxilary arguments are for our own binary. - * (2) The main binary we want to execute will be passed as a file descriptor - * so we'll mock up AT_COUNT. - */ -int -_rtld_cap_start(int argc, char *argv[]) -{ - - _exit(0); -} -#endif - Elf_Addr _rtld_bind(Obj_Entry *obj, Elf_Size reloff) {