From owner-p4-projects@FreeBSD.ORG Sun Mar 27 05:48:52 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD79A1065672; Sun, 27 Mar 2011 05:48: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 57942106566C for ; Sun, 27 Mar 2011 05:48:52 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 053F58FC08 for ; Sun, 27 Mar 2011 05:48:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2R5mpWP065422 for ; Sun, 27 Mar 2011 05:48:51 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2R5mpU3065419 for perforce@freebsd.org; Sun, 27 Mar 2011 05:48:51 GMT (envelope-from lz@FreeBSD.org) Date: Sun, 27 Mar 2011 05:48:51 GMT Message-Id: <201103270548.p2R5mpU3065419@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 05:48:52 -0000 http://p4web.freebsd.org/@@190611?ac=10 Change 190611 by lz@freebsd-dev on 2011/03/27 05:48:24 Rename ext2_rsv_win.h to ext2_prealloc.h. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#41 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#7 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#7 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#1 move/add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#13 move/delete .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#14 edit Moved files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#1 moved from //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#12 Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#41 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include #include -#include +#include #define FANCY_REALLOC 1 ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#7 (text+ko) ==== @@ -49,7 +49,8 @@ #include #include #include -#include +#include + /* * Balloc defines the structure of file system storage * by allocating the physical blocks on a device given ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#7 (text+ko) ==== @@ -52,7 +52,7 @@ #include #include #include -#include +#include static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int, long *); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#1 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2010, 2010 Zheng Liu + * Copyright (c) 2010, 2011 Zheng Liu * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_rsv_win.h,v 0.1 2010/05/08 12:41:51 lz Exp $ + * $FreeBSD: src/sys/fs/ext2fs/ext2_prealloc.h,v 0.1 2011/03/27 13:37:00 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_RSV_WIN_H_ -#define _FS_EXT2FS_EXT2_RSV_WIN_H_ +#ifndef _FS_EXT2FS_EXT2_PREALLOC_H_ +#define _FS_EXT2FS_EXT2_PREALLOC_H_ #include @@ -75,4 +75,4 @@ void ext2_discard_rsv(struct inode *ip); int ext2_alloc_rsv(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); -#endif /* !_FS_EXT2FS_EXT2_RSV_WIN_H_ */ +#endif /* !_FS_EXT2FS_EXT2_PREALLOC_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#14 (text+ko) ==== @@ -62,7 +62,7 @@ #include #include #include -#include +#include static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); From owner-p4-projects@FreeBSD.ORG Sun Mar 27 08:57:41 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E8951065672; Sun, 27 Mar 2011 08:57: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 19111106566C for ; Sun, 27 Mar 2011 08:57:41 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 05D6D8FC0C for ; Sun, 27 Mar 2011 08:57:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2R8vejp001328 for ; Sun, 27 Mar 2011 08:57:40 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2R8veDJ001325 for perforce@freebsd.org; Sun, 27 Mar 2011 08:57:40 GMT (envelope-from trasz@freebsd.org) Date: Sun, 27 Mar 2011 08:57:40 GMT Message-Id: <201103270857.p2R8veDJ001325@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 08:57:41 -0000 http://p4web.freebsd.org/@@190618?ac=10 Change 190618 by trasz@trasz_victim on 2011/03/27 08:57:39 Replace "container" and "rusage" with "racct". Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#22 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#35 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/files#51 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/options#32 edit .. //depot/projects/soc2009/trasz_limits/sys/fs/fdescfs/fdesc_vfsops.c#7 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#15 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#26 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#11 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#40 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#77 move/delete .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#24 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#32 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#36 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#39 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#35 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#35 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#1 move/add .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#40 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#62 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#23 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#15 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#15 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#26 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#9 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#21 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#24 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#28 move/delete .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#22 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/kernel.h#9 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#16 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#35 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#1 move/add .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#14 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#26 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#22 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#35 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#25 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#33 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#15 edit Moved files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#1 moved from //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#76 .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#1 moved from //depot/projects/soc2009/trasz_limits/sys/sys/container.h#27 Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#22 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #if defined(__i386__) #include #endif @@ -51,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -359,7 +359,7 @@ PROC_LOCK(td->td_proc); if (a_out->a_text > maxtsiz || a_out->a_data + bss_size > lim_cur(td->td_proc, RLIMIT_DATA) || - rusage_set(td->td_proc, RUSAGE_DATA, a_out->a_data + + racct_set(td->td_proc, RACCT_DATA, a_out->a_data + bss_size) != 0) { PROC_UNLOCK(td->td_proc); error = ENOMEM; ==== //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#35 (text+ko) ==== @@ -1161,8 +1161,8 @@ # Support for Capsicum options CAPABILITIES -# Resource Containers -options CONTAINERS +# Resource Accounting +options RACCT # Resource Limits options RCTL ==== //depot/projects/soc2009/trasz_limits/sys/conf/files#51 (text+ko) ==== @@ -2185,7 +2185,6 @@ kern/kern_condvar.c standard kern/kern_conf.c standard kern/kern_cons.c standard -kern/kern_container.c standard kern/kern_cpu.c standard kern/kern_cpuset.c standard kern/kern_context.c standard @@ -2226,6 +2225,7 @@ kern/kern_priv.c standard kern/kern_proc.c standard kern/kern_prot.c standard +kern/kern_racct.c standard kern/kern_rctl.c standard kern/kern_resource.c standard kern/kern_rmlock.c standard ==== //depot/projects/soc2009/trasz_limits/sys/conf/options#32 (text+ko) ==== @@ -873,8 +873,8 @@ IPOIB_DEBUG opt_ofed.h IPOIB_CM opt_ofed.h -# Resource Containers -CONTAINERS opt_global.h +# Resource Accounting +RACCT opt_global.h # Resource Limits RCTL opt_global.h ==== //depot/projects/soc2009/trasz_limits/sys/fs/fdescfs/fdesc_vfsops.c#7 (text+ko) ==== @@ -38,7 +38,6 @@ * /dev/fd Filesystem */ -#include #include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include #include #include @@ -202,7 +202,7 @@ PROC_UNLOCK(td->td_proc); fdp = td->td_proc->p_fd; FILEDESC_SLOCK(fdp); - limit = rusage_get_limit(td->td_proc, RUSAGE_NOFILE); + limit = racct_get_limit(td->td_proc, RACCT_NOFILE); if (lim > limit) lim = limit; last = min(fdp->fd_nfiles, lim); ==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#15 (text+ko) ==== @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -192,7 +192,7 @@ /* data + bss can't exceed rlimit */ a_out->a_data + bss_size > lim_cur(imgp->proc, RLIMIT_DATA) || - rusage_set(imgp->proc, RUSAGE_DATA, + racct_set(imgp->proc, RACCT_DATA, a_out->a_data + bss_size) != 0) { PROC_UNLOCK(imgp->proc); return (ENOMEM); ==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#26 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_core.h" #include -#include #include #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -876,8 +876,8 @@ if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) || text_size > maxtsiz || total_size > lim_cur(imgp->proc, RLIMIT_VMEM) || - rusage_set(imgp->proc, RUSAGE_DATA, data_size) != 0 || - rusage_set(imgp->proc, RUSAGE_VMEM, total_size) != 0) { + racct_set(imgp->proc, RACCT_DATA, data_size) != 0 || + racct_set(imgp->proc, RACCT_VMEM, total_size) != 0) { PROC_UNLOCK(imgp->proc); return (ENOMEM); } @@ -1105,7 +1105,7 @@ __elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count); PROC_LOCK(td->td_proc); - error = rusage_add(td->td_proc, RUSAGE_CORE, hdrsize + seginfo.size); + error = racct_add(td->td_proc, RACCT_CORE, hdrsize + seginfo.size); PROC_UNLOCK(td->td_proc); if (error != 0) { error = EFAULT; ==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#11 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -217,7 +218,7 @@ /* data + bss can't exceed rlimit */ gz->a_out.a_data + gz->bss_size > lim_cur(gz->ip->proc, RLIMIT_DATA) || - rusage_set(gz->ip->proc, RUSAGE_DATA, + racct_set(gz->ip->proc, RACCT_DATA, gz->a_out.a_data + gz->bss_size) != 0) { PROC_UNLOCK(gz->ip->proc); gz->where = __LINE__; ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#40 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include -#include #include #include #include @@ -62,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -528,7 +528,7 @@ p->p_cpulimit = RLIM_INFINITY; /* Initialize resource accounting structures. */ - container_create(&p->p_container); + racct_create(&p->p_racct); p->p_stats = pstats_alloc(); @@ -558,7 +558,7 @@ */ (void)chgproccnt(p->p_ucred->cr_ruidinfo, 1, 0); PROC_LOCK(p); - rusage_add_force(p, RUSAGE_NPROC, 1); + racct_add_force(p, RACCT_NPROC, 1); PROC_UNLOCK(p); } SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#24 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include #include #include #include @@ -63,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -282,7 +282,7 @@ PROC_LOCK(p); td->td_retval[0] = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc); - lim = rusage_get_limit(td->td_proc, RUSAGE_NOFILE); + lim = racct_get_limit(td->td_proc, RACCT_NOFILE); PROC_UNLOCK(p); if (lim < td->td_retval[0]) td->td_retval[0] = lim; @@ -802,13 +802,13 @@ /* * The resource limits are here instead of e.g. fdalloc(), * because the file descriptor table may be shared between - * processes, so we can't really use rusage_add()/rusage_sub(). + * processes, so we can't really use racct_add()/racct_sub(). * Instead of counting the number of actually allocated * descriptors, just put the limit on the size of the file * descriptor table. */ PROC_LOCK(p); - error = rusage_set(p, RUSAGE_NOFILE, new + 1); + error = racct_set(p, RACCT_NOFILE, new + 1); PROC_UNLOCK(p); if (error != 0) { FILEDESC_XUNLOCK(fdp); @@ -1486,7 +1486,7 @@ if (fd < fdp->fd_nfiles) break; PROC_LOCK(p); - error = rusage_set(p, RUSAGE_NOFILE, min(fdp->fd_nfiles * 2, maxfd)); + error = racct_set(p, RACCT_NOFILE, min(fdp->fd_nfiles * 2, maxfd)); PROC_UNLOCK(p); if (error != 0) return (EMFILE); @@ -1523,7 +1523,7 @@ /* * XXX: This is only called from uipc_usrreq.c:unp_externalize(); - * call rusage_add() from there instead of dealing with containers + * call racct_add() from there instead of dealing with containers * here. */ PROC_LOCK(p); @@ -1782,7 +1782,7 @@ return; PROC_LOCK(td->td_proc); - rusage_set(td->td_proc, RUSAGE_NOFILE, 0); + racct_set(td->td_proc, RACCT_NOFILE, 0); PROC_UNLOCK(td->td_proc); /* Check for special need to clear POSIX style locks */ ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#32 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,6 @@ #include #include /* for acct_process() function prototype */ #include -#include #include #include #include @@ -177,7 +177,7 @@ } KASSERT(p->p_numthreads == 1, ("exit1: proc %p exiting with %d threads", p, p->p_numthreads)); - rusage_sub(p, RUSAGE_NTHR, 1); + racct_sub(p, RACCT_NTHR, 1); /* * Wakeup anyone in procfs' PIOCWAIT. They should have a hold * on our vmspace, so we should block below until they have @@ -743,11 +743,11 @@ (void)chgproccnt(p->p_ucred->cr_ruidinfo, -1, 0); /* - * Destroy resource container associated with the process. + * Destroy resource accounting information associated with the process. */ - container_proc_exit(p); + racct_proc_exit(p); PROC_LOCK(p->p_pptr); - rusage_sub(p->p_pptr, RUSAGE_NPROC, 1); + racct_sub(p->p_pptr, RACCT_NPROC, 1); PROC_UNLOCK(p->p_pptr); /* @@ -910,10 +910,10 @@ return; PROC_LOCK(parent); - rusage_add_force(parent, RUSAGE_NPROC, 1); + racct_add_force(parent, RACCT_NPROC, 1); PROC_UNLOCK(parent); PROC_LOCK(child->p_pptr); - rusage_sub(child->p_pptr, RUSAGE_NPROC, 1); + racct_sub(child->p_pptr, RACCT_NPROC, 1); sigqueue_take(child->p_ksi); PROC_UNLOCK(child->p_pptr); LIST_REMOVE(child, p_sibling); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#36 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -57,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -735,7 +735,7 @@ } PROC_LOCK(p1); - error = rusage_add(p1, RUSAGE_NPROC, 1); + error = racct_add(p1, RACCT_NPROC, 1); PROC_UNLOCK(p1); if (error != 0) return (EAGAIN); @@ -797,9 +797,9 @@ newproc->p_ucred = p1->p_ucred; /* - * Initialize resource container for the child process. + * Initialize resource accounting for the child process. */ - error = container_proc_fork(p1, newproc); + error = racct_proc_fork(p1, newproc); if (error != 0) { error = EAGAIN; goto fail1; @@ -826,7 +826,7 @@ * After fork, there is exactly one thread running. */ PROC_LOCK(newproc); - error = rusage_set(newproc, RUSAGE_NTHR, 1); + error = racct_set(newproc, RACCT_NTHR, 1); PROC_UNLOCK(newproc); if (error != 0) { error = EAGAIN; @@ -860,7 +860,7 @@ error = EAGAIN; fail: - container_proc_exit(newproc); + racct_proc_exit(newproc); sx_sunlock(&proctree_lock); if (ppsratecheck(&lastfail, &curfail, 1)) printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n", @@ -875,7 +875,7 @@ uma_zfree(proc_zone, newproc); pause("fork", hz / 2); PROC_LOCK(p1); - rusage_sub(p1, RUSAGE_NPROC, 1); + racct_sub(p1, RACCT_NPROC, 1); PROC_UNLOCK(p1); return (error); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#39 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -1197,7 +1197,7 @@ root = mypr->pr_root; vref(root); } - container_create(&pr->pr_container); + racct_create(&pr->pr_racct); strlcpy(pr->pr_hostuuid, DEFAULT_HOSTUUID, HOSTUUIDLEN); pr->pr_flags |= PR_HOST; #if defined(INET) || defined(INET6) @@ -2298,8 +2298,8 @@ newcred->cr_prison = pr; p->p_ucred = newcred; PROC_UNLOCK(p); -#ifdef CONTAINERS - container_proc_ucred_changed(p, oldcred, newcred); +#ifdef RACCT + racct_proc_ucred_changed(p, oldcred, newcred); #endif crfree(oldcred); prison_deref(ppr, PD_DEREF | PD_DEUREF); @@ -2534,9 +2534,9 @@ cpuset_rel(pr->pr_cpuset); osd_jail_exit(pr); #ifdef RCTL - rctl_container_release(pr->pr_container); + rctl_racct_release(pr->pr_racct); #endif - container_destroy(&pr->pr_container); + racct_destroy(&pr->pr_racct); free(pr, M_PRISON); /* Removing a prison frees a reference on its parent. */ @@ -4274,14 +4274,14 @@ "B", "Jail may create sockets other than just UNIX/IPv4/IPv6/route"); void -prison_container_foreach(void (*callback)(struct container *container, +prison_racct_foreach(void (*callback)(struct racct *racct, void *arg2, void *arg3), void *arg2, void *arg3) { struct prison *pr; sx_slock(&allprison_lock); TAILQ_FOREACH(pr, &allprison, pr_list) - (callback)(pr->pr_container, arg2, arg3); + (callback)(pr->pr_racct, arg2, arg3); sx_sunlock(&allprison_lock); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#35 (text+ko) ==== @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_loginclass.c,v 1.1 2011/03/05 12:40:35 trasz Exp $"); #include -#include #include #include #include @@ -57,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -91,7 +91,7 @@ mtx_lock(&loginclasses_lock); if (refcount_release(&lc->lc_refcount)) { - container_destroy(&lc->lc_container); + racct_destroy(&lc->lc_racct); LIST_REMOVE(lc, lc_next); mtx_unlock(&loginclasses_lock); free(lc, M_LOGINCLASS); @@ -117,7 +117,7 @@ return (NULL); newlc = malloc(sizeof(*newlc), M_LOGINCLASS, M_ZERO | M_WAITOK); - container_create(&newlc->lc_container); + racct_create(&newlc->lc_racct); mtx_lock(&loginclasses_lock); LIST_FOREACH(lc, &loginclasses, lc_next) { @@ -127,7 +127,7 @@ /* Found loginclass with a matching name? */ loginclass_hold(lc); mtx_unlock(&loginclasses_lock); - container_destroy(&newlc->lc_container); + racct_destroy(&newlc->lc_racct); free(newlc, M_LOGINCLASS); return (lc); } @@ -209,8 +209,8 @@ newcred->cr_loginclass = newlc; p->p_ucred = newcred; PROC_UNLOCK(p); -#ifdef CONTAINERS - container_proc_ucred_changed(p, oldcred, newcred); +#ifdef RACCT + racct_proc_ucred_changed(p, oldcred, newcred); #endif loginclass_free(oldcred->cr_loginclass); crfree(oldcred); @@ -219,14 +219,14 @@ } void -loginclass_container_foreach(void (*callback)(struct container *container, +loginclass_racct_foreach(void (*callback)(struct racct *racct, void *arg2, void *arg3), void *arg2, void *arg3) { struct loginclass *lc; mtx_lock(&loginclasses_lock); LIST_FOREACH(lc, &loginclasses, lc_next) - (callback)(lc->lc_container, arg2, arg3); + (callback)(lc->lc_racct, arg2, arg3); mtx_unlock(&loginclasses_lock); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#35 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -65,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -585,8 +585,8 @@ } p->p_ucred = newcred; PROC_UNLOCK(p); -#ifdef CONTAINERS - container_proc_ucred_changed(p, oldcred, newcred); +#ifdef RACCT + racct_proc_ucred_changed(p, oldcred, newcred); #endif uifree(uip); crfree(oldcred); @@ -926,8 +926,8 @@ } p->p_ucred = newcred; PROC_UNLOCK(p); -#ifdef CONTAINERS - container_proc_ucred_changed(p, oldcred, newcred); +#ifdef RACCT + racct_proc_ucred_changed(p, oldcred, newcred); #endif uifree(ruip); uifree(euip); @@ -1067,8 +1067,8 @@ } p->p_ucred = newcred; PROC_UNLOCK(p); -#ifdef CONTAINERS - container_proc_ucred_changed(p, oldcred, newcred); +#ifdef RACCT + racct_proc_ucred_changed(p, oldcred, newcred); #endif uifree(ruip); uifree(euip); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#1 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_kdtrace.h" #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -60,178 +60,178 @@ #include #endif -#ifdef CONTAINERS +#ifdef RACCT -FEATURE(containers, "Resource Containers"); +FEATURE(racct, "Resource Accounting"); -static struct mtx container_lock; -MTX_SYSINIT(container_lock, &container_lock, "container lock", MTX_DEF); +static struct mtx racct_lock; +MTX_SYSINIT(racct_lock, &racct_lock, "racct lock", MTX_DEF); -static uma_zone_t container_zone; +static uma_zone_t racct_zone; -static void container_sub(struct container *dest, const struct container *src); -static void rusage_sub_cred_locked(struct ucred *cred, int resource, uint64_t amount); -static void rusage_add_cred_locked(struct ucred *cred, int resource, uint64_t amount); +static void racct_sub_racct(struct racct *dest, const struct racct *src); +static void racct_sub_cred_locked(struct ucred *cred, int resource, uint64_t amount); +static void racct_add_cred_locked(struct ucred *cred, int resource, uint64_t amount); -SDT_PROVIDER_DEFINE(container); -SDT_PROBE_DEFINE3(container, kernel, rusage, add, add, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, add_failure, add-failure, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, add_cred, add-cred, "struct ucred *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, add_force, add-force, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, set, set, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, set_failure, set-failure, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, sub, sub, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, sub_cred, sub-cred, "struct ucred *", "int", "uint64_t"); -SDT_PROBE_DEFINE1(container, kernel, container, create, create, "struct container *"); -SDT_PROBE_DEFINE1(container, kernel, container, destroy, destroy, "struct container *"); -SDT_PROBE_DEFINE2(container, kernel, container, join, join, "struct container *", "struct container *"); -SDT_PROBE_DEFINE2(container, kernel, container, join_failure, join-failure, "struct container *", "struct container *"); -SDT_PROBE_DEFINE2(container, kernel, container, leave, leave, "struct container *", "struct container *"); +SDT_PROVIDER_DEFINE(racct); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add, add, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add_failure, add-failure, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add_cred, add-cred, "struct ucred *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add_force, add-force, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, set, set, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, set_failure, set-failure, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, sub, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, sub_cred, sub-cred, "struct ucred *", "int", "uint64_t"); +SDT_PROBE_DEFINE1(racct, kernel, racct, create, create, "struct racct *"); +SDT_PROBE_DEFINE1(racct, kernel, racct, destroy, destroy, "struct racct *"); +SDT_PROBE_DEFINE2(racct, kernel, racct, join, join, "struct racct *", "struct racct *"); +SDT_PROBE_DEFINE2(racct, kernel, racct, join_failure, join-failure, "struct racct *", "struct racct *"); +SDT_PROBE_DEFINE2(racct, kernel, racct, leave, leave, "struct racct *", "struct racct *"); -int rusage_types[] = { - [RUSAGE_CPU] = RUSAGE_IN_THOUSANDS, - [RUSAGE_FSIZE] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, - [RUSAGE_DATA] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, - [RUSAGE_STACK] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, - [RUSAGE_CORE] = RUSAGE_DENIABLE, - [RUSAGE_RSS] = RUSAGE_RECLAIMABLE, - [RUSAGE_MEMLOCK] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE, - [RUSAGE_NPROC] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE, - [RUSAGE_NOFILE] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, - [RUSAGE_SBSIZE] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_VMEM] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, - [RUSAGE_NPTS] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_SWAP] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_NTHR] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE, - [RUSAGE_MSGQQUEUED] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_MSGQSIZE] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_NMSGQ] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_NSEM] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_NSEMOP] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, - [RUSAGE_NSHM] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_SHMSIZE] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_WALLCLOCK] = RUSAGE_IN_THOUSANDS }; +int racct_types[] = { + [RACCT_CPU] = RACCT_IN_THOUSANDS, + [RACCT_FSIZE] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_DATA] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_STACK] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_CORE] = RACCT_DENIABLE, + [RACCT_RSS] = RACCT_RECLAIMABLE, + [RACCT_MEMLOCK] = RACCT_RECLAIMABLE | RACCT_DENIABLE, + [RACCT_NPROC] = RACCT_RECLAIMABLE | RACCT_DENIABLE, + [RACCT_NOFILE] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_SBSIZE] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_VMEM] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_NPTS] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_SWAP] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NTHR] = RACCT_RECLAIMABLE | RACCT_DENIABLE, + [RACCT_MSGQQUEUED] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_MSGQSIZE] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NMSGQ] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NSEM] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NSEMOP] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_NSHM] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_SHMSIZE] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_WALLCLOCK] = RACCT_IN_THOUSANDS }; static void -container_add(struct container *dest, const struct container *src) +racct_add_racct(struct racct *dest, const struct racct *src) { int i; - mtx_assert(&container_lock, MA_OWNED); + mtx_assert(&racct_lock, MA_OWNED); /* * Update resource usage in dest. */ - for (i = 0; i <= RUSAGE_MAX; i++) { - KASSERT(dest->c_resources[i] >= 0, + for (i = 0; i <= RACCT_MAX; i++) { + KASSERT(dest->r_resources[i] >= 0, ("resource usage propagation meltdown: dest < 0")); - KASSERT(src->c_resources[i] >= 0, + KASSERT(src->r_resources[i] >= 0, ("resource usage propagation meltdown: src < 0")); - dest->c_resources[i] += src->c_resources[i]; + dest->r_resources[i] += src->r_resources[i]; } } static void -container_sub(struct container *dest, const struct container *src) +racct_sub_racct(struct racct *dest, const struct racct *src) { int i; - mtx_assert(&container_lock, MA_OWNED); + mtx_assert(&racct_lock, MA_OWNED); /* * Update resource usage in dest. */ - for (i = 0; i <= RUSAGE_MAX; i++) { - if (!rusage_is_sloppy(i) && - !rusage_is_dampened(i)) { - KASSERT(dest->c_resources[i] >= 0, + for (i = 0; i <= RACCT_MAX; i++) { + if (!racct_is_sloppy(i) && + !racct_is_dampened(i)) { + KASSERT(dest->r_resources[i] >= 0, ("resource usage propagation meltdown: dest < 0")); - KASSERT(src->c_resources[i] >= 0, + KASSERT(src->r_resources[i] >= 0, ("resource usage propagation meltdown: src < 0")); - KASSERT(src->c_resources[i] <= dest->c_resources[i], + KASSERT(src->r_resources[i] <= dest->r_resources[i], ("resource usage propagation meltdown: src > dest")); } - if (rusage_is_reclaimable(i)) { - dest->c_resources[i] -= src->c_resources[i]; - if (dest->c_resources[i] < 0) { - KASSERT(rusage_is_sloppy(i) || - rusage_is_dampened(i), - ("container_sub: usage < 0")); - dest->c_resources[i] = 0; + if (racct_is_reclaimable(i)) { + dest->r_resources[i] -= src->r_resources[i]; + if (dest->r_resources[i] < 0) { + KASSERT(racct_is_sloppy(i) || + racct_is_dampened(i), + ("racct_sub_racct: usage < 0")); + dest->r_resources[i] = 0; } } } } void -container_create(struct container **containerp) +racct_create(struct racct **racctp) { - SDT_PROBE(container, kernel, container, create, containerp, 0, 0, 0, 0); + SDT_PROBE(racct, kernel, racct, create, racctp, 0, 0, 0, 0); - KASSERT(*containerp == NULL, ("container already allocated")); + KASSERT(*racctp == NULL, ("racct already allocated")); - *containerp = uma_zalloc(container_zone, M_WAITOK | M_ZERO); + *racctp = uma_zalloc(racct_zone, M_WAITOK | M_ZERO); } static void -container_destroy_locked(struct container **containerp) +racct_destroy_locked(struct racct **racctp) { int i; - struct container *container; + struct racct *racct; - SDT_PROBE(container, kernel, container, destroy, containerp, 0, 0, 0, 0); + SDT_PROBE(racct, kernel, racct, destroy, racctp, 0, 0, 0, 0); - mtx_assert(&container_lock, MA_OWNED); - KASSERT(containerp != NULL, ("NULL containerp")); - KASSERT(*containerp != NULL, ("NULL container")); + mtx_assert(&racct_lock, MA_OWNED); + KASSERT(racctp != NULL, ("NULL racctp")); + KASSERT(*racctp != NULL, ("NULL racct")); - container = *containerp; + racct = *racctp; - for (i = 0; i <= RUSAGE_MAX; i++) { - if (rusage_is_sloppy(i)) + for (i = 0; i <= RACCT_MAX; i++) { + if (racct_is_sloppy(i)) continue; - if (!rusage_is_reclaimable(i)) + if (!racct_is_reclaimable(i)) continue; - if (rusage_is_dampened(i)) + if (racct_is_dampened(i)) continue; - KASSERT(container->c_resources[i] == 0, - ("destroying non-empty container: " + KASSERT(racct->r_resources[i] == 0, + ("destroying non-empty racct: " "%ju allocated for resource %d\n", - container->c_resources[i], i)); + racct->r_resources[i], i)); } - uma_zfree(container_zone, container); - *containerp = NULL; + uma_zfree(racct_zone, racct); + *racctp = NULL; } void -container_destroy(struct container **container) +racct_destroy(struct racct **racct) { - mtx_lock(&container_lock); - container_destroy_locked(container); - mtx_unlock(&container_lock); + mtx_lock(&racct_lock); + racct_destroy_locked(racct); + mtx_unlock(&racct_lock); } /* - * Increase consumption of 'resource' by 'amount' for 'container' + * Increase consumption of 'resource' by 'amount' for 'racct' * and all its parents. Differently from other cases, 'amount' here * may be less than zero. */ static void -container_alloc_resource(struct container *container, int resource, +racct_alloc_resource(struct racct *racct, int resource, uint64_t amount) { - mtx_assert(&container_lock, MA_OWNED); - KASSERT(container != NULL, ("NULL container")); + mtx_assert(&racct_lock, MA_OWNED); + KASSERT(racct != NULL, ("NULL racct")); - container->c_resources[resource] += amount; - if (container->c_resources[resource] < 0) { - KASSERT(rusage_is_sloppy(resource) || - rusage_is_dampened(resource), - ("container_alloc_resource: usage < 0")); - container->c_resources[resource] = 0; + racct->r_resources[resource] += amount; + if (racct->r_resources[resource] < 0) { + KASSERT(racct_is_sloppy(resource) || + racct_is_dampened(resource), + ("racct_alloc_resource: usage < 0")); + racct->r_resources[resource] = 0; } } @@ -240,7 +240,7 @@ * Return 0 if it's below limits, or errno, if it's not. */ int -rusage_add(struct proc *p, int resource, uint64_t amount) +racct_add(struct proc *p, int resource, uint64_t amount) { #ifdef RCTL int error; @@ -249,45 +249,45 @@ if (p->p_flag & P_SYSTEM) return (0); - SDT_PROBE(container, kernel, rusage, add, p, resource, amount, 0, 0); + SDT_PROBE(racct, kernel, rusage, add, p, resource, amount, 0, 0); /* * We need proc lock to dereference p->p_ucred. */ PROC_LOCK_ASSERT(p, MA_OWNED); - KASSERT(amount >= 0, ("rusage_add: invalid amount for resource %d: %ju", + KASSERT(amount >= 0, ("racct_add: invalid amount for resource %d: %ju", resource, amount)); - mtx_lock(&container_lock); + mtx_lock(&racct_lock); #ifdef RCTL error = rctl_enforce(p, resource, amount); - if (error && rusage_is_deniable(resource)) { - SDT_PROBE(container, kernel, rusage, add_failure, p, resource, amount, 0, 0); - mtx_unlock(&container_lock); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 27 10:46:53 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F09601065673; Sun, 27 Mar 2011 10:46: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 B2E50106566C for ; Sun, 27 Mar 2011 10:46:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A00D18FC0C for ; Sun, 27 Mar 2011 10:46:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2RAkq2i023571 for ; Sun, 27 Mar 2011 10:46:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2RAkqdO023568 for perforce@freebsd.org; Sun, 27 Mar 2011 10:46:52 GMT (envelope-from trasz@freebsd.org) Date: Sun, 27 Mar 2011 10:46:52 GMT Message-Id: <201103271046.p2RAkqdO023568@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 10:46:53 -0000 http://p4web.freebsd.org/@@190621?ac=10 Change 190621 by trasz@trasz_victim on 2011/03/27 10:46:14 style(9) Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#2 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#2 (text+ko) ==== @@ -70,47 +70,82 @@ static uma_zone_t racct_zone; static void racct_sub_racct(struct racct *dest, const struct racct *src); -static void racct_sub_cred_locked(struct ucred *cred, int resource, uint64_t amount); -static void racct_add_cred_locked(struct ucred *cred, int resource, uint64_t amount); +static void racct_sub_cred_locked(struct ucred *cred, int resource, + uint64_t amount); +static void racct_add_cred_locked(struct ucred *cred, int resource, + uint64_t amount); SDT_PROVIDER_DEFINE(racct); -SDT_PROBE_DEFINE3(racct, kernel, rusage, add, add, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, add_failure, add-failure, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, add_cred, add-cred, "struct ucred *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, add_force, add-force, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, set, set, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, set_failure, set-failure, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, sub, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(racct, kernel, rusage, sub_cred, sub-cred, "struct ucred *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add, add, "struct proc *", "int", + "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add_failure, add-failure, + "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add_cred, add-cred, "struct ucred *", + "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, add_force, add-force, "struct proc *", + "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, set, set, "struct proc *", "int", + "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, set_failure, set-failure, + "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, sub, "struct proc *", "int", + "uint64_t"); +SDT_PROBE_DEFINE3(racct, kernel, rusage, sub_cred, sub-cred, "struct ucred *", + "int", "uint64_t"); SDT_PROBE_DEFINE1(racct, kernel, racct, create, create, "struct racct *"); SDT_PROBE_DEFINE1(racct, kernel, racct, destroy, destroy, "struct racct *"); -SDT_PROBE_DEFINE2(racct, kernel, racct, join, join, "struct racct *", "struct racct *"); -SDT_PROBE_DEFINE2(racct, kernel, racct, join_failure, join-failure, "struct racct *", "struct racct *"); -SDT_PROBE_DEFINE2(racct, kernel, racct, leave, leave, "struct racct *", "struct racct *"); +SDT_PROBE_DEFINE2(racct, kernel, racct, join, join, "struct racct *", + "struct racct *"); +SDT_PROBE_DEFINE2(racct, kernel, racct, join_failure, join-failure, + "struct racct *", "struct racct *"); +SDT_PROBE_DEFINE2(racct, kernel, racct, leave, leave, "struct racct *", + "struct racct *"); int racct_types[] = { - [RACCT_CPU] = RACCT_IN_THOUSANDS, - [RACCT_FSIZE] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, - [RACCT_DATA] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, - [RACCT_STACK] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, - [RACCT_CORE] = RACCT_DENIABLE, - [RACCT_RSS] = RACCT_RECLAIMABLE, - [RACCT_MEMLOCK] = RACCT_RECLAIMABLE | RACCT_DENIABLE, - [RACCT_NPROC] = RACCT_RECLAIMABLE | RACCT_DENIABLE, - [RACCT_NOFILE] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, - [RACCT_SBSIZE] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_VMEM] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, - [RACCT_NPTS] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_SWAP] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_NTHR] = RACCT_RECLAIMABLE | RACCT_DENIABLE, - [RACCT_MSGQQUEUED] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_MSGQSIZE] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_NMSGQ] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_NSEM] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_NSEMOP] = RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, - [RACCT_NSHM] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_SHMSIZE] = RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, - [RACCT_WALLCLOCK] = RACCT_IN_THOUSANDS }; + [RACCT_CPU] = + RACCT_IN_THOUSANDS, + [RACCT_FSIZE] = + RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_DATA] = + RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_STACK] = + RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_CORE] = + RACCT_DENIABLE, + [RACCT_RSS] = + RACCT_RECLAIMABLE, + [RACCT_MEMLOCK] = + RACCT_RECLAIMABLE | RACCT_DENIABLE, + [RACCT_NPROC] = + RACCT_RECLAIMABLE | RACCT_DENIABLE, + [RACCT_NOFILE] = + RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_SBSIZE] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_VMEM] = + RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_NPTS] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_SWAP] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NTHR] = + RACCT_RECLAIMABLE | RACCT_DENIABLE, + [RACCT_MSGQQUEUED] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_MSGQSIZE] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NMSGQ] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NSEM] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_NSEMOP] = + RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE, + [RACCT_NSHM] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_SHMSIZE] = + RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY, + [RACCT_WALLCLOCK] = + RACCT_IN_THOUSANDS }; static void racct_add_racct(struct racct *dest, const struct racct *src) @@ -124,9 +159,9 @@ */ for (i = 0; i <= RACCT_MAX; i++) { KASSERT(dest->r_resources[i] >= 0, - ("resource usage propagation meltdown: dest < 0")); + ("racct propagation meltdown: dest < 0")); KASSERT(src->r_resources[i] >= 0, - ("resource usage propagation meltdown: src < 0")); + ("racct propagation meltdown: src < 0")); dest->r_resources[i] += src->r_resources[i]; } } @@ -145,11 +180,11 @@ if (!racct_is_sloppy(i) && !racct_is_dampened(i)) { KASSERT(dest->r_resources[i] >= 0, - ("resource usage propagation meltdown: dest < 0")); + ("racct propagation meltdown: dest < 0")); KASSERT(src->r_resources[i] >= 0, - ("resource usage propagation meltdown: src < 0")); + ("racct propagation meltdown: src < 0")); KASSERT(src->r_resources[i] <= dest->r_resources[i], - ("resource usage propagation meltdown: src > dest")); + ("racct propagation meltdown: src > dest")); } if (racct_is_reclaimable(i)) { dest->r_resources[i] -= src->r_resources[i]; @@ -262,7 +297,8 @@ #ifdef RCTL error = rctl_enforce(p, resource, amount); if (error && racct_is_deniable(resource)) { - SDT_PROBE(racct, kernel, rusage, add_failure, p, resource, amount, 0, 0); + SDT_PROBE(racct, kernel, rusage, add_failure, p, resource, + amount, 0, 0); mtx_unlock(&racct_lock); return (error); } @@ -279,9 +315,11 @@ { struct prison *pr; - SDT_PROBE(racct, kernel, rusage, add_cred, cred, resource, amount, 0, 0); + SDT_PROBE(racct, kernel, rusage, add_cred, cred, resource, amount, + 0, 0); - KASSERT(amount >= 0, ("racct_add_cred: invalid amount for resource %d: %ju", + KASSERT(amount >= 0, + ("racct_add_cred: invalid amount for resource %d: %ju", resource, amount)); racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, amount); @@ -291,8 +329,8 @@ } /* - * Increase allocation of 'resource' by 'amount' for credential 'cred'. Doesn't - * check for limits and never fails. + * Increase allocation of 'resource' by 'amount' for credential 'cred'. + * Doesn't check for limits and never fails. * * XXX: Shouldn't this ever return an error? */ @@ -306,8 +344,8 @@ } /* - * Increase allocation of 'resource' by 'amount' for process 'p'. Doesn't check - * for limits and never fails. + * Increase allocation of 'resource' by 'amount' for process 'p'. + * Doesn't check for limits and never fails. */ void racct_add_force(struct proc *p, int resource, uint64_t amount) @@ -322,7 +360,8 @@ * We need proc lock to dereference p->p_ucred. */ PROC_LOCK_ASSERT(p, MA_OWNED); - KASSERT(amount >= 0, ("racct_add_force: invalid amount for resource %d: %ju", + KASSERT(amount >= 0, + ("racct_add_force: invalid amount for resource %d: %ju", resource, amount)); mtx_lock(&racct_lock); @@ -361,7 +400,8 @@ if (diff > 0) { error = rctl_enforce(p, resource, diff); if (error && racct_is_deniable(resource)) { - SDT_PROBE(racct, kernel, rusage, set_failure, p, resource, amount, 0, 0); + SDT_PROBE(racct, kernel, rusage, set_failure, p, + resource, amount, 0, 0); return (error); } } @@ -407,7 +447,8 @@ * We need proc lock to dereference p->p_ucred. */ PROC_LOCK_ASSERT(p, MA_OWNED); - KASSERT(amount >= 0, ("racct_set_force: invalid amount for resource %d: %ju", + KASSERT(amount >= 0, + ("racct_set_force: invalid amount for resource %d: %ju", resource, amount)); mtx_lock(&racct_lock); @@ -477,8 +518,8 @@ mtx_lock(&racct_lock); KASSERT(amount <= p->p_racct->r_resources[resource], - ("racct_sub: freeing %ju of resource %d, which is more than allocated " - "%jd for %s (pid %d)", amount, resource, + ("racct_sub: freeing %ju of resource %d, which is more " + "than allocated %jd for %s (pid %d)", amount, resource, (intmax_t)p->p_racct->r_resources[resource], p->p_comm, p->p_pid)); racct_alloc_resource(p->p_racct, resource, -amount); @@ -491,13 +532,16 @@ { struct prison *pr; - SDT_PROBE(racct, kernel, rusage, sub_cred, cred, resource, amount, 0, 0); + SDT_PROBE(racct, kernel, rusage, sub_cred, cred, resource, amount, + 0, 0); - KASSERT(amount >= 0, ("racct_sub_cred: invalid amount for resource %d: %ju", + KASSERT(amount >= 0, + ("racct_sub_cred: invalid amount for resource %d: %ju", resource, amount)); #ifdef notyet KASSERT(racct_is_reclaimable(resource), - ("racct_sub_cred: called for non-reclaimable resource %d", resource)); + ("racct_sub_cred: called for non-reclaimable resource %d", + resource)); #endif racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, -amount); @@ -549,11 +593,12 @@ !racct_is_inheritable(i)) continue; - error = racct_set_locked(child, i, parent->p_racct->r_resources[i]); + error = racct_set_locked(child, i, + parent->p_racct->r_resources[i]); if (error != 0) { /* - * XXX: The only purpose of these two lines is to prevent from - * tripping checks in racct_destroy(). + * XXX: The only purpose of these two lines is + * to prevent from tripping checks in racct_destroy(). */ for (i = 0; i <= RACCT_MAX; i++) racct_set_locked(child, i, 0); From owner-p4-projects@FreeBSD.ORG Sun Mar 27 11:34:09 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ECC91065672; Sun, 27 Mar 2011 11:34: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 E3A4F106566B for ; Sun, 27 Mar 2011 11:34:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CF6098FC17 for ; Sun, 27 Mar 2011 11:34:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2RBY8eE032849 for ; Sun, 27 Mar 2011 11:34:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2RBY2P4032846 for perforce@freebsd.org; Sun, 27 Mar 2011 11:34:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Mar 2011 11:34:02 GMT Message-Id: <201103271134.p2RBY2P4032846@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 11:34:09 -0000 http://p4web.freebsd.org/@@190622?ac=10 Change 190622 by hselasky@hselasky_laptop001 on 2011/03/27 11:33:13 IFC @ 190620 Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#10 integrate .. //depot/projects/usb/src/lib/libusb/libusb.3#29 integrate .. //depot/projects/usb/src/lib/libusb/libusb10.c#30 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.3#14 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.c#22 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.h#14 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#15 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#18 integrate .. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#12 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#26 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#12 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#38 integrate .. //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#44 integrate .. //depot/projects/usb/src/sys/amd64/amd64/prof_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#29 integrate .. //depot/projects/usb/src/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#21 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#41 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#29 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#14 integrate .. //depot/projects/usb/src/sys/amd64/include/clock.h#9 integrate .. //depot/projects/usb/src/sys/amd64/include/cpu.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/endian.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/pmap.h#16 integrate .. //depot/projects/usb/src/sys/amd64/include/reg.h#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/Makefile#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#16 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_dummy.c#7 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_genassym.c#3 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#17 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscalls.c#1 branch .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_systrace_args.c#1 branch .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#28 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.conf#3 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#11 integrate .. //depot/projects/usb/src/sys/arm/arm/locore.S#9 integrate .. //depot/projects/usb/src/sys/arm/arm/sys_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#15 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#22 integrate .. //depot/projects/usb/src/sys/arm/econa/econa_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/fdt.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#15 integrate .. //depot/projects/usb/src/sys/arm/include/proc.h#4 integrate .. //depot/projects/usb/src/sys/arm/mv/gpio.c#6 integrate .. //depot/projects/usb/src/sys/arm/mv/ic.c#5 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#7 integrate .. //depot/projects/usb/src/sys/arm/mv/timer.c#4 integrate .. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/s3c2xx0/std.ln2410sbc#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#11 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#11 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#17 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#11 integrate .. //depot/projects/usb/src/sys/arm/xscale/pxa/pxa_machdep.c#7 integrate .. //depot/projects/usb/src/sys/boot/common/Makefile.inc#8 integrate .. //depot/projects/usb/src/sys/boot/common/gpt.c#3 integrate .. //depot/projects/usb/src/sys/boot/common/interp.c#3 integrate .. //depot/projects/usb/src/sys/boot/common/ufsread.c#6 integrate .. //depot/projects/usb/src/sys/boot/common/util.h#2 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/efipart.c#3 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/usb/src/sys/boot/fdt/dts/db78100.dts#2 integrate .. //depot/projects/usb/src/sys/boot/ficl/words.c#3 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#30 integrate .. //depot/projects/usb/src/sys/boot/i386/boot0/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot2.c#9 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btx/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/usb/src/sys/boot/i386/common/cons.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/efi/ldscript.amd64#2 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/i386/gptzfsboot/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/usb/src/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsldr.S#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/common/bootinfo.c#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/common/exec.c#4 integrate .. //depot/projects/usb/src/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/conf.c#4 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/efimd.c#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/ldscript.ia64#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/version#6 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/ldscript.ia64#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/libski.h#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/skimd.c#2 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/version#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot2.c#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/btx/btx/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/cdboot/cdboot.s#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/pc98boot/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate .. //depot/projects/usb/src/sys/boot/powerpc/ofw/start.c#3 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfs.c#8 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_errno.h#3 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_da.c#16 integrate .. //depot/projects/usb/src/sys/cam/cam.c#9 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#19 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#35 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#19 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#25 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#11 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/fletcher.c#2 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#10 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#7 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zle.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#6 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#6 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#6 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#9 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#8 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/byteorder.h#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/file.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kmem.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/misc.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mutex.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/proc.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/rwlock.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sid.h#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sunddi.h#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#6 delete .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/systeminfo.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/taskq.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/time.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/types.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/uio.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vfs.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#11 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/zone.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#16 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#10 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#5 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deadlist.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_onexit.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_sa.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_stat.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zrlock.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#13 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#11 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#13 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#18 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#17 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#26 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#15 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#11 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/fm.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zut.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#7 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#6 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#6 integrate .. //depot/projects/usb/src/sys/cddl/dev/systrace/systrace.c#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#10 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.c#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.h#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#26 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_systrace_args.c#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.conf#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#17 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#29 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_emul.c#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_emul.h#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_fork.c#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#16 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.h#9 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ipc.c#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.h#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#26 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.h#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_signal.c#9 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_signal.h#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.h#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#15 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#17 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#16 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#10 integrate .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#9 integrate .. //depot/projects/usb/src/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/usb/src/sys/conf/Makefile.i386#3 integrate .. //depot/projects/usb/src/sys/conf/NOTES#60 integrate .. //depot/projects/usb/src/sys/conf/files#104 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#35 integrate .. //depot/projects/usb/src/sys/conf/files.i386#39 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#19 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#27 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#20 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#12 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#18 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#22 integrate .. //depot/projects/usb/src/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/usb/src/sys/conf/ldscript.i386#2 integrate .. //depot/projects/usb/src/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/usb/src/sys/conf/ldscript.sparc64#3 integrate .. //depot/projects/usb/src/sys/conf/options#53 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_cbq.c#5 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_cdnr.c#4 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_hfsc.c#6 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_priq.c#5 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_red.c#5 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_rio.c#4 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_rmclass.c#3 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#15 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_var.h#2 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/if_altq.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#14 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtable.c#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbdump.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbinfo.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslbtypes.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#13 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#13 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslpredef.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltree.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslwalks.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompile.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtexpress.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtfield.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtio.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttable.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttemplate.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbinput.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbmethod.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbnames.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsargs.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dscontrol.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload2.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evmisc.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evregion.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfgpe.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfregn.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfldio.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdebug.h#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdisasm.h#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdispat.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acoutput.h#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#14 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl.h#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl2.h#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbfadt.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utdecode.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#10 integrate .. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-fpa.h#3 integrate .. //depot/projects/usb/src/sys/crypto/aesni/aeskeys_amd64.S#2 integrate .. //depot/projects/usb/src/sys/crypto/aesni/aeskeys_i386.S#3 integrate .. //depot/projects/usb/src/sys/crypto/sha2/sha2.c#4 integrate .. //depot/projects/usb/src/sys/ddb/db_command.c#9 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#17 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#11 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_resource.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/usb/src/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#13 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#18 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#14 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#20 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.h#6 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate .. //depot/projects/usb/src/sys/dev/alc/if_alc.c#14 integrate .. //depot/projects/usb/src/sys/dev/ale/if_ale.c#13 integrate .. //depot/projects/usb/src/sys/dev/asr/i2omsg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#22 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#31 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#18 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#16 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#16 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#11 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.h#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_diagcodes.h#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_internal.h#9 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#6 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#13 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#6 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9002phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9280.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9280.h#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285.h#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar9002/ar9285phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#12 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.h#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/tx_schedules.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#42 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_debug.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_debug.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_keycache.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_keycache.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_misc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_sysctl.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_sysctl.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_tx.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_tx.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_tx_ht.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_ath_tx_ht.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/if_athioctl.h#10 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athrate.h#6 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#25 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#33 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#9 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#20 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#9 integrate .. //depot/projects/usb/src/sys/dev/bxe/bxe_debug.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_fw_defs.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_hsi.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_include.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_init.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_init_values_e1.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_init_values_e1h.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_link.c#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_link.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_reg.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/bxe_self_test.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/dump_e1.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/dump_e1h.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/hw_dump_reg_st.h#1 branch .. //depot/projects/usb/src/sys/dev/bxe/if_bxe.c#1 branch .. //depot/projects/usb/src/sys/dev/bxe/if_bxe.h#1 branch .. //depot/projects/usb/src/sys/dev/cs/if_cs.c#10 integrate .. //depot/projects/usb/src/sys/dev/cs/if_csreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/cs/if_csvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/usb/src/sys/dev/ctau/ctddk.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#17 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#20 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#19 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#34 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#28 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgbe/adapter.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/common.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4_hw.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4_hw.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4_msg.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4_regs.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4_regs_values.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4_tcb.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/common/t4fw_interface.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/offload.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/osdep.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/t4_ioctl.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/t4_main.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgbe/t4_sge.c#1 branch .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#16 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drm-preprocess.sh#2 delete .. //depot/projects/usb/src/sys/dev/drm/drm-subprocess.pl#3 delete .. //depot/projects/usb/src/sys/dev/drm/drm_agpsupport.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/r300_reg.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82542.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#11 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mbx.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_vf.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_vf.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#26 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#12 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#25 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#12 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.h#5 integrate .. //depot/projects/usb/src/sys/dev/ep/if_epreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/et/if_et.c#8 integrate .. //depot/projects/usb/src/sys/dev/fb/splash.c#2 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/usb/src/sys/dev/fdt/fdt_common.c#2 integrate .. //depot/projects/usb/src/sys/dev/fdt/fdt_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/fdt/fdtbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci.c#9 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/usb/src/sys/dev/flash/mx25l.c#4 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/usb/src/sys/dev/hptmv/hptproc.c#3 integrate .. //depot/projects/usb/src/sys/dev/ichsmb/ichsmb_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#15 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.h#8 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#16 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_library.c#11 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/usb/src/sys/dev/isp/ispvar.h#10 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#24 integrate .. //depot/projects/usb/src/sys/dev/ixgb/ixgb_ee.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixv.c#2 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#15 integrate .. //depot/projects/usb/src/sys/dev/led/led.c#8 integrate .. //depot/projects/usb/src/sys/dev/led/led.h#3 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malohal.h#2 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#20 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#23 integrate .. //depot/projects/usb/src/sys/dev/mii/rlphy.c#10 integrate .. //depot/projects/usb/src/sys/dev/mps/mps.c#5 integrate .. //depot/projects/usb/src/sys/dev/mps/mps_sas.c#4 integrate .. //depot/projects/usb/src/sys/dev/mps/mpsvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.c#14 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_user.c#5 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#26 integrate .. //depot/projects/usb/src/sys/dev/mwl/mwlhal.h#3 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#27 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#16 integrate .. //depot/projects/usb/src/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-device.c#3 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#3 integrate .. //depot/projects/usb/src/sys/dev/pci/hostb_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#40 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#15 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#31 integrate .. //depot/projects/usb/src/sys/dev/sdhci/sdhci.c#5 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_core.c#3 integrate .. //depot/projects/usb/src/sys/dev/sio/sio.c#8 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#12 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sisreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/sk/if_sk.c#15 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#11 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#46 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/buffer.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#74 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#11 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#14 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_fw1.h#4 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_fw2.h#4 integrate .. //depot/projects/usb/src/sys/dev/ti/if_ti.c#11 integrate .. //depot/projects/usb/src/sys/dev/ti/if_tireg.h#3 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec_fdt.c#2 integrate .. //depot/projects/usb/src/sys/dev/txp/if_txp.c#11 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#66 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mv.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#47 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_mos.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_mosreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#41 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_pf.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_pf.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#190 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#145 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#25 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#35 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#16 integrate .. //depot/projects/usb/src/sys/dev/vr/if_vr.c#9 integrate .. //depot/projects/usb/src/sys/dev/vte/if_vte.c#2 integrate .. //depot/projects/usb/src/sys/dev/vte/if_vtereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/vte/if_vtevar.h#2 integrate .. //depot/projects/usb/src/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#21 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#19 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#12 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_alloc.c#4 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_mount.h#2 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2fs.h#3 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#14 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#9 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#12 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#15 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#18 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#10 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_dbregs.c#6 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_fpregs.c#6 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#12 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_regs.c#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#11 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#16 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#20 integrate .. //depot/projects/usb/src/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/usb/src/sys/gdb/gdb_packet.c#3 integrate .. //depot/projects/usb/src/sys/geom/bde/g_bde.c#3 integrate .. //depot/projects/usb/src/sys/geom/cache/g_cache.c#3 integrate .. //depot/projects/usb/src/sys/geom/concat/g_concat.c#8 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#15 integrate .. //depot/projects/usb/src/sys/geom/gate/g_gate.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom.h#12 integrate .. //depot/projects/usb/src/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#16 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.c#13 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.h#7 integrate .. //depot/projects/usb/src/sys/geom/geom_fox.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_vfs.c#9 integrate .. //depot/projects/usb/src/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#16 integrate .. //depot/projects/usb/src/sys/geom/label/g_label.c#10 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_ext2fs.c#3 integrate .. //depot/projects/usb/src/sys/geom/linux_lvm/g_linux_lvm.c#3 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/usb/src/sys/geom/multipath/g_multipath.c#7 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#31 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#12 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#14 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#15 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#10 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#25 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#14 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#13 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#10 integrate .. //depot/projects/usb/src/sys/geom/raid/g_raid.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/g_raid.h#1 branch .. //depot/projects/usb/src/sys/geom/raid/g_raid_ctl.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/g_raid_md_if.m#1 branch .. //depot/projects/usb/src/sys/geom/raid/g_raid_tr_if.m#1 branch .. //depot/projects/usb/src/sys/geom/raid/md_intel.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/md_jmicron.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/md_nvidia.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/md_promise.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/md_sii.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/tr_concat.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/tr_raid0.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/tr_raid1.c#1 branch .. //depot/projects/usb/src/sys/geom/raid/tr_raid1e.c#1 branch .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/usb/src/sys/geom/sched/gs_rr.c#3 integrate .. //depot/projects/usb/src/sys/geom/sched/gs_scheduler.h#2 integrate .. //depot/projects/usb/src/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/usb/src/sys/geom/stripe/g_stripe.c#9 integrate .. //depot/projects/usb/src/sys/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/usb/src/sys/geom/virstor/g_virstor.c#6 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_itable.c#3 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#40 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#12 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#24 integrate .. //depot/projects/usb/src/sys/i386/i386/initcpu.c#15 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#34 integrate .. //depot/projects/usb/src/sys/i386/i386/sys_machdep.c#12 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#24 integrate .. //depot/projects/usb/src/sys/i386/i386/uio_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#7 integrate .. //depot/projects/usb/src/sys/i386/include/clock.h#9 integrate .. //depot/projects/usb/src/sys/i386/include/cpu.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/endian.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#21 integrate .. //depot/projects/usb/src/sys/i386/include/reg.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/vmparam.h#11 integrate .. //depot/projects/usb/src/sys/i386/isa/prof_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/linux/Makefile#2 integrate .. //depot/projects/usb/src/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#15 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#14 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_syscalls.c#1 branch .. //depot/projects/usb/src/sys/i386/linux/linux_sysent.c#11 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_systrace_args.c#1 branch .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#21 integrate .. //depot/projects/usb/src/sys/i386/linux/syscalls.conf#3 integrate .. //depot/projects/usb/src/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/usb/src/sys/ia64/ia64/autoconf.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/db_machdep.c#10 integrate .. //depot/projects/usb/src/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#10 integrate .. //depot/projects/usb/src/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/genassym.c#7 integrate .. //depot/projects/usb/src/sys/ia64/ia64/locore.S#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pal.S#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/physical.S#1 branch .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#23 integrate .. //depot/projects/usb/src/sys/ia64/ia64/support.S#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#14 integrate .. //depot/projects/usb/src/sys/ia64/ia64/uio_machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/usb/src/sys/ia64/include/bootinfo.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/efi.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/pal.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/pmap.h#10 integrate .. //depot/projects/usb/src/sys/ia64/include/vmparam.h#12 integrate .. //depot/projects/usb/src/sys/kern/Makefile#7 integrate .. //depot/projects/usb/src/sys/kern/capabilities.conf#1 branch .. //depot/projects/usb/src/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#22 integrate .. //depot/projects/usb/src/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#23 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_context.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_cpuset.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#30 integrate .. //depot/projects/usb/src/sys/kern/kern_dtrace.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#31 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#26 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#41 integrate .. //depot/projects/usb/src/sys/kern/kern_ktr.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#26 integrate .. //depot/projects/usb/src/sys/kern/kern_loginclass.c#1 branch .. //depot/projects/usb/src/sys/kern/kern_malloc.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_ntptime.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_pmc.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#34 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#32 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#25 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#21 integrate .. //depot/projects/usb/src/sys/kern/ksched.c#4 integrate .. //depot/projects/usb/src/sys/kern/makesyscalls.sh#13 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#11 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#43 integrate .. //depot/projects/usb/src/sys/kern/subr_kdb.c#10 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#14 integrate .. //depot/projects/usb/src/sys/kern/subr_mchain.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_module.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#16 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#20 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#19 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_trap.c#18 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#12 integrate .. //depot/projects/usb/src/sys/kern/subr_uio.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_unit.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#27 integrate .. //depot/projects/usb/src/sys/kern/sys_capability.c#1 branch .. //depot/projects/usb/src/sys/kern/sys_pipe.c#19 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#24 integrate .. //depot/projects/usb/src/sys/kern/sys_socket.c#15 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#20 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#21 integrate .. //depot/projects/usb/src/sys/kern/systrace_args.c#17 integrate .. //depot/projects/usb/src/sys/kern/sysv_msg.c#13 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#16 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#17 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#24 integrate .. //depot/projects/usb/src/sys/kern/uipc_cow.c#7 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#16 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#16 integrate .. //depot/projects/usb/src/sys/kern/uipc_sem.c#15 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#35 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#31 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#24 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#33 integrate .. //depot/projects/usb/src/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#41 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#38 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#36 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#29 integrate .. //depot/projects/usb/src/sys/libkern/jenkins.h#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_ehci.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar724x_chip.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar724xreg.h#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar91xx_chip.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/if_arge.c#7 integrate .. //depot/projects/usb/src/sys/mips/atheros/if_argevar.h#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/if_octm.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-common.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-common.h#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet.c#5 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/octebus.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/octebusvar.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/wrapper-cvmx-includes.h#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_mp.c#5 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#9 integrate .. //depot/projects/usb/src/sys/mips/include/_inttypes.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/_limits.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/_stdint.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/_types.h#4 integrate .. //depot/projects/usb/src/sys/mips/include/cpufunc.h#8 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#10 integrate .. //depot/projects/usb/src/sys/mips/include/hwfunc.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#15 integrate .. //depot/projects/usb/src/sys/mips/include/sf_buf.h#3 integrate .. //depot/projects/usb/src/sys/mips/mips/cache_mipsNN.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/cpu.c#7 integrate .. //depot/projects/usb/src/sys/mips/mips/elf64_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#13 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#18 integrate .. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#12 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#25 integrate .. //depot/projects/usb/src/sys/mips/mips/swtch.S#8 integrate .. //depot/projects/usb/src/sys/mips/mips/uio_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#9 integrate .. //depot/projects/usb/src/sys/mips/rmi/fmn.c#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#10 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.c#5 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbpci.c#6 integrate .. //depot/projects/usb/src/sys/modules/Makefile#58 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#19 integrate .. //depot/projects/usb/src/sys/modules/ath/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/bios/smapi/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 27 11:56:00 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69A361065673; Sun, 27 Mar 2011 11:56: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 2C6D31065670 for ; Sun, 27 Mar 2011 11:56:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1A1588FC14 for ; Sun, 27 Mar 2011 11:56:00 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2RBtxc7036589 for ; Sun, 27 Mar 2011 11:55:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2RBtxEc036586 for perforce@freebsd.org; Sun, 27 Mar 2011 11:55:59 GMT (envelope-from trasz@freebsd.org) Date: Sun, 27 Mar 2011 11:55:59 GMT Message-Id: <201103271155.p2RBtxEc036586@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 11:56:00 -0000 http://p4web.freebsd.org/@@190625?ac=10 Change 190625 by trasz@trasz_victim on 2011/03/27 11:55:35 Improve comments. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#15 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#2 (text+ko) ==== @@ -29,6 +29,10 @@ * $FreeBSD$ */ +/* + * Resource accounting. + */ + #ifndef _CONTAINER_H_ #define _CONTAINER_H_ @@ -41,9 +45,8 @@ struct ucred; /* - * Resource accounting. + * Resources. */ - #define RACCT_UNDEFINED -1 #define RACCT_CPU 0 #define RACCT_FSIZE 1 @@ -70,7 +73,7 @@ #define RACCT_MAX RACCT_WALLCLOCK /* - * Resource types. + * Resource properties. */ #define RACCT_IN_THOUSANDS 0x01 #define RACCT_RECLAIMABLE 0x02 ==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#15 (text+ko) ==== @@ -29,6 +29,10 @@ * $FreeBSD$ */ +/* + * Resource Limits. + */ + #ifndef _RCTL_H_ #define _RCTL_H_ @@ -44,10 +48,6 @@ struct ucred; struct rctl_rule_link; -/* - * Resource Limits. - */ - #ifdef _KERNEL /* From owner-p4-projects@FreeBSD.ORG Sun Mar 27 12:08:06 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 043F11065672; Sun, 27 Mar 2011 12:08:06 +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 BAB16106566B for ; Sun, 27 Mar 2011 12:08:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A84338FC15 for ; Sun, 27 Mar 2011 12:08:05 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2RC85K3038274 for ; Sun, 27 Mar 2011 12:08:05 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2RC85AI038271 for perforce@freebsd.org; Sun, 27 Mar 2011 12:08:05 GMT (envelope-from trasz@freebsd.org) Date: Sun, 27 Mar 2011 12:08:05 GMT Message-Id: <201103271208.p2RC85AI038271@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 12:08:06 -0000 http://p4web.freebsd.org/@@190626?ac=10 Change 190626 by trasz@trasz_victim on 2011/03/27 12:07:33 Fix ifdefs. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#3 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#3 (text+ko) ==== @@ -33,8 +33,8 @@ * Resource accounting. */ -#ifndef _CONTAINER_H_ -#define _CONTAINER_H_ +#ifndef _RACCT_H_ +#define _RACCT_H_ #include #include @@ -150,4 +150,4 @@ void racct_proc_ucred_changed(struct proc *p, struct ucred *oldcred, struct ucred *newcred); -#endif /* !_CONTAINER_H_ */ +#endif /* !_RACCT_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Mar 27 21:36:40 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37DB91065677; Sun, 27 Mar 2011 21:36:40 +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 EE6711065675 for ; Sun, 27 Mar 2011 21:36:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DC1318FC18 for ; Sun, 27 Mar 2011 21:36:39 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2RLadBA044944 for ; Sun, 27 Mar 2011 21:36:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2RLadlP044941 for perforce@freebsd.org; Sun, 27 Mar 2011 21:36:39 GMT (envelope-from jhb@freebsd.org) Date: Sun, 27 Mar 2011 21:36:39 GMT Message-Id: <201103272136.p2RLadlP044941@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 21:36:40 -0000 http://p4web.freebsd.org/@@190649?ac=10 Change 190649 by jhb@jhb_fiver on 2011/03/27 21:35:47 Checkpoint work on rman_release_region(). Need to flesh out regression tests. Affected files ... .. //depot/projects/pci/sys/kern/subr_rman.c#4 edit .. //depot/projects/pci/sys/modules/rman/rman.c#5 edit .. //depot/projects/pci/sys/sys/rman.h#3 edit Differences ... ==== //depot/projects/pci/sys/kern/subr_rman.c#4 (text+ko) ==== @@ -227,6 +227,85 @@ } int +rman_release_region(struct rman *rm, u_long start, u_long end) +{ + struct resource_i *r, *s; + + DPRINTF(("rman_release_region: <%s> request: start %#lx, end %#lx\n", + rm->rm_descr, start, end)); + + mtx_lock(rm->rm_mtx); + + /* Skip entries before us. */ + TAILQ_FOREACH(r, &rm->rm_list, r_link) { + if (r->r_end == ULONG_MAX) + break; + if (r->r_end + 1 >= start) + break; + } + + /* If no entry found, this region is not managed. */ + if (r == NULL) { + mtx_unlock(rm->rm_mtx); + return (ENOENT); + } + + /* Ensure the entire range is managed. */ + if (r->r_start > start) { + mtx_unlock(rm->rm_mtx); + return (ENOENT); + } + s = r; + while (s->r_end < end) { + t = TAILQ_NEXT(s, r_link); + if (t == NULL || t->r_start != s->r_end + 1) { + mtx_unlock(rm->rm_mtx); + return (ENOENT); + } + s = t; + } + + /* Check if any part of the region is allocated. */ + if (r->r_flags & RF_ALLOCATED || r->r_end < end) { + if (!(r->r_flags & RF_ALLOCATED)) + KASSERT(TAILQ_NEXT(r, r_link)->r_flags & RF_ALLOCATED, + ("adjacent free regions")); + mtx_unlock(rm->rm_mtx); + return (ENOENT); + } + + /* + * If the range exactly matches 'r', remove it, otherwise + * adjust 'r', possibly splitting it. + */ + if (r->r_start == start && r->r_end == end) { + TAILQ_REMOVE(r, r_link); + free(r, M_RMAN); + } else if (r->r_start == start) { + KASSERT(end > r->r_end, ("resource entry too small")); + r->r_start = end + 1; + } else if (r->r_end == end) { + KASSERT(start < r->r_start, ("resource entry too small")); + r->r_end = start - 1; + } else { + KASSERT(r->r_start < start && end < r->r_end, ("resource entry too small")); + s = int_alloc_resource(M_NOWAIT); + if (s == NULL) { + mtx_unlock(rm->rm_mtx); + return (ENOMEM); + } + s->r_start = end + 1; + s->r_end = r->r_end; + s->r_rm = rm; + r->r_end = start - 1; + TAILQ_INSERT_AFTER(&rm->rm_list, r, s, r_link); + } + mtx_unlock(rm->rm_mtx); + + return (0); +} + +int rman_init_from_resource(struct rman *rm, struct resource *r) { int rv; ==== //depot/projects/pci/sys/modules/rman/rman.c#5 (text+ko) ==== @@ -150,7 +150,7 @@ } static void -regression_tests(void) +adjust_regression_tests(void) { int error; @@ -295,6 +295,24 @@ assert_rman_ok(); } +static void +region_regression_tests(void) +{ + + /* Clear any released resources. */ + if (r != NULL) { + rman_release_resource(r); + r = NULL; + } + if (s != NULL) { + rman_release_resource(s); + s = NULL; + } + assert_rman_ok(); + + +} + static int sysctl_rman_test(SYSCTL_HANDLER_ARGS) { @@ -303,12 +321,32 @@ error = sysctl_handle_int(oidp, &i, sizeof(i), req); if (error || req->newptr == NULL || i == 0) return (error); - regression_tests(); + switch (oip->arg2) { + case 0: + adjust_regression_tests(); + break; + case 1: + region_regression_tests(); + break; + } return (error); } -SYSCTL_PROC(_debug_rman, OID_AUTO, test, CTLTYPE_INT | CTLFLAG_RW, 0, 0, - sysctl_rman_test, "I", "run regression tests"); +SYSCTL_PROC(_debug_rman, OID_AUTO, test_adjust, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + sysctl_rman_test, "I", "run regression tests for rman_adjust_resource()"); +SYSCTL_PROC(_debug_rman, OID_AUTO, test_region, CTLTYPE_INT | CTLFLAG_RW, 0, 1, + sysctl_rman_test, "I", "run regression tests for rman_release_region()"); + +static int +sysctl_rman_test_region(SYSCTL_HANDLER_ARGS) +{ + int error, i = 0; + error = sysctl_handle_int(oidp, &i, sizeof(i), req); + if (error || req->newptr == NULL || i == 0) + return (error); + region_regression_tests(); + return (error); +} static int load(void) ==== //depot/projects/pci/sys/sys/rman.h#3 (text+ko) ==== @@ -134,6 +134,7 @@ uint32_t rman_make_alignment_flags(uint32_t size); int rman_manage_region(struct rman *rm, u_long start, u_long end); int rman_is_region_manager(struct resource *r, struct rman *rm); +int rman_release_region(struct rman *rm, u_long start, u_long end); int rman_release_resource(struct resource *r); struct resource *rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count, From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:33 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A95081065679; Fri, 1 Apr 2011 16:32: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 72F3C1065686 for ; Fri, 1 Apr 2011 16:32:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5C6258FC1D for ; Fri, 1 Apr 2011 16:32:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWWoD074871 for ; Fri, 1 Apr 2011 16:32:32 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWWs6074867 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:32 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:32 GMT Message-Id: <201104011632.p31GWWs6074867@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:33 -0000 http://p4web.freebsd.org/@@190690?ac=10 Change 190690 by trasz@trasz_victim on 2011/03/28 15:52:03 Remove leftovers. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#3 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#4 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#3 (text+ko) ==== @@ -177,8 +177,7 @@ * Update resource usage in dest. */ for (i = 0; i <= RACCT_MAX; i++) { - if (!racct_is_sloppy(i) && - !racct_is_dampened(i)) { + if (!racct_is_sloppy(i)) { KASSERT(dest->r_resources[i] >= 0, ("racct propagation meltdown: dest < 0")); KASSERT(src->r_resources[i] >= 0, @@ -189,8 +188,7 @@ if (racct_is_reclaimable(i)) { dest->r_resources[i] -= src->r_resources[i]; if (dest->r_resources[i] < 0) { - KASSERT(racct_is_sloppy(i) || - racct_is_dampened(i), + KASSERT(racct_is_sloppy(i), ("racct_sub_racct: usage < 0")); dest->r_resources[i] = 0; } @@ -228,8 +226,6 @@ continue; if (!racct_is_reclaimable(i)) continue; - if (racct_is_dampened(i)) - continue; KASSERT(racct->r_resources[i] == 0, ("destroying non-empty racct: " "%ju allocated for resource %d\n", @@ -263,8 +259,7 @@ racct->r_resources[resource] += amount; if (racct->r_resources[resource] < 0) { - KASSERT(racct_is_sloppy(resource) || - racct_is_dampened(resource), + KASSERT(racct_is_sloppy(resource), ("racct_alloc_resource: usage < 0")); racct->r_resources[resource] = 0; } ==== //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#4 (text+ko) ==== @@ -80,7 +80,6 @@ #define RACCT_INHERITABLE 0x04 #define RACCT_DENIABLE 0x08 #define RACCT_SLOPPY 0x10 -#define RACCT_DAMPENED 0x20 extern int racct_types[]; @@ -116,11 +115,6 @@ #define racct_is_sloppy(X) (racct_types[X] & RACCT_SLOPPY) /* - * XXX: Explain somehow. - */ -#define racct_is_dampened(X) (racct_types[X] & RACCT_DAMPENED) - -/* * The 'racct' structure defines resource consumption for a particular * subject, such as process or jail. * From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:46 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47FFF10656D1; Fri, 1 Apr 2011 16:32: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 84D0B106566B for ; Fri, 1 Apr 2011 16:32:44 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6F4988FC08 for ; Fri, 1 Apr 2011 16:32:44 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWiqr075227 for ; Fri, 1 Apr 2011 16:32:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWhKK075221 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:43 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:43 GMT Message-Id: <201104011632.p31GWhKK075221@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:46 -0000 http://p4web.freebsd.org/@@190741?ac=10 Change 190741 by trasz@trasz_victim on 2011/03/29 18:57:19 IFC, looping back racct commit. Affected files ... .. //depot/projects/soc2009/trasz_limits/etc/periodic/daily/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/periodic/security/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/soc2009/trasz_limits/kern_racct.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/directory.3#2 integrate .. //depot/projects/soc2009/trasz_limits/release/Makefile#12 integrate .. //depot/projects/soc2009/trasz_limits/release/generate-release.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1125%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1129%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1131%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1133%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1161%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1162%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1163%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1250%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1251%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1252%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1253%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1254%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1255%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1256%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1257%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1258%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP273%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP274%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP275%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP277%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP278%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP280%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP281%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP284%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP285%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP290%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP297%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP420%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP423%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP424%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP437%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP500%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP737%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP775%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP850%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP851%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP852%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP853%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP855%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP856%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP857%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP858%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP860%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP861%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP862%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP863%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP864%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP865%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP866%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP868%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP869%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP870%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP871%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP874%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP875%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP880%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP891%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP903%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP904%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP905%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP918%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP922%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP932UDA%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP936EXT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP942EXT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP949EXT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP950%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP037.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP038.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10000.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10006.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10007.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10029.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1006.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10079.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10081.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1026.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1046.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1124.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1125.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1129.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1131.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1133.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1161.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1162.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1163.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1250.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1251.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1252.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1253.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1254.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1255.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1256.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1257.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1258.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP273.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP274.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP275.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP277.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP278.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP280.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP281.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP284.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP285.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP290.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP297.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP420.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP423.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP424.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP437.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP500.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP737.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP775.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP850.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP851.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP852.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP853.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP855.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP856.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP857.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP858.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP860.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP861.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP862.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP863.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP864.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP865.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP866.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP868.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP869.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP870.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP871.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP874.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP875.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP880.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP891.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP903.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP904.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP905.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP918.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP922.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP932UDA.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP936EXT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP942EXT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP949EXT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP950.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB12345%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKEXT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKUDA%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB12345.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKEXT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKUDA.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI7%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI7.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/JOHAB%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25JOHAB.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/ATARIST%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/DECMCS%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/TDS565%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25ATARIST.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25DECMCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25TDS565.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25VISCII.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/VISCII%25UCS.src#5 delete .. //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#30 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/smp.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_syscalls.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_systrace_args.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysvec.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#36 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#52 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.sparc64#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.sun4v#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/ldscript.amd64#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#33 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_internal.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#26 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_sysctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ksyms/ksyms.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mvs/mvs_soc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/gate/g_gate.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_syscalls.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_systrace_args.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/pmap.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/isa/pnp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#41 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#33 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#37 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#40 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#36 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#63 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_uio.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar71xx_ehci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar71xx_machdep.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pci.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psychovar.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizo.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizoreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizovar.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/kernel.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#36 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#27 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/uio.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/nanobsd.sh#13 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/calendar.freebsd#18 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/inet.c#9 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/su/su.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bluetooth/l2ping/l2ping.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bluetooth/l2ping/l2ping.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsdinstall/scripts/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsdinstall/scripts/auto#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsdinstall/scripts/mirrorselect#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh#7 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-disk.sh#8 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-ftp.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-localize.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-networking.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-packages.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-parse.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-unmount.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-users.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions.sh#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/parseconfig.sh#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/startautoinstall.sh#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/etc/periodic/daily/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.19 2010/08/10 12:58:44 olli Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.20 2011/03/27 03:06:58 dougb Exp $ .include @@ -6,6 +6,7 @@ 110.clean-tmps \ 120.clean-preserve \ 200.backup-passwd \ + 220.backup-pkgdb \ 330.news \ 400.status-disks \ 405.status-ata-raid \ ==== //depot/projects/soc2009/trasz_limits/etc/periodic/security/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.10 2010/11/13 00:40:43 brooks Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.11 2011/03/27 03:06:58 dougb Exp $ .include @@ -17,6 +17,7 @@ .if ${MK_IPFILTER} != "no" FILES+= 510.ipfdenied +FILES+= 610.ipf6denied .endif .if ${MK_IPFW} != "no" ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.21 2011/02/18 20:54:12 dim Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.22 2011/03/26 21:12:53 kib Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -1393,9 +1393,10 @@ code = "UNKNOWN"; break; } - printf_filtered("si_code %s si_pid %d si_uid %d si_status %x si_addr %p\n", - code, ti.ti_siginfo.si_pid, ti.ti_siginfo.si_uid, ti.ti_siginfo.si_status, - ti.ti_siginfo.si_addr); + printf_filtered("si_code %s (%d) si_pid %d si_uid %d si_status %x " + "si_addr %p\n", + code, ti.ti_siginfo.si_code, ti.ti_siginfo.si_pid, ti.ti_siginfo.si_uid, + ti.ti_siginfo.si_status, ti.ti_siginfo.si_addr); } } ==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/directory.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)directory.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.17 2008/04/16 18:59:36 delphij Exp $ +.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.19 2011/03/26 07:17:24 pjd Exp $ .\" .Dd April 16, 2008 .Dt DIRECTORY 3 @@ -207,15 +207,18 @@ .Pp Sample code which searches a directory for entry ``name'' is: .Bd -literal -offset indent +dirp = opendir("."); +if (dirp == NULL) + return (ERROR); len = strlen(name); -dirp = opendir("."); -while ((dp = readdir(dirp)) != NULL) - if (dp->d_namlen == len && !strcmp(dp->d_name, name)) { +while ((dp = readdir(dirp)) != NULL) { + if (dp->d_namlen == len && strcmp(dp->d_name, name) == 0) { (void)closedir(dirp); - return FOUND; + return (FOUND); } +} (void)closedir(dirp); -return NOT_FOUND; +return (NOT_FOUND); .Ed .Sh SEE ALSO .Xr close 2 , ==== //depot/projects/soc2009/trasz_limits/release/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.958 2011/03/22 01:14:53 nwhitehorn Exp $ +# $FreeBSD: src/release/Makefile,v 1.960 2011/03/27 23:46:12 nwhitehorn Exp $ # # Makefile for building releases and release media. # @@ -122,13 +122,38 @@ ln -s /tmp/bsdinstall_etc/resolv.conf ${.OBJDIR}/release/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.OBJDIR}/release/etc/rc.conf echo hostid_enable=\"NO\" >> ${.OBJDIR}/release/etc/rc.conf - touch ${.OBJDIR}/release/etc/fstab cp ${.CURDIR}/rc.local ${.OBJDIR}/release/etc touch ${.OBJDIR}/${.TARGET} +bootonly: packagesystem +# Install system + mkdir ${.OBJDIR}/bootonly + cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ + DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \ + WITHOUT_BIND_DNSSEC=1 WITHOUT_BIND_ETC=1 WITHOUT_BIND_MTREE=1 \ + WITHOUT_BIND_NAMED=1 WITHOUT_GAMES=1 WITHOUT_GROFF=1 \ + WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \ + WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 + -rm ${.OBJDIR}/bootonly/boot/kernel/*.symbols +# Copy manifest only (no distfiles) to get checksums + mkdir ${.OBJDIR}/bootonly/usr/freebsd-dist + cp ${.OBJDIR}/MANIFEST ${.OBJDIR}/bootonly/usr/freebsd-dist +# Copy documentation, if generated +.if !defined(NODOC) + cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/bootonly +.endif +# Set up installation environment + ln -s /tmp/bsdinstall_etc/resolv.conf ${.OBJDIR}/bootonly/etc/resolv.conf + echo sendmail_enable=\"NONE\" > ${.OBJDIR}/bootonly/etc/rc.conf + echo hostid_enable=\"NO\" >> ${.OBJDIR}/bootonly/etc/rc.conf + cp ${.CURDIR}/rc.local ${.OBJDIR}/bootonly/etc + release.iso: system sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.OBJDIR}/release.iso ${.OBJDIR}/release +bootonly.iso: bootonly + sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.OBJDIR}/bootonly.iso ${.OBJDIR}/bootonly + memstick: system sh ${.CURDIR}/${TARGET}/make-memstick.sh ${.OBJDIR}/release ${.OBJDIR}/memstick @@ -136,13 +161,13 @@ sh ${.CURDIR}/scripts/make-manifest.sh ${.OBJDIR}/*.txz > ${.OBJDIR}/MANIFEST touch ${.OBJDIR}/${.TARGET} -cdrom: release.iso +cdrom: release.iso bootonly.iso ftp: packagesystem rm -rf ${.OBJDIR}/ftp mkdir ${.OBJDIR}/ftp cp ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST ${.OBJDIR}/ftp -release: ${RELEASE_TARGETS} +release: obj ${RELEASE_TARGETS} clean: chflags -R noschg ${.OBJDIR} ==== //depot/projects/soc2009/trasz_limits/release/generate-release.sh#2 (text+ko) ==== @@ -17,7 +17,7 @@ # # Note: Since this requires a chroot, release cross-builds will not work! # -# $FreeBSD: src/release/generate-release.sh,v 1.5 2011/03/19 23:06:17 nwhitehorn Exp $ +# $FreeBSD: src/release/generate-release.sh,v 1.7 2011/03/27 23:46:52 nwhitehorn Exp $ # mkdir -p $2/usr/src @@ -60,7 +60,7 @@ fi chroot $2 /bin/sh -c "cd /usr/src && make $MAKE_FLAGS buildworld buildkernel" || exit 1 -chroot $2 /bin/sh -c "cd /usr/src/release && make obj release" || exit 1 +chroot $2 /bin/sh -c "cd /usr/src/release && make release" || exit 1 mkdir $2/R -cp -pRP $2/usr/obj/usr/src/release/release.iso $2/usr/obj/usr/src/release/memstick $2/usr/obj/usr/src/release/ftp $2/R +cp -pRP $2/usr/obj/usr/src/release/*.iso $2/usr/obj/usr/src/release/memstick $2/usr/obj/usr/src/release/ftp $2/R ==== //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-ports.dot,v 1.104 2011/03/18 09:03:14 sbz Exp $ +# $FreeBSD: src/share/misc/committers-ports.dot,v 1.105 2011/03/28 09:05:43 martymac Exp $ # This file is meant to list all FreeBSD ports committers and describe the # mentor-mentee relationships between them. @@ -127,6 +127,7 @@ mandree [label="Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"] marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] +martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"] mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] ==== //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#30 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.745 2011/03/11 18:56:55 mdf Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.746 2011/03/28 06:35:17 alc Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -156,6 +156,11 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); +/* + * The file "conf/ldscript.amd64" defines the symbol "kernphys". Its value is + * the physical address at which the kernel is loaded. + */ +extern char kernphys[]; #ifdef DDB extern vm_offset_t ksym_start, ksym_end; #endif @@ -1417,7 +1422,7 @@ /* * block out kernel memory as not available. */ - if (pa >= 0x100000 && pa < first) + if (pa >= (vm_paddr_t)kernphys && pa < first) goto do_dump_avail; /* ==== //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mp_machdep.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.339 2011/01/13 18:20:27 mdf Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.340 2011/03/27 16:18:51 alc Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -116,7 +116,6 @@ u_long *ipi_invlpg_counts[MAXCPU]; u_long *ipi_invlcache_counts[MAXCPU]; u_long *ipi_rendezvous_counts[MAXCPU]; -u_long *ipi_lazypmap_counts[MAXCPU]; static u_long *ipi_hardclock_counts[MAXCPU]; #endif @@ -1620,8 +1619,6 @@ intrcnt_add(buf, &ipi_ast_counts[i]); snprintf(buf, sizeof(buf), "cpu%d:rendezvous", i); intrcnt_add(buf, &ipi_rendezvous_counts[i]); - snprintf(buf, sizeof(buf), "cpu%d:lazypmap", i); - intrcnt_add(buf, &ipi_lazypmap_counts[i]); snprintf(buf, sizeof(buf), "cpu%d:hardclock", i); intrcnt_add(buf, &ipi_hardclock_counts[i]); } ==== //depot/projects/soc2009/trasz_limits/sys/amd64/include/smp.h#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.99 2010/08/06 15:36:59 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.100 2011/03/27 16:18:51 alc Exp $ * */ @@ -41,7 +41,6 @@ extern u_long *ipi_invlpg_counts[MAXCPU]; extern u_long *ipi_invlcache_counts[MAXCPU]; extern u_long *ipi_rendezvous_counts[MAXCPU]; -extern u_long *ipi_lazypmap_counts[MAXCPU]; #endif /* IPI handlers */ ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.35 2011/03/13 14:58:02 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.36 2011/03/26 11:25:36 avg Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -695,6 +695,7 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 +#define LINUX_SO_PASSCRED 16 #define LINUX_SO_PEERCRED 17 #define LINUX_SO_RCVLOWAT 18 #define LINUX_SO_SNDLOWAT 19 ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.13 2008/05/13 20:01:26 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.14 2011/03/26 10:59:24 avg Exp $"); #include #include @@ -54,8 +54,6 @@ DUMMY(query_module); DUMMY(nfsservctl); DUMMY(rt_sigqueueinfo); -DUMMY(capget); -DUMMY(capset); DUMMY(sendfile); DUMMY(setfsuid); DUMMY(setfsgid); ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.45 2011/03/12 08:58:19 avg Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 219559 2011-03-12 08:51:43Z avg + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.46 2011/03/26 10:59:24 avg Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg */ #ifndef _LINUX_SYSPROTO_H_ @@ -589,10 +589,12 @@ char bufsize_l_[PADL_(l_ulong)]; l_ulong bufsize; char bufsize_r_[PADR_(l_ulong)]; }; struct linux_capget_args { - register_t dummy; + char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)]; + char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)]; }; struct linux_capset_args { - register_t dummy; + char hdrp_l_[PADL_(struct l_user_cap_header *)]; struct l_user_cap_header * hdrp; char hdrp_r_[PADR_(struct l_user_cap_header *)]; + char datap_l_[PADL_(struct l_user_cap_data *)]; struct l_user_cap_data * datap; char datap_r_[PADR_(struct l_user_cap_data *)]; }; struct linux_sigaltstack_args { char uss_l_[PADL_(l_stack_t *)]; l_stack_t * uss; char uss_r_[PADR_(l_stack_t *)]; ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.43 2011/03/12 08:58:19 avg Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 219559 2011-03-12 08:51:43Z avg + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.44 2011/03/26 10:59:24 avg Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_syscalls.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscalls.c,v 1.1 2011/03/12 08:58:19 avg Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 219559 2011-03-12 08:51:43Z avg + * $FreeBSD: src/sys/amd64/linux32/linux32_syscalls.c,v 1.2 2011/03/26 10:59:24 avg Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg */ const char *linux_syscallnames[] = { ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.45 2011/03/12 08:58:19 avg Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 219559 2011-03-12 08:51:43Z avg + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.46 2011/03/26 10:59:24 avg Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg */ #include "opt_compat.h" @@ -203,8 +203,8 @@ { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 181 = linux_pwrite */ { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 182 = linux_chown16 */ { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 185 = linux_capset */ + { AS(linux_capget_args), (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 184 = linux_capget */ + { AS(linux_capset_args), (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0, 0, SY_THR_STATIC }, /* 185 = linux_capset */ { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 186 = linux_sigaltstack */ { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 188 = getpmsg */ ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_systrace_args.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_systrace_args.c,v 1.1 2011/03/12 08:58:19 avg Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_systrace_args.c,v 1.2 2011/03/26 10:59:24 avg Exp $ * This file is part of the DTrace syscall provider. */ @@ -1284,12 +1284,18 @@ } /* linux_capget */ case 184: { - *n_args = 0; + struct linux_capget_args *p = params; + uarg[0] = (intptr_t) p->hdrp; /* struct l_user_cap_header * */ + uarg[1] = (intptr_t) p->datap; /* struct l_user_cap_data * */ + *n_args = 2; break; } /* linux_capset */ case 185: { - *n_args = 0; + struct linux_capset_args *p = params; + uarg[0] = (intptr_t) p->hdrp; /* struct l_user_cap_header * */ + uarg[1] = (intptr_t) p->datap; /* struct l_user_cap_data * */ + *n_args = 2; break; } /* linux_sigaltstack */ @@ -4051,9 +4057,29 @@ break; /* linux_capget */ case 184: + switch(ndx) { + case 0: + p = "struct l_user_cap_header *"; + break; + case 1: + p = "struct l_user_cap_data *"; + break; + default: + break; + }; break; /* linux_capset */ case 185: + switch(ndx) { + case 0: + p = "struct l_user_cap_header *"; + break; + case 1: + p = "struct l_user_cap_data *"; + break; + default: + break; + }; break; /* linux_sigaltstack */ case 186: ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysvec.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.66 2011/03/13 14:58:02 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.67 2011/03/26 09:25:35 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_FREEBSD32 @@ -249,8 +249,7 @@ struct linux32_ps_strings *arginfo; arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS; - uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szsigcode - - linux_szplatform); + uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szplatform); KASSERT(curthread->td_proc == imgp->proc, ("unsafe elf_linux_fixup(), should be curproc")); ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.41 2011/03/12 08:51:43 avg Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.42 2011/03/26 10:51:56 avg Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -326,8 +326,10 @@ l_uid16_t uid, l_gid16_t gid); } 183 AUE_GETCWD STD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -184 AUE_CAPGET STD { int linux_capget(void); } -185 AUE_CAPSET STD { int linux_capset(void); } +184 AUE_CAPGET STD { int linux_capget(struct l_user_cap_header *hdrp, \ + struct l_user_cap_data *datap); } +185 AUE_CAPSET STD { int linux_capset(struct l_user_cap_header *hdrp, \ + struct l_user_cap_data *datap); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:47 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21D9C1065829; Fri, 1 Apr 2011 16:32:47 +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 1838310656B2 for ; Fri, 1 Apr 2011 16:32:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 04CD78FC15 for ; Fri, 1 Apr 2011 16:32:45 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWi1u075248 for ; Fri, 1 Apr 2011 16:32:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWiwf075245 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:44 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:44 GMT Message-Id: <201104011632.p31GWiwf075245@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:47 -0000 http://p4web.freebsd.org/@@190744?ac=10 Change 190744 by trasz@trasz_victim on 2011/03/29 19:38:51 Fix mismerge. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 (text+ko) ==== @@ -182,7 +182,6 @@ char pr_hostname[MAXHOSTNAMELEN]; /* (p) jail hostname */ char pr_domainname[MAXHOSTNAMELEN]; /* (p) jail domainname */ char pr_hostuuid[HOSTUUIDLEN]; /* (p) jail hostuuid */ - struct racct *pr_racct; /* (c) resource accounting */ }; #endif /* _KERNEL || _WANT_PRISON */ From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:47 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FB121065675; Fri, 1 Apr 2011 16:32:47 +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 41C8010656B4 for ; Fri, 1 Apr 2011 16:32:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2E0AD8FC16 for ; Fri, 1 Apr 2011 16:32:45 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWj6W075254 for ; Fri, 1 Apr 2011 16:32:45 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWjJA075251 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:45 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:45 GMT Message-Id: <201104011632.p31GWjJA075251@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:48 -0000 http://p4web.freebsd.org/@@190745?ac=10 Change 190745 by trasz@trasz_victim on 2011/03/29 19:45:31 style(9) Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#18 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#19 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#18 (text+ko) ==== @@ -965,8 +965,18 @@ 523 AUE_NULL NOPROTO { int getloginclass(char *namebuf, \ size_t namelen); } 524 AUE_NULL NOPROTO { int setloginclass(const char *namebuf); } -525 AUE_NULL NOPROTO { int rctl_get_usage(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -526 AUE_NULL NOPROTO { int rctl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -527 AUE_NULL NOPROTO { int rctl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -528 AUE_NULL NOPROTO { int rctl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -529 AUE_NULL NOPROTO { int rctl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +525 AUE_NULL NOPROTO { int rctl_get_usage(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +526 AUE_NULL NOPROTO { int rctl_get_rules(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +527 AUE_NULL NOPROTO { int rctl_get_limits(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +528 AUE_NULL NOPROTO { int rctl_add_rule(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +529 AUE_NULL NOPROTO { int rctl_remove_rule(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#19 (text+ko) ==== @@ -929,10 +929,20 @@ 523 AUE_NULL STD { int getloginclass(char *namebuf, \ size_t namelen); } 524 AUE_NULL STD { int setloginclass(const char *namebuf); } -525 AUE_NULL STD { int rctl_get_usage(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -526 AUE_NULL STD { int rctl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -527 AUE_NULL STD { int rctl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -528 AUE_NULL STD { int rctl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -529 AUE_NULL STD { int rctl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +525 AUE_NULL STD { int rctl_get_usage(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +526 AUE_NULL STD { int rctl_get_rules(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +527 AUE_NULL STD { int rctl_get_limits(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +528 AUE_NULL STD { int rctl_add_rule(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } +529 AUE_NULL STD { int rctl_remove_rule(const void *inbufp, \ + size_t inbuflen, void *outbufp, \ + size_t outbuflen); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:48 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 815F810656D8; Fri, 1 Apr 2011 16:32:47 +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 947951065687 for ; Fri, 1 Apr 2011 16:32:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 809988FC18 for ; Fri, 1 Apr 2011 16:32:45 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWjeF075268 for ; Fri, 1 Apr 2011 16:32:45 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWjiQ075265 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:45 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:45 GMT Message-Id: <201104011632.p31GWjiQ075265@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:48 -0000 http://p4web.freebsd.org/@@190747?ac=10 Change 190747 by trasz@trasz_victim on 2011/03/29 19:56:02 Rename rctl_get_usage(2) to rctl_get_racct(2). Affected files ... .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#18 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#19 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#41 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#20 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#16 edit .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#5 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#18 (text) ==== @@ -364,7 +364,7 @@ cap_enter; cap_getmode; getloginclass; - rctl_get_usage; + rctl_get_racct; rctl_get_rules; rctl_get_limits; rctl_add_rule; ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#19 (text+ko) ==== @@ -965,7 +965,7 @@ 523 AUE_NULL NOPROTO { int getloginclass(char *namebuf, \ size_t namelen); } 524 AUE_NULL NOPROTO { int setloginclass(const char *namebuf); } -525 AUE_NULL NOPROTO { int rctl_get_usage(const void *inbufp, \ +525 AUE_NULL NOPROTO { int rctl_get_racct(const void *inbufp, \ size_t inbuflen, void *outbufp, \ size_t outbuflen); } 526 AUE_NULL NOPROTO { int rctl_get_rules(const void *inbufp, \ ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#41 (text+ko) ==== @@ -1232,7 +1232,7 @@ } int -rctl_get_usage(struct thread *td, struct rctl_get_usage_args *uap) +rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) { int error; char *inputstr; @@ -1803,7 +1803,7 @@ #else /* !RCTL */ int -rctl_get_usage(struct thread *td, struct rctl_get_usage_args *uap) +rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) { return (ENOSYS); ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#20 (text+ko) ==== @@ -929,7 +929,7 @@ 523 AUE_NULL STD { int getloginclass(char *namebuf, \ size_t namelen); } 524 AUE_NULL STD { int setloginclass(const char *namebuf); } -525 AUE_NULL STD { int rctl_get_usage(const void *inbufp, \ +525 AUE_NULL STD { int rctl_get_racct(const void *inbufp, \ size_t inbuflen, void *outbufp, \ size_t outbuflen); } 526 AUE_NULL STD { int rctl_get_rules(const void *inbufp, \ ==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#16 (text+ko) ==== @@ -153,7 +153,7 @@ * Syscall interface. */ __BEGIN_DECLS -int rctl_get_usage(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); +int rctl_get_racct(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); int rctl_get_rules(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); int rctl_get_limits(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); int rctl_add_rule(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); ==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#5 (text+ko) ==== @@ -389,9 +389,9 @@ if (outbuf == NULL) err(1, "realloc"); - error = rctl_get_usage(filter, strlen(filter) + 1, outbuf, outbuflen); + error = rctl_get_racct(filter, strlen(filter) + 1, outbuf, outbuflen); if (error && errno != ERANGE) - err(1, "rctl_get_usage"); + err(1, "rctl_get_racct"); } while (error && errno == ERANGE); while ((tmp = strsep(&outbuf, ",")) != NULL) { From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:55 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44CAB10659CA; Fri, 1 Apr 2011 16:32: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 C8939106579A for ; Fri, 1 Apr 2011 16:32:52 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B47918FC12 for ; Fri, 1 Apr 2011 16:32:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWqXp075456 for ; Fri, 1 Apr 2011 16:32:52 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWqDQ075453 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:52 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 1 Apr 2011 16:32:52 GMT Message-Id: <201104011632.p31GWqDQ075453@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:55 -0000 http://p4web.freebsd.org/@@190774?ac=10 Change 190774 by lz@freebsd-dev on 2011/03/30 12:39:16 Rename ext2_alloc_rsv() to ext2_prealloc and call ext2_alloc() in ext2_balloc.c. * Rename ext2_alloc_rsv() to ext2_prealloc() * Call ext2_alloc() to allocate a block * Rename 'rsv' to 'doprealloc' and 'rsv_winsize' to 'prealloc_size' Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#42 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#8 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#1 add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#2 edit .. //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#2 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#42 (text+ko) ==== @@ -101,11 +101,11 @@ SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem"); -static int rsv = 0; -SYSCTL_INT(_vfs_ext2fs, OID_AUTO, rsv, CTLFLAG_RW, &rsv, 0, ""); +static int doprealloc = 0; +SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doprealloc, CTLFLAG_RW, &doprealloc, 0, ""); -static int rsv_winsize = 8; -SYSCTL_UINT(_vfs_ext2fs, OID_AUTO, rsv_winsize, CTLFLAG_RW, &rsv_winsize, 0, ""); +static int prealloc_size = 8; +SYSCTL_UINT(_vfs_ext2fs, OID_AUTO, prealloc_size, CTLFLAG_RW, &prealloc_size, 0, ""); /* * Allocate a free block. @@ -222,8 +222,8 @@ rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; - if (rsv_winsize < EXT2_RSV_MAX_RESERVE_BLKS) - rp->rsv_goal_size = rsv_winsize; + if (prealloc_size < EXT2_RSV_MAX_RESERVE_BLKS) + rp->rsv_goal_size = prealloc_size; else rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; rp->rsv_alloc_hit = 0; @@ -255,8 +255,8 @@ EXT2_TREE_LOCK(ip->i_e2fs); ext2_remove_rsv_win(ip->i_e2fs, rp); EXT2_TREE_UNLOCK(ip->i_e2fs); - if (rsv_winsize < EXT2_RSV_MAX_RESERVE_BLKS) - rp->rsv_goal_size = rsv_winsize; + if (prealloc_size < EXT2_RSV_MAX_RESERVE_BLKS) + rp->rsv_goal_size = prealloc_size; else rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; } @@ -496,12 +496,10 @@ /* * Allocate a block using reservation window in ext2 file system. - * - * XXX: This function will replace the ext2_alloc() function. */ int -ext2_alloc_rsv(struct inode *ip, int32_t lbn, int32_t bpref, - int size, struct ucred *cred, int32_t *bnp) +ext2_prealloc(struct inode *ip, int32_t lbn, int32_t bpref, + int size, struct ucred *cred) { struct m_ext2fs *fs; struct ext2mount *ump; @@ -509,16 +507,15 @@ int32_t bno = 0; int i, cg, error; - *bnp = 0; fs = ip->i_e2fs; ump = ip->i_ump; mtx_assert(EXT2_MTX(ump), MA_OWNED); if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0) - goto nospace; + goto fail; if (cred->cr_uid != 0 && fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount) - goto nospace; + goto fail; if (bpref >= fs->e2fs->e2fs_bcount) bpref = 0; @@ -526,11 +523,6 @@ cg = ino_to_cg(fs, ip->i_number); else cg = dtog(fs, bpref); - if (rsv == 0) { - bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, - ext2_alloccg); - goto allocated; - } /* If cg has some free blocks, then try to allocate a free block from this cg */ if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) { @@ -541,7 +533,7 @@ (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { brelse(bp); - goto ioerror; + goto fail; } EXT2_RSV_LOCK(ip); @@ -566,7 +558,7 @@ (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { brelse(bp); - goto ioerror; + goto fail; } EXT2_RSV_LOCK(ip); @@ -585,26 +577,11 @@ } allocated: - if (bno > 0) { - ip->i_next_alloc_block = lbn; - ip->i_next_alloc_goal = bno; + if (bno > 0) + return (bno); - ip->i_blocks += btodb(fs->e2fs_bsize); - ip->i_flag |= IN_CHANGE | IN_UPDATE; - *bnp = bno; - return (0); - } - -nospace: - EXT2_UNLOCK(ump); - ext2_fserr(fs, cred->cr_uid, "file system full"); - uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt); - return (ENOSPC); - -ioerror: - ext2_fserr(fs, cred->cr_uid, "file system IO error"); - uprintf("\n%s: write failed, file system IO error\n", fs->e2fs_fsmnt); - return (EIO); +fail: + return (0); } int @@ -643,8 +620,11 @@ cg = ino_to_cg(fs, ip->i_number); else cg = dtog(fs, bpref); - bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, - ext2_alloccg); + if (doprealloc == 1) + bno = (daddr_t)ext2_prealloc(ip, lbn, bpref, size, cred); + else + bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, + ext2_alloccg); if (bno > 0) { /* set next_alloc fields as done in block_getblk */ ip->i_next_alloc_block = lbn; @@ -1623,7 +1603,7 @@ loc = skpc(0xff, len, &bbp[start]); if (loc == 0) { /* XXX: just for reservation window */ - if (rsv == 1) + if (doprealloc == 1) return (-1); else { printf("start = %d, len = %d, fs = %s\n", ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#8 (text+ko) ==== @@ -141,7 +141,7 @@ else nsize = fs->e2fs_bsize; EXT2_LOCK(ump); - error = ext2_alloc_rsv(ip, lbn, + error = ext2_alloc(ip, lbn, ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0), nsize, cred, &newb); if (error) @@ -175,7 +175,7 @@ EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); - if ((error = ext2_alloc_rsv(ip, lbn, pref, + if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb))) return (error); nb = newb; @@ -216,7 +216,7 @@ if (pref == 0) pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, bp->b_lblkno); - error = ext2_alloc_rsv(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); + error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); if (error) { brelse(bp); return (error); @@ -255,7 +255,7 @@ EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[i].in_off, &bap[0], bp->b_lblkno); - if ((error = ext2_alloc_rsv(ip, lbn, pref, + if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { brelse(bp); return (error); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#2 (text+ko) ==== @@ -73,6 +73,6 @@ /* ext2_alloc.c */ void ext2_init_rsv(struct inode *ip); void ext2_discard_rsv(struct inode *ip); -int ext2_alloc_rsv(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); +int ext2_prealloc(struct inode *, int32_t, int32_t, int, struct ucred *); #endif /* !_FS_EXT2FS_EXT2_PREALLOC_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ KMOD= ext2fs SRCS= opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \ ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \ - ext2_inode_cnv.c ext2_lookup.c ext2_subr.c ext2_vfsops.c \ - ext2_vnops.c + ext2_inode_cnv.c ext2_lookup.c ext2_prealloc.c \ + ext2_subr.c ext2_vfsops.c ext2_vnops.c .include From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:56 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1D5B1065AA0; Fri, 1 Apr 2011 16:32: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 1FD8910657BF for ; Fri, 1 Apr 2011 16:32:53 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0BF9D8FC17 for ; Fri, 1 Apr 2011 16:32:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWqfe075469 for ; Fri, 1 Apr 2011 16:32:52 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWqKx075466 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:52 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 1 Apr 2011 16:32:52 GMT Message-Id: <201104011632.p31GWqKx075466@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:56 -0000 http://p4web.freebsd.org/@@190776?ac=10 Change 190776 by lz@freebsd-dev on 2011/03/30 13:20:45 Move ext2_init_rsv(), ext2_discard_rsv() and ext2_remove_rsv_win() to ext2_prealloc.c. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#43 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#5 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#2 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#3 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#43 (text+ko) ==== @@ -77,14 +77,11 @@ static int ext2_bpref_in_rsv(struct ext2_rsv_win *, int32_t); static int ext2_find_rsv(struct ext2_rsv_win *, struct ext2_rsv_win *, struct m_ext2fs *, int32_t, int); -static void ext2_remove_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); static u_long ext2_rsvalloc(struct m_ext2fs *, struct inode *, int, struct buf *, int32_t, int); static daddr_t ext2_search_next_block(struct m_ext2fs *, char *, int, int); static struct ext2_rsv_win *ext2_search_rsv(struct ext2_rsv_win_tree *, int32_t); -RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); - /* * Allocate a block in the file system. * @@ -99,14 +96,11 @@ * groups without preference. */ -SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem"); +SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RD, 0, "EXT2FS filesystem"); static int doprealloc = 0; SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doprealloc, CTLFLAG_RW, &doprealloc, 0, ""); -static int prealloc_size = 8; -SYSCTL_UINT(_vfs_ext2fs, OID_AUTO, prealloc_size, CTLFLAG_RW, &prealloc_size, 0, ""); - /* * Allocate a free block. * @@ -202,78 +196,6 @@ } /* - * Initialize reservation window per inode. - */ -void -ext2_init_rsv(struct inode *ip) -{ - struct ext2_rsv_win *rp; - - rp = malloc(sizeof(struct ext2_rsv_win), - M_EXT2NODE, M_WAITOK | M_ZERO); - - /* - * If malloc failed, we just do not use the - * reservation window mechanism. - */ - if (rp == NULL) - return; - - rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; - rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; - - if (prealloc_size < EXT2_RSV_MAX_RESERVE_BLKS) - rp->rsv_goal_size = prealloc_size; - else - rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; - rp->rsv_alloc_hit = 0; - - ip->i_rsv = rp; -} - -/* - * Discard reservation window. - * - * It is called during the following situations: - * 1. free an inode - * 2. truncate a file - */ -void -ext2_discard_rsv(struct inode *ip) -{ - struct ext2_rsv_win *rp; - - if (ip->i_rsv == NULL) - return; - - rp = ip->i_rsv; - - /* If reservation window is empty, nothing to do */ - if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED) - return; - - EXT2_TREE_LOCK(ip->i_e2fs); - ext2_remove_rsv_win(ip->i_e2fs, rp); - EXT2_TREE_UNLOCK(ip->i_e2fs); - if (prealloc_size < EXT2_RSV_MAX_RESERVE_BLKS) - rp->rsv_goal_size = prealloc_size; - else - rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; -} - -/* - * Remove a ext2_rsv_win structure from RB tree. - */ -static void -ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp) -{ - RB_REMOVE(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); - rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; - rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; - rp->rsv_alloc_hit = 0; -} - -/* * Check bpref is in the reservation window. */ static int ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#5 (text+ko) ==== @@ -91,4 +91,7 @@ extern struct vop_vector ext2_vnodeops; extern struct vop_vector ext2_fifoops; +#include +SYSCTL_DECL(_vfs_ext2fs); + #endif /* !_FS_EXT2FS_EXT2_EXTERN_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#2 (text+ko) ==== @@ -42,3 +42,80 @@ #include #include #include + +RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); + +static int prealloc_size = 8; +SYSCTL_UINT(_vfs_ext2fs, OID_AUTO, prealloc_size, CTLFLAG_RW, &prealloc_size, 0, ""); + +/* + * Remove a ext2_rsv_win structure from RB tree. + */ +void +ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp) +{ + RB_REMOVE(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); + rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; + rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; + rp->rsv_alloc_hit = 0; +} + +/* + * Initialize reservation window per inode. + */ +void +ext2_init_rsv(struct inode *ip) +{ + struct ext2_rsv_win *rp; + + rp = malloc(sizeof(struct ext2_rsv_win), + M_EXT2NODE, M_WAITOK | M_ZERO); + + /* + * If malloc failed, we just do not use the + * reservation window mechanism. + */ + if (rp == NULL) + return; + + rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; + rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; + + if (prealloc_size < EXT2_RSV_MAX_RESERVE_BLKS) + rp->rsv_goal_size = prealloc_size; + else + rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; + rp->rsv_alloc_hit = 0; + + ip->i_rsv = rp; +} + +/* + * Discard reservation window. + * + * It is called during the following situations: + * 1. free an inode + * 2. truncate a file + */ +void +ext2_discard_rsv(struct inode *ip) +{ + struct ext2_rsv_win *rp; + + if (ip->i_rsv == NULL) + return; + + rp = ip->i_rsv; + + /* If reservation window is empty, nothing to do */ + if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED) + return; + + EXT2_TREE_LOCK(ip->i_e2fs); + ext2_remove_rsv_win(ip->i_e2fs, rp); + EXT2_TREE_UNLOCK(ip->i_e2fs); + if (prealloc_size < EXT2_RSV_MAX_RESERVE_BLKS) + rp->rsv_goal_size = prealloc_size; + else + rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; +} ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#3 (text+ko) ==== @@ -74,5 +74,6 @@ void ext2_init_rsv(struct inode *ip); void ext2_discard_rsv(struct inode *ip); int ext2_prealloc(struct inode *, int32_t, int32_t, int, struct ucred *); +void ext2_remove_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); #endif /* !_FS_EXT2FS_EXT2_PREALLOC_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:58 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88E201065687; Fri, 1 Apr 2011 16:32: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 7AFA81065680 for ; Fri, 1 Apr 2011 16:32:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 654EC8FC13 for ; Fri, 1 Apr 2011 16:32:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWu6E075549 for ; Fri, 1 Apr 2011 16:32:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWtkr075544 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:55 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:55 GMT Message-Id: <201104011632.p31GWtkr075544@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:58 -0000 http://p4web.freebsd.org/@@190787?ac=10 Change 190787 by trasz@trasz_victim on 2011/03/30 19:52:07 IFC, looping back most of the rctl. Affected files ... .. //depot/projects/soc2009/trasz_limits/contrib/gcc/BASE-VER#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/DATESTAMP#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/DEV-PHASE#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/mips/predicates.md#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/rs6000.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/dwarf2out.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/expr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/gimplify.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/reload1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/simplify-rtx.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/target-def.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/target.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/targhooks.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/targhooks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree-if-conv.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree-ssa-structalias.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree-vect-analyze.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree-vect-patterns.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/libstdc++/include/std/std_valarray.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/libstdc++/include/tr1/random#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/devd.conf#8 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.amd64/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.arm/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.i386/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.ia64/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.mips/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.pc98/ttys#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#16 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/faith#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/hostid#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/initrandom#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/ipfw#7 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/jail#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#8 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/rctl#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#7 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/securelevel#2 integrate .. //depot/projects/soc2009/trasz_limits/kern_racct.c#2 delete .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#19 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1125%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1129%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1131%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1133%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1161%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1162%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1163%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1250%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1251%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1252%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1253%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1254%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1255%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1256%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1257%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1258%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP273%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP274%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP275%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP277%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP278%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP280%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP281%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP284%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP285%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP290%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP297%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP420%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP423%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP424%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP437%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP500%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP737%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP775%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP850%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP851%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP852%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP853%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP855%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP856%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP857%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP858%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP860%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP861%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP862%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP863%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP864%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP865%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP866%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP868%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP869%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP870%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP871%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP874%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP875%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP880%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP891%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP903%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP904%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP905%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP918%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP922%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP932UDA%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP936EXT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP942EXT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP949EXT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP950%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP037.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP038.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10000.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10006.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10007.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10029.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1006.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10079.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10081.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1026.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1046.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1124.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1125.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1129.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1131.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1133.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1161.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1162.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1163.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1250.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1251.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1252.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1253.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1254.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1255.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1256.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1257.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1258.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP273.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP274.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP275.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP277.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP278.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP280.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP281.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP284.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP285.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP290.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP297.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP420.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP423.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP424.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP437.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP500.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP737.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP775.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP850.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP851.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP852.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP853.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP855.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP856.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP857.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP858.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP860.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP861.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP862.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP863.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP864.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP865.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP866.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP868.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP869.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP870.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP871.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP874.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP875.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP880.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP891.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP903.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP904.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP905.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP918.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP922.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP932UDA.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP936EXT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP942EXT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP949EXT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP950.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB12345%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKEXT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKUDA%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB12345.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKEXT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKUDA.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI7%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI7.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/JOHAB%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25JOHAB.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/ATARIST%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/DECMCS%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/TDS565%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25ATARIST.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25DECMCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25TDS565.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25VISCII.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/VISCII%25UCS.src#6 branch .. //depot/projects/soc2009/trasz_limits/share/man/man9/sbuf.9#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#37 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#53 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#34 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clcomsubs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clrpcops.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#41 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_linker.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#42 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#34 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#19 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#10 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-disk.sh#9 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/BASE-VER#2 (text+ko) ==== @@ -1,1 +1,1 @@ -4.2.1 +4.2.2 ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,121 @@ +2007-08-31 Jakub Jelinek + + PR rtl-optimization/33148 + * simplify-rtx.c (simplify_unary_operation_1): Only optimize + (neg (lt X 0)) if X has scalar int mode. + + PR debug/32914 + * dwarf2out.c (rtl_for_decl_init): If vector decl has CONSTRUCTOR + initializer, use build_vector_from_ctor if possible to create + VECTOR_CST out of it. If vector initializer is not VECTOR_CST + even after this, return NULL. + +2007-08-27 Jason Merrill + + PR c++/31337 + * gimplify.c (gimplify_modify_expr): Discard the assignment of + zero-sized types after calling gimplify_modify_expr_rhs. + +2007-08-24 Jakub Jelinek + + PR debug/32610 + * dwarf2out.c (gen_decl_die): Don't call + gen_tagged_type_instantiation_die if decl doesn't have tagged type. + +2007-08-24 Richard Guenther + + * expr.c (get_inner_reference): Remove unused variable. + +2007-08-24 Richard Guenther + + * expr.c (get_inner_reference): Do computation of bitoffset + from offset in a way we can detect overflow reliably. + +2007-08-22 Richard Guenther + + PR middle-end/32563 + * tree.c (host_integerp): Treat sizetype as signed as it is + sign-extended. + +2007-08-20 Adam Nemet + + * config/mips/predicates.md (const_call_insn_operand): Invoke + SYMBOL_REF_LONG_CALL_P only on SYMBOL_REFs. + +2007-08-17 Chen liqin + + * config/score/score.md : Update pattern tablejump. + * config/score/score.c : Update score_initialize_trampoline + function. + * config/score/score.h (TRAMPOLINE_TEMPLATE): Added macro. + (TRAMPOLINE_INSNS, TRAMPOLINE_SIZE) Update macro. + * doc/contrib.texi: Add my entry. + +2007-08-02 Andreas Krebbel + + * config/s390/s390.md ("*xordi3_cconly"): Change xr to xg. + +2007-08-01 Andreas Krebbel + + * config/s390/s390.md (TF in GPR splitter): Change operand_subword + parameter to TFmode. + +2007-07-30 Mark Mitchell + + * BASE-VER: Bump. + * DEV-PHASE: Mark as prerelease. + +2007-07-25 Steve Ellcey + + PR target/32218 + * tree-vect-patterns.c (vect_pattern_recog_1): Check for valid type. + +2007-07-25 Dorit Nuzman + Devang Patel + + PR tree-optimization/25413 + * targhooks.c (default_builtin_vector_alignment_reachable): New. + * targhooks.h (default_builtin_vector_alignment_reachable): New. + * tree.h (contains_packed_reference): New. + * expr.c (contains_packed_reference): New. + * tree-vect-analyze.c (vector_alignment_reachable_p): New. + (vect_enhance_data_refs_alignment): Call + vector_alignment_reachable_p. + * target.h (vector_alignment_reachable): New builtin. + * target-def.h (TARGET_VECTOR_ALIGNMENT_REACHABLE): New. + * config/rs6000/rs6000.c (rs6000_vector_alignment_reachable): New. + (TARGET_VECTOR_ALIGNMENT_REACHABLE): Define. + +2007-07-24 Richard Guenther + + Backport from mainline: + 2007-07-16 Richard Guenther + Uros Bizjak + + * tree-if-conv.c (find_phi_replacement_condition): Unshare "*cond" + before forcing it to gimple operand. + +2007-07-24 Richard Guenther + + PR tree-optimization/32723 + Backport from mainline: + 2007-03-09 Daniel Berlin + + * tree-ssa-structalias.c (shared_bitmap_info_t): New structure. + (shared_bitmap_table): New variable. + (shared_bitmap_hash): New function. + (shared_bitmap_eq): Ditto + (shared_bitmap_lookup): Ditto. + (shared_bitmap_add): Ditto. + (find_what_p_points_to): Rewrite to use shared bitmap hashtable. + (init_alias_vars): Init shared bitmap hashtable. + (delete_points_to_sets): Delete shared bitmap hashtable. + +2007-07-23 Bernd Schmidt + + * reload1.c (choose_reload_regs): Set reload_spill_index for regs + chosen during find_reloads. + 2007-07-19 Release Manager * GCC 4.2.1 released. ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/DATESTAMP#2 (text+ko) ==== @@ -1,1 +1,1 @@ -20070719 +20070831 ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/DEV-PHASE#2 (text+ko) ==== @@ -1,0 +1,1 @@ +prerelease ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/config/mips/predicates.md#2 (text+ko) ==== @@ -116,7 +116,9 @@ /* If -mlong-calls, force all calls to use register addressing. Also, if this function has the long_call attribute, we must use register addressing. */ - return !TARGET_LONG_CALLS && !SYMBOL_REF_LONG_CALL_P (op); + return (!TARGET_LONG_CALLS + && !(GET_CODE (op) == SYMBOL_REF + && SYMBOL_REF_LONG_CALL_P (op))); case SYMBOL_GOT_GLOBAL: /* Without explicit relocs, there is no special syntax for ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/rs6000.c#3 (text+ko) ==== @@ -664,6 +664,7 @@ static tree rs6000_builtin_mask_for_load (void); static void def_builtin (int, const char *, tree, int); +static bool rs6000_vector_alignment_reachable (tree, bool); static void rs6000_init_builtins (void); static rtx rs6000_expand_unop_builtin (enum insn_code, tree, rtx); static rtx rs6000_expand_binop_builtin (enum insn_code, tree, rtx); @@ -915,6 +916,9 @@ #undef TARGET_VECTORIZE_BUILTIN_MASK_FOR_LOAD #define TARGET_VECTORIZE_BUILTIN_MASK_FOR_LOAD rs6000_builtin_mask_for_load +#undef TARGET_VECTOR_ALIGNMENT_REACHABLE +#define TARGET_VECTOR_ALIGNMENT_REACHABLE rs6000_vector_alignment_reachable + #undef TARGET_INIT_BUILTINS #define TARGET_INIT_BUILTINS rs6000_init_builtins @@ -1584,6 +1588,37 @@ return 0; } + +/* Return true iff, data reference of TYPE can reach vector alignment (16) + after applying N number of iterations. This routine does not determine + how may iterations are required to reach desired alignment. */ + +static bool +rs6000_vector_alignment_reachable (tree type ATTRIBUTE_UNUSED, bool is_packed) +{ + if (is_packed) + return false; + + if (TARGET_32BIT) + { + if (rs6000_alignment_flags == MASK_ALIGN_NATURAL) + return true; + + if (rs6000_alignment_flags == MASK_ALIGN_POWER) + return true; + + return false; + } + else + { + if (TARGET_MACHO) + return false; + + /* Assuming that all other types are naturally aligned. CHECKME! */ + return true; + } +} + /* Handle generic options of the form -mfoo=yes/no. NAME is the option name. VALUE is the option value. ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/config/s390/s390.md#2 (text+ko) ==== @@ -1500,7 +1500,7 @@ && !s_operand (operands[1], VOIDmode)" [(set (match_dup 0) (match_dup 1))] { - rtx addr = operand_subword (operands[0], 1, 0, DFmode); + rtx addr = operand_subword (operands[0], 1, 0, TFmode); s390_load_address (addr, XEXP (operands[1], 0)); operands[1] = replace_equiv_address (operands[1], addr); }) @@ -5624,7 +5624,7 @@ "s390_match_ccmode(insn, CCTmode) && TARGET_64BIT" "@ xgr\t%0,%2 - xr\t%0,%2" + xg\t%0,%2" [(set_attr "op_type" "RRE,RXY")]) (define_insn "*xordi3_extimm" ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,66 @@ +2007-08-24 Jakub Jelinek + + PR c++/31941 + * error.c (resolve_virtual_fun_from_obj_type_ref): Handle + TARGET_VTABLE_USES_DESCRIPTORS targets properly. + + PR c++/32898 + * name-lookup.c (set_decl_namespace): lookup_qualified_name failure + is error_mark_node rather than NULL_TREE. + * pt.c (check_explicit_specialization): Likewise. + +2007-08-22 Jason Merrill + + PR c++/29365 + * pt.c (outermost_tinst_level): New function. + * lex.c (in_main_input_context): New function. + * cp-tree.h: Declare it. + * decl2.c (constrain_class_visibility): Use it to avoid warning + about uses of the anonymous namespace in the main input file. + +2007-08-20 Jakub Jelinek + + PR c++/32992 + * typeck.c (check_return_expr): Don't NRV optimize vars in + anonymous unions. + * decl.c (finish_function): Comment fix. + +2007-08-18 Paolo Carlini + + PR c++/32112 + * error.c (dump_decl): Deal with UNBOUND_CLASS_TEMPLATE. + * cxx-pretty-print.c (pp_cxx_unqualified_id): Likewise. + +2007-08-10 Paolo Carlini + + PR c++/17763 + * error.c (dump_expr): Consistently use the *_cxx_* + variants of the pretty-print functions. + +2007-07-30 Paolo Carlini + + PR c++/32108 + * semantics.c (finish_label_stmt): Reject the __label__ + extension outside function scopes. + +2007-07-28 Simon Martin + Mark Mitchell + + PR c++/30917 + * name-lookup.c (lookup_name_real): Non namespace-scope bindings can be + hidden due to friend declarations in local classes. + +2007-07-27 Mark Mitchell + + PR c++/32346 + * call.c (convert_for_arg_passing): Only widen bitfields to their + declared types if necessary. + +2007-07-24 Paolo Carlini + + PR c++/30535 + * pt.c (unify): Never pass error_mark_node to template_decl_level. + 2007-07-19 Release Manager * GCC 4.2.1 released. ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/call.c#2 (text+ko) ==== @@ -4674,7 +4674,27 @@ tree convert_for_arg_passing (tree type, tree val) { - val = convert_bitfield_to_declared_type (val); + tree bitfield_type; + + /* If VAL is a bitfield, then -- since it has already been converted + to TYPE -- it cannot have a precision greater than TYPE. + + If it has a smaller precision, we must widen it here. For + example, passing "int f:3;" to a function expecting an "int" will + not result in any conversion before this point. + + If the precision is the same we must not risk widening. For + example, the COMPONENT_REF for a 32-bit "long long" bitfield will + often have type "int", even though the C++ type for the field is + "long long". If the value is being passed to a function + expecting an "int", then no conversions will be required. But, + if we call convert_bitfield_to_declared_type, the bitfield will + be converted to "long long". */ + bitfield_type = is_bitfield_expr_with_lowered_type (val); + if (bitfield_type + && TYPE_PRECISION (TREE_TYPE (val)) < TYPE_PRECISION (type)) + val = convert_to_integer (TYPE_MAIN_VARIANT (bitfield_type), val); + if (val == error_mark_node) ; /* Pass classes with copy ctors by invisible reference. */ ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/cp-tree.h#2 (text+ko) ==== @@ -4079,6 +4079,7 @@ extern void yyhook (int); extern bool cxx_init (void); extern void cxx_finish (void); +extern bool in_main_input_context (void); /* in method.c */ extern void init_method (void); @@ -4161,6 +4162,7 @@ extern bool reregister_specialization (tree, tree, tree); extern tree fold_non_dependent_expr (tree); extern bool explicit_class_specialization_p (tree); +extern tree outermost_tinst_level (void); /* in repo.c */ extern void init_repo (void); ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/cxx-pretty-print.c#2 (text+ko) ==== @@ -204,6 +204,10 @@ pp_cxx_unqualified_id (pp, TEMPLATE_PARM_DECL (t)); break; + case UNBOUND_CLASS_TEMPLATE: + pp_cxx_unqualified_id (pp, TYPE_NAME (t)); + break; + default: pp_unsupported_tree (pp, t); break; ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/decl.c#2 (text+ko) ==== @@ -11273,7 +11273,7 @@ gcc_assert (stmts_are_full_exprs_p ()); /* Set up the named return value optimization, if we can. Candidate - variables are selected in check_return_value. */ + variables are selected in check_return_expr. */ if (current_function_return_value) { tree r = current_function_return_value; ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/decl2.c#2 (text+ko) ==== @@ -1860,9 +1860,12 @@ int subvis = type_visibility (ftype); if (subvis == VISIBILITY_ANON) - warning (0, "\ + { + if (!in_main_input_context ()) + warning (0, "\ %qT has a field %qD whose type uses the anonymous namespace", type, t); + } else if (IS_AGGR_TYPE (ftype) && vis < VISIBILITY_HIDDEN && subvis >= VISIBILITY_HIDDEN) @@ -1877,9 +1880,12 @@ int subvis = type_visibility (TREE_TYPE (t)); if (subvis == VISIBILITY_ANON) - warning (0, "\ + { + if (!in_main_input_context()) + warning (0, "\ %qT has a base %qT whose type uses the anonymous namespace", type, TREE_TYPE (t)); + } else if (vis < VISIBILITY_HIDDEN && subvis >= VISIBILITY_HIDDEN) warning (OPT_Wattributes, "\ ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/error.c#2 (text+ko) ==== @@ -901,6 +901,10 @@ pp_type_id (cxx_pp, t); break; + case UNBOUND_CLASS_TEMPLATE: + dump_type (t, flags); + break; + default: pp_unsupported_tree (cxx_pp, t); /* Fall through to error. */ @@ -1301,10 +1305,14 @@ resolve_virtual_fun_from_obj_type_ref (tree ref) { tree obj_type = TREE_TYPE (OBJ_TYPE_REF_OBJECT (ref)); - int index = tree_low_cst (OBJ_TYPE_REF_TOKEN (ref), 1); + HOST_WIDE_INT index = tree_low_cst (OBJ_TYPE_REF_TOKEN (ref), 1); tree fun = BINFO_VIRTUALS (TYPE_BINFO (TREE_TYPE (obj_type))); - while (index--) + while (index) + { fun = TREE_CHAIN (fun); + index -= (TARGET_VTABLE_USES_DESCRIPTORS + ? TARGET_VTABLE_USES_DESCRIPTORS : 1); + } return BV_FN (fun); } @@ -1420,13 +1428,13 @@ if (TREE_CODE (ob) == ADDR_EXPR) { dump_expr (TREE_OPERAND (ob, 0), flags | TFF_EXPR_IN_PARENS); - pp_dot (cxx_pp); + pp_cxx_dot (cxx_pp); } else if (TREE_CODE (ob) != PARM_DECL || strcmp (IDENTIFIER_POINTER (DECL_NAME (ob)), "this")) { dump_expr (ob, flags | TFF_EXPR_IN_PARENS); - pp_arrow (cxx_pp); + pp_cxx_arrow (cxx_pp); } args = TREE_CHAIN (args); } ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/lex.c#2 (text+ko) ==== @@ -827,3 +827,18 @@ return t; } + +/* Returns true if we are currently in the main source file, or in a + template instantiation started from the main source file. */ + +bool +in_main_input_context (void) +{ + tree tl = outermost_tinst_level(); + + if (tl) + return strcmp (main_input_filename, + LOCATION_FILE (TINST_LOCATION (tl))) == 0; + else + return strcmp (main_input_filename, input_filename) == 0; +} ==== //depot/projects/soc2009/trasz_limits/contrib/gcc/cp/name-lookup.c#2 (text+ko) ==== @@ -2924,7 +2924,7 @@ /* See whether this has been declared in the namespace. */ old = lookup_qualified_name (scope, DECL_NAME (decl), false, true); - if (!old) + if (old == error_mark_node) /* No old declaration at all. */ goto complain; if (!is_overloaded_fn (decl)) @@ -3996,8 +3996,49 @@ if (binding) { - /* Only namespace-scope bindings can be hidden. */ - gcc_assert (!hidden_name_p (binding)); + if (hidden_name_p (binding)) + { + /* A non namespace-scope binding can only be hidden if + we are in a local class, due to friend declarations. + In particular, consider: + + void f() { + struct A { + friend struct B; + void g() { B* b; } // error: B is hidden + } + struct B {}; + } + + The standard says that "B" is a local class in "f" + (but not nested within "A") -- but that name lookup + for "B" does not find this declaration until it is + declared directly with "f". + + In particular: + + [class.friend] + + If a friend declaration appears in a local class and + the name specified is an unqualified name, a prior + declaration is looked up without considering scopes + that are outside the innermost enclosing non-class + scope. For a friend class declaration, if there is no + prior declaration, the class that is specified + belongs to the innermost enclosing non-class scope, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:32:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17FD51065C4D; Fri, 1 Apr 2011 16:32: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 34F321065B98 for ; Fri, 1 Apr 2011 16:32:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1FEE58FC12 for ; Fri, 1 Apr 2011 16:32:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GWv5R075564 for ; Fri, 1 Apr 2011 16:32:57 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GWuAF075560 for perforce@freebsd.org; Fri, 1 Apr 2011 16:32:56 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:32:56 GMT Message-Id: <201104011632.p31GWuAF075560@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:32:59 -0000 http://p4web.freebsd.org/@@190789?ac=10 Change 190789 by trasz@trasz_victim on 2011/03/30 21:02:37 Fix mismerges. Affected files ... .. //depot/projects/soc2009/trasz_limits/etc/rc.d/rctl#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_systrace_args.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#38 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#35 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#43 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#64 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#17 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#11 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#7 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/rctl#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: src/etc/rc.d/rctl,v 1.1 2011/03/30 18:32:45 trasz Exp $ # # PROVIDE: rctl @@ -32,7 +32,7 @@ rctl_stop() { - rctl -r :: + rctl -r : } load_rc_config $name ==== //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#21 (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.552 2011/03/19 15:50:34 bz Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.554 2011/03/29 18:16:49 trasz Exp $ cpu HAMMER ident GENERIC @@ -61,8 +61,8 @@ options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options KDTRACE_FRAME # Ensure frames are compiled in -options KDTRACE_HOOKS # Kernel DTrace hooks +#options KDTRACE_FRAME # Ensure frames are compiled in +#options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging for use in -current @@ -76,9 +76,6 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options CONTAINERS -options RCTL - # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.118 2011/03/05 12:46:24 trasz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 219304 2011-03-05 12:40:35Z trasz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.120 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -240,6 +240,10 @@ char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)]; }; +struct freebsd32_kldstat_args { + char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; + char stat_l_[PADL_(struct kld32_file_stat *)]; struct kld32_file_stat * stat; char stat_r_[PADR_(struct kld32_file_stat *)]; +}; struct freebsd32_aio_return_args { char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; }; @@ -607,6 +611,7 @@ int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *); +int freebsd32_kldstat(struct thread *, struct freebsd32_kldstat_args *); int freebsd32_aio_return(struct thread *, struct freebsd32_aio_return_args *); int freebsd32_aio_suspend(struct thread *, struct freebsd32_aio_suspend_args *); int freebsd32_aio_cancel(struct thread *, struct freebsd32_aio_cancel_args *); @@ -939,6 +944,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd4_freebsd32_fhstatfs AUE_FHSTATFS #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_kldstat AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_aio_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_aio_cancel AUE_NULL ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.116 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ #define FREEBSD32_SYS_syscall 0 @@ -234,7 +234,7 @@ #define FREEBSD32_SYS_kldunload 305 #define FREEBSD32_SYS_kldfind 306 #define FREEBSD32_SYS_kldnext 307 -#define FREEBSD32_SYS_kldstat 308 +#define FREEBSD32_SYS_freebsd32_kldstat 308 #define FREEBSD32_SYS_kldfirstmod 309 #define FREEBSD32_SYS_getsid 310 #define FREEBSD32_SYS_setresuid 311 @@ -414,7 +414,7 @@ #define FREEBSD32_SYS_freebsd32_pselect 522 #define FREEBSD32_SYS_getloginclass 523 #define FREEBSD32_SYS_setloginclass 524 -#define FREEBSD32_SYS_rctl_get_usage 525 +#define FREEBSD32_SYS_rctl_get_racct 525 #define FREEBSD32_SYS_rctl_get_rules 526 #define FREEBSD32_SYS_rctl_get_limits 527 #define FREEBSD32_SYS_rctl_add_rule 528 ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.107 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ const char *freebsd32_syscallnames[] = { @@ -318,7 +318,7 @@ "kldunload", /* 305 = kldunload */ "kldfind", /* 306 = kldfind */ "kldnext", /* 307 = kldnext */ - "kldstat", /* 308 = kldstat */ + "freebsd32_kldstat", /* 308 = freebsd32_kldstat */ "kldfirstmod", /* 309 = kldfirstmod */ "getsid", /* 310 = getsid */ "setresuid", /* 311 = setresuid */ @@ -548,7 +548,7 @@ "freebsd32_pselect", /* 522 = freebsd32_pselect */ "getloginclass", /* 523 = getloginclass */ "setloginclass", /* 524 = setloginclass */ - "rctl_get_usage", /* 525 = rctl_get_usage */ + "rctl_get_racct", /* 525 = rctl_get_racct */ "rctl_get_rules", /* 526 = rctl_get_rules */ "rctl_get_limits", /* 527 = rctl_get_limits */ "rctl_add_rule", /* 528 = rctl_add_rule */ ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.118 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ #include "opt_compat.h" @@ -355,7 +355,7 @@ { AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 305 = kldunload */ { AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 306 = kldfind */ { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 307 = kldnext */ - { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 308 = kldstat */ + { AS(freebsd32_kldstat_args), (sy_call_t *)freebsd32_kldstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 308 = freebsd32_kldstat */ { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 309 = kldfirstmod */ { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 310 = getsid */ { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 311 = setresuid */ @@ -585,7 +585,7 @@ { AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, AUE_SELECT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 522 = freebsd32_pselect */ { AS(getloginclass_args), (sy_call_t *)getloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 523 = getloginclass */ { AS(setloginclass_args), (sy_call_t *)setloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 524 = setloginclass */ - { AS(rctl_get_usage_args), (sy_call_t *)rctl_get_usage, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_usage */ + { AS(rctl_get_racct_args), (sy_call_t *)rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_racct */ { AS(rctl_get_rules_args), (sy_call_t *)rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 526 = rctl_get_rules */ { AS(rctl_get_limits_args), (sy_call_t *)rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */ { AS(rctl_add_rule_args), (sy_call_t *)rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */ ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_systrace_args.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_systrace_args.c,v 1.1 2011/03/12 08:58:19 avg Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_systrace_args.c,v 1.3 2011/03/30 17:59:54 trasz Exp $ * This file is part of the DTrace syscall provider. */ @@ -1428,11 +1428,11 @@ *n_args = 1; break; } - /* kldstat */ + /* freebsd32_kldstat */ case 308: { - struct kldstat_args *p = params; + struct freebsd32_kldstat_args *p = params; iarg[0] = p->fileid; /* int */ - uarg[1] = (intptr_t) p->stat; /* struct kld_file_stat * */ + uarg[1] = (intptr_t) p->stat; /* struct kld32_file_stat * */ *n_args = 2; break; } @@ -2957,6 +2957,56 @@ *n_args = 1; break; } + /* rctl_get_racct */ + case 525: { + struct rctl_get_racct_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_get_rules */ + case 526: { + struct rctl_get_rules_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_get_limits */ + case 527: { + struct rctl_get_limits_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_add_rule */ + case 528: { + struct rctl_add_rule_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_remove_rule */ + case 529: { + struct rctl_remove_rule_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -5217,14 +5267,14 @@ break; }; break; - /* kldstat */ + /* freebsd32_kldstat */ case 308: switch(ndx) { case 0: p = "int"; break; case 1: - p = "struct kld_file_stat *"; + p = "struct kld32_file_stat *"; break; default: break; @@ -7873,6 +7923,101 @@ break; }; break; + /* rctl_get_racct */ + case 525: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_get_rules */ + case 526: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_get_limits */ + case 527: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_add_rule */ + case 528: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_remove_rule */ + case 529: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; default: break; }; ==== //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#38 (text+ko) ==== @@ -1161,12 +1161,6 @@ # Support for Capsicum options CAPABILITIES -# Resource Accounting -options RACCT - -# Resource Limits -options RCTL - ##################################################################### # CLOCK OPTIONS ==== //depot/projects/soc2009/trasz_limits/sys/conf/options#35 (text+ko) ==== @@ -883,3 +883,4 @@ # that "lies" about the amount of RAM it has. Until a cleaner method is # defined, this option will suffice in overriding what Redboot says. AR71XX_REALMEM opt_global.h + ==== //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#22 (text+ko) ==== @@ -76,9 +76,6 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options CONTAINERS -options RCTL - # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.260 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ #include "opt_compat.h" @@ -559,7 +559,7 @@ { AS(pselect_args), (sy_call_t *)pselect, AUE_SELECT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 522 = pselect */ { AS(getloginclass_args), (sy_call_t *)getloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 523 = getloginclass */ { AS(setloginclass_args), (sy_call_t *)setloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 524 = setloginclass */ - { AS(rctl_get_usage_args), (sy_call_t *)rctl_get_usage, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_usage */ + { AS(rctl_get_racct_args), (sy_call_t *)rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_racct */ { AS(rctl_get_rules_args), (sy_call_t *)rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 526 = rctl_get_rules */ { AS(rctl_get_limits_args), (sy_call_t *)rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */ { AS(rctl_add_rule_args), (sy_call_t *)rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */ ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#43 (text+ko) ==== @@ -26,11 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/kern_rctl.c,v 1.1 2011/03/30 17:48:15 trasz Exp $ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rctl.c,v 1.1 2011/03/30 17:48:15 trasz Exp $"); #include #include @@ -1126,25 +1126,29 @@ if (rule->rr_subject.rs_proc == NULL) sbuf_printf(sb, ":"); else - sbuf_printf(sb, "%d:", rule->rr_subject.rs_proc->p_pid); + sbuf_printf(sb, "%d:", + rule->rr_subject.rs_proc->p_pid); break; case RCTL_SUBJECT_TYPE_USER: if (rule->rr_subject.rs_uip == NULL) sbuf_printf(sb, ":"); else - sbuf_printf(sb, "%d:", rule->rr_subject.rs_uip->ui_uid); + sbuf_printf(sb, "%d:", + rule->rr_subject.rs_uip->ui_uid); break; case RCTL_SUBJECT_TYPE_LOGINCLASS: if (rule->rr_subject.hr_loginclass == NULL) sbuf_printf(sb, ":"); else - sbuf_printf(sb, "%s:", rule->rr_subject.hr_loginclass->lc_name); + sbuf_printf(sb, "%s:", + rule->rr_subject.hr_loginclass->lc_name); break; case RCTL_SUBJECT_TYPE_JAIL: if (rule->rr_subject.rs_prison == NULL) sbuf_printf(sb, ":"); else - sbuf_printf(sb, "%s:", rule->rr_subject.rs_prison->pr_name); + sbuf_printf(sb, "%s:", + rule->rr_subject.rs_prison->pr_name); break; default: panic("rctl_rule_to_sbuf: unknown subject type %d", @@ -1372,7 +1376,8 @@ * Non-process rules will be added to the buffer later. * Adding them here would result in duplicated output. */ - if (link->rrl_rule->rr_subject_type != RCTL_SUBJECT_TYPE_PROCESS) + if (link->rrl_rule->rr_subject_type != + RCTL_SUBJECT_TYPE_PROCESS) continue; if (!rctl_rule_matches(link->rrl_rule, filter)) continue; @@ -1460,7 +1465,8 @@ KASSERT(sb != NULL, ("sbuf_new failed")); rw_rlock(&rctl_lock); - LIST_FOREACH(link, &filter->rr_subject.rs_proc->p_racct->r_rule_links, rrl_next) { + LIST_FOREACH(link, &filter->rr_subject.rs_proc->p_racct->r_rule_links, + rrl_next) { rctl_rule_to_sbuf(sb, link->rrl_rule); sbuf_printf(sb, ","); } @@ -1735,24 +1741,27 @@ rw_wlock(&rctl_lock); /* - * Go through limits applicable to the parent and assign them to the child. - * Rules with 'process' subject have to be duplicated in order to make their - * rr_subject point to the new process. + * Go through limits applicable to the parent and assign them + * to the child. Rules with 'process' subject have to be duplicated + * in order to make their rr_subject point to the new process. */ LIST_FOREACH(link, &parent->p_racct->r_rule_links, rrl_next) { - if (link->rrl_rule->rr_subject_type == RCTL_SUBJECT_TYPE_PROCESS) { + if (link->rrl_rule->rr_subject_type == + RCTL_SUBJECT_TYPE_PROCESS) { rule = rctl_rule_duplicate(link->rrl_rule, M_NOWAIT); if (rule == NULL) goto fail; KASSERT(rule->rr_subject.rs_proc == parent, ("rule->rr_subject.rs_proc != parent")); rule->rr_subject.rs_proc = child; - error = rctl_racct_add_rule_locked(child->p_racct, rule); + error = rctl_racct_add_rule_locked(child->p_racct, + rule); rctl_rule_release(rule); if (error != 0) goto fail; } else { - error = rctl_racct_add_rule_locked(child->p_racct, link->rrl_rule); + error = rctl_racct_add_rule_locked(child->p_racct, + link->rrl_rule); if (error != 0) goto fail; } @@ -1794,8 +1803,9 @@ rctl_init(void) { - rctl_rule_link_zone = uma_zcreate("rctl_rule_link", sizeof(struct rctl_rule_link), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + rctl_rule_link_zone = uma_zcreate("rctl_rule_link", + sizeof(struct rctl_rule_link), NULL, NULL, NULL, NULL, + UMA_ALIGN_PTR, UMA_ZONE_NOFREE); rctl_rule_zone = uma_zcreate("rctl_rule", sizeof(struct rctl_rule), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#64 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.243 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ const char *syscallnames[] = { @@ -532,7 +532,7 @@ "pselect", /* 522 = pselect */ "getloginclass", /* 523 = getloginclass */ "setloginclass", /* 524 = setloginclass */ - "rctl_get_usage", /* 525 = rctl_get_usage */ + "rctl_get_racct", /* 525 = rctl_get_racct */ "rctl_get_rules", /* 526 = rctl_get_rules */ "rctl_get_limits", /* 527 = rctl_get_limits */ "rctl_add_rule", /* 528 = rctl_add_rule */ ==== //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/kern/systrace_args.c,v 1.39 2011/03/30 17:59:54 trasz Exp $ * This file is part of the DTrace syscall provider. */ @@ -3135,9 +3135,9 @@ *n_args = 1; break; } - /* rctl_get_usage */ + /* rctl_get_racct */ case 525: { - struct rctl_get_usage_args *p = params; + struct rctl_get_racct_args *p = params; uarg[0] = (intptr_t) p->inbufp; /* const void * */ uarg[1] = p->inbuflen; /* size_t */ uarg[2] = (intptr_t) p->outbufp; /* void * */ @@ -8378,7 +8378,7 @@ break; }; break; - /* rctl_get_usage */ + /* rctl_get_racct */ case 525: switch(ndx) { case 0: ==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#25 (text+ko) ==== @@ -341,7 +341,6 @@ struct mount; struct sockaddr; struct statfs; -struct racct; int jailed(struct ucred *cred); int jailed_without_vnet(struct ucred *); void getcredhostname(struct ucred *, char *, size_t); ==== //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sys/racct.h,v 1.1 2011/03/29 17:47:25 trasz Exp $ */ /* ==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#18 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sys/rctl.h,v 1.1 2011/03/30 17:48:15 trasz Exp $ */ /* @@ -139,7 +139,6 @@ void rctl_rule_release(struct rctl_rule *rule); int rctl_rule_add(struct rctl_rule *rule); int rctl_rule_remove(struct rctl_rule *filter); - int rctl_enforce(struct proc *p, int resource, uint64_t amount); uint64_t rctl_get_limit(struct proc *p, int resource); uint64_t rctl_get_available(struct proc *p, int resource); @@ -153,11 +152,16 @@ * Syscall interface. */ __BEGIN_DECLS -int rctl_get_racct(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); -int rctl_get_rules(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); -int rctl_get_limits(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); -int rctl_add_rule(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); -int rctl_remove_rule(const char *inbufp, size_t inbuflen, char *outbufp, size_t outbuflen); +int rctl_get_racct(const char *inbufp, size_t inbuflen, char *outbufp, + size_t outbuflen); +int rctl_get_rules(const char *inbufp, size_t inbuflen, char *outbufp, + size_t outbuflen); +int rctl_get_limits(const char *inbufp, size_t inbuflen, char *outbufp, + size_t outbuflen); +int rctl_add_rule(const char *inbufp, size_t inbuflen, char *outbufp, + size_t outbuflen); +int rctl_remove_rule(const char *inbufp, size_t inbuflen, char *outbufp, + size_t outbuflen); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.240 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ #define SYS_syscall 0 @@ -435,7 +435,7 @@ #define SYS_pselect 522 #define SYS_getloginclass 523 #define SYS_setloginclass 524 -#define SYS_rctl_get_usage 525 +#define SYS_rctl_get_racct 525 #define SYS_rctl_get_rules 526 #define SYS_rctl_get_limits 527 #define SYS_rctl_add_rule 528 ==== //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#16 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.195 2011/03/30 17:59:54 trasz Exp $ +# created from FreeBSD: head/sys/kern/syscalls.master 220163 2011-03-30 17:48:15Z trasz MIASM = \ syscall.o \ exit.o \ @@ -384,7 +384,7 @@ pselect.o \ getloginclass.o \ setloginclass.o \ - rctl_get_usage.o \ + rctl_get_racct.o \ rctl_get_rules.o \ rctl_get_limits.o \ rctl_add_rule.o \ ==== //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.247 2011/03/30 17:59:54 trasz Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 220163 2011-03-30 17:48:15Z trasz */ #ifndef _SYS_SYSPROTO_H_ @@ -1678,7 +1678,7 @@ struct setloginclass_args { char namebuf_l_[PADL_(const char *)]; const char * namebuf; char namebuf_r_[PADR_(const char *)]; }; -struct rctl_get_usage_args { +struct rctl_get_racct_args { char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)]; char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)]; char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)]; @@ -2073,7 +2073,7 @@ int pselect(struct thread *, struct pselect_args *); int getloginclass(struct thread *, struct getloginclass_args *); int setloginclass(struct thread *, struct setloginclass_args *); -int rctl_get_usage(struct thread *, struct rctl_get_usage_args *); +int rctl_get_racct(struct thread *, struct rctl_get_racct_args *); int rctl_get_rules(struct thread *, struct rctl_get_rules_args *); int rctl_get_limits(struct thread *, struct rctl_get_limits_args *); int rctl_add_rule(struct thread *, struct rctl_add_rule_args *); @@ -2757,7 +2757,7 @@ #define SYS_AUE_pselect AUE_SELECT #define SYS_AUE_getloginclass AUE_NULL #define SYS_AUE_setloginclass AUE_NULL -#define SYS_AUE_rctl_get_usage AUE_NULL +#define SYS_AUE_rctl_get_racct AUE_NULL #define SYS_AUE_rctl_get_rules AUE_NULL #define SYS_AUE_rctl_get_limits AUE_NULL #define SYS_AUE_rctl_add_rule AUE_NULL ==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/usr.bin/rctl/Makefile,v 1.1 2011/03/30 18:27:52 trasz Exp $ PROG= rctl MAN= rctl.8 ==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#11 (text+ko) ==== @@ -23,9 +23,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/usr.bin/rctl/rctl.8,v 1.2 2011/03/30 20:13:55 trasz Exp $ .\" -.Dd February 13, 2011 +.Dd March 30, 2011 .Dt RCTL 8 .Os .Sh NAME @@ -105,7 +105,7 @@ up to 100MB of virtual memory. Rule "loginclass:users:vmem:deny=100M/user" would mean that for each user belonging to the login class "users", the sum of virtual memory allocated -by all the processes of a that user will not exceed 100MB. +by all the processes of that user will not exceed 100MB. Rule "loginclass:users:vmem:deny=100M/loginclass" would mean that the sum of virtual memory allocated by all processes of all users belonging to that login class will not exceed 100MB. ==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#7 (text+ko) ==== @@ -26,11 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/usr.bin/rctl/rctl.c,v 1.1 2011/03/30 18:27:52 trasz Exp $ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/usr.bin/rctl/rctl.c,v 1.1 2011/03/30 18:27:52 trasz Exp $"); #include #include @@ -173,9 +173,11 @@ err(1, "expand_number"); if (per == NULL) - asprintf(&expanded, "%s:%s:%s:%s=%ju", subject, subject_id, resource, action, (uintmax_t)num); + asprintf(&expanded, "%s:%s:%s:%s=%ju", subject, subject_id, + resource, action, (uintmax_t)num); else - asprintf(&expanded, "%s:%s:%s:%s=%ju/%s", subject, subject_id, resource, action, (uintmax_t)num, per); + asprintf(&expanded, "%s:%s:%s:%s=%ju/%s", subject, subject_id, + resource, action, (uintmax_t)num, per); if (expanded == NULL) err(1, "asprintf"); @@ -255,7 +257,8 @@ amount = strsep(©, "/"); per = copy; - if (amount == NULL || strlen(amount) == 0 || str2int64(amount, &num) != 0) { + if (amount == NULL || strlen(amount) == 0 || + str2int64(amount, &num) != 0) { free(copy); return (rule); } @@ -265,13 +268,16 @@ assert(resource != NULL); assert(action != NULL); - if (humanize_number(buf, sizeof(buf), num, "", HN_AUTOSCALE, HN_DECIMAL | HN_NOSPACE) == -1) + if (humanize_number(buf, sizeof(buf), num, "", HN_AUTOSCALE, + HN_DECIMAL | HN_NOSPACE) == -1) err(1, "humanize_number"); if (per == NULL) - asprintf(&humanized, "%s:%s:%s:%s=%s", subject, subject_id, resource, action, buf); + asprintf(&humanized, "%s:%s:%s:%s=%s", subject, subject_id, + resource, action, buf); else - asprintf(&humanized, "%s:%s:%s:%s=%s/%s", subject, subject_id, resource, action, buf, per); + asprintf(&humanized, "%s:%s:%s:%s=%s/%s", subject, subject_id, + resource, action, buf, per); if (humanized == NULL) err(1, "asprintf"); @@ -322,7 +328,8 @@ if (outbuf == NULL) err(1, "realloc"); - error = rctl_get_limits(filter, strlen(filter) + 1, outbuf, outbuflen); + error = rctl_get_limits(filter, strlen(filter) + 1, outbuf, + outbuflen); if (error && errno != ERANGE) err(1, "rctl_get_limits"); } while (error && errno == ERANGE); @@ -361,7 +368,8 @@ assert(amount != NULL); if (str2int64(amount, &num) != 0 || - humanize_number(buf, sizeof(buf), num, "", HN_AUTOSCALE, HN_DECIMAL | HN_NOSPACE) == -1) { + humanize_number(buf, sizeof(buf), num, "", HN_AUTOSCALE, + HN_DECIMAL | HN_NOSPACE) == -1) { free(copy); return (usage); } @@ -389,7 +397,8 @@ if (outbuf == NULL) err(1, "realloc"); - error = rctl_get_racct(filter, strlen(filter) + 1, outbuf, outbuflen); + error = rctl_get_racct(filter, strlen(filter) + 1, outbuf, + outbuflen); if (error && errno != ERANGE) err(1, "rctl_get_racct"); } while (error && errno == ERANGE); @@ -429,7 +438,7 @@ if (outbuf == NULL) err(1, "realloc"); - error = rctl_get_rules(filter, filterlen, outbuf, outbuflen); + error = rctl_get_rules(filter, filterlen, outbuf, outbuflen); if (error && errno != ERANGE) err(1, "rctl_get_rules"); } while (error && errno == ERANGE); @@ -442,7 +451,8 @@ usage(void) { - fprintf(stderr, "usage: rctl [ -h ] [-a rule | -l filter | -r filter | -u filter | filter]\n"); + fprintf(stderr, "usage: rctl [ -h ] [-a rule | -l filter | -r filter " + "| -u filter | filter]\n"); exit(1); } From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:06 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52EF01065D97; Fri, 1 Apr 2011 16:33:06 +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 B01261065D40 for ; Fri, 1 Apr 2011 16:33:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 985EF8FC1A for ; Fri, 1 Apr 2011 16:33:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GX3vs075765 for ; Fri, 1 Apr 2011 16:33:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GX3OS075762 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:03 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:03 GMT Message-Id: <201104011633.p31GX3OS075762@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:06 -0000 http://p4web.freebsd.org/@@190818?ac=10 Change 190818 by jhb@jhb_jhbbsd on 2011/03/31 11:59:05 Cleanup. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci.c#9 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci.c#9 (text+ko) ==== @@ -4179,9 +4179,6 @@ void pci_cfg_restore(device_t dev, struct pci_devinfo *dinfo) { -#if 0 - int i; -#endif /* * Only do header type 0 devices. Type 1 devices are bridges, @@ -4203,11 +4200,6 @@ */ if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) pci_set_powerstate(dev, PCI_POWERSTATE_D0); -#if 0 - for (i = 0; i < dinfo->cfg.nummaps; i++) - pci_write_config(dev, PCIR_BAR(i), dinfo->cfg.bar[i], 4); - pci_write_config(dev, PCIR_BIOS, dinfo->cfg.bios, 4); -#endif pci_restore_bars(dev); pci_write_config(dev, PCIR_COMMAND, dinfo->cfg.cmdreg, 2); pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1); @@ -4229,9 +4221,6 @@ void pci_cfg_save(device_t dev, struct pci_devinfo *dinfo, int setstate) { -#if 0 - int i; -#endif uint32_t cls; int ps; @@ -4244,11 +4233,6 @@ */ if ((dinfo->cfg.hdrtype & PCIM_HDRTYPE) != PCIM_HDRTYPE_NORMAL) return; -#if 0 - for (i = 0; i < dinfo->cfg.nummaps; i++) - dinfo->cfg.bar[i] = pci_read_config(dev, PCIR_BAR(i), 4); - dinfo->cfg.bios = pci_read_config(dev, PCIR_BIOS, 4); -#endif /* * Some drivers apparently write to these registers w/o updating our From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:12 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CED6C1065EC8; Fri, 1 Apr 2011 16:33:11 +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 F06151065E95 for ; Fri, 1 Apr 2011 16:33:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DB0A48FC1F for ; Fri, 1 Apr 2011 16:33:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GX8wa075929 for ; Fri, 1 Apr 2011 16:33:08 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GX88F075925 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:08 GMT (envelope-from trasz@freebsd.org) Date: Fri, 1 Apr 2011 16:33:08 GMT Message-Id: <201104011633.p31GX88F075925@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:12 -0000 http://p4web.freebsd.org/@@190840?ac=10 Change 190840 by trasz@trasz_victim on 2011/03/31 19:33:03 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/UPDATING#35 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/firmware.img#2 delete .. //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/firmware.img.in#1 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1125%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1129%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1131%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1133%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1161%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1162%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1163%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1250%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1251%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1252%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1253%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1254%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1255%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1256%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1257%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1258%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP273%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP274%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP275%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP277%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP278%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP280%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP281%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP284%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP285%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP290%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP297%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP420%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP423%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP424%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP437%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP500%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP737%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP775%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP850%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP851%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP852%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP853%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP855%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP856%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP857%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP858%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP860%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP861%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP862%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP863%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP864%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP865%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP866%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP868%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP869%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP870%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP871%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP874%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP875%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP880%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP891%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP903%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP904%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP905%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP918%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP922%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP932UDA%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP936EXT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP942EXT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP949EXT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP950%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP037.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP038.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10000.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10006.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10007.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10029.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1006.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10079.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10081.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1026.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1046.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1124.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1125.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1129.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1131.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1133.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1161.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1162.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1163.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1250.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1251.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1252.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1253.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1254.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1255.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1256.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1257.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1258.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP273.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP274.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP275.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP277.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP278.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP280.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP281.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP284.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP285.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP290.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP297.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP420.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP423.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP424.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP437.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP500.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP737.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP775.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP850.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP851.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP852.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP853.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP855.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP856.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP857.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP858.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP860.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP861.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP862.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP863.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP864.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP865.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP866.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP868.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP869.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP870.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP871.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP874.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP875.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP880.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP891.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP903.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP904.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP905.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP918.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP922.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP932UDA.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP936EXT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP942EXT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP949EXT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP950.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB12345%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKEXT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKUDA%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB12345.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKEXT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKUDA.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI7%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI7.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/JOHAB%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25JOHAB.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/ATARIST%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/DECMCS%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/TDS565%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25ATARIST.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25DECMCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25TDS565.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25VISCII.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/VISCII%25UCS.src#7 delete .. //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/AVILA#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/CAMBRIA#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#54 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#36 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#27 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_ahb.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcivar.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/gate/g_gate.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/g_raid.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/md_intel.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/md_jmicron.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/md_nvidia.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/md_promise.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/md_sii.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/tr_raid1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/tr_raid1e.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/PAE#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#42 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#34 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#38 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#36 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_ule.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar724x_chip.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar724xreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/AR71XX#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/IDT#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/OCTEON1#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/SENTRY5#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#31 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ath/Makefile#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ath_ahb/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/ath_pci/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dn_glue.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dummynet.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw2.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/key.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/key.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/compress/doc/revision.log#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pkg_install/tkpkg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/tzsetup/tzsetup.c#6 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/UPDATING#35 (text+ko) ==== @@ -22,6 +22,16 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110331: + ath(4) has been split into bus- and device- modules. if_ath contains + the HAL, the TX rate control and the network device code. if_ath_pci + contains the PCI bus glue. For Atheros MIPS embedded systems, if_ath_ahb + contains the AHB glue. Users need to load both if_ath_pci and if_ath + in order to use ath on everything else. + + TO REPEAT: if_ath_ahb is not needed for normal users. Normal users only + need to load if_ath and if_ath_pci for ath(4) operation. + 20110218: GNU binutils 2.17.50 (as of 2007-07-03) has been merged to -HEAD. This is the last available version under GPLv2. It brings a number of new @@ -1334,4 +1344,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.681 2011/02/18 20:54:12 dim Exp $ +$FreeBSD: src/UPDATING,v 1.682 2011/03/31 08:32:53 adrian Exp $ ==== //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/Makefile#2 (text+ko) ==== @@ -1,6 +1,10 @@ -# $FreeBSD: src/share/examples/kld/firmware/fwimage/Makefile,v 1.1 2006/01/29 02:52:40 mlaier Exp $ +# $FreeBSD: src/share/examples/kld/firmware/fwimage/Makefile,v 1.2 2011/03/31 15:12:40 emaste Exp $ KMOD= beastie FIRMWS= firmware.img:beastie +firmware.img: firmware.img.in + cp ${.ALLSRC} ${.TARGET} + printf '\0\0\0\0\0' >> ${.TARGET} + .include ==== //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-ports.dot,v 1.105 2011/03/28 09:05:43 martymac Exp $ +# $FreeBSD: src/share/misc/committers-ports.dot,v 1.106 2011/03/31 06:11:49 martymac Exp $ # This file is meant to list all FreeBSD ports committers and describe the # mentor-mentee relationships between them. @@ -231,6 +231,7 @@ edwin -> lx ehaupt -> db +ehaupt -> martymac eik -> sem eik -> trhodes ==== //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#22 (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.554 2011/03/29 18:16:49 trasz Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.555 2011/03/31 08:07:13 adrian Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,8 @@ device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. -device ath # Atheros pci/cardbus NIC's +device ath # Atheros NIC's +device ath_pci # Atheros pci/cardbus glue device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath ==== //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.36 2011/03/26 11:25:36 avg Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.37 2011/03/31 08:14:51 avg Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -695,7 +695,6 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 -#define LINUX_SO_PASSCRED 16 #define LINUX_SO_PEERCRED 17 #define LINUX_SO_RCVLOWAT 18 #define LINUX_SO_SNDLOWAT 19 ==== //depot/projects/soc2009/trasz_limits/sys/arm/conf/AVILA#10 (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/arm/conf/AVILA,v 1.38 2010/11/07 20:33:39 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.39 2011/03/31 08:07:13 adrian Exp $ ident AVILA @@ -120,7 +120,8 @@ device wlan_tkip # 802.11 TKIP support device wlan_xauth -device ath # Atheros pci/cardbus NIC's +device ath # Atheros NIC's +device ath_pci # Atheros pci/cardbus glue options ATH_DEBUG options ATH_DIAGAPI #options ATH_TX99_DIAG ==== //depot/projects/soc2009/trasz_limits/sys/arm/conf/CAMBRIA#10 (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/arm/conf/CAMBRIA,v 1.19 2010/11/11 20:18:33 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.20 2011/03/31 08:07:13 adrian Exp $ ident CAMBRIA @@ -123,7 +123,8 @@ device wlan_tkip # 802.11 TKIP support device wlan_xauth -device ath # Atheros pci/cardbus NIC's +device ath # Atheros NIC's +device ath_pci # Atheros pci/cardbus glue options ATH_DEBUG options ATH_DIAGAPI #options ATH_TX99_DIAG ==== //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.105 2011/03/26 11:25:36 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.106 2011/03/31 08:14:51 avg Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -300,8 +300,6 @@ return (SO_OOBINLINE); case LINUX_SO_LINGER: return (SO_LINGER); - case LINUX_SO_PASSCRED: - return (LOCAL_CREDS); case LINUX_SO_PEERCRED: return (LOCAL_PEERCRED); case LINUX_SO_RCVLOWAT: @@ -1469,12 +1467,6 @@ switch (bsd_args.level) { case SOL_SOCKET: name = linux_to_bsd_so_sockopt(args->optname); - switch (args->optname) { - case LINUX_SO_PASSCRED: - /* FreeBSD bug? socket level opts at non socket level */ - bsd_args.level = 0; - break; - } switch (name) { case SO_RCVTIMEO: /* FALLTHROUGH */ @@ -1552,12 +1544,6 @@ switch (bsd_args.level) { case SOL_SOCKET: name = linux_to_bsd_so_sockopt(args->optname); - switch (args->optname) { - case LINUX_SO_PASSCRED: - /* FreeBSD bug? socket level opts at non socket level */ - bsd_args.level = 0; - break; - } switch (name) { case SO_RCVTIMEO: /* FALLTHROUGH */ ==== //depot/projects/soc2009/trasz_limits/sys/conf/files#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1578 2011/03/30 17:48:15 trasz Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1579 2011/03/31 08:07:13 adrian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -570,6 +570,12 @@ dev/ata/atapi-tape.c optional atapist dev/ata/atapi-cam.c optional atapicam # +dev/ath/if_ath_pci.c optional ath_pci pci \ + compile-with "${NORMAL_C} -I$S/dev/ath" +# +dev/ath/if_ath_ahb.c optional ath_ahb \ + compile-with "${NORMAL_C} -I$S/dev/ath" +# dev/ath/if_ath.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_debug.c optional ath \ @@ -582,8 +588,6 @@ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_sysctl.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" -dev/ath/if_ath_pci.c optional ath pci \ - compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ah_osdep.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" # ==== //depot/projects/soc2009/trasz_limits/sys/conf/options#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.724 2011/03/30 17:48:15 trasz Exp $ +# $FreeBSD: src/sys/conf/options,v 1.725 2011/03/31 08:48:05 adrian Exp $ # # On the handling of kernel options # @@ -786,6 +786,9 @@ AH_MAXCHAN opt_ah.h AH_RXCFG_SDMAMW_4BYTES opt_ah.h +# AR5416 and later interrupt mitigation +AH_AR5416_INTERRUPT_MITIGATION opt_ah.h + # options for the Broadcom BCM43xx driver (bwi) BWI_DEBUG opt_bwi.h BWI_DEBUG_VERBOSE opt_bwi.h ==== //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#6 (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/ar5416/ar5416_interrupts.c,v 1.7 2011/03/25 00:03:21 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c,v 1.8 2011/03/31 08:48:05 adrian Exp $ */ #include "opt_ah.h" @@ -128,7 +128,7 @@ } /* Interrupt Mitigation on AR5416 */ -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) *masked |= HAL_INT_RX; if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM)) @@ -194,7 +194,7 @@ mask = ints & HAL_INT_COMMON; mask2 = 0; -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION /* * Overwrite default mask if Interrupt mitigation * is specified for AR5416 ==== //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#15 (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/ar5416/ar5416_reset.c,v 1.41 2011/03/25 00:03:21 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.42 2011/03/31 08:48:05 adrian Exp $ */ #include "opt_ah.h" @@ -305,7 +305,7 @@ */ OS_REG_WRITE(ah, AR_OBS, 8); -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION OS_REG_WRITE(ah, AR_MIRT, 0); OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500); @@ -538,7 +538,7 @@ | AR_IMR_RXERR | AR_IMR_RXORN | AR_IMR_BCNMISC; -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION ahp->ah_maskReg |= AR_IMR_TXINTM | AR_IMR_RXINTM | AR_IMR_TXMINTR | AR_IMR_RXMINTR; #else ==== //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#27 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.309 2011/03/29 15:59:07 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.310 2011/03/31 08:07:13 adrian Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -58,6 +58,7 @@ #include #include #include +#include #include @@ -5591,3 +5592,5 @@ } #endif /* IEEE80211_SUPPORT_TDMA */ +MODULE_VERSION(if_ath, 1); +MODULE_DEPEND(if_ath, wlan, 1, 1, 1); /* 802.11 media layer */ ==== //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_pci.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.25 2009/05/15 17:02:11 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.26 2011/03/31 08:07:13 adrian Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. @@ -250,6 +250,7 @@ sizeof (struct ath_pci_softc) }; static devclass_t ath_devclass; -DRIVER_MODULE(ath, pci, ath_pci_driver, ath_devclass, 0, 0); -MODULE_VERSION(ath, 1); -MODULE_DEPEND(ath, wlan, 1, 1, 1); /* 802.11 media layer */ +DRIVER_MODULE(ath_pci, pci, ath_pci_driver, ath_devclass, 0, 0); +MODULE_VERSION(ath_pci, 1); +MODULE_DEPEND(ath_pci, wlan, 1, 1, 1); /* 802.11 media layer */ +MODULE_DEPEND(ath_pci, if_ath, 1, 1, 1); /* if_ath driver */ ==== //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.416 2011/03/22 12:05:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.417 2011/03/31 13:22:12 jhb Exp $"); #include "opt_bus.h" @@ -69,6 +69,11 @@ #include "pcib_if.h" #include "pci_if.h" +#define PCIR_IS_BIOS(cfg, reg) \ + (((cfg)->hdrtype == PCIM_HDRTYPE_NORMAL && reg == PCIR_BIOS) || \ + ((cfg)->hdrtype == PCIM_HDRTYPE_BRIDGE && reg == PCIR_BIOS_1)) + + static pci_addr_t pci_mapbase(uint64_t mapreg); static const char *pci_maptype(uint64_t mapreg); static int pci_mapsize(uint64_t testval); @@ -531,6 +536,7 @@ cfg->mfdev = (cfg->hdrtype & PCIM_MFDEV) != 0; cfg->hdrtype &= ~PCIM_MFDEV; + STAILQ_INIT(&cfg->maps); pci_fixancient(cfg); pci_hdrtypedata(pcib, b, s, f, cfg); @@ -2106,6 +2112,7 @@ pci_freecfg(struct pci_devinfo *dinfo) { struct devlist *devlist_head; + struct pci_map *pm, *next; int i; devlist_head = &pci_devq; @@ -2119,6 +2126,9 @@ free(dinfo->cfg.vpd.vpd_w[i].value, M_DEVBUF); free(dinfo->cfg.vpd.vpd_w, M_DEVBUF); } + STAILQ_FOREACH_SAFE(pm, &dinfo->cfg.maps, pm_link, next) { + free(pm, M_DEVBUF); + } STAILQ_REMOVE(devlist_head, dinfo, pci_devinfo, pci_links); free(dinfo, M_DEVBUF); @@ -2393,6 +2403,7 @@ static void pci_read_bar(device_t dev, int reg, pci_addr_t *mapp, pci_addr_t *testvalp) { + struct pci_devinfo *dinfo; pci_addr_t map, testval; int ln2range; uint16_t cmd; @@ -2402,7 +2413,8 @@ * memory BAR. Bit 0 is special and should not be set when * sizing the BAR. */ - if (reg == PCIR_BIOS) { + dinfo = device_get_ivars(dev); + if (PCIR_IS_BIOS(&dinfo->cfg, reg)) { map = pci_read_config(dev, reg, 4); pci_write_config(dev, reg, 0xfffffffe, 4); testval = pci_read_config(dev, reg, 4); @@ -2453,20 +2465,99 @@ } static void -pci_write_bar(device_t dev, int reg, pci_addr_t base) +pci_write_bar(device_t dev, struct pci_map *pm, pci_addr_t base) { - pci_addr_t map; + struct pci_devinfo *dinfo; int ln2range; - map = pci_read_config(dev, reg, 4); + /* The device ROM BAR is always a 32-bit memory BAR. */ + dinfo = device_get_ivars(dev); + if (PCIR_IS_BIOS(&dinfo->cfg, pm->pm_reg)) + ln2range = 32; + else + ln2range = pci_maprange(pm->pm_value); + pci_write_config(dev, pm->pm_reg, base, 4); + if (ln2range == 64) + pci_write_config(dev, pm->pm_reg + 4, base >> 32, 4); + pm->pm_value = pci_read_config(dev, pm->pm_reg, 4); + if (ln2range == 64) + pm->pm_value |= (pci_addr_t)pci_read_config(dev, pm->pm_reg + 4, 4) << 32; +} + +struct pci_map * +pci_find_bar(device_t dev, int reg) +{ + struct pci_devinfo *dinfo; + struct pci_map *pm; + + dinfo = device_get_ivars(dev); + STAILQ_FOREACH(pm, &dinfo->cfg.maps, pm_link) { + if (pm->pm_reg == reg) + return (pm); + } + return (NULL); +} + +int +pci_bar_enabled(device_t dev, struct pci_map *pm) +{ + struct pci_devinfo *dinfo; + uint16_t cmd; + + dinfo = device_get_ivars(dev); + if (PCIR_IS_BIOS(&dinfo->cfg, pm->pm_reg) && + !(pm->pm_value & PCIM_BIOS_ENABLE)) + return (0); + cmd = pci_read_config(dev, PCIR_COMMAND, 2); + if (PCIR_IS_BIOS(&dinfo->cfg, pm->pm_reg) || PCI_BAR_MEM(pm->pm_value)) + return ((cmd & PCIM_CMD_MEMEN) != 0); + else + return ((cmd & PCIM_CMD_PORTEN) != 0); +} + +static struct pci_map * +pci_add_bar(device_t dev, int reg, pci_addr_t value, pci_addr_t size) +{ + struct pci_devinfo *dinfo; + struct pci_map *pm, *prev; + + dinfo = device_get_ivars(dev); + pm = malloc(sizeof(*pm), M_DEVBUF, M_WAITOK | M_ZERO); + pm->pm_reg = reg; + pm->pm_value = value; + pm->pm_size = size; + STAILQ_FOREACH(prev, &dinfo->cfg.maps, pm_link) { + KASSERT(prev->pm_reg != pm->pm_reg, ("duplicate map %02x", + reg)); + if (STAILQ_NEXT(prev, pm_link) == NULL || + STAILQ_NEXT(prev, pm_link)->pm_reg > pm->pm_reg) + break; + } + if (prev != NULL) + STAILQ_INSERT_AFTER(&dinfo->cfg.maps, prev, pm, pm_link); + else + STAILQ_INSERT_TAIL(&dinfo->cfg.maps, pm, pm_link); + return (pm); +} + +static void +pci_restore_bars(device_t dev) +{ + struct pci_devinfo *dinfo; + struct pci_map *pm; + int ln2range; - /* The device ROM BAR is always 32-bits. */ - if (reg == PCIR_BIOS) - return; - ln2range = pci_maprange(map); - pci_write_config(dev, reg, base, 4); - if (ln2range == 64) - pci_write_config(dev, reg + 4, base >> 32, 4); + dinfo = device_get_ivars(dev); + STAILQ_FOREACH(pm, &dinfo->cfg.maps, pm_link) { + if (PCIR_IS_BIOS(&dinfo->cfg, pm->pm_reg)) + ln2range = 32; + else + ln2range = pci_maprange(pm->pm_value); + pci_write_config(dev, pm->pm_reg, pm->pm_value, 4); + if (ln2range == 64) + pci_write_config(dev, pm->pm_reg + 4, + pm->pm_value >> 32, 4); + } } /* @@ -2477,6 +2568,7 @@ pci_add_map(device_t bus, device_t dev, int reg, struct resource_list *rl, int force, int prefetch) { + struct pci_map *pm; pci_addr_t base, map, testval; pci_addr_t start, end, count; int barlen, basezero, maprange, mapsize, type; @@ -2513,6 +2605,8 @@ (type == SYS_RES_IOPORT && mapsize < 2)) return (barlen); + /* Save a record of this BAR. */ + pm = pci_add_bar(dev, reg, map, mapsize); if (bootverbose) { printf("\tmap[%02x]: type %s, range %2d, base %#jx, size %2d", reg, pci_maptype(map), maprange, (uintmax_t)base, mapsize); @@ -2600,7 +2694,7 @@ start = 0; } else start = rman_get_start(res); - pci_write_bar(dev, reg, start); + pci_write_bar(dev, pm, start); return (barlen); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:15 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 825371065E95; Fri, 1 Apr 2011 16:33: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 997A61065EC4 for ; Fri, 1 Apr 2011 16:33:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 863128FC19 for ; Fri, 1 Apr 2011 16:33:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXBel076026 for ; Fri, 1 Apr 2011 16:33:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXBql076023 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:11 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:11 GMT Message-Id: <201104011633.p31GXBql076023@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:15 -0000 http://p4web.freebsd.org/@@190854?ac=10 Change 190854 by jhb@jhb_jhbbsd on 2011/04/01 01:02:49 More WIP on region regression tests. Affected files ... .. //depot/projects/pci/sys/modules/rman/rman.c#6 edit Differences ... ==== //depot/projects/pci/sys/modules/rman/rman.c#6 (text+ko) ==== @@ -295,6 +295,47 @@ assert_rman_ok(); } +struct region { + u_long start; + u_long end; +}; + +static void +assert_rman_regions(struct region *regions, int count) +{ + struct resource_i *i; + struct region *r; + u_long start; + + i = TAILQ_FIRST(&test.rm_list); + if (count == 0) { + KASSERT(i == NULL, ("non-empty rman")); + return; + } + + KASSERT(i != NULL, ("empty rman")); + r = regions; + start = r->start; + while (i != NULL) { + KASSERT(count != 0, ("resource beyond last region")); + KASSERT(i->r_start >= REGION_START && i->r_end <= REGION_END, + ("bad resource range")); + KASSERT(i->r_start == start, ("missing start of region")); + KASSERT(i->r_end <= r->end, ("resource overflows region")); + + if (i->r_end == r->end) { + /* Next region. */ + count--; + r++; + start = r->r_start; + } else + start = i->r_end + 1; + i = TAILQ_NEXT(i, r_link); + } + + KASSERT(count == 0, ("resources did not cover all regions")); +} + static void region_regression_tests(void) { From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:15 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0A261066067; Fri, 1 Apr 2011 16:33: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 BBFA21065EC5 for ; Fri, 1 Apr 2011 16:33:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A8C858FC1A for ; Fri, 1 Apr 2011 16:33:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXBq8076032 for ; Fri, 1 Apr 2011 16:33:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXBoe076029 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:11 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:11 GMT Message-Id: <201104011633.p31GXBoe076029@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:16 -0000 http://p4web.freebsd.org/@@190855?ac=10 Change 190855 by jhb@jhb_jhbbsd on 2011/04/01 01:04:03 More WIP. Affected files ... .. //depot/projects/pci/sys/modules/rman/rman.c#7 edit Differences ... ==== //depot/projects/pci/sys/modules/rman/rman.c#7 (text+ko) ==== @@ -339,6 +339,8 @@ static void region_regression_tests(void) { + struct region regions[3]; + /* Clear any released resources. */ if (r != NULL) { @@ -351,7 +353,13 @@ } assert_rman_ok(); - + /* Should have one region covering the full range. */ + regions[0].start = REGION_START; + regions[0].end = REGION_END; + assert_rman_regions(regions, 1); + + /* Release some holes to end up with two regions. */ + rman_release_region } static int From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:17 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27E36106618D; Fri, 1 Apr 2011 16:33: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 534141065F9D for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3F7B08FC16 for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXC4n076053 for ; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXCla076049 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:12 GMT Message-Id: <201104011633.p31GXCla076049@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:17 -0000 http://p4web.freebsd.org/@@190858?ac=10 Change 190858 by jhb@jhb_kavik on 2011/04/01 01:51:02 Reject attempts to manage a region outside the rman's valid range. Affected files ... .. //depot/projects/pci/sys/kern/subr_rman.c#5 edit Differences ... ==== //depot/projects/pci/sys/kern/subr_rman.c#5 (text+ko) ==== @@ -162,6 +162,8 @@ DPRINTF(("rman_manage_region: <%s> request: start %#lx, end %#lx\n", rm->rm_descr, start, end)); + if (start < rm->rm_start || end > rm->rm_end) + return EINVAL; r = int_alloc_resource(M_NOWAIT); if (r == NULL) return ENOMEM; @@ -271,7 +273,7 @@ KASSERT(TAILQ_NEXT(r, r_link)->r_flags & RF_ALLOCATED, ("adjacent free regions")); mtx_unlock(rm->rm_mtx); - return (ENOENT); + return (EBUSY); } /* From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:17 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F6721066196; Fri, 1 Apr 2011 16:33: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 C00601065FAA for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id AB0138FC1F for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXCHI076066 for ; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXCsF076063 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:12 GMT Message-Id: <201104011633.p31GXCsF076063@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:17 -0000 http://p4web.freebsd.org/@@190860?ac=10 Change 190860 by jhb@jhb_kavik on 2011/04/01 02:24:56 Add a new bus method, BUS_ADJUST_RESOURCE() as a wrapper around rman_adjust_resource() and add it in enough places that a PCI-PCI bridge should be able to propagate it up the tree on x86. Affected files ... .. //depot/projects/pci/sys/amd64/pci/pci_bus.c#2 edit .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#2 edit .. //depot/projects/pci/sys/dev/pci/pci.c#10 edit .. //depot/projects/pci/sys/i386/pci/pci_bus.c#2 edit .. //depot/projects/pci/sys/kern/bus_if.m#2 edit .. //depot/projects/pci/sys/kern/subr_bus.c#2 edit .. //depot/projects/pci/sys/sys/bus.h#2 edit .. //depot/projects/pci/sys/x86/x86/mptable_pci.c#2 edit .. //depot/projects/pci/sys/x86/x86/nexus.c#2 edit Differences ... ==== //depot/projects/pci/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -348,6 +348,7 @@ DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ==== @@ -100,6 +100,7 @@ DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar), DEVMETHOD(bus_write_ivar, acpi_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/pci/sys/dev/pci/pci.c#10 (text+ko) ==== @@ -142,6 +142,7 @@ DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_delete_resource, pci_delete_resource), DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), ==== //depot/projects/pci/sys/i386/pci/pci_bus.c#2 (text+ko) ==== @@ -565,6 +565,7 @@ DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/pci/sys/kern/bus_if.m#2 (text+ko) ==== @@ -297,6 +297,30 @@ }; /** + * @brief Adjust a resource + * + * Adjust the start and/or end of a resource allocated by + * BUS_ALLOC_RESOURCE. At least part of the new address range must overlap + * with the existing address range. If the successful, the resource's range + * will be adjusted to [start, end] on return. + * + * @param _dev the parent device of @p _child + * @param _child the device which allocated the resource + * @param _type the type of resource + * @param _res the resource to adjust + * @param _start the new starting address of the resource range + * @param _end the new ending address of the resource range + */ +METHOD int adjust_resource { + device_t _dev; + device_t _child; + int _type; + struct resource *_res; + u_long _start; + u_long _end; +}; + +/** * @brief Release a resource * * Free a resource allocated by the BUS_ALLOC_RESOURCE. The @p _rid ==== //depot/projects/pci/sys/kern/subr_bus.c#2 (text+ko) ==== @@ -3646,6 +3646,23 @@ } /** + * @brief Helper function for implementing BUS_ADJUST_RESOURCE(). + * + * This simple implementation of BUS_ADJUST_RESOURCE() simply calls the + * BUS_ADJUST_RESOURCE() method of the parent of @p dev. + */ +int +bus_generic_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, u_long start, u_long end) +{ + /* Propagate up the bus hierarchy until someone handles it. */ + if (dev->parent) + return (BUS_ADJUST_RESOURCE(dev->parent, child, type, r, start, + end)); + return (EINVAL); +} + +/** * @brief Helper function for implementing BUS_ALLOC_RESOURCE(). * * This simple implementation of BUS_ALLOC_RESOURCE() simply calls the @@ -3976,6 +3993,21 @@ } /** + * @brief Wrapper function for BUS_ADJUST_RESOURCE(). + * + * This function simply calls the BUS_ADJUST_RESOURCE() method of the + * parent of @p dev. + */ +int +bus_adjust_resource(device_t dev, int type, struct resource *r, u_long start, + u_long end) +{ + if (dev->parent == NULL) + return (EINVAL); + return (BUS_ADJUST_RESOURCE(dev->parent, dev, type, r, start, end)); +} + +/** * @brief Wrapper function for BUS_ACTIVATE_RESOURCE(). * * This function simply calls the BUS_ACTIVATE_RESOURCE() method of the ==== //depot/projects/pci/sys/sys/bus.h#2 (text+ko) ==== @@ -304,6 +304,9 @@ device_t bus_generic_add_child(device_t dev, u_int order, const char *name, int unit); +int bus_generic_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, u_long start, + u_long end); struct resource * bus_generic_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, @@ -374,6 +377,8 @@ void bus_release_resources(device_t dev, const struct resource_spec *rs, struct resource **res); +int bus_adjust_resource(device_t child, int type, struct resource *r, + u_long start, u_long end); struct resource *bus_alloc_resource(device_t dev, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); ==== //depot/projects/pci/sys/x86/x86/mptable_pci.c#2 (text+ko) ==== @@ -116,6 +116,7 @@ DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/pci/sys/x86/x86/nexus.c#2 (text+ko) ==== @@ -100,6 +100,8 @@ int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); +static int nexus_adjust_resource(device_t, device_t, int, struct resource *, + u_long, u_long); #ifdef SMP static int nexus_bind_intr(device_t, device_t, struct resource *, int); #endif @@ -144,6 +146,7 @@ DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), + DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), @@ -332,6 +335,23 @@ return(child); } +static struct rman * +nexus_rman(int type) +{ + switch (type) { + case SYS_RES_IRQ: + return (&irq_rman); + case SYS_RES_DRQ: + return (&drq_rman); + case SYS_RES_IOPORT: + return (&port_rman); + case SYS_RES_MEMORY: + return (&mem_rman); + default: + return (NULL); + } +} + /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -364,27 +384,9 @@ } flags &= ~RF_ACTIVE; - - switch (type) { - case SYS_RES_IRQ: - rm = &irq_rman; - break; - - case SYS_RES_DRQ: - rm = &drq_rman; - break; - - case SYS_RES_IOPORT: - rm = &port_rman; - break; - - case SYS_RES_MEMORY: - rm = &mem_rman; - break; - - default: - return 0; - } + rm = nexus_rman(type); + if (rm == NULL) + return (NULL); rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) @@ -402,6 +404,20 @@ } static int +nexus_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, u_long start, u_long end) +{ + struct rman *rm; + + rm = nexus_rman(type); + if (rm == NULL) + return (ENXIO); + if (!rman_is_region_manager(r, rm)) + return (EINVAL); + return (rman_adjust_resource(r, start, end)); +} + +static int nexus_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:17 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37F64106619F; Fri, 1 Apr 2011 16:33: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 752F1106566C for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 60DFB8FC1E for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXCR6076059 for ; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXCcm076056 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:12 GMT Message-Id: <201104011633.p31GXCcm076056@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:18 -0000 http://p4web.freebsd.org/@@190859?ac=10 Change 190859 by jhb@jhb_kavik on 2011/04/01 01:51:27 Flesh out release region tests. Affected files ... .. //depot/projects/pci/sys/modules/rman/rman.c#8 edit Differences ... ==== //depot/projects/pci/sys/modules/rman/rman.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Regression tests for rman_adjust_resource(). + * Regression tests for rman_adjust_resource() and rman_release_resource(). */ #include @@ -301,6 +301,34 @@ }; static void +assert_rman_hole(u_long start, u_long end) +{ + struct resource_i *i; + + TAILQ_FOREACH(i, &test.rm_list, r_link) { + KASSERT(i->r_end < start || i->r_start > end, + ("region is not free")); + } +} + +static void +assert_rman_managed(u_long start, u_long end) +{ + struct resource_i *i; + + TAILQ_FOREACH(i, &test.rm_list, r_link) { + if (i->r_end < start) + continue; + if (i->r_start <= start) { + if (end <= i->r_end) + return; + start = i->r_end + 1; + } + } + panic("region (%lx, %lx) is not managed", start, end); +} + +static void assert_rman_regions(struct region *regions, int count) { struct resource_i *i; @@ -340,7 +368,45 @@ region_regression_tests(void) { struct region regions[3]; + int error; +#define RELEASE_SHOULD_FAIL(start, end, err) do { \ + error = rman_release_region(&test, (start), (end)); \ + if (error == (err)) \ + printf("Correctly failed to release (%x, %x)\n", \ + (start), (end)); \ + else { \ + if (error) \ + printf("Failed to release (%x, %x) with %d\n", \ + (start), (end), error); \ + else \ + printf("Incorrectly released (%lx, %lx)\n", \ + rman_get_start(r), rman_get_end(r)); \ + return; \ + } \ +} while (0) + +#define RELEASE_SHOULD_WORK(start, end) do { \ + error = rman_release_region(&test, (start), (end)); \ + if (error) { \ + printf("Failed to release (%x, %x) with %d\n", \ + (start), (end), error); \ + return; \ + } \ + printf("Released (%x, %x)\n", (start), (end)); \ + assert_rman_hole((start), (end)); \ +} while (0) + +#define MANAGE_SHOULD_WORK(start, end) do { \ + error = rman_manage_region(&test, (start), (end)); \ + if (error) { \ + printf("Failed to manage (%x, %x) with %d\n", \ + (start), (end), error); \ + return; \ + } \ + printf("Managed (%x, %x)\n", (start), (end)); \ + assert_rman_managed((start), (end)); \ +} while (0) /* Clear any released resources. */ if (r != NULL) { @@ -358,8 +424,84 @@ regions[0].end = REGION_END; assert_rman_regions(regions, 1); + /* Should not be able to release regions outside of bounds. */ + RELEASE_SHOULD_FAIL(REGION_START - 0x10, REGION_START + 0x10, ENOENT); + RELEASE_SHOULD_FAIL(REGION_END - 0x10, REGION_END + 0x10, ENOENT); + + /* Free entire rman and reallocate it. */ + RELEASE_SHOULD_WORK(REGION_START, REGION_END); + assert_rman_regions(NULL, 0); + MANAGE_SHOULD_WORK(REGION_START, REGION_END); + assert_rman_regions(regions, 1); + /* Release some holes to end up with two regions. */ - rman_release_region + RELEASE_SHOULD_WORK(REGION_START, REGION_START + 0xf); + regions[0].start = REGION_START + 0x10; + assert_rman_regions(regions, 1); + RELEASE_SHOULD_WORK(REGION_END - 0xf, REGION_END); + regions[0].end = REGION_END - 0x10; + assert_rman_regions(regions, 1); + RELEASE_SHOULD_WORK(REGION_START + 0x41, REGION_END - 0x41); + regions[1].end = regions[0].end; + regions[0].end = REGION_START + 0x40; + regions[1].start = REGION_END - 0x40; + assert_rman_regions(regions, 2); + + /* Releasing already released regions should fail. */ + RELEASE_SHOULD_FAIL(REGION_START, REGION_START + 0x8, ENOENT); + RELEASE_SHOULD_FAIL(REGION_START + 0x40, REGION_END - 0x41, ENOENT); + RELEASE_SHOULD_FAIL(REGION_END - 0x8, REGION_END, ENOENT); + + /* Allocate a resource from the first region. */ + r = rman_reserve_resource(&test, REGION_START + 0x20, + REGION_START + 0x2f, 0x10, 0, NULL); + if (r == NULL) { + printf("Failed to allocate resource\n"); + return; + } + printf("Allocated (%lx, %lx)\n", rman_get_start(r), rman_get_end(r)); + assert_rman_regions(regions, 2); + + /* Should not be able to release regions that overlap 'r'. */ + RELEASE_SHOULD_FAIL(rman_get_start(r), rman_get_end(r), EBUSY); + RELEASE_SHOULD_FAIL(REGION_START + 0x10, rman_get_start(r), EBUSY); + RELEASE_SHOULD_FAIL(rman_get_end(r), REGION_START + 0x40, EBUSY); + RELEASE_SHOULD_FAIL(REGION_START + 0x10, REGION_START + 0x40, EBUSY); + assert_rman_regions(regions, 2); + + /* Should be able to release regions around 'r'. */ + RELEASE_SHOULD_WORK(REGION_START + 0x10, rman_get_start(r) - 1); + regions[0].start = rman_get_start(r); + assert_rman_regions(regions, 2); + RELEASE_SHOULD_WORK(rman_get_end(r) + 1, REGION_START + 0x40); + regions[0].end = rman_get_end(r); + assert_rman_regions(regions, 2); + + /* Should be able to release a single address in a region. */ + RELEASE_SHOULD_WORK(regions[1].start + 0x10, regions[1].start + 0x10); + regions[2].end = regions[1].end; + regions[2].start = regions[1].start + 0x10 + 1; + regions[1].end = regions[1].start + 0x10 - 1; + assert_rman_regions(regions, 3); + + /* Fill in all the holes. */ + MANAGE_SHOULD_WORK(regions[2].end + 1, REGION_END); + regions[2].end = REGION_END; + assert_rman_regions(regions, 3); + MANAGE_SHOULD_WORK(REGION_START, regions[0].start - 1); + regions[0].start = REGION_START; + assert_rman_regions(regions, 3); + MANAGE_SHOULD_WORK(regions[1].end + 1, regions[2].start - 1); + regions[1].end = REGION_END; + assert_rman_regions(regions, 2); + MANAGE_SHOULD_WORK(regions[0].end + 1, regions[1].start - 1); + regions[0].end = REGION_END; + assert_rman_regions(regions, 1); + assert_rman_ok(); + + rman_release_resource(r); + assert_rman_regions(regions, 1); + assert_rman_ok(); } static int From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ED5910661B8; Fri, 1 Apr 2011 16:33: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 098A91065FB1 for ; Fri, 1 Apr 2011 16:33:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D04058FC20 for ; Fri, 1 Apr 2011 16:33:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXC7C076073 for ; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXCN5076070 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:12 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:12 GMT Message-Id: <201104011633.p31GXCN5076070@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:18 -0000 http://p4web.freebsd.org/@@190861?ac=10 Change 190861 by jhb@jhb_kavik on 2011/04/01 02:29:18 Start hacking on the PCI-PCI bridge driver. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#2 edit .. //depot/projects/pci/sys/dev/pci/pcib_private.h#2 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#2 (text+ko) ==== @@ -73,6 +73,7 @@ DEVMETHOD(bus_read_ivar, pcib_read_ivar), DEVMETHOD(bus_write_ivar, pcib_write_ivar), DEVMETHOD(bus_alloc_resource, pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, pcib_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), @@ -657,6 +658,14 @@ count, flags)); } +int +pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, + u_long start, u_long end) +{ + + return (bus_generic_adjust_resource(bus, child, type, r, start, end)); +} + /* * PCIB interface. */ ==== //depot/projects/pci/sys/dev/pci/pcib_private.h#2 (text+ko) ==== @@ -53,12 +53,18 @@ u_int pribus; /* primary bus number */ u_int secbus; /* secondary bus number */ u_int subbus; /* subordinate bus number */ +#ifdef NEW_PCIB + struct rman pmem_rm; /* prefetchable memory window */ + struct rman mem_rm; /* memory window */ + struct rman io_rm; /* I/O port window */ +#else pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ pci_addr_t memlimit; /* topmost address of memory window */ uint32_t iobase; /* base address of port window */ uint32_t iolimit; /* topmost address of port window */ +#endif uint16_t secstat; /* secondary bus status register */ uint16_t bridgectl; /* bridge control register */ uint8_t seclat; /* secondary bus latency timer */ @@ -74,6 +80,8 @@ int pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value); struct resource *pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); +int pcib_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, u_long start, u_long end); int pcib_maxslots(device_t dev); uint32_t pcib_read_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, int width); void pcib_write_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, uint32_t val, int width); From owner-p4-projects@FreeBSD.ORG Fri Apr 1 16:33:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 677A310658E1; Fri, 1 Apr 2011 16:33:19 +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 70E7E1065FE1 for ; Fri, 1 Apr 2011 16:33:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 54EBC8FC17 for ; Fri, 1 Apr 2011 16:33:15 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GXFwW076143 for ; Fri, 1 Apr 2011 16:33:15 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GXFEu076140 for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:15 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2011 16:33:15 GMT Message-Id: <201104011633.p31GXFEu076140@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2011 16:33:20 -0000 http://p4web.freebsd.org/@@190871?ac=10 Change 190871 by jhb@jhb_kavik on 2011/04/01 10:59:30 More pci-pci bridge hacking. Affected files ... .. //depot/projects/pci/sys/conf/options#2 edit .. //depot/projects/pci/sys/dev/pci/pci_pci.c#3 edit .. //depot/projects/pci/sys/dev/pci/pcib_private.h#3 edit Differences ... ==== //depot/projects/pci/sys/conf/options#2 (text+ko) ==== @@ -135,6 +135,7 @@ MFI_DECODE_LOG opt_mfi.h MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZE opt_mprof.h +NEW_PCIB opt_global.h NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NO_ADAPTIVE_SX ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -100,7 +100,34 @@ DEFINE_CLASS_0(pcib, pcib_driver, pcib_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, 0, 0); +#ifdef NEW_PCIB /* + * Is a resource from a child device sub-allocated from one of our + * resource managers? + */ +static int +pcib_is_resource_managed(struct pcib_softc *sc, int type, struct resource *r) +{ + + /* Subtractive bridges do manage resources. */ + if (sc->flags & PCIB_SUBTRACTIVE) + return (0); + + switch (type) { + case SYS_RES_IOPORT: + return (rman_is_region_manager(r, &sc->io_rman)); + case SYS_RES_MEMORY: + /* Prefetchable resources may live in either memory rman. */ + if (rman_get_flags(r) & RF_PREFETCHABLE && + rman_is_region_manager(r, &sc->pmem_rman)) + return (1); + return (rman_is_region_manager(r, &sc->mem_rman)); + } + return (0); +} +#endif + +/* * Is the prefetch window open (eg, can we allocate memory in it?) */ static int @@ -662,7 +689,13 @@ pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, u_long start, u_long end) { +#ifdef NEW_PCIB + struct pcib_softc *sc; + sc = device_get_softc(bus); + if (pcib_is_resource_managed(sc, type, r)) + return (rman_adjust_resource(r, start, end)); +#endif return (bus_generic_adjust_resource(bus, child, type, r, start, end)); } ==== //depot/projects/pci/sys/dev/pci/pcib_private.h#3 (text+ko) ==== @@ -54,17 +54,16 @@ u_int secbus; /* secondary bus number */ u_int subbus; /* subordinate bus number */ #ifdef NEW_PCIB - struct rman pmem_rm; /* prefetchable memory window */ - struct rman mem_rm; /* memory window */ - struct rman io_rm; /* I/O port window */ -#else + struct rman pmem_rman; /* prefetchable memory window */ + struct rman mem_rman; /* memory window */ + struct rman io_rman; /* I/O port window */ +#endif pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ pci_addr_t memlimit; /* topmost address of memory window */ uint32_t iobase; /* base address of port window */ uint32_t iolimit; /* topmost address of port window */ -#endif uint16_t secstat; /* secondary bus status register */ uint16_t bridgectl; /* bridge control register */ uint8_t seclat; /* secondary bus latency timer */