From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 03:47:02 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 8A17B106566C for ; Sun, 12 Aug 2012 03:47:00 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 03:47:00 +0000 Date: Sun, 12 Aug 2012 03:47:00 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812034700.8A17B106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240287 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 03:47:02 -0000 Author: jhagewood Date: Sun Aug 12 03:46:59 2012 New Revision: 240287 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240287 Log: gzip decompression in sdiff Modified: soc2012/jhagewood/sdiff/Makefile soc2012/jhagewood/sdiff/common.h soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/Makefile ============================================================================== --- soc2012/jhagewood/sdiff/Makefile Sun Aug 12 02:51:28 2012 (r240286) +++ soc2012/jhagewood/sdiff/Makefile Sun Aug 12 03:46:59 2012 (r240287) @@ -3,20 +3,20 @@ #.if defined(__FreeBSD__) -INCLUDEDIR+=/usr/src/crypto/openssh/openbsd-compat /usr/src/contrib/traceroute/lbl +INCLUDEDIR+= /usr/src/crypto/openssh/openbsd-compat /usr/src/contrib/traceroute/lbl .for dir in ${INCLUDEDIR} CFLAGS+= -I${dir} .endfor -COPTS+= -std=c99 -pedantic +COPTS+= -std=c99 -pedantic DEBUG_FLAGS+= -g #.endif -PROG=sdiff -SRCS=common.c edit.c sdiff.c -COPTS+=-Wall -W +PROG= sdiff zsdiff +SRCS= common.c edit.c sdiff.c +COPTS+= -Wall -W LDADD+= -lutil DPADD+= ${LIBUTIL} Modified: soc2012/jhagewood/sdiff/common.h ============================================================================== --- soc2012/jhagewood/sdiff/common.h Sun Aug 12 02:51:28 2012 (r240286) +++ soc2012/jhagewood/sdiff/common.h Sun Aug 12 03:46:59 2012 (r240287) @@ -7,3 +7,9 @@ void cleanup(const char *) __dead2; FILE *decompressfile(char *, char *); + +/* + * File input types + */ +#define FILE_NORMAL 0 +#define FILE_GZIP 1 Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Sun Aug 12 02:51:28 2012 (r240286) +++ soc2012/jhagewood/sdiff/sdiff.c Sun Aug 12 03:46:59 2012 (r240287) @@ -88,6 +88,8 @@ int sflag; /* skip identical lines */ FILE *outfp; /* file to save changes to */ const char *tmpdir; /* TMPDIR or /tmp */ +char *pn; /* program name */ +char *filebehave; /* open file behavior */ enum { HELP_OPT = CHAR_MAX + 1, @@ -249,6 +251,15 @@ struct option *popt; char **diffargv, *diffprog = "/usr/bin/diff", *filename1, *filename2, *tmp1, *tmp2, *s1, *s2; + + filebehave = FILE_NORMAL; + /* Check what is the program name of the binary. In this + way we can have all the funcionalities in one binary + without the need of scripting and using ugly hacks. */ + pn = getprogname(); + if (pn[0] == 'z') { + filebehave = FILE_GZIP; + } /* * Process diff flags. @@ -430,12 +441,19 @@ if ((diffpipe = fdopen(fd[0], "r")) == NULL) err(2, "could not open diff pipe"); } - - if ((file1 = fopen(filename1, "r")) == NULL) - err(2, "could not open %s", filename1); - if ((file2 = fopen(filename2, "r")) == NULL) - err(2, "could not open %s", filename2); - + if (filebehave == FILE_NORMAL) { + if ((file1 = fopen(filename1, "r")) == NULL) + err(2, "could not open %s", filename1); + if ((file2 = fopen(filename2, "r")) == NULL) + err(2, "could not open %s", filename2); + } + /* Decompress gzip input files, treat them as regular FILEs. */ + if (filebehave == FILE_GZIP) { + if ((file1 = decompressfile(filename1, "r")) == NULL) + err(2, "could not open %s", filename1); + if ((file2 = decompressfile(filename2, "r")) == NULL) + err(2, "could not open %s", filename2); + } if (!istextfile(file1) || !istextfile(file2)) { /* Close open files and pipe, delete temps */ fclose(file1); From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 03:53:52 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 50414106566B for ; Sun, 12 Aug 2012 03:53:50 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 03:53:50 +0000 Date: Sun, 12 Aug 2012 03:53:50 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812035351.50414106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240288 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 03:53:52 -0000 Author: jhagewood Date: Sun Aug 12 03:53:50 2012 New Revision: 240288 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240288 Log: Modified: soc2012/jhagewood/sdiff/common.h soc2012/jhagewood/sdiff/decompress.c soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/common.h ============================================================================== --- soc2012/jhagewood/sdiff/common.h Sun Aug 12 03:46:59 2012 (r240287) +++ soc2012/jhagewood/sdiff/common.h Sun Aug 12 03:53:50 2012 (r240288) @@ -6,10 +6,3 @@ */ void cleanup(const char *) __dead2; -FILE *decompressfile(char *, char *); - -/* - * File input types - */ -#define FILE_NORMAL 0 -#define FILE_GZIP 1 Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sun Aug 12 03:46:59 2012 (r240287) +++ soc2012/jhagewood/sdiff/decompress.c Sun Aug 12 03:53:50 2012 (r240288) @@ -52,7 +52,7 @@ #include #endif -#include "common.h" +#include "sdiff.h" #define MAXBUFSIZE (32 * 1024) Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Sun Aug 12 03:46:59 2012 (r240287) +++ soc2012/jhagewood/sdiff/sdiff.c Sun Aug 12 03:53:50 2012 (r240288) @@ -41,6 +41,7 @@ #include "common.h" #include "extern.h" +#include "sdiff.h" #define WIDTH 130 /* From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 03:54:51 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id A96B9106566C for ; Sun, 12 Aug 2012 03:54:50 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 03:54:50 +0000 Date: Sun, 12 Aug 2012 03:54:50 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812035450.A96B9106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240289 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 03:54:51 -0000 Author: jhagewood Date: Sun Aug 12 03:54:49 2012 New Revision: 240289 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240289 Log: Header file for sdiff. Added: soc2012/jhagewood/sdiff/sdiff.h Added: soc2012/jhagewood/sdiff/sdiff.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/jhagewood/sdiff/sdiff.h Sun Aug 12 03:54:49 2012 (r240289) @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2012 Jesse Hagewood + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +FILE *decompressfile(char *, char *); + +/* + * File input types + */ +#define FILE_NORMAL 0 +#define FILE_GZIP 1 From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 07:09:28 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id DED7B1065672 for ; Sun, 12 Aug 2012 07:09:25 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 07:09:25 +0000 Date: Sun, 12 Aug 2012 07:09:25 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812070925.DED7B1065672@hub.freebsd.org> Cc: Subject: socsvn commit: r240291 - in soc2012/gmiller/locking-head: . include lib/libwitness tools/regression/lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 07:09:28 -0000 Author: gmiller Date: Sun Aug 12 07:09:25 2012 New Revision: 240291 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240291 Log: r240358@FreeBSD-dev: root | 2012-08-11 00:49:07 -0500 Replace pthread_setname_np() with pthread_mutex_setname_np(), pthread_rwlock_setname_np(), and pthread_spin_setname_np(). Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/include/pthread_np.h soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c soc2012/gmiller/locking-head/lib/libwitness/witness.h soc2012/gmiller/locking-head/lib/libwitness/wrappers.c soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c Modified: soc2012/gmiller/locking-head/include/pthread_np.h ============================================================================== --- soc2012/gmiller/locking-head/include/pthread_np.h Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/include/pthread_np.h Sun Aug 12 07:09:25 2012 (r240291) @@ -116,7 +116,9 @@ int pthread_lockorder_begin_np(struct pthread_lockorder_np *); int pthread_lockorder_next_np(struct pthread_lockorder_np *); void pthread_lockorder_end_np(struct pthread_lockorder_np *); -int pthread_setname_np(void *, const char *); +int pthread_mutex_setname_np(pthread_mutex_t *, const char *); +int pthread_rwlock_setname_np(pthread_rwlock_t *, const char *); +int pthread_spin_setname_np(pthread_spinlock_t *, const char *); #ifdef LOCK_PROFILING Modified: soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Sun Aug 12 07:09:25 2012 (r240291) @@ -188,7 +188,7 @@ } int -pthread_setname_np(void *lock, const char *name) +set_lock_name(void *lock, const char *name) { struct lock_instance *inst; Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/witness.h Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/lib/libwitness/witness.h Sun Aug 12 07:09:25 2012 (r240291) @@ -69,6 +69,7 @@ int blessed(struct lock_info *first, struct lock_info *second); void reset_lock_info(void); void check_default_name(void *lock, const char *prefix); +int set_lock_name(void *lock, const char *name); const char *get_lock_name(struct lock_info *info); struct lock_info *get_lock_info(struct lock_instance *lock); void destroy_lock(void *lock); Modified: soc2012/gmiller/locking-head/lib/libwitness/wrappers.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Sun Aug 12 07:09:25 2012 (r240291) @@ -426,3 +426,21 @@ _pthread_mutex_unlock(&witness_mtx); } + +int +pthread_mutex_setname_np(pthread_mutex_t *mutex, const char *name) +{ + return (set_lock_name(mutex, name)); +} + +int +pthread_rwlock_setname_np(pthread_rwlock_t *rwlock, const char *name) +{ + return (set_lock_name(rwlock, name)); +} + +int +pthread_spin_setname_np(pthread_spinlock_t *spin, const char *name) +{ + return (set_lock_name(spin, name)); +} Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c ============================================================================== --- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c Sun Aug 12 07:09:25 2012 (r240291) @@ -100,7 +100,7 @@ pthread_mutex_init(&lock_buffer[i], NULL); sprintf(name, "%d", i + 1); - pthread_setname_np(&lock_buffer[i], name); + pthread_mutex_setname_np(&lock_buffer[i], name); } graph_test(lock_buffer, lock_count, lock_set, 0, 0); Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c ============================================================================== --- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c Sun Aug 12 07:09:25 2012 (r240291) @@ -37,8 +37,8 @@ void setname_test(void) { - pthread_setname_np(&mutex1, "mutex 1"); - pthread_setname_np(&mutex2, "mutex 2"); + pthread_mutex_setname_np(&mutex1, "mutex 1"); + pthread_mutex_setname_np(&mutex2, "mutex 2"); pthread_mutex_lock(&mutex1); pthread_mutex_lock(&mutex2); Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c ============================================================================== --- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c Sun Aug 12 04:50:26 2012 (r240290) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c Sun Aug 12 07:09:25 2012 (r240291) @@ -75,8 +75,8 @@ pthread_lor_clear_np(); - pthread_setname_np(&mutex1, "shared_mutex"); - pthread_setname_np(&mutex2, "shared_mutex"); + pthread_mutex_setname_np(&mutex1, "shared_mutex"); + pthread_mutex_setname_np(&mutex2, "shared_mutex"); pthread_mutex_lock(&mutex1); pthread_mutex_lock(&mutex2); From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 08:54:22 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 8ADEF106566B for ; Sun, 12 Aug 2012 08:54:20 +0000 (UTC) (envelope-from rudot@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 08:54:20 +0000 Date: Sun, 12 Aug 2012 08:54:20 +0000 From: rudot@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812085420.8ADEF106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240292 - soc2012/rudot/sys/kern X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 08:54:22 -0000 Author: rudot Date: Sun Aug 12 08:54:19 2012 New Revision: 240292 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240292 Log: decaying pcpu - complete Modified: soc2012/rudot/sys/kern/kern_racct.c Modified: soc2012/rudot/sys/kern/kern_racct.c ============================================================================== --- soc2012/rudot/sys/kern/kern_racct.c Sun Aug 12 07:09:25 2012 (r240291) +++ soc2012/rudot/sys/kern/kern_racct.c Sun Aug 12 08:54:19 2012 (r240292) @@ -308,9 +308,9 @@ fixpt_t p_pctcpu; struct thread *td; - swtime = (ticks - p->p_swtick) / hz; - if ((swtime == 0) || ((p->p_flag & P_INMEM) == 0)) + if ((p->p_flag & P_INMEM) == 0) return (0); + swtime = (ticks - p->p_swtick) / hz; if (swtime < RACCT_PCPU_SECS) { /* * For short-lived processes, the sched_pctcpu() returns small @@ -479,6 +479,12 @@ ("racct_alloc_resource: usage < 0")); racct->r_resources[resource] = 0; } + + if (resource == RACCT_PCTCPU) { + if (racct->r_resources[RACCT_PCTCPU] > 100) { + racct->r_resources[RACCT_PCTCPU] = 100; + } + } } static int @@ -608,16 +614,16 @@ } available = INT64_MAX; -#ifdef RCTL - available = rctl_pcpu_available(p); -#endif racct_alloc_resource(p->p_racct, resource, diff_proc); if (diff_cred > 0) racct_add_cred_locked(p->p_ucred, resource, diff_cred); else if (diff_cred < 0) racct_sub_cred_locked(p->p_ucred, resource, -diff_cred); - return (available <= diff_proc); +#ifdef RCTL + available = rctl_pcpu_available(p); +#endif + return (available <= 0); } static int From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 19:43:07 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 8CE43106566C for ; Sun, 12 Aug 2012 19:43:05 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 19:43:05 +0000 Date: Sun, 12 Aug 2012 19:43:05 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812194305.8CE43106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240299 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 19:43:07 -0000 Author: jhagewood Date: Sun Aug 12 19:43:04 2012 New Revision: 240299 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240299 Log: gzip file support in sdiff Modified: soc2012/jhagewood/sdiff/sdiff.c soc2012/jhagewood/sdiff/sdiff.h Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Sun Aug 12 17:53:06 2012 (r240298) +++ soc2012/jhagewood/sdiff/sdiff.c Sun Aug 12 19:43:04 2012 (r240299) @@ -61,6 +61,8 @@ char *right; }; +extern FILE *decompressfile(char *, char *); + static void astrcat(char **, const char *); static void enqueue(char *, char, char *); static char *mktmpcpy(const char *); @@ -250,7 +252,7 @@ pid_t pid=0; pid_t ppid =-1; const char *outfile = NULL; struct option *popt; - char **diffargv, *diffprog = "/usr/bin/diff", *filename1, *filename2, + char **diffargv, *diffprog = DIFF_PATH, *filename1, *filename2, *tmp1, *tmp2, *s1, *s2; filebehave = FILE_NORMAL; @@ -516,17 +518,25 @@ return (WEXITSTATUS(status)); } +/* + * When sdiff/zsdiff detects a binary file as input, executes them with + * diff/zdiff to maintain the same behavior as GNU sdiff with binary input. + */ static void binexec(char *diffprog, char *f1, char *f2) { char *args[] = {diffprog, f1, f2, (char *) 0}; + if (filebehave == FILE_GZIP) { + diffprog = ZDIFF_PATH; + } execv(diffprog, args); /* If execv() fails, this program's execution will continue. */ sprintf(stderr, "Could not execute diff process.\n"); exit(1); } + /* * Checks whether a file appears to be a text file. */ Modified: soc2012/jhagewood/sdiff/sdiff.h ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.h Sun Aug 12 17:53:06 2012 (r240298) +++ soc2012/jhagewood/sdiff/sdiff.h Sun Aug 12 19:43:04 2012 (r240299) @@ -24,10 +24,16 @@ * SUCH DAMAGE. */ -FILE *decompressfile(char *, char *); - /* * File input types */ #define FILE_NORMAL 0 #define FILE_GZIP 1 + +/* + * Program paths + */ +#define DIFF_PATH "/usr/bin/diff" +#define ZDIFF_PATH "/usr/bin/zdiff" + +FILE *decompressfile(char *, char *); From owner-svn-soc-all@FreeBSD.ORG Sun Aug 12 20:53:20 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 9E2C7106564A for ; Sun, 12 Aug 2012 20:53:19 +0000 (UTC) (envelope-from oleksandr@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 12 Aug 2012 20:53:19 +0000 Date: Sun, 12 Aug 2012 20:53:19 +0000 From: oleksandr@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120812205319.9E2C7106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240301 - soc2012/oleksandr/udf-head/sys/fs/udf2 X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 20:53:20 -0000 Author: oleksandr Date: Sun Aug 12 20:53:18 2012 New Revision: 240301 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240301 Log: fix bug in readdir and add ifdef WRITE_SUPPORT Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c ============================================================================== --- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c Sun Aug 12 19:58:56 2012 (r240300) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c Sun Aug 12 20:53:18 2012 (r240301) @@ -273,7 +273,7 @@ return (error); } /* --------------------------------------------------------------------- */ -#if 0 +#ifdef WRITE_SUPPORT int udf_write(struct vop_write_args *ap) { @@ -561,7 +561,7 @@ /* --------------------------------------------------------------------- */ -/* TODO: Needs lots of work */ + static int udf_readdir(struct vop_readdir_args /* { struct vnode *a_vp; @@ -756,7 +756,7 @@ free(cookies, M_UDFTEMP); } else { *ap->a_ncookies = acookies; - *ap->a_cookies = cookies; + *ap->a_cookies = (u_long *) cookies; } } @@ -1531,7 +1531,7 @@ } /* --------------------------------------------------------------------- */ -#if 0 +#ifdef WRITE_SUPPORT int udf_create(void *v) { @@ -1986,7 +1986,7 @@ * * If source is on the path from target to the root, return error. */ -#if 0 +#ifdef WRITE_SUPPORT static int udf_on_rootpath(struct udf_node *source, struct udf_node *target) { From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 03:48:35 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 4B7E0106566C for ; Mon, 13 Aug 2012 03:48:30 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 03:48:30 +0000 Date: Mon, 13 Aug 2012 03:48:30 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813034831.4B7E0106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240314 - in soc2012/gmiller/locking-head: . bin/cat bin/ed bin/expr bin/ls bin/ps bin/rcp bin/rm bin/sh bin/stty bin/uuidgen cddl/compat/opensolaris/misc cddl/contrib/dtracetoolkit ... X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 03:48:35 -0000 Author: gmiller Date: Mon Aug 13 03:48:24 2012 New Revision: 240314 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240314 Log: r240360@FreeBSD-dev: root | 2012-08-11 11:52:53 -0500 Remerge from trunk. Added: soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/ soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/tst.includefirst.ksh soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/ soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTOREVEN.nodivide.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTOREVEN.notfactor.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTORMATCH.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTORNSTEPS.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTORSMALL.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTORTYPE.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_FACTORVAL.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_HIGHMATCH.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_HIGHTYPE.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_HIGHVAL.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_LOWMATCH.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_LOWTYPE.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_LOWVAL.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGRANGE.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_NSTEPMATCH.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_NSTEPTYPE.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_NSTEPVAL.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.bases.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.bases.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.basic.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.basic.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.negorder.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.negorder.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.negvalue.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.negvalue.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.normal.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.normal.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.range.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.range.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.steps.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.steps.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.trunc.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/tst.trunc.d.out soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zhack/ soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zhack/zhack.c (contents, props changed) soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 (contents, props changed) soc2012/gmiller/locking-head/cddl/lib/libdtrace/io.d (contents, props changed) soc2012/gmiller/locking-head/cddl/usr.sbin/zhack/ soc2012/gmiller/locking-head/cddl/usr.sbin/zhack/Makefile (contents, props changed) soc2012/gmiller/locking-head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c (contents, props changed) soc2012/gmiller/locking-head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/ soc2012/gmiller/locking-head/contrib/byacc/ACKNOWLEDGEMENTS soc2012/gmiller/locking-head/contrib/byacc/AUTHORS soc2012/gmiller/locking-head/contrib/byacc/CHANGES soc2012/gmiller/locking-head/contrib/byacc/Makefile.old (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/NEW_FEATURES soc2012/gmiller/locking-head/contrib/byacc/NOTES soc2012/gmiller/locking-head/contrib/byacc/NO_WARRANTY soc2012/gmiller/locking-head/contrib/byacc/README soc2012/gmiller/locking-head/contrib/byacc/VERSION soc2012/gmiller/locking-head/contrib/byacc/aclocal.m4 soc2012/gmiller/locking-head/contrib/byacc/closure.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/config.guess (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/config.sub (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/config_h.in (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/configure (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/configure.in (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/defs.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/descrip.mms soc2012/gmiller/locking-head/contrib/byacc/error.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/graph.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/install-sh (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/lalr.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/lr0.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/main.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/makefile.in (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/mkpar.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/output.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/package/ soc2012/gmiller/locking-head/contrib/byacc/package/byacc.spec soc2012/gmiller/locking-head/contrib/byacc/package/debian/ soc2012/gmiller/locking-head/contrib/byacc/package/debian/changelog soc2012/gmiller/locking-head/contrib/byacc/package/debian/compat soc2012/gmiller/locking-head/contrib/byacc/package/debian/control soc2012/gmiller/locking-head/contrib/byacc/package/debian/copyright soc2012/gmiller/locking-head/contrib/byacc/package/debian/docs soc2012/gmiller/locking-head/contrib/byacc/package/debian/postinst soc2012/gmiller/locking-head/contrib/byacc/package/debian/prerm soc2012/gmiller/locking-head/contrib/byacc/package/debian/rules (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/package/debian/source/ soc2012/gmiller/locking-head/contrib/byacc/package/debian/source/format soc2012/gmiller/locking-head/contrib/byacc/package/debian/watch soc2012/gmiller/locking-head/contrib/byacc/package/pkgsrc/ soc2012/gmiller/locking-head/contrib/byacc/package/pkgsrc/DESCR soc2012/gmiller/locking-head/contrib/byacc/package/pkgsrc/Makefile (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/package/pkgsrc/PLIST soc2012/gmiller/locking-head/contrib/byacc/package/pkgsrc/distinfo soc2012/gmiller/locking-head/contrib/byacc/reader.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/skeleton.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/symtab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/ soc2012/gmiller/locking-head/contrib/byacc/test/README soc2012/gmiller/locking-head/contrib/byacc/test/calc.output soc2012/gmiller/locking-head/contrib/byacc/test/calc.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc1.output soc2012/gmiller/locking-head/contrib/byacc/test/calc1.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc1.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc1.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc2.output soc2012/gmiller/locking-head/contrib/byacc/test/calc2.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc2.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc2.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc3.output soc2012/gmiller/locking-head/contrib/byacc/test/calc3.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc3.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/calc3.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_calc.code.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_calc.output soc2012/gmiller/locking-head/contrib/byacc/test/code_calc.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_calc.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_calc.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_error.code.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_error.output soc2012/gmiller/locking-head/contrib/byacc/test/code_error.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_error.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/code_error.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/error.output soc2012/gmiller/locking-head/contrib/byacc/test/error.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/error.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/error.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/ftp.output soc2012/gmiller/locking-head/contrib/byacc/test/ftp.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/ftp.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/ftp.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/grammar.output soc2012/gmiller/locking-head/contrib/byacc/test/grammar.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/grammar.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/grammar.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/pure_calc.output soc2012/gmiller/locking-head/contrib/byacc/test/pure_calc.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/pure_calc.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/pure_calc.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/pure_error.output soc2012/gmiller/locking-head/contrib/byacc/test/pure_error.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/pure_error.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/pure_error.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc-s.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc-s.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc-s.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2-s.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2-s.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2-s.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc2.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3-s.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3-s.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3-s.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc3.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4-s.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4-s.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4-s.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4.output soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4.tab.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4.tab.h (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/quote_calc4.y (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/run_lint.sh (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/run_make.sh (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/test/run_test.sh (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/verbose.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/vmsbuild.com soc2012/gmiller/locking-head/contrib/byacc/warshall.c (contents, props changed) soc2012/gmiller/locking-head/contrib/byacc/yacc.1 (contents, props changed) soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_idivmod.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_ldivmod.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_memcmp.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_memcpy.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_memmove.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_memset.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_uidivmod.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/arm/aeabi_uldivmod.S soc2012/gmiller/locking-head/contrib/compiler-rt/lib/atomic.c soc2012/gmiller/locking-head/contrib/dtc/dtdiff soc2012/gmiller/locking-head/contrib/dtc/fdtdump.c (contents, props changed) soc2012/gmiller/locking-head/contrib/dtc/fdtget.c (contents, props changed) soc2012/gmiller/locking-head/contrib/dtc/fdtput.c (contents, props changed) soc2012/gmiller/locking-head/contrib/dtc/libfdt/fdt_empty_tree.c (contents, props changed) soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_getdate.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_match.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_pathmatch.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_pathmatch.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_add_filter.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_disk_acl.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_archive_getdate.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_archive_match_owner.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_archive_match_path.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_archive_match_time.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_archive_pathmatch.c soc2012/gmiller/locking-head/contrib/libarchive/tar/test/test_format_newc.c soc2012/gmiller/locking-head/contrib/libarchive/tar/test/test_option_nodump.c soc2012/gmiller/locking-head/contrib/openpam/TODO soc2012/gmiller/locking-head/contrib/openpam/bin/openpam_dump_policy/ soc2012/gmiller/locking-head/contrib/openpam/bin/openpam_dump_policy/Makefile.am soc2012/gmiller/locking-head/contrib/openpam/bin/openpam_dump_policy/Makefile.in soc2012/gmiller/locking-head/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_get_feature.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_readlinev.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_readword.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_set_feature.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_straddch.3 soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_ctype.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_features.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_features.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_get_feature.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_readlinev.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_readword.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_set_feature.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_straddch.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_strlcat.h soc2012/gmiller/locking-head/contrib/openpam/pamgdb.in soc2012/gmiller/locking-head/contrib/openpam/t/ soc2012/gmiller/locking-head/contrib/openpam/t/Makefile.am soc2012/gmiller/locking-head/contrib/openpam/t/Makefile.in soc2012/gmiller/locking-head/contrib/openpam/t/t.h soc2012/gmiller/locking-head/contrib/openpam/t/t_main.c soc2012/gmiller/locking-head/contrib/openpam/t/t_openpam_readlinev.c soc2012/gmiller/locking-head/contrib/openpam/t/t_openpam_readword.c soc2012/gmiller/locking-head/contrib/tcpdump/in_cksum.c (contents, props changed) soc2012/gmiller/locking-head/contrib/tcpdump/ppi.h (contents, props changed) soc2012/gmiller/locking-head/contrib/tcpdump/print-802_15_4.c (contents, props changed) soc2012/gmiller/locking-head/contrib/tcpdump/print-babel.c (contents, props changed) soc2012/gmiller/locking-head/contrib/tcpdump/print-carp.c (contents, props changed) soc2012/gmiller/locking-head/contrib/tcpdump/print-ppi.c (contents, props changed) soc2012/gmiller/locking-head/contrib/tcpdump/print-rpki-rtr.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/genpkey.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/pkey.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/pkeyparam.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/pkeyutl.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/srp.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/ts.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/apps/tsget soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_x86core.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-armv4.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-mips.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-parisc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-ppc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-s390x.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aesni-x86.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/vpaes-x86.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/vpaes-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/arm_arch.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/armcap.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/armv4cpuid.S (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/ameth_lib.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1_locl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/bio_asn1.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/bio_ndef.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_nx509.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/armv4-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/ia64-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/mips-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/mips.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/mips3-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/modexp512-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/parisc-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/ppc-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/ppc64-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/s390x-gf2m.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/s390x-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/s390x.S (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/via-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/x86-gf2m.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/x86-mont.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/x86_64-gf2m.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/asm/ soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/asm/cmll-x86.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_utl.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/cmac/ soc2012/gmiller/locking-head/crypto/openssl/crypto/cmac/Makefile (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/cmac/cm_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/cmac/cm_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/cmac/cmac.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/cmac/cmac.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_pwri.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_prn.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_locl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_prn.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_beos.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec2_oct.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_oct.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/eck_prn.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_nistp224.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_nistp256.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_nistp521.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_nistputil.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_oct.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_rdrand.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_rsax.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/tb_asnmth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/tb_pkmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_fips.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_sigver.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_wp.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/pmeth_fn.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/pmeth_gn.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/pmeth_lib.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/fips_ers.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/hmac/hm_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/hmac/hm_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/asm/md5-ia64.S (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/ soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/Makefile (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-armv4.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-ia64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-parisc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-s390x.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-sparcv9.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-x86.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/cbc128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/ccm128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/cfb128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/ctr128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/cts128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/gcm128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/modes.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/modes_lcl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/ofb128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/modes/xts128.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/o_fips.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_xref.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_xref.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_xref.txt (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/objxref.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/pariscid.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pvkfmt.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/ppc-xlate.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86gas.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86masm.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/bio_pk7.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ppccap.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ppccpuid.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-ia64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-parisc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-s390x.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4_utl.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_crpt.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_locl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_prn.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/s390xcap.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/s390xcpuid.S (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-armv4-large.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-mips.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-parisc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-ppc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-s390x.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-sparcv9.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-sparcv9a.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-thumb.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha256-586.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha256-armv4.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-586.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-armv4.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-mips.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-parisc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-ppc.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-s390x.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-sparcv9.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/sparcv9cap.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/ soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/Makefile (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/srp.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/srp_grps.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/srp_lcl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/srp_lib.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/srp_vfy.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/srp/srptest.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/Makefile (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_asn1.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_conf.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_err.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_lib.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_req_print.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_req_utils.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_rsp_print.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_rsp_sign.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_rsp_utils.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_rsp_verify.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/ts/ts_verify_ctx.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/vms_rms.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/ soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/Makefile (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/asm/ soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/asm/wp-mmx.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/asm/wp-x86_64.pl (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/whrlpool.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/wp_block.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/wp_dgst.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/wp_locl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/crypto/whrlpool/wp_test.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/doc/apps/cms.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/genpkey.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/pkey.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/pkeyparam.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/pkeyutl.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/ts.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/tsget.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/BIO_new_CMS.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_add0_cert.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_add1_recipient_cert.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_compress.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_decrypt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_encrypt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_final.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_get0_RecipientInfos.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_get0_SignerInfos.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_get0_type.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_sign.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_sign_add1_signer.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_sign_receipt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_uncompress.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_verify.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/CMS_verify_receipt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_DigestSignInit.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_DigestVerifyInit.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_CTX_new.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_cmp.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_decrypt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_derive.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_encrypt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_get_default_digest.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_keygen.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_print_private.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_sign.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_verify.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_PKEY_verifyrecover.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/PEM_write_bio_CMS_stream.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/PEM_write_bio_PKCS7_stream.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/PKCS7_sign_add_signer.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/SMIME_read_CMS.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/SMIME_write_CMS.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_STORE_CTX_get_error.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_STORE_CTX_new.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_STORE_CTX_set_verify_cb.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_STORE_set_verify_cb_func.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/X509_verify_cert.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/i2d_CMS_bio_stream.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/i2d_PKCS7_bio_stream.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_CTX_set_psk_client_callback.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_get_psk_identity.pod soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/ soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/Makefile (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/README.gost soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/e_gost_err.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/e_gost_err.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost2001.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost2001_keyx.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost2001_keyx.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost89.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost89.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost94_keyx.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_ameth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_asn1.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_crypt.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_ctl.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_eng.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_keywrap.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_keywrap.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_lcl.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_md.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_params.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_params.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_pmeth.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gost_sign.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gosthash.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gosthash.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/ccgost/gostsum.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/engines/e_padlock.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_srtp.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/ssl/srtp.h (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/ssl/tls_srp.c (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/util/cygwin.sh (contents, props changed) soc2012/gmiller/locking-head/crypto/openssl/util/mkrc.pl (contents, props changed) soc2012/gmiller/locking-head/lib/libc/amd64/sys/__vdso_gettc.c (contents, props changed) soc2012/gmiller/locking-head/lib/libc/gen/auxv.c - copied, changed from r235813, soc2012/gmiller/locking-head/lib/libc/gen/aux.c soc2012/gmiller/locking-head/lib/libc/gen/dirfd.c (contents, props changed) soc2012/gmiller/locking-head/lib/libc/gen/gen-private.h (contents, props changed) soc2012/gmiller/locking-head/lib/libc/i386/sys/__vdso_gettc.c (contents, props changed) soc2012/gmiller/locking-head/lib/libc/locale/iswalnum_l.3 (contents, props changed) soc2012/gmiller/locking-head/lib/libc/powerpc/gen/eabi.S (contents, props changed) soc2012/gmiller/locking-head/lib/libc/stdio/printf_l.3 (contents, props changed) soc2012/gmiller/locking-head/lib/libc/stdio/scanf_l.3 (contents, props changed) soc2012/gmiller/locking-head/lib/libc/sys/__vdso_gettimeofday.c (contents, props changed) soc2012/gmiller/locking-head/lib/libc/sys/clock_gettime.c (contents, props changed) soc2012/gmiller/locking-head/lib/libc/sys/gettimeofday.c (contents, props changed) soc2012/gmiller/locking-head/lib/libnandfs/ soc2012/gmiller/locking-head/lib/libnandfs/Makefile (contents, props changed) soc2012/gmiller/locking-head/lib/libnandfs/libnandfs.h (contents, props changed) soc2012/gmiller/locking-head/lib/libnandfs/nandfs.c (contents, props changed) soc2012/gmiller/locking-head/lib/libstand/nandfs.c (contents, props changed) soc2012/gmiller/locking-head/lib/libz/test/ soc2012/gmiller/locking-head/lib/libz/test/example.c (contents, props changed) soc2012/gmiller/locking-head/lib/libz/test/infcover.c (contents, props changed) soc2012/gmiller/locking-head/lib/libz/test/minigzip.c (contents, props changed) soc2012/gmiller/locking-head/lib/msun/ld128/s_expl.c (contents, props changed) soc2012/gmiller/locking-head/lib/msun/ld80/s_expl.c (contents, props changed) soc2012/gmiller/locking-head/sbin/camcontrol/progress.c (contents, props changed) soc2012/gmiller/locking-head/sbin/camcontrol/progress.h (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/ soc2012/gmiller/locking-head/sbin/nandfs/Makefile (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/lssnap.c (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/mksnap.c (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/nandfs.8 (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/nandfs.c (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/nandfs.h (contents, props changed) soc2012/gmiller/locking-head/sbin/nandfs/rmsnap.c (contents, props changed) soc2012/gmiller/locking-head/sbin/newfs_nandfs/ soc2012/gmiller/locking-head/sbin/newfs_nandfs/Makefile (contents, props changed) soc2012/gmiller/locking-head/sbin/newfs_nandfs/newfs_nandfs.8 (contents, props changed) soc2012/gmiller/locking-head/sbin/newfs_nandfs/newfs_nandfs.c (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/ soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/aes-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/aesni-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/bsaes-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/cmll-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/ghash-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/md5-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/modexp512-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/rc4-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/sha1-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/sha256-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/sha512-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/vpaes-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/wp-x86_64.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/x86_64-gf2m.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/x86_64-mont.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/x86_64-mont5.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/amd64/x86_64cpuid.S (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/engines/libgost/ soc2012/gmiller/locking-head/secure/lib/libcrypto/engines/libgost/Makefile (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/aes-586.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/aesni-x86.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/cmll-x86.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/ghash-x86.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/sha256-586.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/sha512-586.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/vpaes-x86.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/wp-mmx.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/x86-gf2m.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/x86-mont.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/x86cpuid.s (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_new_CMS.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_add0_cert.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_compress.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_decrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_encrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_final.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_get0_type.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_sign.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_sign_receipt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_uncompress.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_verify.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CMS_verify_receipt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_DigestSignInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_derive.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_sign.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_verify.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_verifyrecover.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/SMIME_read_CMS.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/SMIME_write_CMS.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_verify_cert.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-x86.h (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_psk_identity.3 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/cms.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/genpkey.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/pkey.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/pkeyparam.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/pkeyutl.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/ts.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/tsget.1 (contents, props changed) soc2012/gmiller/locking-head/share/dtrace/ soc2012/gmiller/locking-head/share/dtrace/Makefile (contents, props changed) soc2012/gmiller/locking-head/share/dtrace/README (contents, props changed) soc2012/gmiller/locking-head/share/dtrace/hotopen (contents, props changed) soc2012/gmiller/locking-head/share/dtrace/nfsattrstats (contents, props changed) soc2012/gmiller/locking-head/share/dtrace/nfsclienttime (contents, props changed) soc2012/gmiller/locking-head/share/dtrace/toolkit/ soc2012/gmiller/locking-head/share/dtrace/toolkit/Makefile (contents, props changed) soc2012/gmiller/locking-head/share/examples/libusb20/ soc2012/gmiller/locking-head/share/examples/libusb20/Makefile (contents, props changed) soc2012/gmiller/locking-head/share/examples/libusb20/README (contents, props changed) soc2012/gmiller/locking-head/share/examples/libusb20/aux.c (contents, props changed) soc2012/gmiller/locking-head/share/examples/libusb20/aux.h (contents, props changed) soc2012/gmiller/locking-head/share/examples/libusb20/bulk.c (contents, props changed) soc2012/gmiller/locking-head/share/examples/libusb20/control.c (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/acpi_asus_wmi.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/bxe.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/est.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/filemon.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/nand.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/nandsim.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man4/vale.4 (contents, props changed) soc2012/gmiller/locking-head/share/man/man5/nandfs.5 (contents, props changed) soc2012/gmiller/locking-head/sys/amd64/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91_pio_sam9g45.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91rm9200_devices.c (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91rm9200var.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91sam9g45.c (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91sam9g45reg.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91sam9x5.c (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91sam9x5reg.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91soc.c (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/at91soc.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/board_sam9260ek.c - copied, changed from r235813, soc2012/gmiller/locking-head/sys/arm/at91/board_ethernut5.c soc2012/gmiller/locking-head/sys/arm/at91/board_sam9x25ek.c (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/board_sn9g45.c (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/std.at91sam9g45 (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/std.atmel (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/std.sam9260ek - copied, changed from r235813, soc2012/gmiller/locking-head/sys/arm/at91/std.ethernut5 soc2012/gmiller/locking-head/sys/arm/at91/std.sam9x25ek (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/std.sn9g45 (contents, props changed) soc2012/gmiller/locking-head/sys/arm/at91/uart_cpu_at91usart.c - copied, changed from r235813, soc2012/gmiller/locking-head/sys/arm/at91/uart_cpu_at91rm9200usart.c soc2012/gmiller/locking-head/sys/arm/conf/ATMEL (contents, props changed) soc2012/gmiller/locking-head/sys/arm/conf/SAM9260EK - copied, changed from r235813, soc2012/gmiller/locking-head/sys/arm/conf/ETHERNUT5 soc2012/gmiller/locking-head/sys/arm/conf/SAM9260EK.hints - copied, changed from r235813, soc2012/gmiller/locking-head/sys/arm/conf/ETHERNUT5.hints soc2012/gmiller/locking-head/sys/arm/conf/SAM9X25EK (contents, props changed) soc2012/gmiller/locking-head/sys/arm/conf/SAM9X25EK.hints (contents, props changed) soc2012/gmiller/locking-head/sys/arm/conf/SN9G45 (contents, props changed) soc2012/gmiller/locking-head/sys/arm/include/atags.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/include/board.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/arm/mv/mv_localbus.c (contents, props changed) soc2012/gmiller/locking-head/sys/boot/common/part.c (contents, props changed) soc2012/gmiller/locking-head/sys/boot/common/part.h (contents, props changed) soc2012/gmiller/locking-head/sys/boot/fdt/dts/bindings-localbus.txt (contents, props changed) soc2012/gmiller/locking-head/sys/boot/fdt/dts/p2041rdb.dts (contents, props changed) soc2012/gmiller/locking-head/sys/boot/fdt/dts/p2041si.dtsi (contents, props changed) soc2012/gmiller/locking-head/sys/boot/fdt/dts/p3041si.dtsi (contents, props changed) soc2012/gmiller/locking-head/sys/boot/fdt/dts/p5020ds.dts (contents, props changed) soc2012/gmiller/locking-head/sys/boot/fdt/dts/p5020si.dtsi (contents, props changed) soc2012/gmiller/locking-head/sys/cam/scsi/scsi_enc.c (contents, props changed) soc2012/gmiller/locking-head/sys/cam/scsi/scsi_enc.h (contents, props changed) soc2012/gmiller/locking-head/sys/cam/scsi/scsi_enc_internal.h (contents, props changed) soc2012/gmiller/locking-head/sys/cam/scsi/scsi_enc_safte.c (contents, props changed) soc2012/gmiller/locking-head/sys/cam/scsi/scsi_enc_ses.c (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h (contents, props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c (contents, props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/common/ahpredef.c (contents, props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/tbxfload.c (contents, props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utexcep.c (contents, props changed) soc2012/gmiller/locking-head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu soc2012/gmiller/locking-head/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu soc2012/gmiller/locking-head/sys/contrib/libfdt/fdt_empty_tree.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/acpi_support/acpi_asus_wmi.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/agp/agp_i810.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ahci/ahciem.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_beacon.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_beacon.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_rx.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_rx.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_rx_edma.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_rx_edma.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tdma.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tdma.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tsf.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tx_edma.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tx_edma.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/ soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_connect.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_cpl_io.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_listen.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_tom.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_tom.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_tom_l2t.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/cxgbe/tom/t4_tom_l2t.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/ soc2012/gmiller/locking-head/sys/dev/drm2/drm.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drmP.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_agpsupport.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_atomic.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_auth.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_bufs.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_context.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_crtc.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_crtc.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_crtc_helper.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_crtc_helper.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_dma.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_dp_helper.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_dp_iic_helper.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_drawable.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_drv.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_edid.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_edid.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_edid_modes.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_fb_helper.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_fb_helper.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_fops.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_fourcc.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_gem.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_gem_names.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_gem_names.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_hashtab.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_hashtab.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_internal.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_ioctl.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_irq.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_linux_list.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_linux_list_sort.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_lock.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_memory.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_mm.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_mm.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_mode.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_modes.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_pci.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_pciids.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_sarea.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_scatter.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_sman.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_sman.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_stub.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_sysctl.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/drm_vm.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/ soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_debug.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_dma.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_drm.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_drv.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_drv.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_gem.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_gem_evict.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_gem_execbuffer.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_gem_gtt.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_gem_tiling.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_irq.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_reg.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/i915_suspend.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_bios.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_bios.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_crt.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_display.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_dp.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_drv.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_fb.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_hdmi.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_iic.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_lvds.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_modes.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_opregion.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_overlay.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_panel.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_ringbuffer.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_ringbuffer.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_sdvo.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_sdvo_regs.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_sprite.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/drm2/i915/intel_tv.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/e1000/e1000_i210.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/e1000/e1000_i210.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/fdt/fdt_slicer.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/filemon/ soc2012/gmiller/locking-head/sys/dev/filemon/filemon.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/filemon/filemon.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/filemon/filemon_lock.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/filemon/filemon_wrapper.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/ soc2012/gmiller/locking-head/sys/dev/nand/nand.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_bbt.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_cdev.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_dev.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_ecc_pos.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_generic.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_geom.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_id.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nand_if.m (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandbus.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandbus.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandbus_if.m (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_chip.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_chip.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_ctrl.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_log.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_log.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_swap.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nandsim_swap.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nfc_fsl.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nfc_fsl.h (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nfc_if.m (contents, props changed) soc2012/gmiller/locking-head/sys/dev/nand/nfc_mv.c (contents, props changed) soc2012/gmiller/locking-head/sys/dev/usb/controller/ehci_fsl.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/ soc2012/gmiller/locking-head/sys/fs/nandfs/bmap.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/bmap.h (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs.h (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_alloc.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_bmap.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_buffer.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_cleaner.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_cpfile.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_dat.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_dir.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_fs.h (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_ifile.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_mount.h (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_segment.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_subr.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_subr.h (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_sufile.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_vfsops.c (contents, props changed) soc2012/gmiller/locking-head/sys/fs/nandfs/nandfs_vnops.c (contents, props changed) soc2012/gmiller/locking-head/sys/geom/geom_flashmap.c (contents, props changed) soc2012/gmiller/locking-head/sys/i386/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/ia64/ia64/physmem.c (contents, props changed) soc2012/gmiller/locking-head/sys/ia64/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/kern/dtio_kdtrace.c (contents, props changed) soc2012/gmiller/locking-head/sys/kern/kern_rangelock.c (contents, props changed) soc2012/gmiller/locking-head/sys/kern/kern_sharedpage.c - copied, changed from r235813, soc2012/gmiller/locking-head/sys/kern/kern_exec.c soc2012/gmiller/locking-head/sys/kern/subr_dummy_vdso_tc.c (contents, props changed) soc2012/gmiller/locking-head/sys/mips/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/modules/acpi/acpi_asus_wmi/ soc2012/gmiller/locking-head/sys/modules/acpi/acpi_asus_wmi/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/cxgbe/tom/ soc2012/gmiller/locking-head/sys/modules/cxgbe/tom/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/drm2/ soc2012/gmiller/locking-head/sys/modules/drm2/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/drm2/Makefile.inc (contents, props changed) soc2012/gmiller/locking-head/sys/modules/drm2/drm2/ soc2012/gmiller/locking-head/sys/modules/drm2/drm2/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/drm2/i915kms/ soc2012/gmiller/locking-head/sys/modules/drm2/i915kms/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/dtrace/dtio/ soc2012/gmiller/locking-head/sys/modules/dtrace/dtio/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/filemon/ soc2012/gmiller/locking-head/sys/modules/filemon/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/nand/ soc2012/gmiller/locking-head/sys/modules/nand/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/nandfs/ soc2012/gmiller/locking-head/sys/modules/nandfs/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/nandsim/ soc2012/gmiller/locking-head/sys/modules/nandsim/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/netmap/ soc2012/gmiller/locking-head/sys/modules/netmap/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/modules/toecore/ soc2012/gmiller/locking-head/sys/modules/toecore/Makefile (contents, props changed) soc2012/gmiller/locking-head/sys/netinet/toecore.c (contents, props changed) soc2012/gmiller/locking-head/sys/netinet/toecore.h (contents, props changed) soc2012/gmiller/locking-head/sys/pc98/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/booke/machdep_e500.c (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/booke/machdep_ppc4xx.c (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/include/machdep.h (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/fsl_sdhc.c (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/fsl_sdhc.h (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/powermac/nvbl.c (contents, props changed) soc2012/gmiller/locking-head/sys/powerpc/powerpc/openpic_fdt.c - copied unchanged from r235813, soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/openpic_fdt.c soc2012/gmiller/locking-head/sys/sparc64/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/sys/rangelock.h (contents, props changed) soc2012/gmiller/locking-head/sys/sys/slicer.h (contents, props changed) soc2012/gmiller/locking-head/sys/sys/vdso.h (contents, props changed) soc2012/gmiller/locking-head/sys/x86/acpica/acpi_wakeup.c (contents, props changed) soc2012/gmiller/locking-head/sys/x86/include/vdso.h (contents, props changed) soc2012/gmiller/locking-head/tools/build/make_check/check.mk (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITHOUT_ED_CRYPTO (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITHOUT_LS_COLORS (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITHOUT_NAND (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITHOUT_PKGBOOTSTRAP (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITH_BSDCONFIG (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITH_GNU_SORT (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITH_INSTALL_AS_USER (contents, props changed) soc2012/gmiller/locking-head/tools/build/options/WITH_NAND (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/builtins/local1.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/expansion/export1.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/expansion/export2.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/expansion/export3.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/expansion/local1.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/expansion/local2.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/bin/sh/expansion/readonly1.0 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/filemon/ soc2012/gmiller/locking-head/tools/regression/filemon/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/regression/filemon/filemontest.c (contents, props changed) soc2012/gmiller/locking-head/tools/regression/filemon/test_script.sh (contents, props changed) soc2012/gmiller/locking-head/tools/regression/lib/libc/gen/test-ftw.c (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/ soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/syntax/funny-targets/test.t (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/test-new.mk (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/ soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/modifier_t/test.t (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/ soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/variables/opt_V/test.t (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/ soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/calc.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/calc1.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/calc2.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/calc3.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/code_calc.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/code_error.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/error.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/ftp.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/grammar.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/pure_calc.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/pure_error.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/quote_calc.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/quote_calc2.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/quote_calc3.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/quote_calc4.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.00.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.01.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.02.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.03.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.04.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.05.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.06.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.07.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.08.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.09.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.10.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.11.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.12.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.13.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.14.out (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.sh (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/regress.t (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/yacc/undefined.y (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.sbin/etcupdate/ soc2012/gmiller/locking-head/tools/regression/usr.sbin/etcupdate/always.sh (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.sbin/etcupdate/conflicts.sh (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.sbin/etcupdate/fbsdid.sh (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.sbin/etcupdate/ignore.sh (contents, props changed) soc2012/gmiller/locking-head/tools/regression/usr.sbin/etcupdate/tests.sh (contents, props changed) soc2012/gmiller/locking-head/tools/test/upsdl/ soc2012/gmiller/locking-head/tools/test/upsdl/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/test/upsdl/upsdl.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/ soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/athaggrstats.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/athaggrstats.h (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/main.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/statfoo.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athaggrstats/statfoo.h (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athratestats/ soc2012/gmiller/locking-head/tools/tools/ath/athratestats/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ath/athratestats/main.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/bootparttest/ soc2012/gmiller/locking-head/tools/tools/bootparttest/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/tools/bootparttest/bootparttest.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/bootparttest/malloc.c (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ifpifa/ soc2012/gmiller/locking-head/tools/tools/ifpifa/Makefile (contents, props changed) soc2012/gmiller/locking-head/tools/tools/ifpifa/ifpifa.c (contents, props changed) soc2012/gmiller/locking-head/usr.bin/pamtest/ soc2012/gmiller/locking-head/usr.bin/pamtest/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/bsdconfig (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/bsdconfig.8 (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/console (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/font (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/keymap (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/repeat (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/saver (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/screenmap (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/console/ttys (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/diskmgmt (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/diskmgmt/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/docsinstall (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/docsinstall/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/dot (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/dot/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/examples/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/examples/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/examples/bsdconfigrc (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/fdisk/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/common.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/dialog.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/mustberoot.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/strings.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/include/sysrc.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/disable (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/enable (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/flags (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/mouse (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/port (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/mouse/type (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/defaultrouter (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/devices (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/hostname (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/common.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/device.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/hostname.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/ipaddr.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/media.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/netmask.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/resolv.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/include/routing.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/nameservers (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/networking/networking (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/include/password.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/password/password (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/kern_securelevel (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/security/security (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/include/rcconf.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/include/rcedit.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/include/rcvar.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/misc (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/rcadd (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/rcconf (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/rcdelete (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/rcedit (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/rcvar (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/startup/startup (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/continents.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/countries.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/iso3166.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/menus.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/include/zones.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/timezone/timezone (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/ttys/ttys (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/INDEX (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/USAGE (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/groupadd (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/groupdel (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/groupedit (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/groupinput (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/include/ soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/include/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/include/group_input.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/include/messages.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/include/user_input.subr (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/useradd (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/userdel (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/useredit (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/userinput (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/bsdconfig/usermgmt/usermgmt (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/etcupdate/ soc2012/gmiller/locking-head/usr.sbin/etcupdate/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/etcupdate/etcupdate.8 (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/etcupdate/etcupdate.sh (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/ soc2012/gmiller/locking-head/usr.sbin/nandsim/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/nandsim.8 (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/nandsim.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/nandsim_cfgparse.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/nandsim_cfgparse.h (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/nandsim_rcfile.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/nandsim_rcfile.h (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandsim/sample.conf (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/ soc2012/gmiller/locking-head/usr.sbin/nandtool/Makefile (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nand_erase.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nand_info.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nand_read.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nand_readoob.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nand_write.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nand_writeoob.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nandtool.8 (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nandtool.c (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/nandtool.h (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/nandtool/usage.h (contents, props changed) soc2012/gmiller/locking-head/usr.sbin/pciconf/err.c (contents, props changed) Deleted: soc2012/gmiller/locking-head/contrib/dtc/Makefile.convert-dtsv0 soc2012/gmiller/locking-head/contrib/dtc/Makefile.ftdump soc2012/gmiller/locking-head/contrib/dtc/convert-dtsv0-lexer.l soc2012/gmiller/locking-head/contrib/dtc/ftdump.c soc2012/gmiller/locking-head/contrib/libarchive/cpio/test/test_pathmatch.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/matching.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/matching.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/pathmatch.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/pathmatch.h soc2012/gmiller/locking-head/contrib/libarchive/tar/getdate.c soc2012/gmiller/locking-head/contrib/libarchive/tar/test/test_getdate.c soc2012/gmiller/locking-head/contrib/libarchive/tar/tree.c soc2012/gmiller/locking-head/contrib/libarchive/tar/tree.h soc2012/gmiller/locking-head/contrib/tcpdump/missing/addrsize.h soc2012/gmiller/locking-head/contrib/tcpdump/missing/bittypes.h soc2012/gmiller/locking-head/contrib/tcpdump/missing/resolv6.h soc2012/gmiller/locking-head/contrib/tcpdump/missing/resolv_ext.h soc2012/gmiller/locking-head/contrib/tcpdump/tests/ soc2012/gmiller/locking-head/crypto/openssl/apps/demoCA/ soc2012/gmiller/locking-head/crypto/openssl/apps/winrand.c soc2012/gmiller/locking-head/crypto/openssl/bugs/ soc2012/gmiller/locking-head/crypto/openssl/certs/demo/ soc2012/gmiller/locking-head/crypto/openssl/crypto/LPdir_nyi.c soc2012/gmiller/locking-head/crypto/openssl/crypto/LPdir_vms.c soc2012/gmiller/locking-head/crypto/openssl/crypto/LPdir_win.c soc2012/gmiller/locking-head/crypto/openssl/crypto/LPdir_win32.c soc2012/gmiller/locking-head/crypto/openssl/crypto/LPdir_wince.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_hdr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_meth.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/p8_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bf/bfs.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/mo-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_opt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cast/casts.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/des/asm/des686.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/des/des3s.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/des/des_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/dess.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/des/t/ soc2012/gmiller/locking-head/crypto/openssl/crypto/des/times/ soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_utl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dyn_lck.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec2_smpt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_padlock.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err_bio.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err_def.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err_str.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/openssl.ec soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/dig_eng.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/enc_min.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_cnf.c soc2012/gmiller/locking-head/crypto/openssl/crypto/fips_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/md4/md4s.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/md5s.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86ms.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86unix.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/pqueue/pq_compat.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_eng.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_nw.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_os2.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_vms.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_win.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-ia64.S soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4_fblk.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4s.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/rc5/rc5s.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/ripemd/asm/rips.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_eng.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_x931g.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-sse2.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha1s.cpp soc2012/gmiller/locking-head/crypto/openssl/crypto/tmdiff.c soc2012/gmiller/locking-head/crypto/openssl/crypto/tmdiff.h soc2012/gmiller/locking-head/crypto/openssl/demos/ soc2012/gmiller/locking-head/crypto/openssl/engines/alpha.opt soc2012/gmiller/locking-head/crypto/openssl/engines/e_4758cca.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_aep.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_atalla.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_capi.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_chil.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_cswift.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_gmp.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_nuron.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_sureware.ec soc2012/gmiller/locking-head/crypto/openssl/engines/e_ubsec.ec soc2012/gmiller/locking-head/crypto/openssl/engines/ia64.opt soc2012/gmiller/locking-head/crypto/openssl/engines/vax.opt soc2012/gmiller/locking-head/crypto/openssl/fips/ soc2012/gmiller/locking-head/crypto/openssl/openssl.doxy soc2012/gmiller/locking-head/crypto/openssl/openssl.spec soc2012/gmiller/locking-head/crypto/openssl/test/ soc2012/gmiller/locking-head/crypto/openssl/times/ soc2012/gmiller/locking-head/crypto/openssl/tools/ soc2012/gmiller/locking-head/crypto/openssl/util/arx.pl soc2012/gmiller/locking-head/crypto/openssl/util/fipslink.pl soc2012/gmiller/locking-head/crypto/openssl/util/mksdef.pl soc2012/gmiller/locking-head/etc/auth.conf soc2012/gmiller/locking-head/etc/pam.d/kde soc2012/gmiller/locking-head/lib/libc/gen/aux.c soc2012/gmiller/locking-head/lib/libutil/auth.3 soc2012/gmiller/locking-head/lib/libutil/auth.conf.5 soc2012/gmiller/locking-head/lib/libz/example.c soc2012/gmiller/locking-head/lib/libz/minigzip.c soc2012/gmiller/locking-head/secure/lib/libcrypto/man/des_modes.3 soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-amd64.h soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-i386.h soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/config.1 soc2012/gmiller/locking-head/sys/amd64/acpica/acpi_switch.S soc2012/gmiller/locking-head/sys/amd64/acpica/acpi_wakeup.c soc2012/gmiller/locking-head/sys/arm/at91/at91_pio_rm9200.h soc2012/gmiller/locking-head/sys/arm/at91/files.at91sam9 soc2012/gmiller/locking-head/sys/arm/at91/hints.at91rm9200 soc2012/gmiller/locking-head/sys/arm/at91/hints.at91sam9261 soc2012/gmiller/locking-head/sys/arm/at91/uart_cpu_at91rm9200usart.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_ses.c soc2012/gmiller/locking-head/sys/dev/cxgb/cxgb_offload.c soc2012/gmiller/locking-head/sys/dev/cxgb/t3cdev.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/toecore/ soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_ddp.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_defs.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_tcp.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c soc2012/gmiller/locking-head/sys/dev/netmap/head.diff soc2012/gmiller/locking-head/sys/i386/acpica/acpi_wakeup.c soc2012/gmiller/locking-head/sys/modules/cxgb/toecore/ soc2012/gmiller/locking-head/sys/netinet/toedev.h soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/openpic_fdt.c soc2012/gmiller/locking-head/sys/vm/vm_contig.c soc2012/gmiller/locking-head/tools/build/options/WITH_BSD_SORT soc2012/gmiller/locking-head/usr.bin/yacc/ACKNOWLEDGEMENTS soc2012/gmiller/locking-head/usr.bin/yacc/NEW_FEATURES soc2012/gmiller/locking-head/usr.bin/yacc/NOTES soc2012/gmiller/locking-head/usr.bin/yacc/README soc2012/gmiller/locking-head/usr.bin/yacc/closure.c soc2012/gmiller/locking-head/usr.bin/yacc/defs.h soc2012/gmiller/locking-head/usr.bin/yacc/error.c soc2012/gmiller/locking-head/usr.bin/yacc/lalr.c soc2012/gmiller/locking-head/usr.bin/yacc/lr0.c soc2012/gmiller/locking-head/usr.bin/yacc/main.c soc2012/gmiller/locking-head/usr.bin/yacc/mkpar.c soc2012/gmiller/locking-head/usr.bin/yacc/output.c soc2012/gmiller/locking-head/usr.bin/yacc/reader.c soc2012/gmiller/locking-head/usr.bin/yacc/skeleton.c soc2012/gmiller/locking-head/usr.bin/yacc/symtab.c soc2012/gmiller/locking-head/usr.bin/yacc/test/ soc2012/gmiller/locking-head/usr.bin/yacc/verbose.c soc2012/gmiller/locking-head/usr.bin/yacc/warshall.c soc2012/gmiller/locking-head/usr.bin/yacc/yacc.1 soc2012/gmiller/locking-head/usr.bin/yacc/yyfix.1 soc2012/gmiller/locking-head/usr.bin/yacc/yyfix.sh Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/Makefile soc2012/gmiller/locking-head/Makefile.inc1 soc2012/gmiller/locking-head/ObsoleteFiles.inc soc2012/gmiller/locking-head/UPDATING soc2012/gmiller/locking-head/bin/cat/cat.c soc2012/gmiller/locking-head/bin/ed/Makefile soc2012/gmiller/locking-head/bin/expr/expr.y soc2012/gmiller/locking-head/bin/ls/Makefile soc2012/gmiller/locking-head/bin/ps/keyword.c soc2012/gmiller/locking-head/bin/ps/print.c soc2012/gmiller/locking-head/bin/ps/ps.1 soc2012/gmiller/locking-head/bin/rcp/rcp.1 soc2012/gmiller/locking-head/bin/rcp/rcp.c soc2012/gmiller/locking-head/bin/rm/rm.c soc2012/gmiller/locking-head/bin/sh/Makefile soc2012/gmiller/locking-head/bin/sh/eval.c soc2012/gmiller/locking-head/bin/sh/exec.c soc2012/gmiller/locking-head/bin/sh/exec.h soc2012/gmiller/locking-head/bin/sh/input.c soc2012/gmiller/locking-head/bin/sh/jobs.c soc2012/gmiller/locking-head/bin/sh/jobs.h soc2012/gmiller/locking-head/bin/sh/miscbltin.c soc2012/gmiller/locking-head/bin/sh/mkbuiltins soc2012/gmiller/locking-head/bin/sh/sh.1 soc2012/gmiller/locking-head/bin/sh/trap.c soc2012/gmiller/locking-head/bin/sh/trap.h soc2012/gmiller/locking-head/bin/stty/extern.h soc2012/gmiller/locking-head/bin/uuidgen/uuidgen.1 soc2012/gmiller/locking-head/cddl/compat/opensolaris/misc/deviceid.c soc2012/gmiller/locking-head/cddl/contrib/dtracetoolkit/dtruss soc2012/gmiller/locking-head/cddl/contrib/opensolaris/ (props changed) soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zdb/zdb.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zfs/ (props changed) soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/cmd/ztest/ztest.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/ (props changed) soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c soc2012/gmiller/locking-head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c soc2012/gmiller/locking-head/cddl/lib/libdtrace/Makefile soc2012/gmiller/locking-head/cddl/lib/libnvpair/Makefile soc2012/gmiller/locking-head/cddl/lib/libzfs/Makefile soc2012/gmiller/locking-head/cddl/sbin/zpool/Makefile soc2012/gmiller/locking-head/cddl/usr.bin/ztest/Makefile soc2012/gmiller/locking-head/cddl/usr.sbin/Makefile soc2012/gmiller/locking-head/contrib/bind9/ (props changed) soc2012/gmiller/locking-head/contrib/bind9/CHANGES soc2012/gmiller/locking-head/contrib/bind9/README soc2012/gmiller/locking-head/contrib/bind9/bin/named/builtin.c soc2012/gmiller/locking-head/contrib/bind9/bin/named/query.c soc2012/gmiller/locking-head/contrib/bind9/bin/named/server.c soc2012/gmiller/locking-head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c soc2012/gmiller/locking-head/contrib/bind9/lib/bind9/api soc2012/gmiller/locking-head/contrib/bind9/lib/bind9/check.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/api soc2012/gmiller/locking-head/contrib/bind9/lib/dns/dnssec.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/include/dns/ecdb.h soc2012/gmiller/locking-head/contrib/bind9/lib/dns/include/dns/rpz.h soc2012/gmiller/locking-head/contrib/bind9/lib/dns/include/dns/sdb.h soc2012/gmiller/locking-head/contrib/bind9/lib/dns/include/dns/stats.h soc2012/gmiller/locking-head/contrib/bind9/lib/dns/include/dns/tsec.h soc2012/gmiller/locking-head/contrib/bind9/lib/dns/include/dns/view.h soc2012/gmiller/locking-head/contrib/bind9/lib/dns/rbtdb.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/rdata.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/rdataslab.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/resolver.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/sdb.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/tkey.c soc2012/gmiller/locking-head/contrib/bind9/lib/dns/zone.c soc2012/gmiller/locking-head/contrib/bind9/lib/isc/pthreads/mutex.c soc2012/gmiller/locking-head/contrib/bind9/lib/isccfg/api soc2012/gmiller/locking-head/contrib/bind9/lib/isccfg/parser.c soc2012/gmiller/locking-head/contrib/bind9/version soc2012/gmiller/locking-head/contrib/binutils/gas/config/tc-i386.c soc2012/gmiller/locking-head/contrib/binutils/opcodes/i386-dis.c soc2012/gmiller/locking-head/contrib/binutils/opcodes/i386-opc.h soc2012/gmiller/locking-head/contrib/binutils/opcodes/i386-opc.tbl soc2012/gmiller/locking-head/contrib/binutils/opcodes/i386-tbl.h soc2012/gmiller/locking-head/contrib/bsnmp/lib/bsnmpclient.3 soc2012/gmiller/locking-head/contrib/bsnmp/lib/bsnmplib.3 soc2012/gmiller/locking-head/contrib/bsnmp/snmp_mibII/mibII_tcp.c soc2012/gmiller/locking-head/contrib/bsnmp/snmp_target/snmp_target.3 soc2012/gmiller/locking-head/contrib/bsnmp/snmp_usm/snmp_usm.3 soc2012/gmiller/locking-head/contrib/bsnmp/snmp_vacm/snmp_vacm.3 soc2012/gmiller/locking-head/contrib/com_err/com_err.3 soc2012/gmiller/locking-head/contrib/compiler-rt/ (props changed) soc2012/gmiller/locking-head/contrib/compiler-rt/LICENSE.TXT soc2012/gmiller/locking-head/contrib/compiler-rt/lib/absvti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/adddf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/addsf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/addvti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ashldi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ashlti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ashrdi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ashrti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/assembly.h soc2012/gmiller/locking-head/contrib/compiler-rt/lib/clzti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/cmpti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ctzti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/divdf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/divmoddi4.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/divsf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/divsi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/divti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/extendsfdf2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ffsti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixdfdi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixdfsi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixdfti.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixsfdi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixsfsi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixsfti.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunsdfdi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunsdfsi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunsdfti.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunssfdi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunssfsi.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunssfti.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixunsxfti.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fixxfti.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatdidf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatdisf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatsidf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatsisf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floattidf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floattisf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floattixf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatundidf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatundisf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatunsidf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatunsisf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatuntidf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatuntisf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/floatuntixf.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/fp_lib.h soc2012/gmiller/locking-head/contrib/compiler-rt/lib/int_endianness.h soc2012/gmiller/locking-head/contrib/compiler-rt/lib/int_util.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/int_util.h soc2012/gmiller/locking-head/contrib/compiler-rt/lib/lshrdi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/lshrti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/modti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/muldf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/muldi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/muloti4.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/mulsf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/multi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/mulvti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/negdf2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/negsf2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/negti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/negvti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/parityti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/popcountti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/powitf2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/subdf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/subsf3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/subvti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/truncdfsf2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/ucmpti2.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/udivmoddi4.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/udivmodti4.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/udivsi3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/udivti3.c soc2012/gmiller/locking-head/contrib/compiler-rt/lib/umodti3.c soc2012/gmiller/locking-head/contrib/dtc/ (props changed) soc2012/gmiller/locking-head/contrib/dtc/Documentation/dts-format.txt soc2012/gmiller/locking-head/contrib/dtc/Documentation/manual.txt soc2012/gmiller/locking-head/contrib/dtc/Makefile soc2012/gmiller/locking-head/contrib/dtc/checks.c soc2012/gmiller/locking-head/contrib/dtc/data.c soc2012/gmiller/locking-head/contrib/dtc/dtc-lexer.l soc2012/gmiller/locking-head/contrib/dtc/dtc-parser.y soc2012/gmiller/locking-head/contrib/dtc/dtc.c soc2012/gmiller/locking-head/contrib/dtc/dtc.h soc2012/gmiller/locking-head/contrib/dtc/flattree.c soc2012/gmiller/locking-head/contrib/dtc/fstree.c soc2012/gmiller/locking-head/contrib/dtc/libfdt/Makefile.libfdt soc2012/gmiller/locking-head/contrib/dtc/libfdt/fdt.c soc2012/gmiller/locking-head/contrib/dtc/libfdt/fdt_ro.c soc2012/gmiller/locking-head/contrib/dtc/libfdt/fdt_rw.c soc2012/gmiller/locking-head/contrib/dtc/libfdt/libfdt.h soc2012/gmiller/locking-head/contrib/dtc/libfdt/libfdt_env.h soc2012/gmiller/locking-head/contrib/dtc/libfdt/libfdt_internal.h soc2012/gmiller/locking-head/contrib/dtc/livetree.c soc2012/gmiller/locking-head/contrib/dtc/srcpos.c soc2012/gmiller/locking-head/contrib/dtc/srcpos.h soc2012/gmiller/locking-head/contrib/dtc/treesource.c soc2012/gmiller/locking-head/contrib/dtc/util.c soc2012/gmiller/locking-head/contrib/dtc/util.h soc2012/gmiller/locking-head/contrib/gcc/ (props changed) soc2012/gmiller/locking-head/contrib/gcc/ChangeLog.gcc43 soc2012/gmiller/locking-head/contrib/gcc/config/arm/freebsd.h soc2012/gmiller/locking-head/contrib/gcc/config/i386/freebsd.h soc2012/gmiller/locking-head/contrib/gcc/config/i386/freebsd64.h soc2012/gmiller/locking-head/contrib/gcc/config/ia64/freebsd.h soc2012/gmiller/locking-head/contrib/gcc/config/mips/freebsd.h soc2012/gmiller/locking-head/contrib/gcc/config/rs6000/freebsd.h soc2012/gmiller/locking-head/contrib/gcc/config/rs6000/rs6000.md soc2012/gmiller/locking-head/contrib/gcc/config/sparc/freebsd.h soc2012/gmiller/locking-head/contrib/gcc/config/sparc/sparc.md soc2012/gmiller/locking-head/contrib/gcc/cse.c soc2012/gmiller/locking-head/contrib/gcc/expr.c soc2012/gmiller/locking-head/contrib/gcc/fold-const.c soc2012/gmiller/locking-head/contrib/gcc/gimplify.c soc2012/gmiller/locking-head/contrib/gcc/ipa-pure-const.c soc2012/gmiller/locking-head/contrib/gcc/ipa-utils.c soc2012/gmiller/locking-head/contrib/gcc/rtl.h soc2012/gmiller/locking-head/contrib/gcc/tree-ssa-ccp.c soc2012/gmiller/locking-head/contrib/gcc/tree-ssa-pre.c soc2012/gmiller/locking-head/contrib/gcc/var-tracking.c soc2012/gmiller/locking-head/contrib/gcc/varasm.c soc2012/gmiller/locking-head/contrib/groff/ (props changed) soc2012/gmiller/locking-head/contrib/groff/tmac/doc-syms soc2012/gmiller/locking-head/contrib/groff/tmac/doc.tmac soc2012/gmiller/locking-head/contrib/groff/tmac/groff_mdoc.man soc2012/gmiller/locking-head/contrib/less/ (props changed) soc2012/gmiller/locking-head/contrib/less/LICENSE soc2012/gmiller/locking-head/contrib/less/Makefile.aut soc2012/gmiller/locking-head/contrib/less/NEWS soc2012/gmiller/locking-head/contrib/less/README soc2012/gmiller/locking-head/contrib/less/brac.c soc2012/gmiller/locking-head/contrib/less/ch.c soc2012/gmiller/locking-head/contrib/less/charset.c soc2012/gmiller/locking-head/contrib/less/charset.h soc2012/gmiller/locking-head/contrib/less/cmd.h soc2012/gmiller/locking-head/contrib/less/cmdbuf.c soc2012/gmiller/locking-head/contrib/less/command.c soc2012/gmiller/locking-head/contrib/less/configure soc2012/gmiller/locking-head/contrib/less/configure.ac soc2012/gmiller/locking-head/contrib/less/cvt.c soc2012/gmiller/locking-head/contrib/less/decode.c soc2012/gmiller/locking-head/contrib/less/defines.ds soc2012/gmiller/locking-head/contrib/less/defines.h.in soc2012/gmiller/locking-head/contrib/less/defines.o2 soc2012/gmiller/locking-head/contrib/less/defines.o9 soc2012/gmiller/locking-head/contrib/less/defines.wn soc2012/gmiller/locking-head/contrib/less/edit.c soc2012/gmiller/locking-head/contrib/less/filename.c soc2012/gmiller/locking-head/contrib/less/forwback.c soc2012/gmiller/locking-head/contrib/less/funcs.h soc2012/gmiller/locking-head/contrib/less/help.c soc2012/gmiller/locking-head/contrib/less/ifile.c soc2012/gmiller/locking-head/contrib/less/input.c soc2012/gmiller/locking-head/contrib/less/jump.c soc2012/gmiller/locking-head/contrib/less/less.h soc2012/gmiller/locking-head/contrib/less/less.hlp soc2012/gmiller/locking-head/contrib/less/less.man soc2012/gmiller/locking-head/contrib/less/less.nro soc2012/gmiller/locking-head/contrib/less/lessecho.c soc2012/gmiller/locking-head/contrib/less/lessecho.man soc2012/gmiller/locking-head/contrib/less/lessecho.nro soc2012/gmiller/locking-head/contrib/less/lesskey.c soc2012/gmiller/locking-head/contrib/less/lesskey.h soc2012/gmiller/locking-head/contrib/less/lesskey.man soc2012/gmiller/locking-head/contrib/less/lesskey.nro soc2012/gmiller/locking-head/contrib/less/lglob.h soc2012/gmiller/locking-head/contrib/less/line.c soc2012/gmiller/locking-head/contrib/less/linenum.c soc2012/gmiller/locking-head/contrib/less/lsystem.c soc2012/gmiller/locking-head/contrib/less/main.c soc2012/gmiller/locking-head/contrib/less/mark.c soc2012/gmiller/locking-head/contrib/less/mkhelp.c soc2012/gmiller/locking-head/contrib/less/optfunc.c soc2012/gmiller/locking-head/contrib/less/option.c soc2012/gmiller/locking-head/contrib/less/option.h soc2012/gmiller/locking-head/contrib/less/opttbl.c soc2012/gmiller/locking-head/contrib/less/os.c soc2012/gmiller/locking-head/contrib/less/output.c soc2012/gmiller/locking-head/contrib/less/pattern.c soc2012/gmiller/locking-head/contrib/less/pattern.h soc2012/gmiller/locking-head/contrib/less/pckeys.h soc2012/gmiller/locking-head/contrib/less/position.c soc2012/gmiller/locking-head/contrib/less/position.h soc2012/gmiller/locking-head/contrib/less/prompt.c soc2012/gmiller/locking-head/contrib/less/screen.c soc2012/gmiller/locking-head/contrib/less/scrsize.c soc2012/gmiller/locking-head/contrib/less/search.c soc2012/gmiller/locking-head/contrib/less/signal.c soc2012/gmiller/locking-head/contrib/less/tags.c soc2012/gmiller/locking-head/contrib/less/ttyin.c soc2012/gmiller/locking-head/contrib/less/version.c soc2012/gmiller/locking-head/contrib/libarchive/ (props changed) soc2012/gmiller/locking-head/contrib/libarchive/FREEBSD-Xlist (contents, props changed) soc2012/gmiller/locking-head/contrib/libarchive/FREEBSD-upgrade soc2012/gmiller/locking-head/contrib/libarchive/NEWS soc2012/gmiller/locking-head/contrib/libarchive/README soc2012/gmiller/locking-head/contrib/libarchive/cpio/ (props changed) soc2012/gmiller/locking-head/contrib/libarchive/cpio/bsdcpio.1 soc2012/gmiller/locking-head/contrib/libarchive/cpio/cmdline.c soc2012/gmiller/locking-head/contrib/libarchive/cpio/cpio.c soc2012/gmiller/locking-head/contrib/libarchive/cpio/cpio.h soc2012/gmiller/locking-head/contrib/libarchive/cpio/test/main.c soc2012/gmiller/locking-head/contrib/libarchive/cpio/test/test.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/ (props changed) soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_acl.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_check_magic.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_endian.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_acl.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_link_resolver.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_linkify.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_paths.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_perms.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_stat.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_stat.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_entry_time.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_ppmd7.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_private.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_data.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_disk.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_disk_posix.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_disk_private.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_extract.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_filter.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_format.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_free.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_header.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_new.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_open.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_open_fd.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_open_filename.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_private.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_set_options.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_7zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_cab.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_cpio.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_lha.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_rar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_tar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_xar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_read_support_format_zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_string.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_string.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_string_composition.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_string_sprintf.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_util.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_util.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_add_filter_compress.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_add_filter_program.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_add_filter_xz.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_blocksize.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_data.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_disk.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_disk_posix.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_disk_private.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_filter.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_finish_entry.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_format.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_free.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_header.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_new.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_open.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_open_filename.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_private.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_7zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_ar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_cpio.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_gnutar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_mtree.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_pax.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_ustar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_xar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_format_zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/archive_write_set_options.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/cpio.5 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/libarchive-formats.5 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/libarchive.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/libarchive_changes.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/libarchive_internals.3 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/tar.5 soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/main.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/read_open_memory.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test.h soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_archive_string_conversion.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_compat_zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_7zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_cab.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_rar.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_rar_unicode.rar.uu soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_format_tar_filename.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_pax_truncated.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_read_position.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_sparse_basic.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive/test/test_write_format_zip.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/ (props changed) soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/err.c soc2012/gmiller/locking-head/contrib/libarchive/libarchive_fe/err.h soc2012/gmiller/locking-head/contrib/libarchive/tar/ (props changed) soc2012/gmiller/locking-head/contrib/libarchive/tar/bsdtar.1 soc2012/gmiller/locking-head/contrib/libarchive/tar/bsdtar.c soc2012/gmiller/locking-head/contrib/libarchive/tar/bsdtar.h soc2012/gmiller/locking-head/contrib/libarchive/tar/read.c soc2012/gmiller/locking-head/contrib/libarchive/tar/test/main.c soc2012/gmiller/locking-head/contrib/libarchive/tar/test/test.h soc2012/gmiller/locking-head/contrib/libarchive/tar/test/test_basic.c soc2012/gmiller/locking-head/contrib/libarchive/tar/write.c soc2012/gmiller/locking-head/contrib/libc++/include/__bit_reference soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/locale_facets.tcc soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_bvector.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_deque.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_list.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_map.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_multimap.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_multiset.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_set.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_tree.h soc2012/gmiller/locking-head/contrib/libstdc++/include/bits/stl_vector.h soc2012/gmiller/locking-head/contrib/llvm/ (props changed) soc2012/gmiller/locking-head/contrib/llvm/include/llvm/Support/FileSystem.h soc2012/gmiller/locking-head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp soc2012/gmiller/locking-head/contrib/llvm/lib/Support/Unix/PathV2.inc soc2012/gmiller/locking-head/contrib/llvm/lib/Support/Windows/PathV2.inc soc2012/gmiller/locking-head/contrib/llvm/tools/bugpoint/ToolRunner.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/ (props changed) soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/AST/Decl.h soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h soc2012/gmiller/locking-head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp soc2012/gmiller/locking-head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp soc2012/gmiller/locking-head/contrib/ncurses/man/curs_threads.3x soc2012/gmiller/locking-head/contrib/openpam/ (props changed) soc2012/gmiller/locking-head/contrib/openpam/CREDITS soc2012/gmiller/locking-head/contrib/openpam/HISTORY soc2012/gmiller/locking-head/contrib/openpam/LICENSE soc2012/gmiller/locking-head/contrib/openpam/Makefile.am soc2012/gmiller/locking-head/contrib/openpam/Makefile.in soc2012/gmiller/locking-head/contrib/openpam/RELNOTES soc2012/gmiller/locking-head/contrib/openpam/aclocal.m4 soc2012/gmiller/locking-head/contrib/openpam/bin/Makefile.am soc2012/gmiller/locking-head/contrib/openpam/bin/Makefile.in soc2012/gmiller/locking-head/contrib/openpam/bin/pamtest/pamtest.1 soc2012/gmiller/locking-head/contrib/openpam/bin/pamtest/pamtest.c soc2012/gmiller/locking-head/contrib/openpam/bin/su/su.1 soc2012/gmiller/locking-head/contrib/openpam/config.h.in soc2012/gmiller/locking-head/contrib/openpam/configure soc2012/gmiller/locking-head/contrib/openpam/configure.ac soc2012/gmiller/locking-head/contrib/openpam/doc/man/Makefile.am soc2012/gmiller/locking-head/contrib/openpam/doc/man/Makefile.in soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_borrow_cred.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_free_data.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_free_envlist.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_get_option.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_log.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_nullconv.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_readline.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_restore_cred.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_set_option.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_subst.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/openpam_ttyconv.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam.conf.5 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_acct_mgmt.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_authenticate.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_chauthtok.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_close_session.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_conv.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_end.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_error.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_get_authtok.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_get_data.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_get_item.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_get_user.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_getenv.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_getenvlist.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_info.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_open_session.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_prompt.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_putenv.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_set_data.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_set_item.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_setcred.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_setenv.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_sm_authenticate.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_sm_chauthtok.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_sm_close_session.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_sm_open_session.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_sm_setcred.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_start.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_strerror.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_verror.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_vinfo.3 soc2012/gmiller/locking-head/contrib/openpam/doc/man/pam_vprompt.3 soc2012/gmiller/locking-head/contrib/openpam/include/security/openpam.h soc2012/gmiller/locking-head/contrib/openpam/include/security/openpam_version.h soc2012/gmiller/locking-head/contrib/openpam/lib/Makefile.am soc2012/gmiller/locking-head/contrib/openpam/lib/Makefile.in soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_check_owner_perms.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_configure.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_constants.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_debug.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_dynamic.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_get_option.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_impl.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_load.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_log.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_readline.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_set_option.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_strlcmp.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_strlcpy.h soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_subst.c soc2012/gmiller/locking-head/contrib/openpam/lib/openpam_ttyconv.c soc2012/gmiller/locking-head/contrib/openpam/lib/pam_get_authtok.c soc2012/gmiller/locking-head/contrib/openpam/lib/pam_putenv.c soc2012/gmiller/locking-head/contrib/openpam/lib/pam_setenv.c soc2012/gmiller/locking-head/contrib/openpam/ltmain.sh soc2012/gmiller/locking-head/contrib/openpam/misc/gendoc.pl soc2012/gmiller/locking-head/contrib/opie/libopie/hash.c soc2012/gmiller/locking-head/contrib/opie/libopie/hashlen.c soc2012/gmiller/locking-head/contrib/tcpdump/ (props changed) soc2012/gmiller/locking-head/contrib/tcpdump/CHANGES soc2012/gmiller/locking-head/contrib/tcpdump/CREDITS soc2012/gmiller/locking-head/contrib/tcpdump/Makefile.in soc2012/gmiller/locking-head/contrib/tcpdump/VERSION soc2012/gmiller/locking-head/contrib/tcpdump/acconfig.h soc2012/gmiller/locking-head/contrib/tcpdump/addrtoname.c soc2012/gmiller/locking-head/contrib/tcpdump/addrtoname.h soc2012/gmiller/locking-head/contrib/tcpdump/bootp.h soc2012/gmiller/locking-head/contrib/tcpdump/config.h.in soc2012/gmiller/locking-head/contrib/tcpdump/configure soc2012/gmiller/locking-head/contrib/tcpdump/configure.in soc2012/gmiller/locking-head/contrib/tcpdump/cpack.c soc2012/gmiller/locking-head/contrib/tcpdump/cpack.h soc2012/gmiller/locking-head/contrib/tcpdump/ethertype.h soc2012/gmiller/locking-head/contrib/tcpdump/forces.h soc2012/gmiller/locking-head/contrib/tcpdump/ieee802_11_radio.h soc2012/gmiller/locking-head/contrib/tcpdump/interface.h soc2012/gmiller/locking-head/contrib/tcpdump/ip.h soc2012/gmiller/locking-head/contrib/tcpdump/ip6.h soc2012/gmiller/locking-head/contrib/tcpdump/ipproto.c soc2012/gmiller/locking-head/contrib/tcpdump/ipproto.h soc2012/gmiller/locking-head/contrib/tcpdump/netdissect.h soc2012/gmiller/locking-head/contrib/tcpdump/ospf.h soc2012/gmiller/locking-head/contrib/tcpdump/oui.c soc2012/gmiller/locking-head/contrib/tcpdump/oui.h soc2012/gmiller/locking-head/contrib/tcpdump/print-802_11.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ap1394.c soc2012/gmiller/locking-head/contrib/tcpdump/print-arcnet.c soc2012/gmiller/locking-head/contrib/tcpdump/print-arp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-atalk.c soc2012/gmiller/locking-head/contrib/tcpdump/print-atm.c soc2012/gmiller/locking-head/contrib/tcpdump/print-bgp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-cdp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-chdlc.c soc2012/gmiller/locking-head/contrib/tcpdump/print-dccp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-dhcp6.c soc2012/gmiller/locking-head/contrib/tcpdump/print-enc.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ether.c soc2012/gmiller/locking-head/contrib/tcpdump/print-forces.c soc2012/gmiller/locking-head/contrib/tcpdump/print-fr.c soc2012/gmiller/locking-head/contrib/tcpdump/print-gre.c soc2012/gmiller/locking-head/contrib/tcpdump/print-icmp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-icmp6.c soc2012/gmiller/locking-head/contrib/tcpdump/print-igmp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ip.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ip6.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ipnet.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ipx.c soc2012/gmiller/locking-head/contrib/tcpdump/print-isoclns.c soc2012/gmiller/locking-head/contrib/tcpdump/print-juniper.c soc2012/gmiller/locking-head/contrib/tcpdump/print-lane.c soc2012/gmiller/locking-head/contrib/tcpdump/print-llc.c soc2012/gmiller/locking-head/contrib/tcpdump/print-lldp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-mobile.c soc2012/gmiller/locking-head/contrib/tcpdump/print-mpls.c soc2012/gmiller/locking-head/contrib/tcpdump/print-null.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ospf.c soc2012/gmiller/locking-head/contrib/tcpdump/print-pflog.c soc2012/gmiller/locking-head/contrib/tcpdump/print-pgm.c soc2012/gmiller/locking-head/contrib/tcpdump/print-pim.c soc2012/gmiller/locking-head/contrib/tcpdump/print-ppp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-rrcp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-sctp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-sflow.c soc2012/gmiller/locking-head/contrib/tcpdump/print-sl.c soc2012/gmiller/locking-head/contrib/tcpdump/print-sll.c soc2012/gmiller/locking-head/contrib/tcpdump/print-sunrpc.c soc2012/gmiller/locking-head/contrib/tcpdump/print-symantec.c soc2012/gmiller/locking-head/contrib/tcpdump/print-tcp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-tftp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-udp.c soc2012/gmiller/locking-head/contrib/tcpdump/print-vrrp.c soc2012/gmiller/locking-head/contrib/tcpdump/tcp.h soc2012/gmiller/locking-head/contrib/tcpdump/tcpdump-stdinc.h soc2012/gmiller/locking-head/contrib/tcpdump/tcpdump.1.in soc2012/gmiller/locking-head/contrib/tcpdump/tcpdump.c soc2012/gmiller/locking-head/contrib/tcpdump/udp.h soc2012/gmiller/locking-head/contrib/telnet/telnet/telnet.1 soc2012/gmiller/locking-head/contrib/top/display.c soc2012/gmiller/locking-head/contrib/top/layout.h soc2012/gmiller/locking-head/contrib/top/machine.h soc2012/gmiller/locking-head/contrib/top/top.c soc2012/gmiller/locking-head/contrib/traceroute/traceroute.8 soc2012/gmiller/locking-head/crypto/openssh/ (props changed) soc2012/gmiller/locking-head/crypto/openssh/ssh-keyscan.1 soc2012/gmiller/locking-head/crypto/openssh/ssh-keyscan.c soc2012/gmiller/locking-head/crypto/openssh/ssh.c soc2012/gmiller/locking-head/crypto/openssh/sshconnect.c soc2012/gmiller/locking-head/crypto/openssh/sshd.c soc2012/gmiller/locking-head/crypto/openssh/version.c soc2012/gmiller/locking-head/crypto/openssh/version.h soc2012/gmiller/locking-head/crypto/openssl/ (props changed) soc2012/gmiller/locking-head/crypto/openssl/CHANGES soc2012/gmiller/locking-head/crypto/openssl/CHANGES.SSLeay soc2012/gmiller/locking-head/crypto/openssl/Configure soc2012/gmiller/locking-head/crypto/openssl/FAQ soc2012/gmiller/locking-head/crypto/openssl/INSTALL soc2012/gmiller/locking-head/crypto/openssl/LICENSE soc2012/gmiller/locking-head/crypto/openssl/Makefile soc2012/gmiller/locking-head/crypto/openssl/Makefile.org soc2012/gmiller/locking-head/crypto/openssl/Makefile.shared soc2012/gmiller/locking-head/crypto/openssl/NEWS soc2012/gmiller/locking-head/crypto/openssl/README soc2012/gmiller/locking-head/crypto/openssl/apps/Makefile soc2012/gmiller/locking-head/crypto/openssl/apps/apps.c soc2012/gmiller/locking-head/crypto/openssl/apps/apps.h soc2012/gmiller/locking-head/crypto/openssl/apps/asn1pars.c soc2012/gmiller/locking-head/crypto/openssl/apps/ca.c soc2012/gmiller/locking-head/crypto/openssl/apps/ciphers.c soc2012/gmiller/locking-head/crypto/openssl/apps/client.pem soc2012/gmiller/locking-head/crypto/openssl/apps/cms.c soc2012/gmiller/locking-head/crypto/openssl/apps/crl2p7.c soc2012/gmiller/locking-head/crypto/openssl/apps/dgst.c soc2012/gmiller/locking-head/crypto/openssl/apps/dh.c soc2012/gmiller/locking-head/crypto/openssl/apps/dhparam.c soc2012/gmiller/locking-head/crypto/openssl/apps/dsa.c soc2012/gmiller/locking-head/crypto/openssl/apps/ec.c soc2012/gmiller/locking-head/crypto/openssl/apps/ecparam.c soc2012/gmiller/locking-head/crypto/openssl/apps/enc.c soc2012/gmiller/locking-head/crypto/openssl/apps/engine.c soc2012/gmiller/locking-head/crypto/openssl/apps/errstr.c soc2012/gmiller/locking-head/crypto/openssl/apps/gendh.c soc2012/gmiller/locking-head/crypto/openssl/apps/genrsa.c soc2012/gmiller/locking-head/crypto/openssl/apps/ocsp.c soc2012/gmiller/locking-head/crypto/openssl/apps/openssl.c soc2012/gmiller/locking-head/crypto/openssl/apps/openssl.cnf soc2012/gmiller/locking-head/crypto/openssl/apps/pkcs12.c soc2012/gmiller/locking-head/crypto/openssl/apps/pkcs7.c soc2012/gmiller/locking-head/crypto/openssl/apps/pkcs8.c soc2012/gmiller/locking-head/crypto/openssl/apps/prime.c soc2012/gmiller/locking-head/crypto/openssl/apps/progs.h soc2012/gmiller/locking-head/crypto/openssl/apps/progs.pl soc2012/gmiller/locking-head/crypto/openssl/apps/req.c soc2012/gmiller/locking-head/crypto/openssl/apps/rsa.c soc2012/gmiller/locking-head/crypto/openssl/apps/rsautl.c soc2012/gmiller/locking-head/crypto/openssl/apps/s_apps.h soc2012/gmiller/locking-head/crypto/openssl/apps/s_cb.c soc2012/gmiller/locking-head/crypto/openssl/apps/s_client.c soc2012/gmiller/locking-head/crypto/openssl/apps/s_server.c soc2012/gmiller/locking-head/crypto/openssl/apps/s_socket.c soc2012/gmiller/locking-head/crypto/openssl/apps/s_time.c soc2012/gmiller/locking-head/crypto/openssl/apps/server.pem soc2012/gmiller/locking-head/crypto/openssl/apps/server2.pem soc2012/gmiller/locking-head/crypto/openssl/apps/sess_id.c soc2012/gmiller/locking-head/crypto/openssl/apps/smime.c soc2012/gmiller/locking-head/crypto/openssl/apps/speed.c soc2012/gmiller/locking-head/crypto/openssl/apps/verify.c soc2012/gmiller/locking-head/crypto/openssl/apps/x509.c soc2012/gmiller/locking-head/crypto/openssl/config soc2012/gmiller/locking-head/crypto/openssl/crypto/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes.h soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_cbc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_cfb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_core.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_ctr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_ige.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_misc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/aes_ofb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/aes/asm/aes-x86_64.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_bitstr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_digest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_dup.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_gentm.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_int.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_object.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_octet.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_set.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_sign.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_strex.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_strnid.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_time.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_type.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_utctm.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/a_verify.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1.h soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1_gen.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1_mac.h soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1_par.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn1t.h soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn_mime.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/asn_pack.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/charmap.h soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/d2i_pr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/d2i_pu.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/i2d_pr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/n_pkey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/nsseq.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/p5_pbe.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/p5_pbev2.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/p8_pkey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/t_crl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/t_pkey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/t_req.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/t_spki.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/t_x509.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/tasn_dec.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/tasn_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/tasn_fre.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/tasn_new.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/tasn_prn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/tasn_typ.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_algor.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_crl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_long.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_name.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_pubkey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_req.c soc2012/gmiller/locking-head/crypto/openssl/crypto/asn1/x_x509.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bf/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/bf/asm/bf-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/bf/bf_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bf/blowfish.h soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/b_print.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/b_sock.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bf_buff.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bio.h soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bio_cb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bio_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bio_lcl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bio_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_acpt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_bio.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_dgram.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_fd.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_file.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_log.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bio/bss_mem.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/bn-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/co-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/ppc.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/sparcv8plus.S soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/x86_64-gcc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/asm/x86_64-mont.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn.h soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_asm.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_blind.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_ctx.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_div.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_exp.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_gf2m.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_lcl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_mont.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_nist.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_print.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bn_shift.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/bntest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/bn/exptest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/buffer/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/buffer/buf_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/buffer/buf_str.c soc2012/gmiller/locking-head/crypto/openssl/crypto/buffer/buffer.c soc2012/gmiller/locking-head/crypto/openssl/crypto/buffer/buffer.h soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/camellia.c soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/camellia.h soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_cbc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_cfb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_ctr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_misc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/camellia/cmll_ofb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cast/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/cast/asm/cast-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/cast/c_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cast/cast.h soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms.h soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_asn1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_env.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_ess.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_io.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_lcl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_sd.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cms/cms_smime.c soc2012/gmiller/locking-head/crypto/openssl/crypto/comp/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/comp/c_rle.c soc2012/gmiller/locking-head/crypto/openssl/crypto/comp/c_zlib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/comp/comp_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/README soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf.h soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf_api.c soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf_def.c soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf_mall.c soc2012/gmiller/locking-head/crypto/openssl/crypto/conf/conf_mod.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cpt_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cryptlib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/cryptlib.h soc2012/gmiller/locking-head/crypto/openssl/crypto/crypto.h soc2012/gmiller/locking-head/crypto/openssl/crypto/des/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/des/asm/crypt586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/des/asm/des-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/des/asm/des_enc.m4 soc2012/gmiller/locking-head/crypto/openssl/crypto/des/des.h soc2012/gmiller/locking-head/crypto/openssl/crypto/des/des_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/des_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/des/ecb_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/enc_read.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/enc_writ.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/fcrypt_b.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/set_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/des/xcbc_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh.h soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_asn1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_check.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_gen.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dh/dh_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa.h soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_asn1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_gen.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_ossl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_sign.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsa_vrf.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dsa/dsatest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso.h soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_dl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_dlfcn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_null.c soc2012/gmiller/locking-head/crypto/openssl/crypto/dso/dso_openssl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec2_mult.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec2_smpl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_asn1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_curve.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_cvt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_lcl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ec_mult.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_mont.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_nist.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ecp_smpl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ec/ectest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/ecdh.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/ecdhtest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/ech_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/ech_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/ech_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdh/ech_ossl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/ecdsa.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/ecdsatest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/ecs_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/ecs_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/ecs_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ecdsa/ecs_ossl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_all.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_cryptodev.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_dyn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_fat.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_int.h soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_list.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_openssl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/eng_table.c soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/engine.h soc2012/gmiller/locking-head/crypto/openssl/crypto/engine/enginetest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err.h soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err_all.c soc2012/gmiller/locking-head/crypto/openssl/crypto/err/err_prn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/bio_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/bio_md.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/bio_ok.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/c_all.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/c_allc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/c_alld.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/digest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_aes.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_camellia.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_des.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_des3.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_idea.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_null.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_rc2.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_rc4.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_seed.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/e_xcbc_d.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/encode.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp.h soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_pbe.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_pkey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evp_test.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/evptests.txt soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_dss.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_dss1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_ecdsa.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_md2.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_md4.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_md5.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_mdc2.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_ripemd.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_sha.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/m_sha1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/names.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p5_crpt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p5_crpt2.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_dec.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_open.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_seal.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_sign.c soc2012/gmiller/locking-head/crypto/openssl/crypto/evp/p_verify.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ex_data.c soc2012/gmiller/locking-head/crypto/openssl/crypto/fips_err.h soc2012/gmiller/locking-head/crypto/openssl/crypto/hmac/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/hmac/hmac.c soc2012/gmiller/locking-head/crypto/openssl/crypto/hmac/hmac.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ia64cpuid.S soc2012/gmiller/locking-head/crypto/openssl/crypto/idea/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/idea/i_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/idea/idea.h soc2012/gmiller/locking-head/crypto/openssl/crypto/jpake/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/jpake/jpake.c soc2012/gmiller/locking-head/crypto/openssl/crypto/jpake/jpaketest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/krb5/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/lhash/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/lhash/lh_stats.c soc2012/gmiller/locking-head/crypto/openssl/crypto/lhash/lhash.c soc2012/gmiller/locking-head/crypto/openssl/crypto/lhash/lhash.h soc2012/gmiller/locking-head/crypto/openssl/crypto/md2/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/md2/md2_dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/md32_common.h soc2012/gmiller/locking-head/crypto/openssl/crypto/md4/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/md4/md4.h soc2012/gmiller/locking-head/crypto/openssl/crypto/md4/md4_dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/asm/md5-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/asm/md5-x86_64.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/md5.h soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/md5_dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/md5/md5_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/mdc2/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/mdc2/mdc2.h soc2012/gmiller/locking-head/crypto/openssl/crypto/mdc2/mdc2dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/mem.c soc2012/gmiller/locking-head/crypto/openssl/crypto/mem_dbg.c soc2012/gmiller/locking-head/crypto/openssl/crypto/o_init.c soc2012/gmiller/locking-head/crypto/openssl/crypto/o_time.c soc2012/gmiller/locking-head/crypto/openssl/crypto/o_time.h soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/o_names.c soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_dat.c soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_dat.h soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_dat.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_mac.h soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/obj_mac.num soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/objects.h soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/objects.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/objects/objects.txt soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_cl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_ext.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_ht.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_prn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ocsp/ocsp_vfy.c soc2012/gmiller/locking-head/crypto/openssl/crypto/opensslconf.h soc2012/gmiller/locking-head/crypto/openssl/crypto/opensslconf.h.in soc2012/gmiller/locking-head/crypto/openssl/crypto/opensslv.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ossl_typ.h soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem.h soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_all.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_info.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_pkey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_x509.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pem/pem_xaux.c soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/cbc.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86_64-xlate.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86asm.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/perlasm/x86nasm.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_add.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_attr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_crpt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_crt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_decr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_key.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_kiss.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_mutl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/p12_utl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/pk12err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs12/pkcs12.h soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pk7_asn1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pk7_attr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pk7_doit.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pk7_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pk7_mime.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pk7_smime.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pkcs7.h soc2012/gmiller/locking-head/crypto/openssl/crypto/pkcs7/pkcs7err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pqueue/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/pqueue/pqueue.c soc2012/gmiller/locking-head/crypto/openssl/crypto/pqueue/pqueue.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/md_rand.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_egd.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_lcl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/rand_unix.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rand/randfile.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc2/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/rc2/rc2_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4_enc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc4/rc4test.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rc5/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/rc5/asm/rc5-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/rc5/rc5.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rc5/rc5_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ripemd/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/ripemd/asm/rmd-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/ripemd/ripemd.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ripemd/rmd_dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ripemd/rmd_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa.h soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_asn1.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_eay.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_gen.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_oaep.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_pss.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_sign.c soc2012/gmiller/locking-head/crypto/openssl/crypto/rsa/rsa_test.c soc2012/gmiller/locking-head/crypto/openssl/crypto/seed/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/seed/seed.c soc2012/gmiller/locking-head/crypto/openssl/crypto/seed/seed.h soc2012/gmiller/locking-head/crypto/openssl/crypto/seed/seed_cbc.c soc2012/gmiller/locking-head/crypto/openssl/crypto/seed/seed_cfb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/seed/seed_ofb.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-586.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-ia64.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha.h soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha1_one.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha1dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha256.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha512.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha_dgst.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/sha_locl.h soc2012/gmiller/locking-head/crypto/openssl/crypto/sha/shatest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/sparccpuid.S soc2012/gmiller/locking-head/crypto/openssl/crypto/stack/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/stack/safestack.h soc2012/gmiller/locking-head/crypto/openssl/crypto/stack/stack.c soc2012/gmiller/locking-head/crypto/openssl/crypto/stack/stack.h soc2012/gmiller/locking-head/crypto/openssl/crypto/store/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/store/store.h soc2012/gmiller/locking-head/crypto/openssl/crypto/store/str_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/store/str_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/store/str_mem.c soc2012/gmiller/locking-head/crypto/openssl/crypto/symhacks.h soc2012/gmiller/locking-head/crypto/openssl/crypto/threads/mttest.c soc2012/gmiller/locking-head/crypto/openssl/crypto/txt_db/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/txt_db/txt_db.c soc2012/gmiller/locking-head/crypto/openssl/crypto/txt_db/txt_db.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ui/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/ui/ui.h soc2012/gmiller/locking-head/crypto/openssl/crypto/ui/ui_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ui/ui_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/ui/ui_openssl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/by_dir.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/by_file.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509.h soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_cmp.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_lu.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_obj.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_req.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_set.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_trs.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_txt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_vfy.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_vfy.h soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509_vpm.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509cset.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509name.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x509type.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509/x_all.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/Makefile soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/ext_dat.h soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/pcy_cache.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/pcy_data.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/pcy_int.h soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/pcy_map.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/pcy_node.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/pcy_tree.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_addr.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_alt.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_asid.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_conf.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_cpols.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_crld.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_enum.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_extku.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_genn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_lib.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_ncons.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_ocsp.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_pci.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_pcons.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_pmaps.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_prn.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_purp.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_skey.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3_utl.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/v3err.c soc2012/gmiller/locking-head/crypto/openssl/crypto/x509v3/x509v3.h soc2012/gmiller/locking-head/crypto/openssl/crypto/x86_64cpuid.pl soc2012/gmiller/locking-head/crypto/openssl/crypto/x86cpuid.pl soc2012/gmiller/locking-head/crypto/openssl/doc/HOWTO/proxy_certificates.txt soc2012/gmiller/locking-head/crypto/openssl/doc/apps/asn1parse.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/ca.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/ciphers.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/config.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/dgst.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/dhparam.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/dsa.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/dsaparam.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/ec.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/ecparam.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/enc.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/gendsa.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/genrsa.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/ocsp.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/openssl.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/pkcs12.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/pkcs7.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/pkcs8.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/req.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/rsa.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/s_client.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/s_server.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/smime.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/speed.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/spkac.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/verify.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/x509.pod soc2012/gmiller/locking-head/crypto/openssl/doc/apps/x509v3_config.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/BIO_f_md.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/BIO_f_ssl.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/BIO_s_file.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/BIO_s_mem.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/BN_BLINDING_new.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/DSA_get_ex_new_index.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_DigestInit.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_SignInit.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/EVP_VerifyInit.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/PKCS7_encrypt.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/PKCS7_sign.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/ecdsa.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/engine.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/evp.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/hmac.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/lhash.pod soc2012/gmiller/locking-head/crypto/openssl/doc/crypto/threads.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_CTX_new.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_alert_type_string.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_clear.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/SSL_library_init.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssl/ssl.pod soc2012/gmiller/locking-head/crypto/openssl/doc/ssleay.txt soc2012/gmiller/locking-head/crypto/openssl/doc/standards.txt soc2012/gmiller/locking-head/crypto/openssl/e_os.h soc2012/gmiller/locking-head/crypto/openssl/e_os2.h soc2012/gmiller/locking-head/crypto/openssl/engines/Makefile soc2012/gmiller/locking-head/crypto/openssl/engines/e_4758cca.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_aep.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_capi.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_capi_err.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_capi_err.h soc2012/gmiller/locking-head/crypto/openssl/engines/e_chil.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_gmp.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_sureware.c soc2012/gmiller/locking-head/crypto/openssl/engines/e_ubsec.c soc2012/gmiller/locking-head/crypto/openssl/ssl/Makefile soc2012/gmiller/locking-head/crypto/openssl/ssl/bio_ssl.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_both.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_clnt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_enc.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_lib.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_meth.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_pkt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/d1_srvr.c soc2012/gmiller/locking-head/crypto/openssl/ssl/dtls1.h soc2012/gmiller/locking-head/crypto/openssl/ssl/kssl.c soc2012/gmiller/locking-head/crypto/openssl/ssl/kssl.h soc2012/gmiller/locking-head/crypto/openssl/ssl/kssl_lcl.h soc2012/gmiller/locking-head/crypto/openssl/ssl/s23_clnt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s23_lib.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s23_meth.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s23_srvr.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s2_clnt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s2_enc.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s2_lib.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s2_meth.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s2_pkt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s2_srvr.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_both.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_clnt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_enc.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_lib.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_meth.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_pkt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/s3_srvr.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl.h soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl2.h soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl3.h soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_algs.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_asn1.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_cert.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_ciph.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_err.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_lib.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_locl.h soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_sess.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_stat.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssl_txt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/ssltest.c soc2012/gmiller/locking-head/crypto/openssl/ssl/t1_clnt.c soc2012/gmiller/locking-head/crypto/openssl/ssl/t1_enc.c soc2012/gmiller/locking-head/crypto/openssl/ssl/t1_lib.c soc2012/gmiller/locking-head/crypto/openssl/ssl/t1_meth.c soc2012/gmiller/locking-head/crypto/openssl/ssl/t1_srvr.c soc2012/gmiller/locking-head/crypto/openssl/ssl/tls1.h soc2012/gmiller/locking-head/crypto/openssl/util/ck_errf.pl soc2012/gmiller/locking-head/crypto/openssl/util/clean-depend.pl soc2012/gmiller/locking-head/crypto/openssl/util/domd soc2012/gmiller/locking-head/crypto/openssl/util/libeay.num soc2012/gmiller/locking-head/crypto/openssl/util/mk1mf.pl soc2012/gmiller/locking-head/crypto/openssl/util/mkdef.pl soc2012/gmiller/locking-head/crypto/openssl/util/mkerr.pl soc2012/gmiller/locking-head/crypto/openssl/util/mkfiles.pl soc2012/gmiller/locking-head/crypto/openssl/util/mklink.pl soc2012/gmiller/locking-head/crypto/openssl/util/mkstack.pl soc2012/gmiller/locking-head/crypto/openssl/util/pl/BC-32.pl soc2012/gmiller/locking-head/crypto/openssl/util/pl/Mingw32.pl soc2012/gmiller/locking-head/crypto/openssl/util/pl/VC-32.pl soc2012/gmiller/locking-head/crypto/openssl/util/pl/netware.pl soc2012/gmiller/locking-head/crypto/openssl/util/point.sh soc2012/gmiller/locking-head/crypto/openssl/util/selftest.pl soc2012/gmiller/locking-head/crypto/openssl/util/shlib_wrap.sh soc2012/gmiller/locking-head/crypto/openssl/util/ssleay.num soc2012/gmiller/locking-head/etc/Makefile soc2012/gmiller/locking-head/etc/defaults/periodic.conf soc2012/gmiller/locking-head/etc/defaults/rc.conf soc2012/gmiller/locking-head/etc/devd.conf soc2012/gmiller/locking-head/etc/devd/usb.conf soc2012/gmiller/locking-head/etc/login.conf soc2012/gmiller/locking-head/etc/mtree/BSD.include.dist soc2012/gmiller/locking-head/etc/mtree/BSD.usr.dist soc2012/gmiller/locking-head/etc/pam.d/Makefile soc2012/gmiller/locking-head/etc/periodic/daily/400.status-disks soc2012/gmiller/locking-head/etc/rc.d/bgfsck soc2012/gmiller/locking-head/etc/rc.d/bridge soc2012/gmiller/locking-head/etc/rc.d/cleanvar soc2012/gmiller/locking-head/etc/rc.d/devd soc2012/gmiller/locking-head/etc/rc.d/ip6addrctl soc2012/gmiller/locking-head/etc/rc.d/ipfw soc2012/gmiller/locking-head/etc/rc.d/jail soc2012/gmiller/locking-head/etc/rc.d/kldxref soc2012/gmiller/locking-head/etc/rc.d/named soc2012/gmiller/locking-head/etc/rc.d/power_profile soc2012/gmiller/locking-head/etc/rc.d/rarpd soc2012/gmiller/locking-head/etc/rc.d/tmp soc2012/gmiller/locking-head/etc/rc.firewall soc2012/gmiller/locking-head/etc/rc.subr soc2012/gmiller/locking-head/etc/syslog.conf soc2012/gmiller/locking-head/games/fortune/datfiles/fortunes soc2012/gmiller/locking-head/gnu/lib/Makefile soc2012/gmiller/locking-head/gnu/lib/csu/Makefile soc2012/gmiller/locking-head/gnu/lib/libgcc/Makefile soc2012/gmiller/locking-head/gnu/lib/libgomp/config.h soc2012/gmiller/locking-head/gnu/lib/libstdc++/config.h soc2012/gmiller/locking-head/gnu/lib/libsupc++/Version.map soc2012/gmiller/locking-head/gnu/usr.bin/cc/cc_tools/auto-host.h soc2012/gmiller/locking-head/gnu/usr.bin/gdb/libgdb/fbsd-threads.c soc2012/gmiller/locking-head/gnu/usr.bin/groff/tmac/Makefile soc2012/gmiller/locking-head/gnu/usr.bin/groff/tmac/mdoc.local soc2012/gmiller/locking-head/gnu/usr.bin/sort/Makefile soc2012/gmiller/locking-head/include/Makefile soc2012/gmiller/locking-head/include/dirent.h soc2012/gmiller/locking-head/include/fmtmsg.h soc2012/gmiller/locking-head/include/gssapi/gssapi.h soc2012/gmiller/locking-head/include/malloc_np.h soc2012/gmiller/locking-head/include/paths.h soc2012/gmiller/locking-head/include/printf.h soc2012/gmiller/locking-head/include/protocols/dumprestore.h soc2012/gmiller/locking-head/include/wchar.h soc2012/gmiller/locking-head/kerberos5/Makefile.inc soc2012/gmiller/locking-head/kerberos5/lib/libasn1/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libgssapi_krb5/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libgssapi_ntlm/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libgssapi_spnego/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libhdb/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libheimbase/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libheimipcc/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libheimipcs/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libhx509/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libkadm5clnt/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libkadm5srv/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libkafs5/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libkdc/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libkrb5/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libroken/Makefile soc2012/gmiller/locking-head/kerberos5/lib/libvers/Makefile soc2012/gmiller/locking-head/kerberos5/libexec/hprop/Makefile soc2012/gmiller/locking-head/kerberos5/libexec/kadmind/Makefile soc2012/gmiller/locking-head/kerberos5/libexec/kcm/Makefile soc2012/gmiller/locking-head/kerberos5/libexec/kdigest/Makefile soc2012/gmiller/locking-head/kerberos5/libexec/kfd/Makefile soc2012/gmiller/locking-head/kerberos5/tools/asn1_compile/Makefile soc2012/gmiller/locking-head/kerberos5/tools/slc/Makefile soc2012/gmiller/locking-head/kerberos5/usr.bin/hxtool/Makefile soc2012/gmiller/locking-head/kerberos5/usr.bin/kadmin/Makefile soc2012/gmiller/locking-head/kerberos5/usr.bin/kcc/Makefile soc2012/gmiller/locking-head/kerberos5/usr.bin/kf/Makefile soc2012/gmiller/locking-head/kerberos5/usr.bin/string2key/Makefile soc2012/gmiller/locking-head/kerberos5/usr.sbin/iprop-log/Makefile soc2012/gmiller/locking-head/kerberos5/usr.sbin/ktutil/Makefile soc2012/gmiller/locking-head/lib/Makefile soc2012/gmiller/locking-head/lib/bind/dns/code.h soc2012/gmiller/locking-head/lib/bind/dns/dns/enumtype.h soc2012/gmiller/locking-head/lib/bind/dns/dns/rdatastruct.h soc2012/gmiller/locking-head/lib/clang/include/clang/Basic/Version.inc soc2012/gmiller/locking-head/lib/clang/include/llvm/Config/config.h soc2012/gmiller/locking-head/lib/libarchive/Makefile soc2012/gmiller/locking-head/lib/libarchive/config_freebsd.h soc2012/gmiller/locking-head/lib/libarchive/test/Makefile soc2012/gmiller/locking-head/lib/libc++/Makefile soc2012/gmiller/locking-head/lib/libc/Makefile soc2012/gmiller/locking-head/lib/libc/amd64/sys/Makefile.inc soc2012/gmiller/locking-head/lib/libc/arm/Symbol.map soc2012/gmiller/locking-head/lib/libc/gen/Makefile.inc soc2012/gmiller/locking-head/lib/libc/gen/Symbol.map soc2012/gmiller/locking-head/lib/libc/gen/arc4random.c soc2012/gmiller/locking-head/lib/libc/gen/closedir.c soc2012/gmiller/locking-head/lib/libc/gen/directory.3 soc2012/gmiller/locking-head/lib/libc/gen/fstab.c soc2012/gmiller/locking-head/lib/libc/gen/fts-compat.c soc2012/gmiller/locking-head/lib/libc/gen/fts.c soc2012/gmiller/locking-head/lib/libc/gen/ftw.c soc2012/gmiller/locking-head/lib/libc/gen/getcwd.c soc2012/gmiller/locking-head/lib/libc/gen/getnetgrent.c soc2012/gmiller/locking-head/lib/libc/gen/nftw.c soc2012/gmiller/locking-head/lib/libc/gen/opendir.c soc2012/gmiller/locking-head/lib/libc/gen/posix_spawnattr_getflags.3 soc2012/gmiller/locking-head/lib/libc/gen/readdir.c soc2012/gmiller/locking-head/lib/libc/gen/rewinddir.c soc2012/gmiller/locking-head/lib/libc/gen/seekdir.c soc2012/gmiller/locking-head/lib/libc/gen/signal.3 soc2012/gmiller/locking-head/lib/libc/gen/sysconf.c soc2012/gmiller/locking-head/lib/libc/gen/syslog.c soc2012/gmiller/locking-head/lib/libc/gen/telldir.c soc2012/gmiller/locking-head/lib/libc/i386/gen/getcontextx.c soc2012/gmiller/locking-head/lib/libc/i386/sys/Makefile.inc soc2012/gmiller/locking-head/lib/libc/include/libc_private.h soc2012/gmiller/locking-head/lib/libc/include/port_before.h soc2012/gmiller/locking-head/lib/libc/locale/Makefile.inc soc2012/gmiller/locking-head/lib/libc/locale/collate.c soc2012/gmiller/locking-head/lib/libc/locale/ctype_l.3 soc2012/gmiller/locking-head/lib/libc/locale/isgraph.3 soc2012/gmiller/locking-head/lib/libc/locale/islower.3 soc2012/gmiller/locking-head/lib/libc/locale/ispunct.3 soc2012/gmiller/locking-head/lib/libc/locale/isspace.3 soc2012/gmiller/locking-head/lib/libc/locale/nl_langinfo.3 soc2012/gmiller/locking-head/lib/libc/locale/setrunelocale.c soc2012/gmiller/locking-head/lib/libc/net/Makefile.inc soc2012/gmiller/locking-head/lib/libc/net/getaddrinfo.c soc2012/gmiller/locking-head/lib/libc/net/if_indextoname.c soc2012/gmiller/locking-head/lib/libc/net/if_nameindex.c soc2012/gmiller/locking-head/lib/libc/net/if_nametoindex.c soc2012/gmiller/locking-head/lib/libc/net/nsparser.y soc2012/gmiller/locking-head/lib/libc/net/sctp_sys_calls.c soc2012/gmiller/locking-head/lib/libc/net/sourcefilter.c soc2012/gmiller/locking-head/lib/libc/powerpc/Symbol.map soc2012/gmiller/locking-head/lib/libc/powerpc/gen/Makefile.inc soc2012/gmiller/locking-head/lib/libc/rpc/getnetpath.c soc2012/gmiller/locking-head/lib/libc/stdio/Makefile.inc soc2012/gmiller/locking-head/lib/libc/stdio/fpurge.c soc2012/gmiller/locking-head/lib/libc/stdio/xprintf.c soc2012/gmiller/locking-head/lib/libc/stdlib/Makefile.inc soc2012/gmiller/locking-head/lib/libc/stdlib/at_quick_exit.3 soc2012/gmiller/locking-head/lib/libc/stdlib/getopt_long.c soc2012/gmiller/locking-head/lib/libc/stdlib/quick_exit.3 soc2012/gmiller/locking-head/lib/libc/stdlib/realpath.c soc2012/gmiller/locking-head/lib/libc/stdlib/strfmon.3 soc2012/gmiller/locking-head/lib/libc/stdtime/Makefile.inc soc2012/gmiller/locking-head/lib/libc/stdtime/strftime.3 soc2012/gmiller/locking-head/lib/libc/stdtime/strftime.c soc2012/gmiller/locking-head/lib/libc/stdtime/strptime.3 soc2012/gmiller/locking-head/lib/libc/string/Makefile.inc soc2012/gmiller/locking-head/lib/libc/string/strcasecmp.3 soc2012/gmiller/locking-head/lib/libc/string/strcoll.3 soc2012/gmiller/locking-head/lib/libc/string/strerror.3 soc2012/gmiller/locking-head/lib/libc/string/strstr.3 soc2012/gmiller/locking-head/lib/libc/string/strxfrm.3 soc2012/gmiller/locking-head/lib/libc/sys/Makefile.inc soc2012/gmiller/locking-head/lib/libc/sys/Symbol.map soc2012/gmiller/locking-head/lib/libc/sys/fcntl.2 soc2012/gmiller/locking-head/lib/libc/sys/fcntl.c soc2012/gmiller/locking-head/lib/libc/sys/lseek.2 soc2012/gmiller/locking-head/lib/libc/sys/posix_fadvise.2 soc2012/gmiller/locking-head/lib/libc/sys/stat.2 soc2012/gmiller/locking-head/lib/libcompiler_rt/Makefile soc2012/gmiller/locking-head/lib/libcrypt/Makefile soc2012/gmiller/locking-head/lib/libcrypt/crypt.3 soc2012/gmiller/locking-head/lib/libcrypt/crypt.c soc2012/gmiller/locking-head/lib/libcxxrt/Makefile soc2012/gmiller/locking-head/lib/libcxxrt/Version.map soc2012/gmiller/locking-head/lib/libedit/chared.c soc2012/gmiller/locking-head/lib/libedit/chared.h soc2012/gmiller/locking-head/lib/libedit/common.c soc2012/gmiller/locking-head/lib/libedit/editline.3 soc2012/gmiller/locking-head/lib/libedit/editrc.5 soc2012/gmiller/locking-head/lib/libedit/el.c soc2012/gmiller/locking-head/lib/libedit/el.h soc2012/gmiller/locking-head/lib/libedit/histedit.h soc2012/gmiller/locking-head/lib/libedit/history.c soc2012/gmiller/locking-head/lib/libedit/key.c soc2012/gmiller/locking-head/lib/libedit/key.h soc2012/gmiller/locking-head/lib/libedit/makelist soc2012/gmiller/locking-head/lib/libedit/prompt.c soc2012/gmiller/locking-head/lib/libedit/prompt.h soc2012/gmiller/locking-head/lib/libedit/read.c soc2012/gmiller/locking-head/lib/libedit/refresh.c soc2012/gmiller/locking-head/lib/libedit/search.c soc2012/gmiller/locking-head/lib/libedit/sig.c soc2012/gmiller/locking-head/lib/libedit/sig.h soc2012/gmiller/locking-head/lib/libedit/term.c soc2012/gmiller/locking-head/lib/libedit/term.h soc2012/gmiller/locking-head/lib/libedit/tokenizer.c soc2012/gmiller/locking-head/lib/libedit/tty.c soc2012/gmiller/locking-head/lib/libedit/vi.c soc2012/gmiller/locking-head/lib/libelf/Makefile soc2012/gmiller/locking-head/lib/libelf/elf.3 soc2012/gmiller/locking-head/lib/libelf/elf_begin.3 soc2012/gmiller/locking-head/lib/libelf/gelf.3 soc2012/gmiller/locking-head/lib/libfetch/common.c soc2012/gmiller/locking-head/lib/libfetch/common.h soc2012/gmiller/locking-head/lib/libgpib/gpib.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_accept_sec_context.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_acquire_cred.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_add_cred.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_add_oid_set_member.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_canonicalize_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_compare_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_context_time.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_create_empty_oid_set.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_delete_sec_context.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_display_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_display_status.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_duplicate_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_export_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_export_sec_context.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_get_mic.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_import_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_import_sec_context.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_indicate_mechs.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_init_sec_context.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_inquire_context.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_inquire_cred.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_inquire_cred_by_mech.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_inquire_mechs_for_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_inquire_names_for_mech.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_process_context_token.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_release_buffer.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_release_cred.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_release_name.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_release_oid_set.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_test_oid_set_member.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_unwrap.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_verify_mic.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_wrap.3 soc2012/gmiller/locking-head/lib/libgssapi/gss_wrap_size_limit.3 soc2012/gmiller/locking-head/lib/libgssapi/gssapi.3 soc2012/gmiller/locking-head/lib/libgssapi/mech.5 soc2012/gmiller/locking-head/lib/libjail/jail.c soc2012/gmiller/locking-head/lib/libkiconv/Makefile soc2012/gmiller/locking-head/lib/libkiconv/xlat16_iconv.c soc2012/gmiller/locking-head/lib/libmagic/Makefile soc2012/gmiller/locking-head/lib/libmagic/config.h soc2012/gmiller/locking-head/lib/libncp/ncpl_nls.c soc2012/gmiller/locking-head/lib/libpam/libpam/Makefile soc2012/gmiller/locking-head/lib/libpam/modules/pam_exec/pam_exec.8 soc2012/gmiller/locking-head/lib/libpam/modules/pam_krb5/pam_krb5.c soc2012/gmiller/locking-head/lib/libpam/modules/pam_ssh/pam_ssh.c soc2012/gmiller/locking-head/lib/libpam/modules/pam_unix/pam_unix.c soc2012/gmiller/locking-head/lib/libpmc/pmc.3 soc2012/gmiller/locking-head/lib/libprocstat/cd9660.c soc2012/gmiller/locking-head/lib/libprocstat/common_kvm.c soc2012/gmiller/locking-head/lib/libprocstat/libprocstat.c soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_get_error.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_get_mech_info.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_get_principal_name.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_get_versions.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_getcred.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_is_installed.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_max_data_length.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_qop_to_num.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_seccreate.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_set_callback.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_set_defaults.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_set_svc_name.3 soc2012/gmiller/locking-head/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 soc2012/gmiller/locking-head/lib/libstand/Makefile soc2012/gmiller/locking-head/lib/libstand/bswap.c soc2012/gmiller/locking-head/lib/libstand/stand.h soc2012/gmiller/locking-head/lib/libthr/thread/thr_cond.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_getschedparam.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_info.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_kern.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_mutex.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h soc2012/gmiller/locking-head/lib/libthr/thread/thr_setprio.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_setschedparam.c soc2012/gmiller/locking-head/lib/libthr/thread/thr_umtx.h soc2012/gmiller/locking-head/lib/libusb/Makefile soc2012/gmiller/locking-head/lib/libusb/libusb10.c soc2012/gmiller/locking-head/lib/libusb/libusb10_io.c soc2012/gmiller/locking-head/lib/libusb/libusb20.3 soc2012/gmiller/locking-head/lib/libusbhid/parse.c soc2012/gmiller/locking-head/lib/libutil/Makefile soc2012/gmiller/locking-head/lib/libutil/auth.c soc2012/gmiller/locking-head/lib/libutil/login.conf.5 soc2012/gmiller/locking-head/lib/libutil/property.3 soc2012/gmiller/locking-head/lib/libutil/pw_util.c soc2012/gmiller/locking-head/lib/libz/ (props changed) soc2012/gmiller/locking-head/lib/libz/ChangeLog soc2012/gmiller/locking-head/lib/libz/FAQ soc2012/gmiller/locking-head/lib/libz/FREEBSD-upgrade (contents, props changed) soc2012/gmiller/locking-head/lib/libz/Makefile (contents, props changed) soc2012/gmiller/locking-head/lib/libz/README soc2012/gmiller/locking-head/lib/libz/Symbol.map (contents, props changed) soc2012/gmiller/locking-head/lib/libz/Versions.def (contents, props changed) soc2012/gmiller/locking-head/lib/libz/adler32.c soc2012/gmiller/locking-head/lib/libz/contrib/ (props changed) soc2012/gmiller/locking-head/lib/libz/contrib/README.contrib (props changed) soc2012/gmiller/locking-head/lib/libz/contrib/asm686/ (props changed) soc2012/gmiller/locking-head/lib/libz/contrib/asm686/README.686 (props changed) soc2012/gmiller/locking-head/lib/libz/contrib/asm686/match.S (contents, props changed) soc2012/gmiller/locking-head/lib/libz/contrib/gcc_gvmat64/ (props changed) soc2012/gmiller/locking-head/lib/libz/contrib/gcc_gvmat64/gvmat64.S (props changed) soc2012/gmiller/locking-head/lib/libz/crc32.c soc2012/gmiller/locking-head/lib/libz/crc32.h soc2012/gmiller/locking-head/lib/libz/deflate.c soc2012/gmiller/locking-head/lib/libz/deflate.h soc2012/gmiller/locking-head/lib/libz/doc/ (props changed) soc2012/gmiller/locking-head/lib/libz/doc/algorithm.txt (contents, props changed) soc2012/gmiller/locking-head/lib/libz/doc/rfc1950.txt (props changed) soc2012/gmiller/locking-head/lib/libz/doc/rfc1951.txt (props changed) soc2012/gmiller/locking-head/lib/libz/doc/rfc1952.txt (props changed) soc2012/gmiller/locking-head/lib/libz/doc/txtvsbin.txt (props changed) soc2012/gmiller/locking-head/lib/libz/gzclose.c (props changed) soc2012/gmiller/locking-head/lib/libz/gzguts.h (contents, props changed) soc2012/gmiller/locking-head/lib/libz/gzlib.c soc2012/gmiller/locking-head/lib/libz/gzread.c soc2012/gmiller/locking-head/lib/libz/gzwrite.c soc2012/gmiller/locking-head/lib/libz/infback.c soc2012/gmiller/locking-head/lib/libz/inffixed.h soc2012/gmiller/locking-head/lib/libz/inflate.c soc2012/gmiller/locking-head/lib/libz/inftrees.c soc2012/gmiller/locking-head/lib/libz/trees.c soc2012/gmiller/locking-head/lib/libz/zconf.h soc2012/gmiller/locking-head/lib/libz/zlib.3 soc2012/gmiller/locking-head/lib/libz/zlib.h soc2012/gmiller/locking-head/lib/libz/zopen.c (contents, props changed) soc2012/gmiller/locking-head/lib/libz/zutil.c soc2012/gmiller/locking-head/lib/libz/zutil.h soc2012/gmiller/locking-head/lib/msun/Makefile soc2012/gmiller/locking-head/lib/msun/Symbol.map soc2012/gmiller/locking-head/lib/msun/man/exp.3 soc2012/gmiller/locking-head/lib/msun/src/e_exp.c soc2012/gmiller/locking-head/lib/msun/src/e_rem_pio2.c soc2012/gmiller/locking-head/lib/msun/src/e_rem_pio2f.c soc2012/gmiller/locking-head/lib/msun/src/k_cosf.c soc2012/gmiller/locking-head/lib/msun/src/k_sinf.c soc2012/gmiller/locking-head/lib/msun/src/k_tanf.c soc2012/gmiller/locking-head/lib/msun/src/math.h soc2012/gmiller/locking-head/lib/msun/src/math_private.h soc2012/gmiller/locking-head/lib/msun/src/s_cbrtl.c soc2012/gmiller/locking-head/libexec/rbootd/rbootd.8 soc2012/gmiller/locking-head/libexec/rshd/rshd.8 soc2012/gmiller/locking-head/libexec/rtld-elf/arm/rtld_start.S soc2012/gmiller/locking-head/libexec/rtld-elf/map_object.c soc2012/gmiller/locking-head/libexec/rtld-elf/rtld.1 soc2012/gmiller/locking-head/libexec/rtld-elf/rtld.c soc2012/gmiller/locking-head/libexec/rtld-elf/rtld.h soc2012/gmiller/locking-head/libexec/tftpd/Makefile soc2012/gmiller/locking-head/libexec/tftpd/tftpd.8 soc2012/gmiller/locking-head/release/doc/en_US.ISO8859-1/hardware/article.sgml soc2012/gmiller/locking-head/release/doc/share/misc/dev.archlist.txt soc2012/gmiller/locking-head/release/picobsd/tinyware/passwd/passwd.c soc2012/gmiller/locking-head/rescue/rescue/Makefile soc2012/gmiller/locking-head/sbin/Makefile soc2012/gmiller/locking-head/sbin/atacontrol/atacontrol.8 soc2012/gmiller/locking-head/sbin/camcontrol/Makefile soc2012/gmiller/locking-head/sbin/camcontrol/camcontrol.8 soc2012/gmiller/locking-head/sbin/camcontrol/camcontrol.c soc2012/gmiller/locking-head/sbin/camcontrol/camcontrol.h soc2012/gmiller/locking-head/sbin/camcontrol/fwdownload.c soc2012/gmiller/locking-head/sbin/devd/devd.cc soc2012/gmiller/locking-head/sbin/devd/parse.y soc2012/gmiller/locking-head/sbin/devfs/devfs.8 soc2012/gmiller/locking-head/sbin/dump/dump.8 soc2012/gmiller/locking-head/sbin/etherswitchcfg/etherswitchcfg.8 soc2012/gmiller/locking-head/sbin/fsck_ffs/suj.c soc2012/gmiller/locking-head/sbin/fsck_msdosfs/main.c soc2012/gmiller/locking-head/sbin/geom/class/eli/geli.8 soc2012/gmiller/locking-head/sbin/geom/class/multipath/geom_multipath.c soc2012/gmiller/locking-head/sbin/geom/class/multipath/gmultipath.8 soc2012/gmiller/locking-head/sbin/geom/class/part/gpart.8 soc2012/gmiller/locking-head/sbin/geom/class/raid/graid.8 soc2012/gmiller/locking-head/sbin/geom/class/sched/gsched.8 soc2012/gmiller/locking-head/sbin/geom/class/virstor/gvirstor.8 soc2012/gmiller/locking-head/sbin/ggate/shared/ggate.h soc2012/gmiller/locking-head/sbin/growfs/growfs.c soc2012/gmiller/locking-head/sbin/gvinum/gvinum.8 soc2012/gmiller/locking-head/sbin/hastctl/hastctl.8 soc2012/gmiller/locking-head/sbin/hastd/hast.conf.5 soc2012/gmiller/locking-head/sbin/hastd/hast.h soc2012/gmiller/locking-head/sbin/hastd/hastd.8 soc2012/gmiller/locking-head/sbin/hastd/parse.y soc2012/gmiller/locking-head/sbin/hastd/primary.c soc2012/gmiller/locking-head/sbin/hastd/proto_common.c soc2012/gmiller/locking-head/sbin/hastd/synch.h soc2012/gmiller/locking-head/sbin/ifconfig/af_inet6.c soc2012/gmiller/locking-head/sbin/ifconfig/ifconfig.8 soc2012/gmiller/locking-head/sbin/ifconfig/ifconfig.c soc2012/gmiller/locking-head/sbin/ifconfig/iflagg.c soc2012/gmiller/locking-head/sbin/init/init.c soc2012/gmiller/locking-head/sbin/ipfw/dummynet.c soc2012/gmiller/locking-head/sbin/ipfw/ipfw.8 soc2012/gmiller/locking-head/sbin/ipfw/ipfw2.c soc2012/gmiller/locking-head/sbin/ipfw/nat.c soc2012/gmiller/locking-head/sbin/mca/Makefile soc2012/gmiller/locking-head/sbin/mca/mca.c soc2012/gmiller/locking-head/sbin/md5/Makefile soc2012/gmiller/locking-head/sbin/md5/md5.1 soc2012/gmiller/locking-head/sbin/md5/md5.c soc2012/gmiller/locking-head/sbin/mdconfig/Makefile soc2012/gmiller/locking-head/sbin/mdconfig/mdconfig.8 soc2012/gmiller/locking-head/sbin/mdconfig/mdconfig.c soc2012/gmiller/locking-head/sbin/mount/mount.8 soc2012/gmiller/locking-head/sbin/natd/natd.8 soc2012/gmiller/locking-head/sbin/ping/ping.c soc2012/gmiller/locking-head/sbin/restore/restore.8 soc2012/gmiller/locking-head/sbin/restore/utilities.c soc2012/gmiller/locking-head/sbin/setkey/setkey.8 soc2012/gmiller/locking-head/sbin/shutdown/shutdown.c soc2012/gmiller/locking-head/secure/lib/libcrypt/crypt-des.c soc2012/gmiller/locking-head/secure/lib/libcrypto/Makefile soc2012/gmiller/locking-head/secure/lib/libcrypto/Makefile.asm soc2012/gmiller/locking-head/secure/lib/libcrypto/Makefile.inc soc2012/gmiller/locking-head/secure/lib/libcrypto/Makefile.man soc2012/gmiller/locking-head/secure/lib/libcrypto/engines/Makefile soc2012/gmiller/locking-head/secure/lib/libcrypto/engines/Makefile.inc soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/bf-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/bf-686.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/bn-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/cast-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/co-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/crypt586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/des-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/md5-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/rc4-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/rc5-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/rmd-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/i386/sha1-586.s soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ASN1_STRING_length.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ASN1_STRING_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ASN1_generate_nconf.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_ctrl.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_f_base64.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_f_buffer.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_f_cipher.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_f_md.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_f_null.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_f_ssl.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_find_type.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_push.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_read.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_accept.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_bio.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_connect.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_fd.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_file.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_mem.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_null.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_s_socket.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_set_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BIO_should_retry.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_BLINDING_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_CTX_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_CTX_start.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_add.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_add_word.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_bn2bin.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_cmp.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_copy.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_generate_prime.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_mod_inverse.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_num_bytes.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_rand.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_set_bit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_swap.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/BN_zero.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CONF_modules_free.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CONF_modules_load_file.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DH_generate_key.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DH_generate_parameters.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DH_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DH_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DH_set_method.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DH_size.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_SIG_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_do_sign.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_dup_DH.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_generate_key.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_generate_parameters.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_set_method.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_sign.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/DSA_size.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_GET_LIB.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_clear_error.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_error_string.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_get_error.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_load_strings.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_print_errors.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_put_error.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_remove_state.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ERR_set_mark.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_BytesToKey.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_DigestInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_EncryptInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_OpenInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_SealInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_SignInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/EVP_VerifyInit.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OBJ_nid2obj.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OPENSSL_Applink.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OPENSSL_config.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS12_create.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS12_parse.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS7_decrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS7_encrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS7_sign.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/PKCS7_verify.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RAND_add.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RAND_bytes.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RAND_cleanup.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RAND_egd.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RAND_load_file.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RAND_set_rand_method.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_blinding_on.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_check_key.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_generate_key.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_print.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_private_encrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_public_encrypt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_set_method.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_sign.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/RSA_size.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_NAME_print_ex.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/X509_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/bio.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/blowfish.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/bn.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/bn_internal.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/buffer.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/crypto.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_DHparams.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_X509.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_X509_CRL.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_X509_NAME.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_X509_REQ.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/d2i_X509_SIG.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/des.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/dh.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/dsa.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ecdsa.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/engine.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/err.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/evp.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/hmac.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/lh_stats.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/lhash.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/md5.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/mdc2.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/pem.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/rand.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/rc4.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ripemd.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/rsa.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/sha.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/threads.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ui.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/ui_compat.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/man/x509.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-arm.h soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-ia64.h soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-mips.h soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-powerpc.h soc2012/gmiller/locking-head/secure/lib/libcrypto/opensslconf-sparc64.h soc2012/gmiller/locking-head/secure/lib/libssl/Makefile soc2012/gmiller/locking-head/secure/lib/libssl/Makefile.man soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CIPHER_get_name.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_add_session.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_ctrl.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_free.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_sess_number.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_sessions.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_mode.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_options.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_timeout.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_set_verify.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_CTX_use_certificate.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_SESSION_free.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_SESSION_get_time.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_accept.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_alert_type_string.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_clear.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_connect.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_do_handshake.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_free.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_SSL_CTX.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_ciphers.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_client_CA_list.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_current_cipher.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_default_timeout.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_error.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_ex_new_index.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_fd.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_peer_certificate.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_rbio.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_session.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_verify_result.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_get_version.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_library_init.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_load_client_CA_file.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_new.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_pending.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_read.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_rstate_string.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_session_reused.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_set_bio.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_set_connect_state.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_set_fd.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_set_session.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_set_shutdown.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_set_verify_result.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_shutdown.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_state_string.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_want.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/SSL_write.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/d2i_SSL_SESSION.3 (contents, props changed) soc2012/gmiller/locking-head/secure/lib/libssl/man/ssl.3 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/Makefile soc2012/gmiller/locking-head/secure/usr.bin/openssl/Makefile.man soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/CA.pl.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/asn1parse.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/ca.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/ciphers.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/crl.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/crl2pkcs7.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/dgst.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/dhparam.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/dsa.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/dsaparam.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/ec.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/ecparam.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/enc.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/errstr.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/gendsa.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/genrsa.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/nseq.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/ocsp.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/openssl.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/passwd.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/pkcs12.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/pkcs7.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/pkcs8.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/rand.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/req.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/rsa.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/rsautl.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/s_client.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/s_server.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/s_time.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/sess_id.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/smime.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/speed.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/spkac.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/verify.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/version.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/x509.1 (contents, props changed) soc2012/gmiller/locking-head/secure/usr.bin/openssl/man/x509v3_config.1 (contents, props changed) soc2012/gmiller/locking-head/share/Makefile soc2012/gmiller/locking-head/share/examples/Makefile soc2012/gmiller/locking-head/share/examples/csh/dot.cshrc soc2012/gmiller/locking-head/share/examples/etc/README.examples soc2012/gmiller/locking-head/share/examples/kld/dyn_sysctl/dyn_sysctl.c soc2012/gmiller/locking-head/share/examples/mdoc/example.4 soc2012/gmiller/locking-head/share/examples/pf/faq-example1 soc2012/gmiller/locking-head/share/examples/pf/pf.conf soc2012/gmiller/locking-head/share/examples/scsi_target/scsi_target.c soc2012/gmiller/locking-head/share/examples/ses/Makefile.inc soc2012/gmiller/locking-head/share/examples/ses/srcs/eltsub.c soc2012/gmiller/locking-head/share/examples/ses/srcs/getencstat.c soc2012/gmiller/locking-head/share/examples/ses/srcs/getnobj.c soc2012/gmiller/locking-head/share/examples/ses/srcs/getobjmap.c soc2012/gmiller/locking-head/share/examples/ses/srcs/getobjstat.c soc2012/gmiller/locking-head/share/examples/ses/srcs/inienc.c soc2012/gmiller/locking-head/share/examples/ses/srcs/sesd.c soc2012/gmiller/locking-head/share/examples/ses/srcs/setencstat.c soc2012/gmiller/locking-head/share/examples/ses/srcs/setobjstat.c soc2012/gmiller/locking-head/share/man/man4/Makefile soc2012/gmiller/locking-head/share/man/man4/acpi_asus.4 soc2012/gmiller/locking-head/share/man/man4/acpi_ibm.4 soc2012/gmiller/locking-head/share/man/man4/acpi_panasonic.4 soc2012/gmiller/locking-head/share/man/man4/ahci.4 soc2012/gmiller/locking-head/share/man/man4/ata.4 soc2012/gmiller/locking-head/share/man/man4/bce.4 soc2012/gmiller/locking-head/share/man/man4/carp.4 soc2012/gmiller/locking-head/share/man/man4/cpufreq.4 soc2012/gmiller/locking-head/share/man/man4/firewire.4 soc2012/gmiller/locking-head/share/man/man4/gpib.4 soc2012/gmiller/locking-head/share/man/man4/hptiop.4 soc2012/gmiller/locking-head/share/man/man4/hptrr.4 soc2012/gmiller/locking-head/share/man/man4/io.4 soc2012/gmiller/locking-head/share/man/man4/ip.4 soc2012/gmiller/locking-head/share/man/man4/mac_lomac.4 soc2012/gmiller/locking-head/share/man/man4/man4.i386/sbni.4 soc2012/gmiller/locking-head/share/man/man4/mps.4 soc2012/gmiller/locking-head/share/man/man4/mpt.4 soc2012/gmiller/locking-head/share/man/man4/mvs.4 soc2012/gmiller/locking-head/share/man/man4/netmap.4 soc2012/gmiller/locking-head/share/man/man4/ng_ksocket.4 soc2012/gmiller/locking-head/share/man/man4/ng_netflow.4 soc2012/gmiller/locking-head/share/man/man4/polling.4 soc2012/gmiller/locking-head/share/man/man4/run.4 soc2012/gmiller/locking-head/share/man/man4/sched_ule.4 soc2012/gmiller/locking-head/share/man/man4/scsi.4 soc2012/gmiller/locking-head/share/man/man4/siftr.4 soc2012/gmiller/locking-head/share/man/man4/siis.4 soc2012/gmiller/locking-head/share/man/man4/snd_hda.4 soc2012/gmiller/locking-head/share/man/man4/ugen.4 soc2012/gmiller/locking-head/share/man/man4/umodem.4 soc2012/gmiller/locking-head/share/man/man4/uplcom.4 soc2012/gmiller/locking-head/share/man/man4/usb.4 soc2012/gmiller/locking-head/share/man/man4/uslcom.4 soc2012/gmiller/locking-head/share/man/man4/vlan.4 soc2012/gmiller/locking-head/share/man/man4/witness.4 soc2012/gmiller/locking-head/share/man/man5/Makefile soc2012/gmiller/locking-head/share/man/man5/devfs.conf.5 soc2012/gmiller/locking-head/share/man/man5/devfs.rules.5 soc2012/gmiller/locking-head/share/man/man5/make.conf.5 soc2012/gmiller/locking-head/share/man/man5/moduli.5 soc2012/gmiller/locking-head/share/man/man5/passwd.5 soc2012/gmiller/locking-head/share/man/man5/periodic.conf.5 soc2012/gmiller/locking-head/share/man/man5/rc.conf.5 soc2012/gmiller/locking-head/share/man/man5/src.conf.5 soc2012/gmiller/locking-head/share/man/man7/build.7 soc2012/gmiller/locking-head/share/man/man7/c99.7 soc2012/gmiller/locking-head/share/man/man7/development.7 soc2012/gmiller/locking-head/share/man/man7/release.7 soc2012/gmiller/locking-head/share/man/man8/picobsd.8 soc2012/gmiller/locking-head/share/man/man8/rc.8 soc2012/gmiller/locking-head/share/man/man9/BUF_ISLOCKED.9 soc2012/gmiller/locking-head/share/man/man9/DB_COMMAND.9 soc2012/gmiller/locking-head/share/man/man9/EVENTHANDLER.9 soc2012/gmiller/locking-head/share/man/man9/VOP_GETEXTATTR.9 soc2012/gmiller/locking-head/share/man/man9/VOP_GETPAGES.9 soc2012/gmiller/locking-head/share/man/man9/VOP_GETVOBJECT.9 soc2012/gmiller/locking-head/share/man/man9/VOP_SETEXTATTR.9 soc2012/gmiller/locking-head/share/man/man9/acl.9 soc2012/gmiller/locking-head/share/man/man9/bpf.9 soc2012/gmiller/locking-head/share/man/man9/bus_generic_print_child.9 soc2012/gmiller/locking-head/share/man/man9/bus_release_resource.9 soc2012/gmiller/locking-head/share/man/man9/bus_space.9 soc2012/gmiller/locking-head/share/man/man9/byteorder.9 soc2012/gmiller/locking-head/share/man/man9/cd.9 soc2012/gmiller/locking-head/share/man/man9/devclass_get_maxunit.9 soc2012/gmiller/locking-head/share/man/man9/device_find_child.9 soc2012/gmiller/locking-head/share/man/man9/disk.9 soc2012/gmiller/locking-head/share/man/man9/firmware.9 soc2012/gmiller/locking-head/share/man/man9/hashinit.9 soc2012/gmiller/locking-head/share/man/man9/ieee80211_node.9 soc2012/gmiller/locking-head/share/man/man9/ieee80211_proto.9 soc2012/gmiller/locking-head/share/man/man9/ifnet.9 soc2012/gmiller/locking-head/share/man/man9/kernel_mount.9 soc2012/gmiller/locking-head/share/man/man9/kqueue.9 soc2012/gmiller/locking-head/share/man/man9/lock.9 soc2012/gmiller/locking-head/share/man/man9/locking.9 soc2012/gmiller/locking-head/share/man/man9/malloc.9 soc2012/gmiller/locking-head/share/man/man9/mbuf.9 soc2012/gmiller/locking-head/share/man/man9/mod_cc.9 soc2012/gmiller/locking-head/share/man/man9/netisr.9 soc2012/gmiller/locking-head/share/man/man9/pci.9 soc2012/gmiller/locking-head/share/man/man9/rmlock.9 soc2012/gmiller/locking-head/share/man/man9/rtalloc.9 soc2012/gmiller/locking-head/share/man/man9/rwlock.9 soc2012/gmiller/locking-head/share/man/man9/spl.9 soc2012/gmiller/locking-head/share/man/man9/sysctl.9 soc2012/gmiller/locking-head/share/man/man9/taskqueue.9 soc2012/gmiller/locking-head/share/man/man9/usbdi.9 soc2012/gmiller/locking-head/share/man/man9/vm_page_aflag.9 soc2012/gmiller/locking-head/share/misc/bsd-family-tree soc2012/gmiller/locking-head/share/misc/committers-doc.dot soc2012/gmiller/locking-head/share/misc/committers-ports.dot soc2012/gmiller/locking-head/share/misc/committers-src.dot soc2012/gmiller/locking-head/share/misc/organization.dot soc2012/gmiller/locking-head/share/mk/bsd.README soc2012/gmiller/locking-head/share/mk/bsd.crunchgen.mk soc2012/gmiller/locking-head/share/mk/bsd.lib.mk soc2012/gmiller/locking-head/share/mk/bsd.libnames.mk soc2012/gmiller/locking-head/share/mk/bsd.own.mk soc2012/gmiller/locking-head/share/mk/bsd.sys.mk soc2012/gmiller/locking-head/share/syscons/keymaps/INDEX.keymaps soc2012/gmiller/locking-head/sys/amd64/acpica/acpi_machdep.c soc2012/gmiller/locking-head/sys/amd64/acpica/acpi_wakecode.S soc2012/gmiller/locking-head/sys/amd64/amd64/cpu_switch.S soc2012/gmiller/locking-head/sys/amd64/amd64/db_disasm.c soc2012/gmiller/locking-head/sys/amd64/amd64/elf_machdep.c soc2012/gmiller/locking-head/sys/amd64/amd64/fpu.c soc2012/gmiller/locking-head/sys/amd64/amd64/genassym.c soc2012/gmiller/locking-head/sys/amd64/amd64/initcpu.c soc2012/gmiller/locking-head/sys/amd64/amd64/machdep.c soc2012/gmiller/locking-head/sys/amd64/amd64/mem.c soc2012/gmiller/locking-head/sys/amd64/amd64/minidump_machdep.c soc2012/gmiller/locking-head/sys/amd64/amd64/mp_machdep.c soc2012/gmiller/locking-head/sys/amd64/amd64/pmap.c soc2012/gmiller/locking-head/sys/amd64/amd64/ptrace_machdep.c soc2012/gmiller/locking-head/sys/amd64/amd64/trap.c soc2012/gmiller/locking-head/sys/amd64/amd64/vm_machdep.c soc2012/gmiller/locking-head/sys/amd64/conf/GENERIC soc2012/gmiller/locking-head/sys/amd64/include/atomic.h soc2012/gmiller/locking-head/sys/amd64/include/cpufunc.h soc2012/gmiller/locking-head/sys/amd64/include/elf.h soc2012/gmiller/locking-head/sys/amd64/include/fpu.h soc2012/gmiller/locking-head/sys/amd64/include/in_cksum.h soc2012/gmiller/locking-head/sys/amd64/include/md_var.h soc2012/gmiller/locking-head/sys/amd64/include/pcb.h soc2012/gmiller/locking-head/sys/amd64/include/pcpu.h soc2012/gmiller/locking-head/sys/amd64/include/pmap.h soc2012/gmiller/locking-head/sys/amd64/include/smp.h soc2012/gmiller/locking-head/sys/amd64/linux32/linux32_proto.h soc2012/gmiller/locking-head/sys/amd64/linux32/linux32_syscall.h soc2012/gmiller/locking-head/sys/amd64/linux32/linux32_syscalls.c soc2012/gmiller/locking-head/sys/amd64/linux32/linux32_sysent.c soc2012/gmiller/locking-head/sys/amd64/linux32/linux32_systrace_args.c soc2012/gmiller/locking-head/sys/amd64/linux32/syscalls.master soc2012/gmiller/locking-head/sys/arm/arm/bcopyinout.S soc2012/gmiller/locking-head/sys/arm/arm/bcopyinout_xscale.S soc2012/gmiller/locking-head/sys/arm/arm/bootconfig.c soc2012/gmiller/locking-head/sys/arm/arm/busdma_machdep.c soc2012/gmiller/locking-head/sys/arm/arm/cpufunc.c soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_arm10.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_arm11.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_arm7tdmi.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_arm8.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_arm9.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_armv4.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_armv5.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_sa1.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_xscale.S soc2012/gmiller/locking-head/sys/arm/arm/cpufunc_asm_xscale_c3.S soc2012/gmiller/locking-head/sys/arm/arm/db_disasm.c soc2012/gmiller/locking-head/sys/arm/arm/db_interface.c soc2012/gmiller/locking-head/sys/arm/arm/db_trace.c soc2012/gmiller/locking-head/sys/arm/arm/disassem.c soc2012/gmiller/locking-head/sys/arm/arm/dump_machdep.c soc2012/gmiller/locking-head/sys/arm/arm/elf_trampoline.c soc2012/gmiller/locking-head/sys/arm/arm/exception.S soc2012/gmiller/locking-head/sys/arm/arm/gdb_machdep.c soc2012/gmiller/locking-head/sys/arm/arm/in_cksum.c soc2012/gmiller/locking-head/sys/arm/arm/intr.c soc2012/gmiller/locking-head/sys/arm/arm/irq_dispatch.S soc2012/gmiller/locking-head/sys/arm/arm/locore.S soc2012/gmiller/locking-head/sys/arm/arm/machdep.c soc2012/gmiller/locking-head/sys/arm/arm/mem.c soc2012/gmiller/locking-head/sys/arm/arm/nexus.c soc2012/gmiller/locking-head/sys/arm/arm/pmap.c soc2012/gmiller/locking-head/sys/arm/arm/support.S soc2012/gmiller/locking-head/sys/arm/arm/swtch.S soc2012/gmiller/locking-head/sys/arm/arm/sys_machdep.c soc2012/gmiller/locking-head/sys/arm/arm/trap.c soc2012/gmiller/locking-head/sys/arm/arm/undefined.c soc2012/gmiller/locking-head/sys/arm/arm/vectors.S soc2012/gmiller/locking-head/sys/arm/arm/vm_machdep.c soc2012/gmiller/locking-head/sys/arm/at91/at91.c soc2012/gmiller/locking-head/sys/arm/at91/at91_machdep.c soc2012/gmiller/locking-head/sys/arm/at91/at91_mci.c soc2012/gmiller/locking-head/sys/arm/at91/at91_pio.c soc2012/gmiller/locking-head/sys/arm/at91/at91_pit.c soc2012/gmiller/locking-head/sys/arm/at91/at91_pitreg.h soc2012/gmiller/locking-head/sys/arm/at91/at91_pmc.c soc2012/gmiller/locking-head/sys/arm/at91/at91_pmcreg.h soc2012/gmiller/locking-head/sys/arm/at91/at91_pmcvar.h soc2012/gmiller/locking-head/sys/arm/at91/at91_reset.S soc2012/gmiller/locking-head/sys/arm/at91/at91_rst.c soc2012/gmiller/locking-head/sys/arm/at91/at91_rstreg.h soc2012/gmiller/locking-head/sys/arm/at91/at91_spi.c soc2012/gmiller/locking-head/sys/arm/at91/at91_spireg.h soc2012/gmiller/locking-head/sys/arm/at91/at91_ssc.c soc2012/gmiller/locking-head/sys/arm/at91/at91_st.c soc2012/gmiller/locking-head/sys/arm/at91/at91_streg.h soc2012/gmiller/locking-head/sys/arm/at91/at91_twi.c soc2012/gmiller/locking-head/sys/arm/at91/at91_wdtreg.h soc2012/gmiller/locking-head/sys/arm/at91/at91board.h soc2012/gmiller/locking-head/sys/arm/at91/at91reg.h soc2012/gmiller/locking-head/sys/arm/at91/at91rm9200.c soc2012/gmiller/locking-head/sys/arm/at91/at91rm92reg.h soc2012/gmiller/locking-head/sys/arm/at91/at91sam9260.c soc2012/gmiller/locking-head/sys/arm/at91/at91sam9260reg.h soc2012/gmiller/locking-head/sys/arm/at91/at91sam9g20.c soc2012/gmiller/locking-head/sys/arm/at91/at91sam9g20reg.h soc2012/gmiller/locking-head/sys/arm/at91/at91var.h soc2012/gmiller/locking-head/sys/arm/at91/board_bwct.c soc2012/gmiller/locking-head/sys/arm/at91/board_ethernut5.c soc2012/gmiller/locking-head/sys/arm/at91/board_hl200.c soc2012/gmiller/locking-head/sys/arm/at91/board_hl201.c soc2012/gmiller/locking-head/sys/arm/at91/board_kb920x.c soc2012/gmiller/locking-head/sys/arm/at91/board_qila9g20.c soc2012/gmiller/locking-head/sys/arm/at91/board_sam9g20ek.c soc2012/gmiller/locking-head/sys/arm/at91/board_tsc4370.c soc2012/gmiller/locking-head/sys/arm/at91/files.at91 soc2012/gmiller/locking-head/sys/arm/at91/if_ate.c soc2012/gmiller/locking-head/sys/arm/at91/if_macb.c soc2012/gmiller/locking-head/sys/arm/at91/std.at91 soc2012/gmiller/locking-head/sys/arm/at91/std.at91sam9 soc2012/gmiller/locking-head/sys/arm/at91/std.ethernut5 soc2012/gmiller/locking-head/sys/arm/at91/std.hl200 soc2012/gmiller/locking-head/sys/arm/at91/std.hl201 soc2012/gmiller/locking-head/sys/arm/at91/std.kb920x soc2012/gmiller/locking-head/sys/arm/at91/std.qila9g20 soc2012/gmiller/locking-head/sys/arm/at91/std.sam9g20ek soc2012/gmiller/locking-head/sys/arm/at91/uart_bus_at91usart.c soc2012/gmiller/locking-head/sys/arm/conf/AVILA soc2012/gmiller/locking-head/sys/arm/conf/BWCT soc2012/gmiller/locking-head/sys/arm/conf/CAMBRIA soc2012/gmiller/locking-head/sys/arm/conf/CNS11XXNAS soc2012/gmiller/locking-head/sys/arm/conf/CRB soc2012/gmiller/locking-head/sys/arm/conf/DB-78XXX soc2012/gmiller/locking-head/sys/arm/conf/DB-88F6XXX soc2012/gmiller/locking-head/sys/arm/conf/EP80219 soc2012/gmiller/locking-head/sys/arm/conf/ETHERNUT5 soc2012/gmiller/locking-head/sys/arm/conf/ETHERNUT5.hints soc2012/gmiller/locking-head/sys/arm/conf/GUMSTIX soc2012/gmiller/locking-head/sys/arm/conf/GUMSTIX-QEMU soc2012/gmiller/locking-head/sys/arm/conf/HL200 soc2012/gmiller/locking-head/sys/arm/conf/HL201 soc2012/gmiller/locking-head/sys/arm/conf/IQ31244 soc2012/gmiller/locking-head/sys/arm/conf/KB920X soc2012/gmiller/locking-head/sys/arm/conf/LN2410SBC soc2012/gmiller/locking-head/sys/arm/conf/NSLU soc2012/gmiller/locking-head/sys/arm/conf/QILA9G20 soc2012/gmiller/locking-head/sys/arm/conf/QILA9G20.hints soc2012/gmiller/locking-head/sys/arm/conf/SAM9G20EK soc2012/gmiller/locking-head/sys/arm/conf/SAM9G20EK.hints soc2012/gmiller/locking-head/sys/arm/conf/SHEEVAPLUG soc2012/gmiller/locking-head/sys/arm/conf/SIMICS soc2012/gmiller/locking-head/sys/arm/econa/econa.c soc2012/gmiller/locking-head/sys/arm/econa/econa_machdep.c soc2012/gmiller/locking-head/sys/arm/include/_stdint.h soc2012/gmiller/locking-head/sys/arm/include/_types.h soc2012/gmiller/locking-head/sys/arm/include/armreg.h soc2012/gmiller/locking-head/sys/arm/include/asmacros.h soc2012/gmiller/locking-head/sys/arm/include/atomic.h soc2012/gmiller/locking-head/sys/arm/include/blockio.h soc2012/gmiller/locking-head/sys/arm/include/cpu.h soc2012/gmiller/locking-head/sys/arm/include/cpufunc.h soc2012/gmiller/locking-head/sys/arm/include/elf.h soc2012/gmiller/locking-head/sys/arm/include/endian.h soc2012/gmiller/locking-head/sys/arm/include/fdt.h soc2012/gmiller/locking-head/sys/arm/include/fp.h soc2012/gmiller/locking-head/sys/arm/include/frame.h soc2012/gmiller/locking-head/sys/arm/include/ieee.h soc2012/gmiller/locking-head/sys/arm/include/in_cksum.h soc2012/gmiller/locking-head/sys/arm/include/intr.h soc2012/gmiller/locking-head/sys/arm/include/katelib.h soc2012/gmiller/locking-head/sys/arm/include/kdb.h soc2012/gmiller/locking-head/sys/arm/include/machdep.h soc2012/gmiller/locking-head/sys/arm/include/param.h soc2012/gmiller/locking-head/sys/arm/include/pmap.h soc2012/gmiller/locking-head/sys/arm/include/pmc_mdep.h soc2012/gmiller/locking-head/sys/arm/include/profile.h soc2012/gmiller/locking-head/sys/arm/include/pte.h soc2012/gmiller/locking-head/sys/arm/include/resource.h soc2012/gmiller/locking-head/sys/arm/include/stack.h soc2012/gmiller/locking-head/sys/arm/include/vmparam.h soc2012/gmiller/locking-head/sys/arm/mv/common.c soc2012/gmiller/locking-head/sys/arm/mv/discovery/discovery.c soc2012/gmiller/locking-head/sys/arm/mv/files.mv soc2012/gmiller/locking-head/sys/arm/mv/gpio.c soc2012/gmiller/locking-head/sys/arm/mv/ic.c soc2012/gmiller/locking-head/sys/arm/mv/kirkwood/kirkwood.c soc2012/gmiller/locking-head/sys/arm/mv/mv_machdep.c soc2012/gmiller/locking-head/sys/arm/mv/mv_sata.c soc2012/gmiller/locking-head/sys/arm/mv/mvreg.h soc2012/gmiller/locking-head/sys/arm/mv/mvwin.h soc2012/gmiller/locking-head/sys/arm/mv/std.mv soc2012/gmiller/locking-head/sys/arm/s3c2xx0/s3c2410reg.h soc2012/gmiller/locking-head/sys/arm/s3c2xx0/s3c2440reg.h soc2012/gmiller/locking-head/sys/arm/s3c2xx0/s3c24x0.c soc2012/gmiller/locking-head/sys/arm/s3c2xx0/s3c24x0_machdep.c soc2012/gmiller/locking-head/sys/arm/s3c2xx0/s3c24x0reg.h soc2012/gmiller/locking-head/sys/arm/sa11x0/assabet_machdep.c soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0.c soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0_gpioreg.h soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0_io_asm.S soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0_irq.S soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0_ost.c soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0_ostreg.h soc2012/gmiller/locking-head/sys/arm/sa11x0/sa11x0_var.h soc2012/gmiller/locking-head/sys/arm/sa11x0/uart_dev_sa1110.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/ep80219_machdep.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321_aau.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321_dma.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321_intr.h soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321_pci.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321_space.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321_timer.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/i80321reg.h soc2012/gmiller/locking-head/sys/arm/xscale/i80321/iq31244_7seg.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/iq31244_machdep.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/iq80321.c soc2012/gmiller/locking-head/sys/arm/xscale/i80321/obio.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/crb_machdep.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/i81342.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/i81342_mcu.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/i81342_pci.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/i81342_space.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/i81342reg.h soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/iq81342_7seg.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/obio.c soc2012/gmiller/locking-head/sys/arm/xscale/i8134x/uart_cpu_i81342.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/avila_ata.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/avila_gpio.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/avila_machdep.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/cambria_exp_space.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/if_npe.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/if_npereg.h soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_iic.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_npe.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_npereg.h soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_pci.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_pci_space.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_qmgr.c soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425_qmgr.h soc2012/gmiller/locking-head/sys/arm/xscale/ixp425/ixp425reg.h soc2012/gmiller/locking-head/sys/arm/xscale/pxa/if_smc_smi.c soc2012/gmiller/locking-head/sys/arm/xscale/pxa/pxa_machdep.c soc2012/gmiller/locking-head/sys/arm/xscale/pxa/pxa_obio.c soc2012/gmiller/locking-head/sys/arm/xscale/pxa/pxareg.h soc2012/gmiller/locking-head/sys/arm/xscale/std.xscale soc2012/gmiller/locking-head/sys/boot/arm/at91/boot0spi/main.c soc2012/gmiller/locking-head/sys/boot/arm/at91/boot2/boot2.c soc2012/gmiller/locking-head/sys/boot/arm/at91/bootspi/ee.c soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/Makefile soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/at91rm9200.h soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/eeprom.c soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/emac_init.c soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/lib_AT91RM9200.h soc2012/gmiller/locking-head/sys/boot/arm/at91/libat91/spi_flash.c soc2012/gmiller/locking-head/sys/boot/arm/at91/linker.cfg soc2012/gmiller/locking-head/sys/boot/arm/ixp425/boot2/boot2.c soc2012/gmiller/locking-head/sys/boot/arm/uboot/Makefile soc2012/gmiller/locking-head/sys/boot/arm/uboot/conf.c soc2012/gmiller/locking-head/sys/boot/arm/uboot/ldscript.arm soc2012/gmiller/locking-head/sys/boot/arm/uboot/version soc2012/gmiller/locking-head/sys/boot/common/Makefile.inc soc2012/gmiller/locking-head/sys/boot/common/disk.c soc2012/gmiller/locking-head/sys/boot/common/disk.h soc2012/gmiller/locking-head/sys/boot/common/load_elf.c soc2012/gmiller/locking-head/sys/boot/common/load_elf_obj.c soc2012/gmiller/locking-head/sys/boot/common/loader.8 soc2012/gmiller/locking-head/sys/boot/common/ufsread.c soc2012/gmiller/locking-head/sys/boot/fdt/dts/db78100.dts soc2012/gmiller/locking-head/sys/boot/fdt/dts/db88f6281.dts soc2012/gmiller/locking-head/sys/boot/fdt/dts/p3041ds.dts soc2012/gmiller/locking-head/sys/boot/fdt/dts/sheevaplug.dts soc2012/gmiller/locking-head/sys/boot/fdt/fdt_loader_cmd.c soc2012/gmiller/locking-head/sys/boot/ficl/Makefile soc2012/gmiller/locking-head/sys/boot/forth/beastie.4th soc2012/gmiller/locking-head/sys/boot/forth/beastie.4th.8 soc2012/gmiller/locking-head/sys/boot/forth/brand.4th soc2012/gmiller/locking-head/sys/boot/forth/brand.4th.8 soc2012/gmiller/locking-head/sys/boot/forth/check-password.4th soc2012/gmiller/locking-head/sys/boot/forth/check-password.4th.8 soc2012/gmiller/locking-head/sys/boot/forth/color.4th soc2012/gmiller/locking-head/sys/boot/forth/color.4th.8 soc2012/gmiller/locking-head/sys/boot/forth/delay.4th soc2012/gmiller/locking-head/sys/boot/forth/delay.4th.8 soc2012/gmiller/locking-head/sys/boot/forth/menu-commands.4th soc2012/gmiller/locking-head/sys/boot/forth/menu.4th soc2012/gmiller/locking-head/sys/boot/forth/menu.4th.8 soc2012/gmiller/locking-head/sys/boot/forth/shortcuts.4th soc2012/gmiller/locking-head/sys/boot/forth/version.4th soc2012/gmiller/locking-head/sys/boot/forth/version.4th.8 soc2012/gmiller/locking-head/sys/boot/i386/boot2/boot2.c soc2012/gmiller/locking-head/sys/boot/i386/gptboot/gptboot.c soc2012/gmiller/locking-head/sys/boot/i386/libi386/Makefile soc2012/gmiller/locking-head/sys/boot/i386/libi386/biosdisk.c soc2012/gmiller/locking-head/sys/boot/i386/libi386/biospnp.c soc2012/gmiller/locking-head/sys/boot/i386/libi386/devicename.c soc2012/gmiller/locking-head/sys/boot/i386/libi386/libi386.h soc2012/gmiller/locking-head/sys/boot/i386/loader/Makefile soc2012/gmiller/locking-head/sys/boot/i386/loader/conf.c soc2012/gmiller/locking-head/sys/boot/i386/loader/main.c soc2012/gmiller/locking-head/sys/boot/i386/pmbr/pmbr.s soc2012/gmiller/locking-head/sys/boot/ofw/libofw/ofw_disk.c soc2012/gmiller/locking-head/sys/boot/pc98/boot2/boot2.c soc2012/gmiller/locking-head/sys/boot/pc98/btx/btxldr/btxldr.S soc2012/gmiller/locking-head/sys/boot/pc98/btx/lib/btxcsu.S soc2012/gmiller/locking-head/sys/boot/pc98/cdboot/cdboot.S soc2012/gmiller/locking-head/sys/boot/pc98/libpc98/Makefile soc2012/gmiller/locking-head/sys/boot/powerpc/boot1.chrp/boot1.c soc2012/gmiller/locking-head/sys/boot/sparc64/boot1/boot1.c soc2012/gmiller/locking-head/sys/boot/sparc64/loader/main.c soc2012/gmiller/locking-head/sys/boot/uboot/common/metadata.c soc2012/gmiller/locking-head/sys/boot/uboot/lib/api_public.h soc2012/gmiller/locking-head/sys/boot/uboot/lib/copy.c soc2012/gmiller/locking-head/sys/boot/uboot/lib/elf_freebsd.c soc2012/gmiller/locking-head/sys/boot/uboot/lib/glue.c soc2012/gmiller/locking-head/sys/boot/uboot/lib/libuboot.h soc2012/gmiller/locking-head/sys/boot/userboot/libstand/Makefile soc2012/gmiller/locking-head/sys/boot/userboot/test/test.c soc2012/gmiller/locking-head/sys/boot/userboot/userboot.h soc2012/gmiller/locking-head/sys/boot/userboot/userboot/Makefile soc2012/gmiller/locking-head/sys/boot/userboot/userboot/bootinfo32.c soc2012/gmiller/locking-head/sys/boot/userboot/userboot/copy.c soc2012/gmiller/locking-head/sys/boot/userboot/userboot/devicename.c soc2012/gmiller/locking-head/sys/boot/userboot/userboot/main.c soc2012/gmiller/locking-head/sys/boot/userboot/userboot/userboot_disk.c soc2012/gmiller/locking-head/sys/boot/zfs/Makefile soc2012/gmiller/locking-head/sys/boot/zfs/zfs.c soc2012/gmiller/locking-head/sys/boot/zfs/zfsimpl.c soc2012/gmiller/locking-head/sys/cam/ata/ata_all.c soc2012/gmiller/locking-head/sys/cam/ata/ata_all.h soc2012/gmiller/locking-head/sys/cam/ata/ata_da.c soc2012/gmiller/locking-head/sys/cam/ata/ata_pmp.c soc2012/gmiller/locking-head/sys/cam/ata/ata_xpt.c soc2012/gmiller/locking-head/sys/cam/cam.h soc2012/gmiller/locking-head/sys/cam/cam_ccb.h soc2012/gmiller/locking-head/sys/cam/cam_debug.h soc2012/gmiller/locking-head/sys/cam/cam_periph.c soc2012/gmiller/locking-head/sys/cam/cam_periph.h soc2012/gmiller/locking-head/sys/cam/cam_xpt.c soc2012/gmiller/locking-head/sys/cam/cam_xpt.h soc2012/gmiller/locking-head/sys/cam/cam_xpt_periph.h soc2012/gmiller/locking-head/sys/cam/ctl/ctl.c soc2012/gmiller/locking-head/sys/cam/ctl/ctl_backend.c soc2012/gmiller/locking-head/sys/cam/ctl/ctl_frontend_cam_sim.c soc2012/gmiller/locking-head/sys/cam/ctl/ctl_frontend_internal.c soc2012/gmiller/locking-head/sys/cam/ctl/scsi_ctl.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_all.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_all.h soc2012/gmiller/locking-head/sys/cam/scsi/scsi_cd.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_ch.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_da.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_da.h soc2012/gmiller/locking-head/sys/cam/scsi/scsi_pass.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_pt.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_sa.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_ses.h soc2012/gmiller/locking-head/sys/cam/scsi/scsi_sg.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_target.c soc2012/gmiller/locking-head/sys/cam/scsi/scsi_xpt.c soc2012/gmiller/locking-head/sys/cddl/boot/zfs/zfsimpl.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/ (props changed) soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/Makefile.files soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h soc2012/gmiller/locking-head/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h soc2012/gmiller/locking-head/sys/cddl/dev/dtrace/amd64/dis_tables.c soc2012/gmiller/locking-head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c soc2012/gmiller/locking-head/sys/cddl/dev/dtrace/i386/dis_tables.c soc2012/gmiller/locking-head/sys/cddl/dev/dtrace/i386/dtrace_subr.c soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32.h soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32_misc.c soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32_proto.h soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32_syscall.h soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32_syscalls.c soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32_sysent.c soc2012/gmiller/locking-head/sys/compat/freebsd32/freebsd32_systrace_args.c soc2012/gmiller/locking-head/sys/compat/freebsd32/syscalls.master soc2012/gmiller/locking-head/sys/compat/ia32/ia32_sysvec.c soc2012/gmiller/locking-head/sys/compat/ia32/ia32_util.h soc2012/gmiller/locking-head/sys/compat/linux/linux_file.c soc2012/gmiller/locking-head/sys/compat/ndis/subr_ntoskrnl.c soc2012/gmiller/locking-head/sys/conf/Makefile.arm soc2012/gmiller/locking-head/sys/conf/NOTES soc2012/gmiller/locking-head/sys/conf/files soc2012/gmiller/locking-head/sys/conf/files.amd64 soc2012/gmiller/locking-head/sys/conf/files.arm soc2012/gmiller/locking-head/sys/conf/files.i386 soc2012/gmiller/locking-head/sys/conf/files.ia64 soc2012/gmiller/locking-head/sys/conf/files.mips soc2012/gmiller/locking-head/sys/conf/files.powerpc soc2012/gmiller/locking-head/sys/conf/files.sparc64 soc2012/gmiller/locking-head/sys/conf/kern.post.mk soc2012/gmiller/locking-head/sys/conf/kmod.mk soc2012/gmiller/locking-head/sys/conf/options soc2012/gmiller/locking-head/sys/conf/options.arm soc2012/gmiller/locking-head/sys/conf/options.powerpc soc2012/gmiller/locking-head/sys/contrib/dev/acpica/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/acpica_prep.sh soc2012/gmiller/locking-head/sys/contrib/dev/acpica/changes.txt (contents, props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/common/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/common/adfile.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/common/adwalk.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/common/dmextern.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/common/dmrestag.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslcompile.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslcompiler.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslcompiler.l soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslcompiler.y soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslerror.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslfiles.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/asllookup.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslmain.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslmap.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslmessages.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslstartup.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslsupport.l soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/aslutils.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/dtio.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/dttemplate.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/prscan.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/compiler/prutils.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/dbcmds.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/dbdisply.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/dbexec.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/dbfileio.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/dbinput.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/debugger/dbutils.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/disassembler/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/disassembler/dmwalk.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/dispatcher/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/events/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/events/evgpe.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/events/evgpeutil.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/events/evxface.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/events/evxfgpe.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/executer/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/executer/exconfig.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/executer/exprep.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/executer/exresolv.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/executer/exstore.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/executer/exutils.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/hardware/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/hardware/hwsleep.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/namespace/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/namespace/nspredef.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/parser/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/parser/psxface.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/resources/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/resources/rscreate.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/resources/rsutils.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/tbfadt.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/tbinstal.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/tbutils.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/tbxface.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/tables/tbxfroot.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utdecode.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utglobal.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utmisc.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utobject.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utresrc.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/components/utilities/utxferror.c soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acdebug.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acdisasm.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acexcep.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acglobal.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/aclocal.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acmacros.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acobject.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acoutput.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acpiosxf.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acpixf.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acpredef.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/actbl1.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/actypes.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/acutils.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/include/platform/acenv.h soc2012/gmiller/locking-head/sys/contrib/dev/acpica/os_specific/ (props changed) soc2012/gmiller/locking-head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c soc2012/gmiller/locking-head/sys/contrib/libfdt/ (props changed) soc2012/gmiller/locking-head/sys/contrib/libfdt/fdt.c soc2012/gmiller/locking-head/sys/contrib/libfdt/fdt_ro.c soc2012/gmiller/locking-head/sys/contrib/libfdt/fdt_rw.c soc2012/gmiller/locking-head/sys/contrib/libfdt/libfdt.h soc2012/gmiller/locking-head/sys/contrib/libfdt/libfdt_env.h soc2012/gmiller/locking-head/sys/contrib/libfdt/libfdt_internal.h soc2012/gmiller/locking-head/sys/contrib/pf/net/pf.c soc2012/gmiller/locking-head/sys/contrib/pf/net/pf_if.c soc2012/gmiller/locking-head/sys/contrib/pf/net/pf_ioctl.c soc2012/gmiller/locking-head/sys/contrib/pf/net/pf_table.c soc2012/gmiller/locking-head/sys/contrib/pf/net/pfvar.h soc2012/gmiller/locking-head/sys/contrib/rdma/krping/krping.c soc2012/gmiller/locking-head/sys/contrib/rdma/krping/krping.h soc2012/gmiller/locking-head/sys/contrib/rdma/krping/krping_dev.c soc2012/gmiller/locking-head/sys/contrib/rdma/rdma_addr.c soc2012/gmiller/locking-head/sys/contrib/rdma/rdma_cache.c soc2012/gmiller/locking-head/sys/dev/aac/aac_disk.c soc2012/gmiller/locking-head/sys/dev/acpi_support/acpi_ibm.c soc2012/gmiller/locking-head/sys/dev/acpica/Osd/OsdSchedule.c soc2012/gmiller/locking-head/sys/dev/acpica/Osd/OsdSynch.c soc2012/gmiller/locking-head/sys/dev/acpica/acpi.c soc2012/gmiller/locking-head/sys/dev/acpica/acpi_cpu.c soc2012/gmiller/locking-head/sys/dev/acpica/acpi_ec.c soc2012/gmiller/locking-head/sys/dev/acpica/acpi_powerres.c soc2012/gmiller/locking-head/sys/dev/acpica/acpi_smbat.c soc2012/gmiller/locking-head/sys/dev/acpica/acpi_video.c soc2012/gmiller/locking-head/sys/dev/acpica/acpivar.h soc2012/gmiller/locking-head/sys/dev/adb/adb_kbd.c soc2012/gmiller/locking-head/sys/dev/ae/if_ae.c soc2012/gmiller/locking-head/sys/dev/agp/agp.c soc2012/gmiller/locking-head/sys/dev/agp/agp_i810.c soc2012/gmiller/locking-head/sys/dev/agp/agp_if.m soc2012/gmiller/locking-head/sys/dev/agp/agppriv.h soc2012/gmiller/locking-head/sys/dev/agp/agpreg.h soc2012/gmiller/locking-head/sys/dev/agp/agpvar.h soc2012/gmiller/locking-head/sys/dev/ahci/ahci.c soc2012/gmiller/locking-head/sys/dev/ahci/ahci.h soc2012/gmiller/locking-head/sys/dev/aic7xxx/aic79xx.c soc2012/gmiller/locking-head/sys/dev/aic7xxx/aic79xx_osm.c soc2012/gmiller/locking-head/sys/dev/aic7xxx/aic7xxx.c soc2012/gmiller/locking-head/sys/dev/aic7xxx/aic7xxx_osm.c soc2012/gmiller/locking-head/sys/dev/aic7xxx/aic_osm_lib.c soc2012/gmiller/locking-head/sys/dev/aic7xxx/aicasm/Makefile soc2012/gmiller/locking-head/sys/dev/aic7xxx/aicasm/aicasm.c soc2012/gmiller/locking-head/sys/dev/ata/ata-all.c soc2012/gmiller/locking-head/sys/dev/ata/ata-lowlevel.c soc2012/gmiller/locking-head/sys/dev/ata/chipsets/ata-ite.c soc2012/gmiller/locking-head/sys/dev/ata/chipsets/ata-via.c soc2012/gmiller/locking-head/sys/dev/ath/ah_osdep.c soc2012/gmiller/locking-head/sys/dev/ath/ah_osdep.h soc2012/gmiller/locking-head/sys/dev/ath/ath_dfs/null/dfs_null.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ah.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ah.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ah_debug.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ah_desc.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ah_devid.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ah_internal.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5210/ar5210.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5211/ar5211.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5212/ar5212.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9002/ar9285.h soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c soc2012/gmiller/locking-head/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c soc2012/gmiller/locking-head/sys/dev/ath/ath_rate/amrr/amrr.c soc2012/gmiller/locking-head/sys/dev/ath/ath_rate/onoe/onoe.c soc2012/gmiller/locking-head/sys/dev/ath/ath_rate/sample/sample.c soc2012/gmiller/locking-head/sys/dev/ath/ath_rate/sample/sample.h soc2012/gmiller/locking-head/sys/dev/ath/if_ath.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_ahb.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_debug.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_debug.h soc2012/gmiller/locking-head/sys/dev/ath/if_ath_led.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_misc.h soc2012/gmiller/locking-head/sys/dev/ath/if_ath_pci.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_sysctl.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tx.c soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tx.h soc2012/gmiller/locking-head/sys/dev/ath/if_ath_tx_ht.c soc2012/gmiller/locking-head/sys/dev/ath/if_athdfs.h soc2012/gmiller/locking-head/sys/dev/ath/if_athioctl.h soc2012/gmiller/locking-head/sys/dev/ath/if_athrate.h soc2012/gmiller/locking-head/sys/dev/ath/if_athvar.h soc2012/gmiller/locking-head/sys/dev/atkbdc/atkbdc_isa.c soc2012/gmiller/locking-head/sys/dev/bce/if_bce.c soc2012/gmiller/locking-head/sys/dev/bge/if_bge.c soc2012/gmiller/locking-head/sys/dev/bge/if_bgereg.h soc2012/gmiller/locking-head/sys/dev/cesa/cesa.c soc2012/gmiller/locking-head/sys/dev/cxgb/common/cxgb_ctl_defs.h soc2012/gmiller/locking-head/sys/dev/cxgb/cxgb_adapter.h soc2012/gmiller/locking-head/sys/dev/cxgb/cxgb_main.c soc2012/gmiller/locking-head/sys/dev/cxgb/cxgb_offload.h soc2012/gmiller/locking-head/sys/dev/cxgb/cxgb_osdep.h soc2012/gmiller/locking-head/sys/dev/cxgb/cxgb_sge.c soc2012/gmiller/locking-head/sys/dev/cxgb/sys/mvec.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_l2t.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_l2t.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_listen.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_tom.c soc2012/gmiller/locking-head/sys/dev/cxgb/ulp/tom/cxgb_tom.h soc2012/gmiller/locking-head/sys/dev/cxgbe/adapter.h soc2012/gmiller/locking-head/sys/dev/cxgbe/common/common.h soc2012/gmiller/locking-head/sys/dev/cxgbe/common/t4_hw.c soc2012/gmiller/locking-head/sys/dev/cxgbe/common/t4_msg.h soc2012/gmiller/locking-head/sys/dev/cxgbe/firmware/t4fw_cfg.txt soc2012/gmiller/locking-head/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt soc2012/gmiller/locking-head/sys/dev/cxgbe/firmware/t4fw_interface.h soc2012/gmiller/locking-head/sys/dev/cxgbe/offload.h soc2012/gmiller/locking-head/sys/dev/cxgbe/osdep.h soc2012/gmiller/locking-head/sys/dev/cxgbe/t4_l2t.c soc2012/gmiller/locking-head/sys/dev/cxgbe/t4_l2t.h soc2012/gmiller/locking-head/sys/dev/cxgbe/t4_main.c soc2012/gmiller/locking-head/sys/dev/cxgbe/t4_sge.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_82541.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_82543.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_82571.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_82575.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_api.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_api.h soc2012/gmiller/locking-head/sys/dev/e1000/e1000_defines.h soc2012/gmiller/locking-head/sys/dev/e1000/e1000_hw.h soc2012/gmiller/locking-head/sys/dev/e1000/e1000_ich8lan.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_mac.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_mac.h soc2012/gmiller/locking-head/sys/dev/e1000/e1000_manage.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_manage.h soc2012/gmiller/locking-head/sys/dev/e1000/e1000_phy.c soc2012/gmiller/locking-head/sys/dev/e1000/e1000_phy.h soc2012/gmiller/locking-head/sys/dev/e1000/e1000_regs.h soc2012/gmiller/locking-head/sys/dev/e1000/if_em.c soc2012/gmiller/locking-head/sys/dev/e1000/if_igb.c soc2012/gmiller/locking-head/sys/dev/e1000/if_lem.c soc2012/gmiller/locking-head/sys/dev/esp/ncr53c9x.c soc2012/gmiller/locking-head/sys/dev/fb/fbreg.h soc2012/gmiller/locking-head/sys/dev/fdt/fdt_common.h soc2012/gmiller/locking-head/sys/dev/fdt/fdt_pci.c soc2012/gmiller/locking-head/sys/dev/fdt/fdtbus.c soc2012/gmiller/locking-head/sys/dev/fdt/simplebus.c soc2012/gmiller/locking-head/sys/dev/firewire/sbp_targ.c soc2012/gmiller/locking-head/sys/dev/flash/at45d.c soc2012/gmiller/locking-head/sys/dev/hptiop/hptiop.c soc2012/gmiller/locking-head/sys/dev/hptmv/entry.c soc2012/gmiller/locking-head/sys/dev/hptrr/hptrr_osm_bsd.c soc2012/gmiller/locking-head/sys/dev/hwpmc/hwpmc_arm.c soc2012/gmiller/locking-head/sys/dev/hwpmc/hwpmc_intel.c soc2012/gmiller/locking-head/sys/dev/iicbus/ds1374.c soc2012/gmiller/locking-head/sys/dev/ipmi/ipmi.c soc2012/gmiller/locking-head/sys/dev/ipmi/ipmivars.h soc2012/gmiller/locking-head/sys/dev/isci/isci.h soc2012/gmiller/locking-head/sys/dev/isci/isci_controller.c soc2012/gmiller/locking-head/sys/dev/isci/isci_interrupt.c soc2012/gmiller/locking-head/sys/dev/isci/isci_io_request.c soc2012/gmiller/locking-head/sys/dev/isci/isci_remote_device.c soc2012/gmiller/locking-head/sys/dev/isp/isp.c soc2012/gmiller/locking-head/sys/dev/isp/isp_freebsd.c soc2012/gmiller/locking-head/sys/dev/isp/isp_freebsd.h soc2012/gmiller/locking-head/sys/dev/isp/isp_library.c soc2012/gmiller/locking-head/sys/dev/isp/isp_library.h soc2012/gmiller/locking-head/sys/dev/isp/isp_pci.c soc2012/gmiller/locking-head/sys/dev/isp/isp_sbus.c soc2012/gmiller/locking-head/sys/dev/isp/isp_stds.h soc2012/gmiller/locking-head/sys/dev/isp/isp_target.c soc2012/gmiller/locking-head/sys/dev/isp/isp_target.h soc2012/gmiller/locking-head/sys/dev/isp/ispmbox.h soc2012/gmiller/locking-head/sys/dev/isp/ispreg.h soc2012/gmiller/locking-head/sys/dev/isp/ispvar.h soc2012/gmiller/locking-head/sys/dev/ispfw/asm_2300.h soc2012/gmiller/locking-head/sys/dev/ispfw/asm_2400.h soc2012/gmiller/locking-head/sys/dev/ispfw/asm_2500.h soc2012/gmiller/locking-head/sys/dev/iwn/if_iwn.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_82598.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_82598.h soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_82599.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_api.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_api.h soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_common.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_common.h soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_osdep.h soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_phy.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_type.h soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_vf.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixgbe_x540.c soc2012/gmiller/locking-head/sys/dev/ixgbe/ixv.c soc2012/gmiller/locking-head/sys/dev/jme/if_jme.c soc2012/gmiller/locking-head/sys/dev/md/md.c soc2012/gmiller/locking-head/sys/dev/mfi/mfi.c soc2012/gmiller/locking-head/sys/dev/mfi/mfi_disk.c soc2012/gmiller/locking-head/sys/dev/mfi/mfi_tbolt.c soc2012/gmiller/locking-head/sys/dev/mfi/mfireg.h soc2012/gmiller/locking-head/sys/dev/mfi/mfivar.h soc2012/gmiller/locking-head/sys/dev/mge/if_mge.c soc2012/gmiller/locking-head/sys/dev/mii/ciphy.c soc2012/gmiller/locking-head/sys/dev/mii/e1000phy.c soc2012/gmiller/locking-head/sys/dev/mii/miidevs soc2012/gmiller/locking-head/sys/dev/mlx/mlxvar.h soc2012/gmiller/locking-head/sys/dev/mmc/mmc.c soc2012/gmiller/locking-head/sys/dev/mmc/mmcsd.c soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_cnfg.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_hbd.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_history.txt soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_init.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_ioc.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_ra.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_raid.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_sas.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_targ.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_tool.h soc2012/gmiller/locking-head/sys/dev/mps/mpi/mpi2_type.h soc2012/gmiller/locking-head/sys/dev/mps/mps.c soc2012/gmiller/locking-head/sys/dev/mps/mps_config.c soc2012/gmiller/locking-head/sys/dev/mps/mps_ioctl.h soc2012/gmiller/locking-head/sys/dev/mps/mps_mapping.c soc2012/gmiller/locking-head/sys/dev/mps/mps_mapping.h soc2012/gmiller/locking-head/sys/dev/mps/mps_sas.c soc2012/gmiller/locking-head/sys/dev/mps/mps_sas.h soc2012/gmiller/locking-head/sys/dev/mps/mps_sas_lsi.c soc2012/gmiller/locking-head/sys/dev/mps/mps_table.c soc2012/gmiller/locking-head/sys/dev/mps/mps_user.c soc2012/gmiller/locking-head/sys/dev/mps/mpsvar.h soc2012/gmiller/locking-head/sys/dev/mpt/mpt_cam.c soc2012/gmiller/locking-head/sys/dev/mvs/mvs.c soc2012/gmiller/locking-head/sys/dev/mvs/mvs.h soc2012/gmiller/locking-head/sys/dev/mvs/mvs_soc.c soc2012/gmiller/locking-head/sys/dev/mxge/eth_z8e.h soc2012/gmiller/locking-head/sys/dev/mxge/ethp_z8e.h soc2012/gmiller/locking-head/sys/dev/mxge/rss_eth_z8e.h soc2012/gmiller/locking-head/sys/dev/mxge/rss_ethp_z8e.h soc2012/gmiller/locking-head/sys/dev/netmap/if_em_netmap.h soc2012/gmiller/locking-head/sys/dev/netmap/if_igb_netmap.h soc2012/gmiller/locking-head/sys/dev/netmap/ixgbe_netmap.h soc2012/gmiller/locking-head/sys/dev/netmap/netmap.c soc2012/gmiller/locking-head/sys/dev/netmap/netmap_kern.h soc2012/gmiller/locking-head/sys/dev/netmap/netmap_mem2.c soc2012/gmiller/locking-head/sys/dev/pccard/pccard.c soc2012/gmiller/locking-head/sys/dev/pccard/pccardvarp.h soc2012/gmiller/locking-head/sys/dev/pccbb/pccbb_pci.c soc2012/gmiller/locking-head/sys/dev/pci/pci.c soc2012/gmiller/locking-head/sys/dev/pci/pci_pci.c soc2012/gmiller/locking-head/sys/dev/pci/vga_pci.c soc2012/gmiller/locking-head/sys/dev/powermac_nvram/powermac_nvram.c soc2012/gmiller/locking-head/sys/dev/puc/pucdata.c soc2012/gmiller/locking-head/sys/dev/re/if_re.c soc2012/gmiller/locking-head/sys/dev/sdhci/sdhci.c soc2012/gmiller/locking-head/sys/dev/sec/sec.c soc2012/gmiller/locking-head/sys/dev/sec/sec.h soc2012/gmiller/locking-head/sys/dev/siis/siis.c soc2012/gmiller/locking-head/sys/dev/sio/sio.c soc2012/gmiller/locking-head/sys/dev/sound/pci/hda/hdaa.c soc2012/gmiller/locking-head/sys/dev/sound/pci/hda/hdaa_patches.c soc2012/gmiller/locking-head/sys/dev/sound/pci/hdspe.c soc2012/gmiller/locking-head/sys/dev/spibus/spi.h soc2012/gmiller/locking-head/sys/dev/spibus/spibus.c soc2012/gmiller/locking-head/sys/dev/sym/sym_conf.h soc2012/gmiller/locking-head/sys/dev/sym/sym_hipd.c soc2012/gmiller/locking-head/sys/dev/twa/tw_osl_cam.c soc2012/gmiller/locking-head/sys/dev/usb/controller/at91dci_atmelarm.c soc2012/gmiller/locking-head/sys/dev/usb/controller/ehci_pci.c soc2012/gmiller/locking-head/sys/dev/usb/controller/ohci_atmelarm.c soc2012/gmiller/locking-head/sys/dev/usb/controller/ohci_pci.c soc2012/gmiller/locking-head/sys/dev/usb/controller/xhci_pci.c soc2012/gmiller/locking-head/sys/dev/usb/controller/xhcireg.h soc2012/gmiller/locking-head/sys/dev/usb/input/uhid.c soc2012/gmiller/locking-head/sys/dev/usb/net/if_udav.c soc2012/gmiller/locking-head/sys/dev/usb/net/if_udavreg.h soc2012/gmiller/locking-head/sys/dev/usb/net/if_usie.c soc2012/gmiller/locking-head/sys/dev/usb/net/uhso.c soc2012/gmiller/locking-head/sys/dev/usb/quirk/usb_quirk.c soc2012/gmiller/locking-head/sys/dev/usb/serial/u3g.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uark.c soc2012/gmiller/locking-head/sys/dev/usb/serial/ubsa.c soc2012/gmiller/locking-head/sys/dev/usb/serial/ubser.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uchcom.c soc2012/gmiller/locking-head/sys/dev/usb/serial/ucycom.c soc2012/gmiller/locking-head/sys/dev/usb/serial/ufoma.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uftdi.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uftdi_reg.h soc2012/gmiller/locking-head/sys/dev/usb/serial/ugensa.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uipaq.c soc2012/gmiller/locking-head/sys/dev/usb/serial/ulpt.c soc2012/gmiller/locking-head/sys/dev/usb/serial/umcs.c soc2012/gmiller/locking-head/sys/dev/usb/serial/umct.c soc2012/gmiller/locking-head/sys/dev/usb/serial/umodem.c soc2012/gmiller/locking-head/sys/dev/usb/serial/umoscom.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uplcom.c soc2012/gmiller/locking-head/sys/dev/usb/serial/usb_serial.c soc2012/gmiller/locking-head/sys/dev/usb/serial/usb_serial.h soc2012/gmiller/locking-head/sys/dev/usb/serial/uslcom.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uvisor.c soc2012/gmiller/locking-head/sys/dev/usb/serial/uvscom.c soc2012/gmiller/locking-head/sys/dev/usb/usb_device.c soc2012/gmiller/locking-head/sys/dev/usb/usb_device.h soc2012/gmiller/locking-head/sys/dev/usb/usb_generic.c soc2012/gmiller/locking-head/sys/dev/usb/usb_hid.c soc2012/gmiller/locking-head/sys/dev/usb/usb_pf.c soc2012/gmiller/locking-head/sys/dev/usb/usb_transfer.c soc2012/gmiller/locking-head/sys/dev/usb/usbdevs soc2012/gmiller/locking-head/sys/dev/usb/wlan/if_rum.c soc2012/gmiller/locking-head/sys/dev/usb/wlan/if_run.c soc2012/gmiller/locking-head/sys/dev/usb/wlan/if_ural.c soc2012/gmiller/locking-head/sys/dev/viawd/viawd.c soc2012/gmiller/locking-head/sys/dev/virtio/balloon/virtio_balloon.c soc2012/gmiller/locking-head/sys/dev/virtio/balloon/virtio_balloon.h soc2012/gmiller/locking-head/sys/dev/virtio/block/virtio_blk.c soc2012/gmiller/locking-head/sys/dev/virtio/block/virtio_blk.h soc2012/gmiller/locking-head/sys/dev/virtio/network/if_vtnet.c soc2012/gmiller/locking-head/sys/dev/virtio/network/virtio_net.h soc2012/gmiller/locking-head/sys/dev/virtio/pci/virtio_pci.c soc2012/gmiller/locking-head/sys/dev/virtio/pci/virtio_pci.h soc2012/gmiller/locking-head/sys/dev/virtio/virtio.c soc2012/gmiller/locking-head/sys/dev/virtio/virtio.h soc2012/gmiller/locking-head/sys/dev/virtio/virtio_ring.h soc2012/gmiller/locking-head/sys/dev/virtio/virtqueue.c soc2012/gmiller/locking-head/sys/dev/virtio/virtqueue.h soc2012/gmiller/locking-head/sys/dev/vxge/vxgehal/vxgehal-channel.h soc2012/gmiller/locking-head/sys/dev/wbwd/wbwd.c soc2012/gmiller/locking-head/sys/dev/wpi/if_wpi.c soc2012/gmiller/locking-head/sys/dev/wtap/if_wtap.c soc2012/gmiller/locking-head/sys/dev/xen/balloon/balloon.c soc2012/gmiller/locking-head/sys/dev/xen/blkfront/blkfront.c soc2012/gmiller/locking-head/sys/fs/cd9660/cd9660_vfsops.c soc2012/gmiller/locking-head/sys/fs/devfs/devfs_vnops.c soc2012/gmiller/locking-head/sys/fs/ext2fs/ext2_lookup.c soc2012/gmiller/locking-head/sys/fs/ext2fs/ext2_vfsops.c soc2012/gmiller/locking-head/sys/fs/ext2fs/ext2_vnops.c soc2012/gmiller/locking-head/sys/fs/fifofs/fifo_vnops.c soc2012/gmiller/locking-head/sys/fs/hpfs/hpfs_vnops.c soc2012/gmiller/locking-head/sys/fs/msdosfs/msdosfs_lookup.c soc2012/gmiller/locking-head/sys/fs/nfs/nfs_commonacl.c soc2012/gmiller/locking-head/sys/fs/nfs/nfs_commonport.c soc2012/gmiller/locking-head/sys/fs/nfsclient/nfs_clbio.c soc2012/gmiller/locking-head/sys/fs/nfsclient/nfs_clnode.c soc2012/gmiller/locking-head/sys/fs/nfsclient/nfs_clvfsops.c soc2012/gmiller/locking-head/sys/fs/ntfs/ntfs.h soc2012/gmiller/locking-head/sys/fs/ntfs/ntfs_subr.c soc2012/gmiller/locking-head/sys/fs/ntfs/ntfs_subr.h soc2012/gmiller/locking-head/sys/fs/ntfs/ntfs_vfsops.c soc2012/gmiller/locking-head/sys/fs/ntfs/ntfs_vnops.c soc2012/gmiller/locking-head/sys/fs/nwfs/nwfs_io.c soc2012/gmiller/locking-head/sys/fs/portalfs/portal_vnops.c soc2012/gmiller/locking-head/sys/fs/smbfs/smbfs_io.c soc2012/gmiller/locking-head/sys/fs/smbfs/smbfs_node.c soc2012/gmiller/locking-head/sys/fs/tmpfs/tmpfs_subr.c soc2012/gmiller/locking-head/sys/fs/tmpfs/tmpfs_vnops.c soc2012/gmiller/locking-head/sys/fs/udf/udf_vfsops.c soc2012/gmiller/locking-head/sys/fs/unionfs/union_subr.c soc2012/gmiller/locking-head/sys/geom/bde/g_bde.c soc2012/gmiller/locking-head/sys/geom/eli/g_eli.c soc2012/gmiller/locking-head/sys/geom/eli/g_eli.h soc2012/gmiller/locking-head/sys/geom/eli/g_eli_ctl.c soc2012/gmiller/locking-head/sys/geom/eli/g_eli_key.c soc2012/gmiller/locking-head/sys/geom/eli/g_eli_key_cache.c soc2012/gmiller/locking-head/sys/geom/gate/g_gate.c soc2012/gmiller/locking-head/sys/geom/gate/g_gate.h soc2012/gmiller/locking-head/sys/geom/geom.h soc2012/gmiller/locking-head/sys/geom/geom_aes.c soc2012/gmiller/locking-head/sys/geom/geom_dev.c soc2012/gmiller/locking-head/sys/geom/geom_disk.c soc2012/gmiller/locking-head/sys/geom/geom_disk.h soc2012/gmiller/locking-head/sys/geom/geom_event.c soc2012/gmiller/locking-head/sys/geom/geom_io.c soc2012/gmiller/locking-head/sys/geom/geom_map.c soc2012/gmiller/locking-head/sys/geom/geom_slice.c soc2012/gmiller/locking-head/sys/geom/geom_subr.c soc2012/gmiller/locking-head/sys/geom/label/g_label_ufs.c soc2012/gmiller/locking-head/sys/geom/mirror/g_mirror.c soc2012/gmiller/locking-head/sys/geom/mirror/g_mirror.h soc2012/gmiller/locking-head/sys/geom/mirror/g_mirror_ctl.c soc2012/gmiller/locking-head/sys/geom/mountver/g_mountver.c soc2012/gmiller/locking-head/sys/geom/multipath/g_multipath.c soc2012/gmiller/locking-head/sys/geom/nop/g_nop.c soc2012/gmiller/locking-head/sys/geom/nop/g_nop.h soc2012/gmiller/locking-head/sys/geom/part/g_part.c soc2012/gmiller/locking-head/sys/geom/part/g_part.h soc2012/gmiller/locking-head/sys/geom/part/g_part_apm.c soc2012/gmiller/locking-head/sys/geom/part/g_part_bsd.c soc2012/gmiller/locking-head/sys/geom/part/g_part_gpt.c soc2012/gmiller/locking-head/sys/geom/part/g_part_vtoc8.c soc2012/gmiller/locking-head/sys/geom/raid/g_raid.c soc2012/gmiller/locking-head/sys/geom/uncompress/g_uncompress.c soc2012/gmiller/locking-head/sys/geom/uzip/g_uzip.c soc2012/gmiller/locking-head/sys/geom/virstor/g_virstor.c soc2012/gmiller/locking-head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c soc2012/gmiller/locking-head/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c soc2012/gmiller/locking-head/sys/i386/acpica/acpi_machdep.c soc2012/gmiller/locking-head/sys/i386/acpica/acpi_wakecode.S soc2012/gmiller/locking-head/sys/i386/conf/GENERIC soc2012/gmiller/locking-head/sys/i386/conf/XEN soc2012/gmiller/locking-head/sys/i386/i386/apic_vector.s soc2012/gmiller/locking-head/sys/i386/i386/bios.c soc2012/gmiller/locking-head/sys/i386/i386/elf_machdep.c soc2012/gmiller/locking-head/sys/i386/i386/genassym.c soc2012/gmiller/locking-head/sys/i386/i386/initcpu.c soc2012/gmiller/locking-head/sys/i386/i386/machdep.c soc2012/gmiller/locking-head/sys/i386/i386/mem.c soc2012/gmiller/locking-head/sys/i386/i386/minidump_machdep.c soc2012/gmiller/locking-head/sys/i386/i386/mp_machdep.c soc2012/gmiller/locking-head/sys/i386/i386/pmap.c soc2012/gmiller/locking-head/sys/i386/i386/ptrace_machdep.c soc2012/gmiller/locking-head/sys/i386/i386/swtch.s soc2012/gmiller/locking-head/sys/i386/i386/trap.c soc2012/gmiller/locking-head/sys/i386/i386/vm86.c soc2012/gmiller/locking-head/sys/i386/i386/vm_machdep.c soc2012/gmiller/locking-head/sys/i386/include/apicvar.h soc2012/gmiller/locking-head/sys/i386/include/atomic.h soc2012/gmiller/locking-head/sys/i386/include/cpufunc.h soc2012/gmiller/locking-head/sys/i386/include/elf.h soc2012/gmiller/locking-head/sys/i386/include/in_cksum.h soc2012/gmiller/locking-head/sys/i386/include/md_var.h soc2012/gmiller/locking-head/sys/i386/include/npx.h soc2012/gmiller/locking-head/sys/i386/include/pcb.h soc2012/gmiller/locking-head/sys/i386/include/pcpu.h soc2012/gmiller/locking-head/sys/i386/include/pmap.h soc2012/gmiller/locking-head/sys/i386/include/smp.h soc2012/gmiller/locking-head/sys/i386/include/vmparam.h soc2012/gmiller/locking-head/sys/i386/isa/npx.c soc2012/gmiller/locking-head/sys/i386/linux/linux_proto.h soc2012/gmiller/locking-head/sys/i386/linux/linux_syscall.h soc2012/gmiller/locking-head/sys/i386/linux/linux_syscalls.c soc2012/gmiller/locking-head/sys/i386/linux/linux_sysent.c soc2012/gmiller/locking-head/sys/i386/linux/linux_systrace_args.c soc2012/gmiller/locking-head/sys/i386/linux/syscalls.master soc2012/gmiller/locking-head/sys/i386/xen/pmap.c soc2012/gmiller/locking-head/sys/ia64/acpica/acpi_wakeup.c soc2012/gmiller/locking-head/sys/ia64/ia64/busdma_machdep.c soc2012/gmiller/locking-head/sys/ia64/ia64/machdep.c soc2012/gmiller/locking-head/sys/ia64/ia64/mp_machdep.c soc2012/gmiller/locking-head/sys/ia64/ia64/pmap.c soc2012/gmiller/locking-head/sys/ia64/include/_stdint.h soc2012/gmiller/locking-head/sys/ia64/include/_types.h soc2012/gmiller/locking-head/sys/ia64/include/elf.h soc2012/gmiller/locking-head/sys/ia64/include/in_cksum.h soc2012/gmiller/locking-head/sys/ia64/include/md_var.h soc2012/gmiller/locking-head/sys/ia64/include/param.h soc2012/gmiller/locking-head/sys/ia64/include/pmap.h soc2012/gmiller/locking-head/sys/kern/capabilities.conf soc2012/gmiller/locking-head/sys/kern/device_if.m soc2012/gmiller/locking-head/sys/kern/imgact_aout.c soc2012/gmiller/locking-head/sys/kern/imgact_elf.c soc2012/gmiller/locking-head/sys/kern/imgact_gzip.c soc2012/gmiller/locking-head/sys/kern/init_main.c soc2012/gmiller/locking-head/sys/kern/init_sysent.c soc2012/gmiller/locking-head/sys/kern/kern_clocksource.c soc2012/gmiller/locking-head/sys/kern/kern_conf.c soc2012/gmiller/locking-head/sys/kern/kern_descrip.c soc2012/gmiller/locking-head/sys/kern/kern_event.c soc2012/gmiller/locking-head/sys/kern/kern_exec.c soc2012/gmiller/locking-head/sys/kern/kern_fork.c soc2012/gmiller/locking-head/sys/kern/kern_intr.c soc2012/gmiller/locking-head/sys/kern/kern_jail.c soc2012/gmiller/locking-head/sys/kern/kern_kthread.c soc2012/gmiller/locking-head/sys/kern/kern_ktr.c soc2012/gmiller/locking-head/sys/kern/kern_malloc.c soc2012/gmiller/locking-head/sys/kern/kern_proc.c soc2012/gmiller/locking-head/sys/kern/kern_racct.c soc2012/gmiller/locking-head/sys/kern/kern_shutdown.c soc2012/gmiller/locking-head/sys/kern/kern_sig.c soc2012/gmiller/locking-head/sys/kern/kern_tc.c soc2012/gmiller/locking-head/sys/kern/kern_thr.c soc2012/gmiller/locking-head/sys/kern/kern_thread.c soc2012/gmiller/locking-head/sys/kern/kern_umtx.c soc2012/gmiller/locking-head/sys/kern/ksched.c soc2012/gmiller/locking-head/sys/kern/sched_4bsd.c soc2012/gmiller/locking-head/sys/kern/sched_ule.c soc2012/gmiller/locking-head/sys/kern/subr_bus.c soc2012/gmiller/locking-head/sys/kern/subr_devstat.c soc2012/gmiller/locking-head/sys/kern/subr_firmware.c soc2012/gmiller/locking-head/sys/kern/subr_rman.c soc2012/gmiller/locking-head/sys/kern/subr_smp.c soc2012/gmiller/locking-head/sys/kern/subr_syscall.c soc2012/gmiller/locking-head/sys/kern/subr_trap.c soc2012/gmiller/locking-head/sys/kern/subr_uio.c soc2012/gmiller/locking-head/sys/kern/subr_witness.c soc2012/gmiller/locking-head/sys/kern/sys_capability.c soc2012/gmiller/locking-head/sys/kern/sys_generic.c soc2012/gmiller/locking-head/sys/kern/sys_pipe.c soc2012/gmiller/locking-head/sys/kern/sys_procdesc.c soc2012/gmiller/locking-head/sys/kern/sys_process.c soc2012/gmiller/locking-head/sys/kern/syscalls.c soc2012/gmiller/locking-head/sys/kern/syscalls.master soc2012/gmiller/locking-head/sys/kern/systrace_args.c soc2012/gmiller/locking-head/sys/kern/tty.c soc2012/gmiller/locking-head/sys/kern/uipc_socket.c soc2012/gmiller/locking-head/sys/kern/uipc_syscalls.c soc2012/gmiller/locking-head/sys/kern/uipc_usrreq.c soc2012/gmiller/locking-head/sys/kern/vfs_bio.c soc2012/gmiller/locking-head/sys/kern/vfs_default.c soc2012/gmiller/locking-head/sys/kern/vfs_subr.c soc2012/gmiller/locking-head/sys/kern/vfs_syscalls.c soc2012/gmiller/locking-head/sys/kern/vfs_vnops.c soc2012/gmiller/locking-head/sys/libkern/iconv.c soc2012/gmiller/locking-head/sys/libkern/iconv_ucs.c soc2012/gmiller/locking-head/sys/mips/cavium/uart_bus_octeonusart.c soc2012/gmiller/locking-head/sys/mips/conf/OCTEON1 soc2012/gmiller/locking-head/sys/mips/conf/RSPRO soc2012/gmiller/locking-head/sys/mips/conf/RSPRO.hints soc2012/gmiller/locking-head/sys/mips/include/_stdint.h soc2012/gmiller/locking-head/sys/mips/include/_types.h soc2012/gmiller/locking-head/sys/mips/include/elf.h soc2012/gmiller/locking-head/sys/mips/include/in_cksum.h soc2012/gmiller/locking-head/sys/mips/include/pmap.h soc2012/gmiller/locking-head/sys/mips/mips/pmap.c soc2012/gmiller/locking-head/sys/mips/mips/trap.c soc2012/gmiller/locking-head/sys/mips/nlm/board.c soc2012/gmiller/locking-head/sys/mips/nlm/dev/net/mdio.c soc2012/gmiller/locking-head/sys/mips/nlm/hal/mdio.h soc2012/gmiller/locking-head/sys/mips/nlm/xlp.h soc2012/gmiller/locking-head/sys/mips/nlm/xlp_pci.c soc2012/gmiller/locking-head/sys/mips/rmi/rootfs_list.txt soc2012/gmiller/locking-head/sys/modules/Makefile soc2012/gmiller/locking-head/sys/modules/acpi/Makefile soc2012/gmiller/locking-head/sys/modules/acpi/acpi/Makefile soc2012/gmiller/locking-head/sys/modules/aesni/Makefile soc2012/gmiller/locking-head/sys/modules/agp/Makefile soc2012/gmiller/locking-head/sys/modules/ahci/Makefile soc2012/gmiller/locking-head/sys/modules/ath/Makefile soc2012/gmiller/locking-head/sys/modules/bwi/Makefile soc2012/gmiller/locking-head/sys/modules/cam/Makefile soc2012/gmiller/locking-head/sys/modules/cxgb/Makefile soc2012/gmiller/locking-head/sys/modules/cxgb/cxgb/Makefile soc2012/gmiller/locking-head/sys/modules/cxgb/iw_cxgb/Makefile soc2012/gmiller/locking-head/sys/modules/cxgb/tom/Makefile soc2012/gmiller/locking-head/sys/modules/cxgbe/Makefile soc2012/gmiller/locking-head/sys/modules/cxgbe/if_cxgbe/Makefile soc2012/gmiller/locking-head/sys/modules/dtrace/Makefile soc2012/gmiller/locking-head/sys/modules/dtrace/dtraceall/dtraceall.c soc2012/gmiller/locking-head/sys/modules/em/Makefile soc2012/gmiller/locking-head/sys/modules/igb/Makefile soc2012/gmiller/locking-head/sys/modules/ixgbe/Makefile soc2012/gmiller/locking-head/sys/modules/rdma/krping/Makefile soc2012/gmiller/locking-head/sys/modules/wpi/Makefile soc2012/gmiller/locking-head/sys/modules/zfs/Makefile soc2012/gmiller/locking-head/sys/net/bpf.c soc2012/gmiller/locking-head/sys/net/bpf.h soc2012/gmiller/locking-head/sys/net/bpf_buffer.c soc2012/gmiller/locking-head/sys/net/bpf_buffer.h soc2012/gmiller/locking-head/sys/net/bpf_zerocopy.c soc2012/gmiller/locking-head/sys/net/bpfdesc.h soc2012/gmiller/locking-head/sys/net/flowtable.c soc2012/gmiller/locking-head/sys/net/ieee8023ad_lacp.c soc2012/gmiller/locking-head/sys/net/if.h soc2012/gmiller/locking-head/sys/net/if_bridge.c soc2012/gmiller/locking-head/sys/net/if_dl.h soc2012/gmiller/locking-head/sys/net/if_epair.c soc2012/gmiller/locking-head/sys/net/if_gif.c soc2012/gmiller/locking-head/sys/net/if_lagg.c soc2012/gmiller/locking-head/sys/net/if_llatbl.c soc2012/gmiller/locking-head/sys/net/if_llatbl.h soc2012/gmiller/locking-head/sys/net/if_loop.c soc2012/gmiller/locking-head/sys/net/if_stf.c soc2012/gmiller/locking-head/sys/net/if_tap.c soc2012/gmiller/locking-head/sys/net/if_var.h soc2012/gmiller/locking-head/sys/net/if_vlan.c soc2012/gmiller/locking-head/sys/net/route.h soc2012/gmiller/locking-head/sys/net80211/_ieee80211.h soc2012/gmiller/locking-head/sys/net80211/ieee80211.h soc2012/gmiller/locking-head/sys/net80211/ieee80211_ht.c soc2012/gmiller/locking-head/sys/net80211/ieee80211_hwmp.c soc2012/gmiller/locking-head/sys/net80211/ieee80211_output.c soc2012/gmiller/locking-head/sys/net80211/ieee80211_radiotap.c soc2012/gmiller/locking-head/sys/net80211/ieee80211_var.h soc2012/gmiller/locking-head/sys/netgraph/netflow/netflow.c soc2012/gmiller/locking-head/sys/netgraph/netflow/netflow_v9.c soc2012/gmiller/locking-head/sys/netgraph/netflow/ng_netflow.c soc2012/gmiller/locking-head/sys/netgraph/netflow/ng_netflow.h soc2012/gmiller/locking-head/sys/netgraph/ng_ether.c soc2012/gmiller/locking-head/sys/netgraph/ng_ksocket.c soc2012/gmiller/locking-head/sys/netgraph/ng_pptpgre.c soc2012/gmiller/locking-head/sys/netinet/icmp_var.h soc2012/gmiller/locking-head/sys/netinet/if_ether.c soc2012/gmiller/locking-head/sys/netinet/if_ether.h soc2012/gmiller/locking-head/sys/netinet/igmp.c soc2012/gmiller/locking-head/sys/netinet/in.c soc2012/gmiller/locking-head/sys/netinet/in.h soc2012/gmiller/locking-head/sys/netinet/in_cksum.c soc2012/gmiller/locking-head/sys/netinet/in_pcb.c soc2012/gmiller/locking-head/sys/netinet/in_pcb.h soc2012/gmiller/locking-head/sys/netinet/in_var.h soc2012/gmiller/locking-head/sys/netinet/ip_carp.c soc2012/gmiller/locking-head/sys/netinet/ip_dummynet.h soc2012/gmiller/locking-head/sys/netinet/ip_icmp.c soc2012/gmiller/locking-head/sys/netinet/ip_input.c soc2012/gmiller/locking-head/sys/netinet/ip_mroute.c soc2012/gmiller/locking-head/sys/netinet/ip_mroute.h soc2012/gmiller/locking-head/sys/netinet/ip_output.c soc2012/gmiller/locking-head/sys/netinet/ipfw/dummynet.txt soc2012/gmiller/locking-head/sys/netinet/ipfw/ip_dn_io.c soc2012/gmiller/locking-head/sys/netinet/ipfw/ip_dummynet.c soc2012/gmiller/locking-head/sys/netinet/ipfw/ip_fw2.c soc2012/gmiller/locking-head/sys/netinet/ipfw/ip_fw_dynamic.c soc2012/gmiller/locking-head/sys/netinet/ipfw/ip_fw_log.c soc2012/gmiller/locking-head/sys/netinet/ipfw/ip_fw_table.c soc2012/gmiller/locking-head/sys/netinet/libalias/alias_sctp.h soc2012/gmiller/locking-head/sys/netinet/libalias/libalias.3 soc2012/gmiller/locking-head/sys/netinet/sctp.h soc2012/gmiller/locking-head/sys/netinet/sctp_asconf.c soc2012/gmiller/locking-head/sys/netinet/sctp_asconf.h soc2012/gmiller/locking-head/sys/netinet/sctp_auth.c soc2012/gmiller/locking-head/sys/netinet/sctp_auth.h soc2012/gmiller/locking-head/sys/netinet/sctp_bsd_addr.c soc2012/gmiller/locking-head/sys/netinet/sctp_bsd_addr.h soc2012/gmiller/locking-head/sys/netinet/sctp_cc_functions.c soc2012/gmiller/locking-head/sys/netinet/sctp_constants.h soc2012/gmiller/locking-head/sys/netinet/sctp_crc32.c soc2012/gmiller/locking-head/sys/netinet/sctp_crc32.h soc2012/gmiller/locking-head/sys/netinet/sctp_dtrace_declare.h soc2012/gmiller/locking-head/sys/netinet/sctp_dtrace_define.h soc2012/gmiller/locking-head/sys/netinet/sctp_header.h soc2012/gmiller/locking-head/sys/netinet/sctp_indata.c soc2012/gmiller/locking-head/sys/netinet/sctp_indata.h soc2012/gmiller/locking-head/sys/netinet/sctp_input.c soc2012/gmiller/locking-head/sys/netinet/sctp_input.h soc2012/gmiller/locking-head/sys/netinet/sctp_lock_bsd.h soc2012/gmiller/locking-head/sys/netinet/sctp_os.h soc2012/gmiller/locking-head/sys/netinet/sctp_os_bsd.h soc2012/gmiller/locking-head/sys/netinet/sctp_output.c soc2012/gmiller/locking-head/sys/netinet/sctp_output.h soc2012/gmiller/locking-head/sys/netinet/sctp_pcb.c soc2012/gmiller/locking-head/sys/netinet/sctp_pcb.h soc2012/gmiller/locking-head/sys/netinet/sctp_peeloff.c soc2012/gmiller/locking-head/sys/netinet/sctp_peeloff.h soc2012/gmiller/locking-head/sys/netinet/sctp_ss_functions.c soc2012/gmiller/locking-head/sys/netinet/sctp_structs.h soc2012/gmiller/locking-head/sys/netinet/sctp_sysctl.c soc2012/gmiller/locking-head/sys/netinet/sctp_sysctl.h soc2012/gmiller/locking-head/sys/netinet/sctp_timer.c soc2012/gmiller/locking-head/sys/netinet/sctp_timer.h soc2012/gmiller/locking-head/sys/netinet/sctp_uio.h soc2012/gmiller/locking-head/sys/netinet/sctp_usrreq.c soc2012/gmiller/locking-head/sys/netinet/sctp_var.h soc2012/gmiller/locking-head/sys/netinet/sctputil.c soc2012/gmiller/locking-head/sys/netinet/sctputil.h soc2012/gmiller/locking-head/sys/netinet/tcp_hostcache.c soc2012/gmiller/locking-head/sys/netinet/tcp_input.c soc2012/gmiller/locking-head/sys/netinet/tcp_lro.c soc2012/gmiller/locking-head/sys/netinet/tcp_lro.h soc2012/gmiller/locking-head/sys/netinet/tcp_offload.c soc2012/gmiller/locking-head/sys/netinet/tcp_offload.h soc2012/gmiller/locking-head/sys/netinet/tcp_output.c soc2012/gmiller/locking-head/sys/netinet/tcp_subr.c soc2012/gmiller/locking-head/sys/netinet/tcp_syncache.c soc2012/gmiller/locking-head/sys/netinet/tcp_syncache.h soc2012/gmiller/locking-head/sys/netinet/tcp_timer.c soc2012/gmiller/locking-head/sys/netinet/tcp_timewait.c soc2012/gmiller/locking-head/sys/netinet/tcp_usrreq.c soc2012/gmiller/locking-head/sys/netinet/tcp_var.h soc2012/gmiller/locking-head/sys/netinet/udp_usrreq.c soc2012/gmiller/locking-head/sys/netinet6/frag6.c soc2012/gmiller/locking-head/sys/netinet6/icmp6.c soc2012/gmiller/locking-head/sys/netinet6/in6.c soc2012/gmiller/locking-head/sys/netinet6/in6.h soc2012/gmiller/locking-head/sys/netinet6/in6_cksum.c soc2012/gmiller/locking-head/sys/netinet6/in6_src.c soc2012/gmiller/locking-head/sys/netinet6/ip6_forward.c soc2012/gmiller/locking-head/sys/netinet6/ip6_input.c soc2012/gmiller/locking-head/sys/netinet6/ip6_ipsec.c soc2012/gmiller/locking-head/sys/netinet6/ip6_mroute.c soc2012/gmiller/locking-head/sys/netinet6/ip6_mroute.h soc2012/gmiller/locking-head/sys/netinet6/ip6_output.c soc2012/gmiller/locking-head/sys/netinet6/ip6_var.h soc2012/gmiller/locking-head/sys/netinet6/mld6.c soc2012/gmiller/locking-head/sys/netinet6/nd6.c soc2012/gmiller/locking-head/sys/netinet6/nd6.h soc2012/gmiller/locking-head/sys/netinet6/nd6_nbr.c soc2012/gmiller/locking-head/sys/netinet6/route6.c soc2012/gmiller/locking-head/sys/netinet6/scope6.c soc2012/gmiller/locking-head/sys/netinet6/scope6_var.h soc2012/gmiller/locking-head/sys/netinet6/sctp6_usrreq.c soc2012/gmiller/locking-head/sys/netinet6/sctp6_var.h soc2012/gmiller/locking-head/sys/netinet6/udp6_usrreq.c soc2012/gmiller/locking-head/sys/netipsec/ipsec_output.c soc2012/gmiller/locking-head/sys/netncp/ncp_nls.h soc2012/gmiller/locking-head/sys/netsmb/smb_dev.c soc2012/gmiller/locking-head/sys/netsmb/smb_trantcp.c soc2012/gmiller/locking-head/sys/nfsclient/nfs_bio.c soc2012/gmiller/locking-head/sys/ofed/drivers/infiniband/core/cma.c soc2012/gmiller/locking-head/sys/ofed/drivers/infiniband/core/iwcm.c soc2012/gmiller/locking-head/sys/ofed/include/linux/gfp.h soc2012/gmiller/locking-head/sys/ofed/include/linux/net.h soc2012/gmiller/locking-head/sys/ofed/include/linux/workqueue.h soc2012/gmiller/locking-head/sys/ofed/include/net/netevent.h soc2012/gmiller/locking-head/sys/ofed/include/rdma/iw_cm.h soc2012/gmiller/locking-head/sys/pc98/conf/GENERIC soc2012/gmiller/locking-head/sys/pc98/pc98/machdep.c soc2012/gmiller/locking-head/sys/powerpc/aim/locore32.S soc2012/gmiller/locking-head/sys/powerpc/aim/locore64.S soc2012/gmiller/locking-head/sys/powerpc/aim/mmu_oea.c soc2012/gmiller/locking-head/sys/powerpc/aim/mmu_oea64.c soc2012/gmiller/locking-head/sys/powerpc/booke/locore.S soc2012/gmiller/locking-head/sys/powerpc/booke/machdep.c soc2012/gmiller/locking-head/sys/powerpc/booke/platform_bare.c soc2012/gmiller/locking-head/sys/powerpc/booke/pmap.c soc2012/gmiller/locking-head/sys/powerpc/booke/trap.c soc2012/gmiller/locking-head/sys/powerpc/booke/trap_subr.S soc2012/gmiller/locking-head/sys/powerpc/conf/DEFAULTS soc2012/gmiller/locking-head/sys/powerpc/conf/GENERIC soc2012/gmiller/locking-head/sys/powerpc/conf/GENERIC64 soc2012/gmiller/locking-head/sys/powerpc/conf/MPC85XX soc2012/gmiller/locking-head/sys/powerpc/conf/NOTES soc2012/gmiller/locking-head/sys/powerpc/include/_stdint.h soc2012/gmiller/locking-head/sys/powerpc/include/_types.h soc2012/gmiller/locking-head/sys/powerpc/include/atomic.h soc2012/gmiller/locking-head/sys/powerpc/include/elf.h soc2012/gmiller/locking-head/sys/powerpc/include/hid.h soc2012/gmiller/locking-head/sys/powerpc/include/in_cksum.h soc2012/gmiller/locking-head/sys/powerpc/include/pcpu.h soc2012/gmiller/locking-head/sys/powerpc/include/pmap.h soc2012/gmiller/locking-head/sys/powerpc/include/profile.h soc2012/gmiller/locking-head/sys/powerpc/include/psl.h soc2012/gmiller/locking-head/sys/powerpc/include/pte.h soc2012/gmiller/locking-head/sys/powerpc/include/spr.h soc2012/gmiller/locking-head/sys/powerpc/include/tlb.h soc2012/gmiller/locking-head/sys/powerpc/include/trap.h soc2012/gmiller/locking-head/sys/powerpc/include/vmparam.h soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/i2c.c soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/lbc.c soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/lbc.h soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/mpc85xx.c soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/nexus.c soc2012/gmiller/locking-head/sys/powerpc/mpc85xx/pci_fdt.c soc2012/gmiller/locking-head/sys/powerpc/powermac/hrowpic.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/busdma_machdep.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/cpu.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/db_trace.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/gdb_machdep.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/genassym.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/mmu_if.m soc2012/gmiller/locking-head/sys/powerpc/powerpc/platform.c soc2012/gmiller/locking-head/sys/powerpc/powerpc/pmap_dispatch.c soc2012/gmiller/locking-head/sys/sparc64/conf/GENERIC soc2012/gmiller/locking-head/sys/sparc64/include/_stdint.h soc2012/gmiller/locking-head/sys/sparc64/include/_types.h soc2012/gmiller/locking-head/sys/sparc64/include/elf.h soc2012/gmiller/locking-head/sys/sparc64/include/in_cksum.h soc2012/gmiller/locking-head/sys/sparc64/include/pmap.h soc2012/gmiller/locking-head/sys/sparc64/sparc64/pmap.c soc2012/gmiller/locking-head/sys/sparc64/sparc64/tsb.c soc2012/gmiller/locking-head/sys/sys/_types.h soc2012/gmiller/locking-head/sys/sys/agpio.h soc2012/gmiller/locking-head/sys/sys/apm.h soc2012/gmiller/locking-head/sys/sys/ata.h soc2012/gmiller/locking-head/sys/sys/buf.h soc2012/gmiller/locking-head/sys/sys/bus.h soc2012/gmiller/locking-head/sys/sys/cdefs.h soc2012/gmiller/locking-head/sys/sys/disklabel.h soc2012/gmiller/locking-head/sys/sys/dtrace_bsd.h soc2012/gmiller/locking-head/sys/sys/fcntl.h soc2012/gmiller/locking-head/sys/sys/file.h soc2012/gmiller/locking-head/sys/sys/filedesc.h soc2012/gmiller/locking-head/sys/sys/gpt.h soc2012/gmiller/locking-head/sys/sys/iconv.h soc2012/gmiller/locking-head/sys/sys/imgact_aout.h soc2012/gmiller/locking-head/sys/sys/kernel.h soc2012/gmiller/locking-head/sys/sys/mbuf.h soc2012/gmiller/locking-head/sys/sys/mdioctl.h soc2012/gmiller/locking-head/sys/sys/mount.h soc2012/gmiller/locking-head/sys/sys/param.h soc2012/gmiller/locking-head/sys/sys/pipe.h soc2012/gmiller/locking-head/sys/sys/proc.h soc2012/gmiller/locking-head/sys/sys/refcount.h soc2012/gmiller/locking-head/sys/sys/smp.h soc2012/gmiller/locking-head/sys/sys/stat.h soc2012/gmiller/locking-head/sys/sys/stdint.h soc2012/gmiller/locking-head/sys/sys/syscall.h soc2012/gmiller/locking-head/sys/sys/syscall.mk soc2012/gmiller/locking-head/sys/sys/syscallsubr.h soc2012/gmiller/locking-head/sys/sys/sysent.h soc2012/gmiller/locking-head/sys/sys/sysproto.h soc2012/gmiller/locking-head/sys/sys/user.h soc2012/gmiller/locking-head/sys/sys/vmmeter.h soc2012/gmiller/locking-head/sys/sys/vnode.h soc2012/gmiller/locking-head/sys/sys/vtoc.h soc2012/gmiller/locking-head/sys/ufs/ffs/ffs_alloc.c soc2012/gmiller/locking-head/sys/ufs/ffs/ffs_snapshot.c soc2012/gmiller/locking-head/sys/ufs/ffs/ffs_softdep.c soc2012/gmiller/locking-head/sys/ufs/ffs/ffs_vfsops.c soc2012/gmiller/locking-head/sys/ufs/ffs/ffs_vnops.c soc2012/gmiller/locking-head/sys/ufs/ufs/ufs_vnops.c soc2012/gmiller/locking-head/sys/vm/device_pager.c soc2012/gmiller/locking-head/sys/vm/memguard.c soc2012/gmiller/locking-head/sys/vm/memguard.h soc2012/gmiller/locking-head/sys/vm/pmap.h soc2012/gmiller/locking-head/sys/vm/sg_pager.c soc2012/gmiller/locking-head/sys/vm/swap_pager.c soc2012/gmiller/locking-head/sys/vm/uma_core.c soc2012/gmiller/locking-head/sys/vm/vm_fault.c soc2012/gmiller/locking-head/sys/vm/vm_kern.c soc2012/gmiller/locking-head/sys/vm/vm_map.c soc2012/gmiller/locking-head/sys/vm/vm_map.h soc2012/gmiller/locking-head/sys/vm/vm_object.c soc2012/gmiller/locking-head/sys/vm/vm_object.h soc2012/gmiller/locking-head/sys/vm/vm_page.c soc2012/gmiller/locking-head/sys/vm/vm_page.h soc2012/gmiller/locking-head/sys/vm/vm_pageout.c soc2012/gmiller/locking-head/sys/vm/vm_pageout.h soc2012/gmiller/locking-head/sys/vm/vm_pager.c soc2012/gmiller/locking-head/sys/vm/vm_reserv.c soc2012/gmiller/locking-head/sys/vm/vnode_pager.c soc2012/gmiller/locking-head/sys/x86/include/_limits.h soc2012/gmiller/locking-head/sys/x86/include/_stdint.h soc2012/gmiller/locking-head/sys/x86/include/_types.h soc2012/gmiller/locking-head/sys/x86/include/float.h soc2012/gmiller/locking-head/sys/x86/include/ptrace.h soc2012/gmiller/locking-head/sys/x86/include/specialreg.h soc2012/gmiller/locking-head/sys/x86/x86/busdma_machdep.c soc2012/gmiller/locking-head/sys/x86/x86/dump_machdep.c soc2012/gmiller/locking-head/sys/x86/x86/local_apic.c soc2012/gmiller/locking-head/sys/x86/x86/tsc.c soc2012/gmiller/locking-head/tools/build/make_check/Makefile soc2012/gmiller/locking-head/tools/build/mk/OptionalObsoleteFiles.inc soc2012/gmiller/locking-head/tools/build/options/makeman soc2012/gmiller/locking-head/tools/regression/bin/sh/builtins/wait3.0 soc2012/gmiller/locking-head/tools/regression/lib/libc/gen/Makefile soc2012/gmiller/locking-head/tools/regression/pjdfstest/pjdfstest.c soc2012/gmiller/locking-head/tools/regression/sysvmsg/msgtest.c soc2012/gmiller/locking-head/tools/regression/sysvsem/semtest.c soc2012/gmiller/locking-head/tools/regression/sysvshm/shmtest.c soc2012/gmiller/locking-head/tools/regression/usr.bin/make/all.sh (props changed) soc2012/gmiller/locking-head/tools/regression/usr.bin/make/common.sh soc2012/gmiller/locking-head/tools/test/auxinfo/auxinfo.c soc2012/gmiller/locking-head/tools/tools/ath/Makefile soc2012/gmiller/locking-head/tools/tools/ath/ath_prom_read/Makefile soc2012/gmiller/locking-head/tools/tools/ath/athdebug/athdebug.c soc2012/gmiller/locking-head/tools/tools/ath/athstats/Makefile soc2012/gmiller/locking-head/tools/tools/ath/common/ah_osdep.h soc2012/gmiller/locking-head/tools/tools/ath/common/diag.h soc2012/gmiller/locking-head/tools/tools/ath/common/dumpregs_5416.c soc2012/gmiller/locking-head/tools/tools/net80211/w00t/redir/buddy.c soc2012/gmiller/locking-head/tools/tools/net80211/wesside/dics/dics.c soc2012/gmiller/locking-head/tools/tools/net80211/wlanstats/main.c soc2012/gmiller/locking-head/tools/tools/netmap/bridge.c soc2012/gmiller/locking-head/tools/tools/netmap/pcap.c soc2012/gmiller/locking-head/tools/tools/netmap/pkt-gen.c soc2012/gmiller/locking-head/tools/tools/sysbuild/sysbuild.sh soc2012/gmiller/locking-head/tools/tools/syscall_timing/syscall_timing.c soc2012/gmiller/locking-head/tools/tools/tinybsd/README soc2012/gmiller/locking-head/usr.bin/Makefile soc2012/gmiller/locking-head/usr.bin/ar/acpyacc.y soc2012/gmiller/locking-head/usr.bin/bc/bc.y soc2012/gmiller/locking-head/usr.bin/calendar/calendars/calendar.freebsd soc2012/gmiller/locking-head/usr.bin/chat/chat.c soc2012/gmiller/locking-head/usr.bin/cpio/Makefile soc2012/gmiller/locking-head/usr.bin/cpio/test/Makefile soc2012/gmiller/locking-head/usr.bin/ctlstat/ctlstat.8 soc2012/gmiller/locking-head/usr.bin/cut/cut.1 soc2012/gmiller/locking-head/usr.bin/cut/cut.c soc2012/gmiller/locking-head/usr.bin/du/du.1 soc2012/gmiller/locking-head/usr.bin/du/du.c soc2012/gmiller/locking-head/usr.bin/fetch/fetch.1 soc2012/gmiller/locking-head/usr.bin/find/extern.h soc2012/gmiller/locking-head/usr.bin/find/find.1 soc2012/gmiller/locking-head/usr.bin/find/find.c soc2012/gmiller/locking-head/usr.bin/find/function.c soc2012/gmiller/locking-head/usr.bin/find/getdate.y soc2012/gmiller/locking-head/usr.bin/find/main.c soc2012/gmiller/locking-head/usr.bin/find/option.c soc2012/gmiller/locking-head/usr.bin/fstat/Makefile soc2012/gmiller/locking-head/usr.bin/fstat/fstat.c soc2012/gmiller/locking-head/usr.bin/gprof/lookup.c soc2012/gmiller/locking-head/usr.bin/gzip/zmore.1 soc2012/gmiller/locking-head/usr.bin/join/join.1 soc2012/gmiller/locking-head/usr.bin/kdump/kdump.1 soc2012/gmiller/locking-head/usr.bin/kdump/kdump.c soc2012/gmiller/locking-head/usr.bin/kdump/mkioctls soc2012/gmiller/locking-head/usr.bin/killall/killall.1 soc2012/gmiller/locking-head/usr.bin/killall/killall.c soc2012/gmiller/locking-head/usr.bin/ktrace/ktrace.1 soc2012/gmiller/locking-head/usr.bin/ktrace/ktrace.h soc2012/gmiller/locking-head/usr.bin/lastcomm/lastcomm.1 soc2012/gmiller/locking-head/usr.bin/lastcomm/lastcomm.c soc2012/gmiller/locking-head/usr.bin/less/defines.h soc2012/gmiller/locking-head/usr.bin/lex/lex.1 soc2012/gmiller/locking-head/usr.bin/login/login.1 soc2012/gmiller/locking-head/usr.bin/m4/parser.y soc2012/gmiller/locking-head/usr.bin/mail/popen.c soc2012/gmiller/locking-head/usr.bin/make/Makefile soc2012/gmiller/locking-head/usr.bin/make/make.1 soc2012/gmiller/locking-head/usr.bin/make/var.c soc2012/gmiller/locking-head/usr.bin/makewhatis/makewhatis.c soc2012/gmiller/locking-head/usr.bin/man/man.conf.5 soc2012/gmiller/locking-head/usr.bin/minigzip/Makefile soc2012/gmiller/locking-head/usr.bin/minigzip/minigzip.1 soc2012/gmiller/locking-head/usr.bin/mkcsmapper/ldef.h soc2012/gmiller/locking-head/usr.bin/mkcsmapper/lex.l soc2012/gmiller/locking-head/usr.bin/mkesdb/ldef.h soc2012/gmiller/locking-head/usr.bin/mkesdb/lex.l soc2012/gmiller/locking-head/usr.bin/mklocale/extern.h soc2012/gmiller/locking-head/usr.bin/netstat/Makefile soc2012/gmiller/locking-head/usr.bin/netstat/inet.c soc2012/gmiller/locking-head/usr.bin/netstat/sctp.c soc2012/gmiller/locking-head/usr.bin/nfsstat/nfsstat.c soc2012/gmiller/locking-head/usr.bin/passwd/passwd.1 soc2012/gmiller/locking-head/usr.bin/procstat/Makefile soc2012/gmiller/locking-head/usr.bin/procstat/procstat.1 soc2012/gmiller/locking-head/usr.bin/procstat/procstat_rlimit.c soc2012/gmiller/locking-head/usr.bin/procstat/procstat_vm.c soc2012/gmiller/locking-head/usr.bin/rlogin/rlogin.1 soc2012/gmiller/locking-head/usr.bin/rsh/rsh.1 soc2012/gmiller/locking-head/usr.bin/script/script.1 soc2012/gmiller/locking-head/usr.bin/script/script.c soc2012/gmiller/locking-head/usr.bin/sockstat/sockstat.1 soc2012/gmiller/locking-head/usr.bin/sockstat/sockstat.c soc2012/gmiller/locking-head/usr.bin/sort/Makefile soc2012/gmiller/locking-head/usr.bin/sort/bwstring.c soc2012/gmiller/locking-head/usr.bin/sort/coll.c soc2012/gmiller/locking-head/usr.bin/sort/file.c soc2012/gmiller/locking-head/usr.bin/sort/file.h soc2012/gmiller/locking-head/usr.bin/sort/radixsort.c soc2012/gmiller/locking-head/usr.bin/sort/sort.1.in soc2012/gmiller/locking-head/usr.bin/sort/sort.c soc2012/gmiller/locking-head/usr.bin/sort/sort.h soc2012/gmiller/locking-head/usr.bin/tar/Makefile soc2012/gmiller/locking-head/usr.bin/tar/test/Makefile soc2012/gmiller/locking-head/usr.bin/top/machine.c soc2012/gmiller/locking-head/usr.bin/top/top.local.1 soc2012/gmiller/locking-head/usr.bin/touch/touch.1 soc2012/gmiller/locking-head/usr.bin/touch/touch.c soc2012/gmiller/locking-head/usr.bin/unzip/unzip.c soc2012/gmiller/locking-head/usr.bin/usbhidctl/usbhid.c soc2012/gmiller/locking-head/usr.bin/usbhidctl/usbhidctl.1 soc2012/gmiller/locking-head/usr.bin/xinstall/xinstall.c soc2012/gmiller/locking-head/usr.bin/yacc/Makefile soc2012/gmiller/locking-head/usr.sbin/Makefile soc2012/gmiller/locking-head/usr.sbin/acpi/acpidb/Makefile soc2012/gmiller/locking-head/usr.sbin/acpi/acpidump/acpi.c soc2012/gmiller/locking-head/usr.sbin/acpi/iasl/Makefile soc2012/gmiller/locking-head/usr.sbin/adduser/rmuser.8 soc2012/gmiller/locking-head/usr.sbin/ancontrol/ancontrol.c soc2012/gmiller/locking-head/usr.sbin/apmd/apmd.8 soc2012/gmiller/locking-head/usr.sbin/arp/arp.4 soc2012/gmiller/locking-head/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 soc2012/gmiller/locking-head/usr.sbin/bluetooth/bthidd/parser.y soc2012/gmiller/locking-head/usr.sbin/bluetooth/btpand/btpand.8 soc2012/gmiller/locking-head/usr.sbin/bluetooth/hccontrol/hccontrol.8 soc2012/gmiller/locking-head/usr.sbin/bluetooth/hcsecd/parser.y soc2012/gmiller/locking-head/usr.sbin/bluetooth/l2control/l2control.8 soc2012/gmiller/locking-head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 soc2012/gmiller/locking-head/usr.sbin/bsdinstall/partedit/diskeditor.c soc2012/gmiller/locking-head/usr.sbin/bsdinstall/partedit/part_wizard.c soc2012/gmiller/locking-head/usr.sbin/config/config.h soc2012/gmiller/locking-head/usr.sbin/config/main.c soc2012/gmiller/locking-head/usr.sbin/cpucontrol/amd.c soc2012/gmiller/locking-head/usr.sbin/cpucontrol/cpucontrol.8 soc2012/gmiller/locking-head/usr.sbin/cpucontrol/cpucontrol.c soc2012/gmiller/locking-head/usr.sbin/cron/crontab/crontab.c soc2012/gmiller/locking-head/usr.sbin/crunch/crunchgen/crunched_main.c soc2012/gmiller/locking-head/usr.sbin/crunch/crunchgen/crunchgen.c soc2012/gmiller/locking-head/usr.sbin/crunch/crunchide/crunchide.c soc2012/gmiller/locking-head/usr.sbin/crunch/crunchide/exec_elf32.c soc2012/gmiller/locking-head/usr.sbin/ctladm/ctladm.8 soc2012/gmiller/locking-head/usr.sbin/ctladm/ctladm.c soc2012/gmiller/locking-head/usr.sbin/daemon/daemon.8 soc2012/gmiller/locking-head/usr.sbin/daemon/daemon.c soc2012/gmiller/locking-head/usr.sbin/digictl/digictl.8 soc2012/gmiller/locking-head/usr.sbin/fifolog/lib/getdate.y soc2012/gmiller/locking-head/usr.sbin/flowctl/flowctl.8 soc2012/gmiller/locking-head/usr.sbin/flowctl/flowctl.c soc2012/gmiller/locking-head/usr.sbin/freebsd-update/freebsd-update.8 soc2012/gmiller/locking-head/usr.sbin/fwcontrol/fwcontrol.8 soc2012/gmiller/locking-head/usr.sbin/gssd/gssd.8 soc2012/gmiller/locking-head/usr.sbin/i2c/i2c.8 soc2012/gmiller/locking-head/usr.sbin/ifmcstat/ifmcstat.c soc2012/gmiller/locking-head/usr.sbin/inetd/inetd.c soc2012/gmiller/locking-head/usr.sbin/inetd/inetd.h soc2012/gmiller/locking-head/usr.sbin/ipfwpcap/ipfwpcap.8 soc2012/gmiller/locking-head/usr.sbin/jail/command.c soc2012/gmiller/locking-head/usr.sbin/jail/config.c soc2012/gmiller/locking-head/usr.sbin/jail/jail.8 soc2012/gmiller/locking-head/usr.sbin/jail/jail.c soc2012/gmiller/locking-head/usr.sbin/jail/jail.conf.5 soc2012/gmiller/locking-head/usr.sbin/jail/jailp.h soc2012/gmiller/locking-head/usr.sbin/kbdmap/kbdmap.c soc2012/gmiller/locking-head/usr.sbin/kldxref/ef.c soc2012/gmiller/locking-head/usr.sbin/lpr/common_source/common.c soc2012/gmiller/locking-head/usr.sbin/lpr/lpr/lpr.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/Makefile soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_cmd.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_config.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_drive.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_evt.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_flash.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_patrol.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_show.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfi_volume.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfiutil.c soc2012/gmiller/locking-head/usr.sbin/mfiutil/mfiutil.h soc2012/gmiller/locking-head/usr.sbin/mptutil/mpt_show.c soc2012/gmiller/locking-head/usr.sbin/ndiscvt/ndiscvt.8 soc2012/gmiller/locking-head/usr.sbin/ndp/ndp.8 soc2012/gmiller/locking-head/usr.sbin/ndp/ndp.c soc2012/gmiller/locking-head/usr.sbin/newsyslog/newsyslog.8 soc2012/gmiller/locking-head/usr.sbin/newsyslog/newsyslog.c soc2012/gmiller/locking-head/usr.sbin/newsyslog/newsyslog.conf.5 soc2012/gmiller/locking-head/usr.sbin/nscd/cachelib.c soc2012/gmiller/locking-head/usr.sbin/nscd/cachelib.h soc2012/gmiller/locking-head/usr.sbin/nscd/config.c soc2012/gmiller/locking-head/usr.sbin/nscd/config.h soc2012/gmiller/locking-head/usr.sbin/nscd/nscd.conf.5 soc2012/gmiller/locking-head/usr.sbin/nscd/parser.c soc2012/gmiller/locking-head/usr.sbin/pc-sysinstall/backend/functions-localize.sh soc2012/gmiller/locking-head/usr.sbin/pc-sysinstall/backend/functions.sh soc2012/gmiller/locking-head/usr.sbin/pciconf/Makefile soc2012/gmiller/locking-head/usr.sbin/pciconf/cap.c soc2012/gmiller/locking-head/usr.sbin/pciconf/pciconf.8 soc2012/gmiller/locking-head/usr.sbin/pciconf/pciconf.c soc2012/gmiller/locking-head/usr.sbin/pciconf/pciconf.h soc2012/gmiller/locking-head/usr.sbin/pkg/pkg.c soc2012/gmiller/locking-head/usr.sbin/pkg_install/add/main.c soc2012/gmiller/locking-head/usr.sbin/pkg_install/add/perform.c soc2012/gmiller/locking-head/usr.sbin/pkg_install/add/pkg_add.1 soc2012/gmiller/locking-head/usr.sbin/pkg_install/lib/exec.c soc2012/gmiller/locking-head/usr.sbin/pkg_install/lib/file.c soc2012/gmiller/locking-head/usr.sbin/pkg_install/lib/lib.h soc2012/gmiller/locking-head/usr.sbin/pkg_install/lib/msg.c soc2012/gmiller/locking-head/usr.sbin/pkg_install/lib/url.c soc2012/gmiller/locking-head/usr.sbin/pmcstat/pmcstat.8 soc2012/gmiller/locking-head/usr.sbin/pmcstat/pmcstat_log.c soc2012/gmiller/locking-head/usr.sbin/portsnap/portsnap/portsnap.8 soc2012/gmiller/locking-head/usr.sbin/portsnap/portsnap/portsnap.sh soc2012/gmiller/locking-head/usr.sbin/ppp/throughput.c soc2012/gmiller/locking-head/usr.sbin/rarpd/Makefile soc2012/gmiller/locking-head/usr.sbin/rarpd/rarpd.8 soc2012/gmiller/locking-head/usr.sbin/rarpd/rarpd.c soc2012/gmiller/locking-head/usr.sbin/rpc.lockd/kern.c soc2012/gmiller/locking-head/usr.sbin/rtadvctl/rtadvctl.8 soc2012/gmiller/locking-head/usr.sbin/rtadvd/rtadvd.8 soc2012/gmiller/locking-head/usr.sbin/setfib/setfib.1 soc2012/gmiller/locking-head/usr.sbin/smbmsg/smbmsg.8 soc2012/gmiller/locking-head/usr.sbin/syslogd/syslogd.8 soc2012/gmiller/locking-head/usr.sbin/tcpdump/tcpdump/Makefile soc2012/gmiller/locking-head/usr.sbin/tcpdump/tcpdump/config.h soc2012/gmiller/locking-head/usr.sbin/tcpdump/tcpdump/tcpdump.1 soc2012/gmiller/locking-head/usr.sbin/usbdump/usbdump.c soc2012/gmiller/locking-head/usr.sbin/utx/utx.8 soc2012/gmiller/locking-head/usr.sbin/vidcontrol/vidcontrol.c soc2012/gmiller/locking-head/usr.sbin/wpa/hostapd/hostapd.8 soc2012/gmiller/locking-head/usr.sbin/wpa/hostapd/hostapd.conf.5 soc2012/gmiller/locking-head/usr.sbin/wpa/ndis_events/ndis_events.8 Modified: soc2012/gmiller/locking-head/Makefile ============================================================================== --- soc2012/gmiller/locking-head/Makefile Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/Makefile Mon Aug 13 03:48:24 2012 (r240314) @@ -92,7 +92,7 @@ delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributekernel distributekernel.debug \ distributeworld distrib-dirs distribution doxygen \ - everything hierarchy install installcheck installkernel \ + everything hier hierarchy install installcheck installkernel \ installkernel.debug packagekernel packageworld \ reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ Modified: soc2012/gmiller/locking-head/Makefile.inc1 ============================================================================== --- soc2012/gmiller/locking-head/Makefile.inc1 Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/Makefile.inc1 Mon Aug 13 03:48:24 2012 (r240314) @@ -15,6 +15,7 @@ # -DNO_WWWUPDATE do not update www in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target # LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools # list # TARGET="machine" to crossbuild world for a different machine type @@ -88,7 +89,7 @@ # These are last, since it is nice to at least get the base system # rebuilt before you do them. -.for _DIR in ${LOCAL_DIRS} +.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS} .if exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} .endif @@ -242,7 +243,7 @@ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DNO_PIC -DNO_PROFILE -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -252,7 +253,7 @@ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DNO_LINT \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -487,7 +488,8 @@ .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ - DIRPRFX=${_dir}/ build-tools + DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \ + -DEARLY_BUILD build-tools .endfor cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries @@ -829,7 +831,7 @@ cd ${KRNLOBJDIR}/${_kernel}; \ PATH=${BPATH}:${PATH} \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) @@ -837,7 +839,7 @@ cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ PATH=${BPATH}:${PATH} \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) @@ -978,8 +980,8 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0 - @echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \ +.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \ false .endif .for _tool in tools/build @@ -1007,12 +1009,23 @@ _groff= gnu/usr.bin/groff .endif +.if ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 900002 _sed= usr.bin/sed .endif .if ${BOOTSTRAPPING} < 900006 _lex= usr.bin/lex +.endif + +.if ${BOOTSTRAPPING} < 1000013 _yacc= usr.bin/yacc .endif @@ -1020,7 +1033,7 @@ _awk= usr.bin/awk .endif -.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree) +.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree) _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -1034,7 +1047,9 @@ # dtrace tools are required for older bootstrap env and cross-build .if ${MK_CDDL} != "no" && \ - (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}) + ((${BOOTSTRAPPING} < 800038 && \ + !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \ + || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})) _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge .endif @@ -1063,14 +1078,16 @@ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ ${_dtc} \ ${_awk} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ ${_sed} \ - ${_lex} \ ${_yacc} \ + ${_lex} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config @@ -1132,7 +1149,7 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif @@ -1180,7 +1197,7 @@ # # hierarchy - ensure that all the needed directories are present # -hierarchy: +hierarchy hier: cd ${.CURDIR}/etc; ${MAKE} distrib-dirs # @@ -1243,7 +1260,7 @@ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ - ${_cddl_lib_libumem} \ + ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} @@ -1257,11 +1274,17 @@ .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} +.for _DIR in ${LOCAL_LIB_DIRS} +.if exists(${.CURDIR}/${_DIR}/Makefile) +_generic_libs+= ${_DIR} +.endif +.endfor lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem +_cddl_lib_libnvpair= cddl/lib/libnvpair _cddl_lib= cddl/lib .endif Modified: soc2012/gmiller/locking-head/ObsoleteFiles.inc ============================================================================== --- soc2012/gmiller/locking-head/ObsoleteFiles.inc Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/ObsoleteFiles.inc Mon Aug 13 03:48:24 2012 (r240314) @@ -38,6 +38,31 @@ # xargs -n1 | sort | uniq -d; # done +# 20120712: OpenSSL 1.0.1c import +OLD_LIBS+=lib/libcrypto.so.6 +OLD_LIBS+=usr/lib/libssl.so.6 +OLD_LIBS+=usr/lib32/libcrypto.so.6 +OLD_LIBS+=usr/lib32/libssl.so.6 +OLD_FILES+=usr/include/openssl/aes_locl.h +OLD_FILES+=usr/include/openssl/bio_lcl.h +OLD_FILES+=usr/include/openssl/e_os.h +OLD_FILES+=usr/include/openssl/fips.h +OLD_FILES+=usr/include/openssl/fips_rand.h +OLD_FILES+=usr/include/openssl/md2.h +OLD_FILES+=usr/include/openssl/pq_compat.h +OLD_FILES+=usr/include/openssl/store.h +OLD_FILES+=usr/include/openssl/tmdiff.h +OLD_FILES+=usr/include/openssl/ui_locl.h +OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz +# 20120621: remove old man page +OLD_FILES+=usr/share/man/man8/vnconfig.8.gz +# 20120613: auth.conf removed +OLD_FILES+=etc/auth.conf +OLD_FILES+=usr/share/examples/etc/auth.conf +OLD_FILES+=usr/share/man/man3/auth.3.gz +OLD_FILES+=usr/share/man/man5/auth.conf.5.gz +# 20120530: kde pam lives now in ports +OLD_FILES+=etc/pam.d/kde # 20120505: new clang import installed a redundant internal header OLD_FILES+=usr/include/clang/3.1/stdalign.h # 20120428: MD2 removed from libmd @@ -1333,6 +1358,11 @@ OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz OLD_FILES+=usr/lib32/libkse.so OLD_LIBS+=usr/lib32/libkse.so.3 +# 20080225: bsdar/bsdranlib rename to ar/ranlib +OLD_FILES+=usr/bin/bsdar +OLD_FILES+=usr/bin/bsdranlib +OLD_FILES+=usr/share/man/man1/bsdar.1.gz +OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal Modified: soc2012/gmiller/locking-head/UPDATING ============================================================================== --- soc2012/gmiller/locking-head/UPDATING Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/UPDATING Mon Aug 13 03:48:24 2012 (r240314) @@ -24,6 +24,39 @@ disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20120727: + The sparc64 ZFS loader has been changed to no longer try to auto- + detect ZFS providers based on diskN aliases but now requires these + to be explicitly listed in the OFW boot-device environment variable. + +20120712: + The OpenSSL has been upgraded to 1.0.1c. Any binaries requiring + libcrypto.so.6 or libssl.so.6 must be recompiled. Also, there are + configuration changes. Make sure to merge /etc/ssl/openssl.cnf. + +20120712: + The following sysctls and tunables have been renamed for consistency + with other variables: + kern.cam.da.da_send_ordered -> kern.cam.da.send_ordered + kern.cam.ada.ada_send_ordered -> kern.cam.ada.send_ordered + +20120628: + The sort utility has been replaced with BSD sort. For now, GNU sort + is also available as "gnusort" or the default can be set back to + GNU sort by setting WITH_GNU_SORT. In this case, BSD sort will be + installed as "bsdsort". + +20120611: + A new version of ZFS (pool version 5000) has been merged to -HEAD. + Starting with this version the old system of ZFS pool versioning + is superseded by "feature flags". This concept enables forward + compatibility against certain future changes in functionality of ZFS + pools. The first read-only compatible "feature flag" for ZFS pools + is named "com.delphix:async_destroy". For more information + read the new zpool-features(5) manual page. + Please refer to the "ZFS notes" section of this file for information + on upgrading boot ZFS pools. + 20120417: The malloc(3) implementation embedded in libc now uses sources imported as contrib/jemalloc. The most disruptive API change is to Modified: soc2012/gmiller/locking-head/bin/cat/cat.c ============================================================================== --- soc2012/gmiller/locking-head/bin/cat/cat.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/cat/cat.c Mon Aug 13 03:48:24 2012 (r240314) @@ -58,11 +58,11 @@ #include #include #include +#include #include #include #include #include -#include static int bflag, eflag, nflag, sflag, tflag, vflag; static int rval; @@ -77,16 +77,20 @@ static int udom_open(const char *path, int flags); #endif -/* Memory strategy threshold, in pages: if physmem is larger then this, use a - * large buffer */ -#define PHYSPAGES_THRESHOLD (32*1024) - -/* Maximum buffer size in bytes - do not allow it to grow larger than this */ -#define BUFSIZE_MAX (2*1024*1024) - -/* Small (default) buffer size in bytes. It's inefficient for this to be - * smaller than MAXPHYS */ -#define BUFSIZE_SMALL (MAXPHYS) +/* + * Memory strategy threshold, in pages: if physmem is larger than this, + * use a large buffer. + */ +#define PHYSPAGES_THRESHOLD (32 * 1024) + +/* Maximum buffer size in bytes - do not allow it to grow larger than this. */ +#define BUFSIZE_MAX (2 * 1024 * 1024) + +/* + * Small (default) buffer size in bytes. It's inefficient for this to be + * smaller than MAXPHYS. + */ +#define BUFSIZE_SMALL (MAXPHYS) int main(int argc, char *argv[]) @@ -144,13 +148,12 @@ static void scanfiles(char *argv[], int cooked) { - int i = 0; + int fd, i; char *path; FILE *fp; + i = 0; while ((path = argv[i]) != NULL || i == 0) { - int fd; - if (path == NULL || strcmp(path, "-") == 0) { filename = "stdin"; fd = STDIN_FILENO; @@ -257,16 +260,16 @@ wfd = fileno(stdout); if (buf == NULL) { if (fstat(wfd, &sbuf)) - err(1, "%s", filename); + err(1, "stdout"); if (S_ISREG(sbuf.st_mode)) { /* If there's plenty of RAM, use a large copy buffer */ if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) - bsize = MIN(BUFSIZE_MAX, MAXPHYS*8); + bsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); else bsize = BUFSIZE_SMALL; } else - bsize = MAX(sbuf.st_blksize, - (blksize_t)sysconf(_SC_PAGESIZE)); + bsize = MAX(sbuf.st_blksize, + (blksize_t)sysconf(_SC_PAGESIZE)); if ((buf = malloc(bsize)) == NULL) err(1, "malloc() failure of IO buffer"); } @@ -327,7 +330,7 @@ break; } } - return(fd); + return (fd); } #endif Modified: soc2012/gmiller/locking-head/bin/ed/Makefile ============================================================================== --- soc2012/gmiller/locking-head/bin/ed/Makefile Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/ed/Makefile Mon Aug 13 03:48:24 2012 (r240314) @@ -7,12 +7,12 @@ LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(RELEASE_CRUNCH) -.if ${MK_OPENSSL} != "no" +.if !defined(RELEASE_CRUNCH) && \ + ${MK_OPENSSL} != "no" && \ + ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif -.endif .include Modified: soc2012/gmiller/locking-head/bin/expr/expr.y ============================================================================== --- soc2012/gmiller/locking-head/bin/expr/expr.y Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/expr/expr.y Mon Aug 13 03:48:24 2012 (r240314) @@ -74,7 +74,6 @@ void to_string(struct val *); int yyerror(const char *); int yylex(void); -int yyparse(void); %} Modified: soc2012/gmiller/locking-head/bin/ls/Makefile ============================================================================== --- soc2012/gmiller/locking-head/bin/ls/Makefile Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/ls/Makefile Mon Aug 13 03:48:24 2012 (r240314) @@ -1,12 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 # $FreeBSD$ +.include + PROG= ls SRCS= cmp.c ls.c print.c util.c DPADD= ${LIBUTIL} LDADD= -lutil -.if !defined(RELEASE_CRUNCH) +.if !defined(RELEASE_CRUNCH) && \ + ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS DPADD+= ${LIBTERMCAP} LDADD+= -ltermcap Modified: soc2012/gmiller/locking-head/bin/ps/keyword.c ============================================================================== --- soc2012/gmiller/locking-head/bin/ps/keyword.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/ps/keyword.c Mon Aug 13 03:48:24 2012 (r240314) @@ -76,6 +76,7 @@ {"comm", "COMMAND", NULL, LJUST, ucomm, 0, CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, 0, CHAR, NULL, 0}, + {"cow", "COW", NULL, 0, kvar, KOFF(ki_cow), UINT, "u", 0}, {"cpu", "CPU", NULL, 0, kvar, KOFF(ki_estcpu), UINT, "d", 0}, {"cputime", "", "time", 0, NULL, 0, CHAR, NULL, 0}, {"egid", "", "gid", 0, NULL, 0, CHAR, NULL, 0}, Modified: soc2012/gmiller/locking-head/bin/ps/print.c ============================================================================== --- soc2012/gmiller/locking-head/bin/ps/print.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/ps/print.c Mon Aug 13 03:48:24 2012 (r240314) @@ -387,12 +387,13 @@ size_t buflen = 100; char *buf; + if (!k->ki_valid) + return (NULL); + buf = malloc(buflen); if (buf == NULL) errx(1, "malloc failed"); - if (!k->ki_valid) - return (NULL); if (use_ampm < 0) use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0'); then = k->ki_p->ki_start.tv_sec; @@ -415,12 +416,13 @@ char *buf; size_t buflen = 100; + if (!k->ki_valid) + return (NULL); + buf = malloc(buflen); if (buf == NULL) errx(1, "malloc failed"); - if (!k->ki_valid) - return (NULL); then = k->ki_p->ki_start.tv_sec; (void)strftime(buf, buflen, "%c", localtime(&then)); return (buf); Modified: soc2012/gmiller/locking-head/bin/ps/ps.1 ============================================================================== --- soc2012/gmiller/locking-head/bin/ps/ps.1 Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/ps/ps.1 Mon Aug 13 03:48:24 2012 (r240314) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd March 8, 2012 +.Dd May 20, 2012 .Dt PS 1 .Os .Sh NAME @@ -496,6 +496,8 @@ command .It Cm command command and arguments +.It Cm cow +number of copy-on-write faults .It Cm cpu short-term CPU usage factor (for scheduling) .It Cm emul Modified: soc2012/gmiller/locking-head/bin/rcp/rcp.1 ============================================================================== --- soc2012/gmiller/locking-head/bin/rcp/rcp.1 Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/rcp/rcp.1 Mon Aug 13 03:48:24 2012 (r240314) @@ -116,17 +116,11 @@ .Nm utility handles third party copies, where neither source nor target files are on the current machine. -.Sh FILES -.Bl -tag -width ".Pa /etc/auth.conf" -compact -.It Pa /etc/auth.conf -configure authentication services -.El .Sh SEE ALSO .Xr cp 1 , .Xr ftp 1 , .Xr rlogin 1 , .Xr rsh 1 , -.Xr auth.conf 5 , .Xr hosts.equiv 5 .Sh HISTORY The Modified: soc2012/gmiller/locking-head/bin/rcp/rcp.c ============================================================================== --- soc2012/gmiller/locking-head/bin/rcp/rcp.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/rcp/rcp.c Mon Aug 13 03:48:24 2012 (r240314) @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include Modified: soc2012/gmiller/locking-head/bin/rm/rm.c ============================================================================== --- soc2012/gmiller/locking-head/bin/rm/rm.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/rm/rm.c Mon Aug 13 03:48:24 2012 (r240314) @@ -301,10 +301,16 @@ if (fflag) continue; /* FALLTHROUGH */ - default: + + case FTS_F: + case FTS_NSOK: if (Pflag) - if (!rm_overwrite(p->fts_accpath, NULL)) + if (!rm_overwrite(p->fts_accpath, p->fts_info == + FTS_NSOK ? NULL : p->fts_statp)) continue; + /* FALLTHROUGH */ + + default: rval = unlink(p->fts_accpath); if (rval == 0 || (fflag && errno == ENOENT)) { if (rval == 0 && vflag) @@ -408,7 +414,7 @@ int rm_overwrite(char *file, struct stat *sbp) { - struct stat sb; + struct stat sb, sb2; struct statfs fsb; off_t len; int bsize, fd, wlen; @@ -427,8 +433,15 @@ file, sbp->st_ino); return (0); } - if ((fd = open(file, O_WRONLY, 0)) == -1) + if ((fd = open(file, O_WRONLY|O_NONBLOCK|O_NOFOLLOW, 0)) == -1) + goto err; + if (fstat(fd, &sb2)) goto err; + if (sb2.st_dev != sbp->st_dev || sb2.st_ino != sbp->st_ino || + !S_ISREG(sb2.st_mode)) { + errno = EPERM; + goto err; + } if (fstatfs(fd, &fsb) == -1) goto err; bsize = MAX(fsb.f_iosize, 1024); Modified: soc2012/gmiller/locking-head/bin/sh/Makefile ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/Makefile Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/Makefile Mon Aug 13 03:48:24 2012 (r240314) @@ -38,7 +38,7 @@ .ORDER: builtins.c builtins.h builtins.c builtins.h: mkbuiltins builtins.def - cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR} + sh ${.CURDIR}/mkbuiltins ${.CURDIR} init.c: mkinit alias.c eval.c exec.c input.c jobs.c options.c parser.c \ redir.c trap.c var.c Modified: soc2012/gmiller/locking-head/bin/sh/eval.c ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/eval.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/eval.c Mon Aug 13 03:48:24 2012 (r240314) @@ -672,6 +672,52 @@ result->fd, result->buf, result->nleft, result->jp)); } +static int +mustexpandto(const char *argtext, const char *mask) +{ + for (;;) { + if (*argtext == CTLQUOTEMARK || *argtext == CTLQUOTEEND) { + argtext++; + continue; + } + if (*argtext == CTLESC) + argtext++; + else if (BASESYNTAX[(int)*argtext] == CCTL) + return (0); + if (*argtext != *mask) + return (0); + if (*argtext == '\0') + return (1); + argtext++; + mask++; + } +} + +static int +isdeclarationcmd(struct narg *arg) +{ + int have_command = 0; + + if (arg == NULL) + return (0); + while (mustexpandto(arg->text, "command")) { + have_command = 1; + arg = &arg->next->narg; + if (arg == NULL) + return (0); + /* + * To also allow "command -p" and "command --" as part of + * a declaration command, add code here. + * We do not do this, as ksh does not do it either and it + * is not required by POSIX. + */ + } + return (mustexpandto(arg->text, "export") || + mustexpandto(arg->text, "readonly") || + (mustexpandto(arg->text, "local") && + (have_command || !isfunc("local")))); +} + /* * Check if a builtin can safely be executed in the same process, * even though it should be in a subshell (command substitution). @@ -743,11 +789,12 @@ exitstatus = 0; for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) { if (varflag && isassignment(argp->narg.text)) { - expandarg(argp, &varlist, EXP_VARTILDE); + expandarg(argp, varflag == 1 ? &varlist : &arglist, + EXP_VARTILDE); continue; - } + } else if (varflag == 1) + varflag = isdeclarationcmd(&argp->narg) ? 2 : 0; expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); - varflag = 0; } *arglist.lastp = NULL; *varlist.lastp = NULL; Modified: soc2012/gmiller/locking-head/bin/sh/exec.c ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/exec.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/exec.c Mon Aug 13 03:48:24 2012 (r240314) @@ -648,6 +648,19 @@ return (0); } + +/* + * Check if a function by a certain name exists. + */ +int +isfunc(const char *name) +{ + struct tblentry *cmdp; + cmdp = cmdlookup(name, 0); + return (cmdp != NULL && cmdp->cmdtype == CMDFUNCTION); +} + + /* * Shared code for the following builtin commands: * type, command -v, command -V Modified: soc2012/gmiller/locking-head/bin/sh/exec.h ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/exec.h Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/exec.h Mon Aug 13 03:48:24 2012 (r240314) @@ -72,5 +72,6 @@ void changepath(const char *); void defun(const char *, union node *); int unsetfunc(const char *); +int isfunc(const char *); int typecmd_impl(int, char **, int, const char *); void clearcmdentry(void); Modified: soc2012/gmiller/locking-head/bin/sh/input.c ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/input.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/input.c Mon Aug 13 03:48:24 2012 (r240314) @@ -186,7 +186,7 @@ if (rl_cp == NULL) rl_cp = el_gets(el, &el_len); if (rl_cp == NULL) - nr = 0; + nr = el_len == 0 ? 0 : -1; else { nr = el_len; if (nr > BUFSIZ) Modified: soc2012/gmiller/locking-head/bin/sh/jobs.c ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/jobs.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/jobs.c Mon Aug 13 03:48:24 2012 (r240314) @@ -84,10 +84,13 @@ static pid_t initialpgrp; /* pgrp of shell on invocation */ #endif int in_waitcmd = 0; /* are we in waitcmd()? */ -int in_dowait = 0; /* are we in dowait()? */ volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */ static int ttyfd = -1; +/* mode flags for dowait */ +#define DOWAIT_BLOCK 0x1 /* wait until a child exits */ +#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on signals */ + #if JOBS static void restartjob(struct job *); #endif @@ -95,7 +98,6 @@ static struct job *getjob(char *); pid_t getjobpgrp(char *); static pid_t dowait(int, struct job *); -static pid_t waitproc(int, int *); static void checkzombies(void); static void cmdtxt(union node *); static void cmdputs(const char *); @@ -520,7 +522,7 @@ break; } } - } while (dowait(1, (struct job *)NULL) != -1); + } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1); in_waitcmd--; return 0; @@ -967,7 +969,7 @@ INTOFF; TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1)); while (jp->state == 0) - if (dowait(1, jp) == -1) + if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG : 0), jp) == -1) dotrap(); #if JOBS if (jp->jobctl) { @@ -1005,14 +1007,20 @@ } +static void +dummy_handler(int sig) +{ +} /* * Wait for a process to terminate. */ static pid_t -dowait(int block, struct job *job) +dowait(int mode, struct job *job) { + struct sigaction sa, osa; + sigset_t mask, omask; pid_t pid; int status; struct procstat *sp; @@ -1022,17 +1030,49 @@ int stopped; int sig; int coredump; + int wflags; + int restore_sigchld; - in_dowait++; TRACE(("dowait(%d) called\n", block)); + restore_sigchld = 0; + if ((mode & DOWAIT_SIG) != 0) { + sigfillset(&mask); + sigprocmask(SIG_BLOCK, &mask, &omask); + INTOFF; + if (!issigchldtrapped()) { + restore_sigchld = 1; + sa.sa_handler = dummy_handler; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(SIGCHLD, &sa, &osa); + } + } do { - pid = waitproc(block, &status); +#if JOBS + if (iflag) + wflags = WUNTRACED | WCONTINUED; + else +#endif + wflags = 0; + if ((mode & (DOWAIT_BLOCK | DOWAIT_SIG)) != DOWAIT_BLOCK) + wflags |= WNOHANG; + pid = wait3(&status, wflags, (struct rusage *)NULL); TRACE(("wait returns %d, status=%d\n", (int)pid, status)); - } while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) || - (pid > 0 && WIFSTOPPED(status) && !iflag)); - in_dowait--; + if (pid == 0 && (mode & DOWAIT_SIG) != 0) { + sigsuspend(&omask); + pid = -1; + if (int_pending()) + break; + } + } while (pid == -1 && errno == EINTR && breakwaitcmd == 0); if (pid == -1 && errno == ECHILD && job != NULL) job->state = JOBDONE; + if ((mode & DOWAIT_SIG) != 0) { + if (restore_sigchld) + sigaction(SIGCHLD, &osa, NULL); + sigprocmask(SIG_SETMASK, &omask, NULL); + INTON; + } if (breakwaitcmd != 0) { breakwaitcmd = 0; if (pid <= 0) @@ -1053,7 +1093,11 @@ TRACE(("Changing status of proc %d from 0x%x to 0x%x\n", (int)pid, sp->status, status)); - sp->status = status; + if (WIFCONTINUED(status)) { + sp->status = -1; + jp->state = 0; + } else + sp->status = status; thisjob = jp; } if (sp->status == -1) @@ -1111,26 +1155,6 @@ /* - * Do a wait system call. If job control is compiled in, we accept - * stopped processes. If block is zero, we return a value of zero - * rather than blocking. - */ -static pid_t -waitproc(int block, int *status) -{ - int flags; - -#if JOBS - flags = WUNTRACED; -#else - flags = 0; -#endif - if (block == 0) - flags |= WNOHANG; - return wait3(status, flags, (struct rusage *)NULL); -} - -/* * return 1 if there are stopped jobs, otherwise 0 */ int job_warning = 0; Modified: soc2012/gmiller/locking-head/bin/sh/jobs.h ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/jobs.h Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/jobs.h Mon Aug 13 03:48:24 2012 (r240314) @@ -84,7 +84,6 @@ extern int job_warning; /* user was warned about stopped jobs */ extern int in_waitcmd; /* are we in waitcmd()? */ -extern int in_dowait; /* are we in dowait()? */ extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */ void setjobctl(int); Modified: soc2012/gmiller/locking-head/bin/sh/miscbltin.c ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/miscbltin.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/miscbltin.c Mon Aug 13 03:48:24 2012 (r240314) @@ -52,7 +52,6 @@ #include #include #include -#include #include "shell.h" #include "options.h" Modified: soc2012/gmiller/locking-head/bin/sh/mkbuiltins ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/mkbuiltins Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/mkbuiltins Mon Aug 13 03:48:24 2012 (r240314) @@ -35,17 +35,17 @@ # $FreeBSD$ temp=`/usr/bin/mktemp -t ka` -havejobs=0 -if grep '^#define[ ]*JOBS[ ]*1' shell.h > /dev/null -then havejobs=1 -fi havehist=1 if [ "X$1" = "X-h" ]; then havehist=0 shift fi -objdir=$1 -exec > ${objdir}/builtins.c +srcdir=$1 +havejobs=0 +if grep '^#define[ ]*JOBS[ ]*1' $srcdir/shell.h > /dev/null +then havejobs=1 +fi +exec > builtins.c cat <<\! /* * This file was generated by the mkbuiltins program. @@ -57,7 +57,7 @@ ! awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \ - print $0}' builtins.def | sed 's/-[hj]//' > $temp + print $0}' $srcdir/builtins.def | sed 's/-[hj]//' > $temp echo 'int (*const builtinfunc[])(int, char **) = {' awk '/^[^#]/ { printf "\t%s,\n", $1}' $temp echo '}; @@ -74,7 +74,7 @@ echo ' { NULL, 0, 0 } };' -exec > ${objdir}/builtins.h +exec > builtins.h cat <<\! /* * This file was generated by the mkbuiltins program. Modified: soc2012/gmiller/locking-head/bin/sh/sh.1 ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/sh.1 Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/sh.1 Mon Aug 13 03:48:24 2012 (r240314) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 5, 2011 +.Dd July 15, 2012 .Dt SH 1 .Os .Sh NAME @@ -1164,6 +1164,20 @@ tilde expansion is also performed after the equals sign and after any colon and usernames are also terminated by colons, and field splitting and pathname expansion are not performed. +.Pp +This special expansion applies not only to assignments that form a simple +command by themselves or precede a command word, +but also to words passed to the +.Ic export , +.Ic local +or +.Ic readonly +built-in commands that have this form. +For this, the builtin's name must be literal +(not the result of an expansion) +and may optionally be preceded by one or more literal instances of +.Ic command +without options. .Ss Positional Parameters A positional parameter is a parameter denoted by a number greater than zero. The shell sets these initially to the values of its command line Modified: soc2012/gmiller/locking-head/bin/sh/trap.c ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/trap.c Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/trap.c Mon Aug 13 03:48:24 2012 (r240314) @@ -368,6 +368,14 @@ } +int +issigchldtrapped(void) +{ + + return (trap[SIGCHLD] != NULL && *trap[SIGCHLD] != '\0'); +} + + /* * Signal handler. */ @@ -416,6 +424,7 @@ in_dotrap++; for (;;) { + pendingsigs = 0; for (i = 1; i < NSIG; i++) { if (gotsig[i]) { gotsig[i] = 0; @@ -467,7 +476,6 @@ break; } in_dotrap--; - pendingsigs = 0; } Modified: soc2012/gmiller/locking-head/bin/sh/trap.h ============================================================================== --- soc2012/gmiller/locking-head/bin/sh/trap.h Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/sh/trap.h Mon Aug 13 03:48:24 2012 (r240314) @@ -41,6 +41,7 @@ int have_traps(void); void setsignal(int); void ignoresig(int); +int issigchldtrapped(void); void onsig(int); void dotrap(void); void setinteractive(int); Modified: soc2012/gmiller/locking-head/bin/stty/extern.h ============================================================================== --- soc2012/gmiller/locking-head/bin/stty/extern.h Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/stty/extern.h Mon Aug 13 03:48:24 2012 (r240314) @@ -40,6 +40,6 @@ int msearch(char ***, struct info *); void optlist(void); void print(struct termios *, struct winsize *, int, enum FMT); -void usage(void); +void usage(void) __dead2; extern struct cchar cchars1[], cchars2[]; Modified: soc2012/gmiller/locking-head/bin/uuidgen/uuidgen.1 ============================================================================== --- soc2012/gmiller/locking-head/bin/uuidgen/uuidgen.1 Mon Aug 13 02:16:37 2012 (r240313) +++ soc2012/gmiller/locking-head/bin/uuidgen/uuidgen.1 Mon Aug 13 03:48:24 2012 (r240314) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 04:08:27 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 9AB4E106564A for ; Mon, 13 Aug 2012 04:08:25 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 04:08:25 +0000 Date: Mon, 13 Aug 2012 04:08:25 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813040825.9AB4E106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240315 - in soc2012/gmiller/locking-head: . lib/libthr/thread X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 04:08:27 -0000 Author: gmiller Date: Mon Aug 13 04:08:25 2012 New Revision: 240315 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240315 Log: r240361@FreeBSD-dev: root | 2012-08-11 12:41:04 -0500 Fix an error in the merge. Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h Modified: soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h ============================================================================== --- soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h Mon Aug 13 03:48:24 2012 (r240314) +++ soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h Mon Aug 13 04:08:25 2012 (r240315) @@ -743,8 +743,8 @@ int _mutex_cv_lock(struct pthread_mutex *, int _PROFILE_PARMS) __hidden; int _mutex_cv_unlock(struct pthread_mutex *, int *, int * _PROFILE_PARMS) __hidden; -int _mutex_cv_attach(struct pthread_mutex *, int _PROFILE_PARMS) __hidden; -int _mutex_cv_detach(struct pthread_mutex *, int * _PROFILE_PARMS) __hidden; +int _mutex_cv_attach(struct pthread_mutex *, int) __hidden; +int _mutex_cv_detach(struct pthread_mutex *, int *) __hidden; int _mutex_owned(struct pthread *, const struct pthread_mutex *) __hidden; int _mutex_reinit(pthread_mutex_t *) __hidden; void _mutex_fork(struct pthread *curthread) __hidden; From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 04:19:29 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 78D37106566B for ; Mon, 13 Aug 2012 04:19:28 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 04:19:28 +0000 Date: Mon, 13 Aug 2012 04:19:28 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813041928.78D37106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240316 - soc2012/gmiller/locking-head X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 04:19:29 -0000 Author: gmiller Date: Mon Aug 13 04:19:27 2012 New Revision: 240316 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240316 Log: Modified: soc2012/gmiller/locking-head/ (props changed) From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 04:35:39 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id A520C106564A for ; Mon, 13 Aug 2012 04:35:38 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 04:35:38 +0000 Date: Mon, 13 Aug 2012 04:35:38 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813043538.A520C106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240317 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 04:35:39 -0000 Author: jhagewood Date: Mon Aug 13 04:35:38 2012 New Revision: 240317 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240317 Log: Modified: soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 04:19:27 2012 (r240316) +++ soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 04:35:38 2012 (r240317) @@ -526,13 +526,14 @@ binexec(char *diffprog, char *f1, char *f2) { - char *args[] = {diffprog, f1, f2, (char *) 0}; + char *args[]; if (filebehave == FILE_GZIP) { diffprog = ZDIFF_PATH; } + args[] = {diffprog, f1, f2, (char *) 0}; execv(diffprog, args); - /* If execv() fails, this program's execution will continue. */ + /* If execv() fails, sdiff's execution will continue. */ sprintf(stderr, "Could not execute diff process.\n"); exit(1); } From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 05:13:33 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 1BE5A106564A for ; Mon, 13 Aug 2012 05:13:31 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 05:13:31 +0000 Date: Mon, 13 Aug 2012 05:13:31 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813051332.1BE5A106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240318 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 05:13:33 -0000 Author: jhagewood Date: Mon Aug 13 05:13:31 2012 New Revision: 240318 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240318 Log: Added -lz flags to compile options in sdiff's Makefile. Modified: soc2012/jhagewood/sdiff/Makefile soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/Makefile ============================================================================== --- soc2012/jhagewood/sdiff/Makefile Mon Aug 13 04:35:38 2012 (r240317) +++ soc2012/jhagewood/sdiff/Makefile Mon Aug 13 05:13:31 2012 (r240318) @@ -15,8 +15,8 @@ #.endif PROG= sdiff zsdiff -SRCS= common.c edit.c sdiff.c -COPTS+= -Wall -W +SRCS= common.c edit.c sdiff.c decompress.c +COPTS+= -Wall -W -lz LDADD+= -lutil DPADD+= ${LIBUTIL} Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 04:35:38 2012 (r240317) +++ soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 05:13:31 2012 (r240318) @@ -89,10 +89,10 @@ int Iflag = 0; /* ignore sets matching regexp */ int lflag; /* print only left column for identical lines */ int sflag; /* skip identical lines */ +int filebehave; /* open file behavior */ FILE *outfp; /* file to save changes to */ const char *tmpdir; /* TMPDIR or /tmp */ -char *pn; /* program name */ -char *filebehave; /* open file behavior */ +const char *pn; /* program name */ enum { HELP_OPT = CHAR_MAX + 1, @@ -470,6 +470,9 @@ warn("Error deleting %s.", tmp2); free(tmp1); free(tmp2); + if (filebehave == FILE_GZIP) { + diffprog = ZDIFF_PATH; + } binexec(diffprog, filename1, filename2); } /* Line numbers start at one. */ @@ -526,16 +529,11 @@ binexec(char *diffprog, char *f1, char *f2) { - char *args[]; - - if (filebehave == FILE_GZIP) { - diffprog = ZDIFF_PATH; - } - args[] = {diffprog, f1, f2, (char *) 0}; + char *args[] = {diffprog, f1, f2, (char *) 0}; execv(diffprog, args); - /* If execv() fails, sdiff's execution will continue. */ - sprintf(stderr, "Could not execute diff process.\n"); - exit(1); + + /* If execv() fails, sdiff's execution will continue below. */ + errx(1, "Could not execute diff process.\n"); } /* From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 12:09:41 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id A6200106566B for ; Mon, 13 Aug 2012 12:09:39 +0000 (UTC) (envelope-from rudot@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 12:09:39 +0000 Date: Mon, 13 Aug 2012 12:09:39 +0000 From: rudot@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813120939.A6200106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240321 - soc2012/rudot/sys/kern X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 12:09:41 -0000 Author: rudot Date: Mon Aug 13 12:09:39 2012 New Revision: 240321 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240321 Log: cosmetic changes - adding some comments, some adjustments to comply with the coding style. Modified: soc2012/rudot/sys/kern/kern_racct.c Modified: soc2012/rudot/sys/kern/kern_racct.c ============================================================================== --- soc2012/rudot/sys/kern/kern_racct.c Mon Aug 13 08:16:30 2012 (r240320) +++ soc2012/rudot/sys/kern/kern_racct.c Mon Aug 13 12:09:39 2012 (r240321) @@ -308,17 +308,21 @@ fixpt_t p_pctcpu; struct thread *td; + /* + * If the process is swapped out, we count its %cpu usage as zero. + * This behaviour is consistent with the userland ps(1) tool. + */ if ((p->p_flag & P_INMEM) == 0) return (0); swtime = (ticks - p->p_swtick) / hz; - if (swtime < RACCT_PCPU_SECS) { - /* - * For short-lived processes, the sched_pctcpu() returns small - * values even for cpu intensive processes. Therefore we use - * our own estimate in this case. - */ - return (pcpu); - } + + /* + * For short-lived processes, the sched_pctcpu() returns small + * values even for cpu intensive processes. Therefore we use + * our own estimate in this case. + */ + if (swtime < RACCT_PCPU_SECS) + return (pcpu); p_pctcpu = 0; FOREACH_THREAD_IN_PROC(p, td) { @@ -355,9 +359,8 @@ } #ifdef SCHED_4BSD - if (swtime <= CCPU_EXP_MAX) { + if (swtime <= CCPU_EXP_MAX) return ((100 * p_pctcpu) / (FSCALE - ccpu_exp[swtime])); - } #endif return ((100 * p_pctcpu) / FSCALE); @@ -462,7 +465,7 @@ /* * Increase consumption of 'resource' by 'amount' for 'racct' - * and all its parents. Differently from other cases, 'amount' here + * and all its parents. Differently from other cases, 'amount' here * may be less than zero. */ static void @@ -480,11 +483,18 @@ racct->r_resources[resource] = 0; } - if (resource == RACCT_PCTCPU) { - if (racct->r_resources[RACCT_PCTCPU] > 100) { - racct->r_resources[RACCT_PCTCPU] = 100; - } - } + /* + * There are some cases where the racct %cpu resource would grow + * beyond 100%. + * For example in racct_proc_exit() we add the process %cpu usage + * to the ucred racct containers. If too many processes terminated + * in a short time span, the ucred %cpu resource could grow too much. + * Also, the 4BSD scheduler sometimes returns for a thread more than + * 100% cpu usage. So we set a boundary here to 100%. + */ + if ((resource == RACCT_PCTCPU) && + (racct->r_resources[RACCT_PCTCPU] > 100)) + racct->r_resources[RACCT_PCTCPU] = 100; } static int @@ -609,9 +619,8 @@ if (RACCT_IS_DECAYING(resource)) { decayed_amount = old_amount * RACCT_DECAY_FACTOR / FSCALE; diff_cred = amount - decayed_amount; - } else { + } else diff_cred = diff_proc; - } available = INT64_MAX; racct_alloc_resource(p->p_racct, resource, diff_proc); @@ -650,9 +659,8 @@ if (RACCT_IS_DECAYING(resource)) { decayed_amount = old_amount * RACCT_DECAY_FACTOR / FSCALE; diff_cred = amount - decayed_amount; - } else { + } else diff_cred = diff_proc; - } #ifdef notyet KASSERT(diff_proc >= 0 || RACCT_CAN_DROP(resource), ("racct_set: usage of non-droppable resource %d dropping", @@ -726,7 +734,7 @@ /* * Returns amount of 'resource' the process 'p' can keep allocated. * Allocating more than that would be denied, unless the resource - * is marked undeniable. Amount of already allocated resource does + * is marked undeniable. Amount of already allocated resource does * not matter. */ uint64_t @@ -743,7 +751,7 @@ /* * Returns amount of 'resource' the process 'p' can keep allocated. * Allocating more than that would be denied, unless the resource - * is marked undeniable. Amount of already allocated resource does + * is marked undeniable. Amount of already allocated resource does * matter. */ uint64_t @@ -1059,7 +1067,7 @@ int resource; int64_t r_old, r_new; - resource = *(int *) res; + resource = *(int *)res; r_old = racct->r_resources[resource]; /* If there is nothing to decay, just exit. */ @@ -1130,11 +1138,10 @@ mtx_lock(&racct_lock); over_limits = racct_set_check_locked(p, RACCT_PCTCPU, pct); - if (over_limits) { + if (over_limits) racct_proc_disable(p); - } else if (racct_proc_disabled(p)) { + else if (racct_proc_disabled(p)) racct_proc_enable(p); - } racct_set_locked(p, RACCT_CPU, runtime); racct_set_locked(p, RACCT_WALLCLOCK, (uint64_t)wallclock.tv_sec * 1000000 + From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 23:06:18 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id AD226106564A for ; Mon, 13 Aug 2012 23:06:16 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 23:06:16 +0000 Date: Mon, 13 Aug 2012 23:06:16 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813230616.AD226106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240337 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 23:06:18 -0000 Author: jhagewood Date: Mon Aug 13 23:06:16 2012 New Revision: 240337 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240337 Log: File extension detection. Modified: soc2012/jhagewood/sdiff/decompress.c soc2012/jhagewood/sdiff/sdiff.c soc2012/jhagewood/sdiff/sdiff.h Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Mon Aug 13 21:29:34 2012 (r240336) +++ soc2012/jhagewood/sdiff/decompress.c Mon Aug 13 23:06:16 2012 (r240337) @@ -71,3 +71,16 @@ return file; } + +/* Checks for a gz file extension. */ +int +isgzip(char *filename) { + + int length = (sizeof filename)-1; + + if (filename[length-1] == 'g' && filename[length] == 'z') + return 1; + + return 0; + +} Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 21:29:34 2012 (r240336) +++ soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 23:06:16 2012 (r240337) @@ -62,6 +62,7 @@ }; extern FILE *decompressfile(char *, char *); +extern int isgzip(char *); static void astrcat(char **, const char *); static void enqueue(char *, char, char *); @@ -444,6 +445,13 @@ if ((diffpipe = fdopen(fd[0], "r")) == NULL) err(2, "could not open diff pipe"); } + + /* Checks for file extension to determine behavior. */ + if (isgzip(filename1) || isgzip(filename2)) + filebehave = FILE_GZIP); + else + filebehave = FILE_NORMAL; + if (filebehave == FILE_NORMAL) { if ((file1 = fopen(filename1, "r")) == NULL) err(2, "could not open %s", filename1); Modified: soc2012/jhagewood/sdiff/sdiff.h ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.h Mon Aug 13 21:29:34 2012 (r240336) +++ soc2012/jhagewood/sdiff/sdiff.h Mon Aug 13 23:06:16 2012 (r240337) @@ -37,3 +37,4 @@ #define ZDIFF_PATH "/usr/bin/zdiff" FILE *decompressfile(char *, char *); +int isgzip(char *); From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 23:19:53 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id B0BD3106566C for ; Mon, 13 Aug 2012 23:19:52 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 23:19:52 +0000 Date: Mon, 13 Aug 2012 23:19:52 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120813231952.B0BD3106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240338 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 23:19:53 -0000 Author: jhagewood Date: Mon Aug 13 23:19:52 2012 New Revision: 240338 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240338 Log: File extension detection. Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/diff/diff.h soc2012/jhagewood/diff/diffreg.c soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Mon Aug 13 23:06:16 2012 (r240337) +++ soc2012/jhagewood/diff/decompress.c Mon Aug 13 23:19:52 2012 (r240338) @@ -72,3 +72,16 @@ return file; } + +/* Checks for a gz file extension. */ +int +isgzip(char *filename) { + + int length = (sizeof filename)-1; + + if (filename[length-1] == 'g' && filename[length] == 'z') + return 1; + + return 0; + +} Modified: soc2012/jhagewood/diff/diff.h ============================================================================== --- soc2012/jhagewood/diff/diff.h Mon Aug 13 23:06:16 2012 (r240337) +++ soc2012/jhagewood/diff/diff.h Mon Aug 13 23:19:52 2012 (r240338) @@ -104,3 +104,4 @@ void print_status(int, char *, char *, char *); FILE *decompressfile(char *, char *); +int isgzip(char *); Modified: soc2012/jhagewood/diff/diffreg.c ============================================================================== --- soc2012/jhagewood/diff/diffreg.c Mon Aug 13 23:06:16 2012 (r240337) +++ soc2012/jhagewood/diff/diffreg.c Mon Aug 13 23:19:52 2012 (r240338) @@ -192,6 +192,7 @@ }; extern FILE *decompressfile(char *, char *); +extern int isgzip(char *); static FILE *opentemp(const char *); static void output(char *, FILE *, char *, FILE *, int); @@ -338,6 +339,10 @@ } else if (strcmp(file1, "-") == 0) f1 = stdin; else { + if (isgzip(file1)) + filebehave = FILE_GZIP; + else + filebehave = FILE_NORMAL; if (filebehave == FILE_NORMAL) f1 = fopen(file1, "r"); if (filebehave == FILE_GZIP) { @@ -364,6 +369,10 @@ } else if (strcmp(file2, "-") == 0) f2 = stdin; else { + if (isgzip(file1)) + filebehave = FILE_GZIP; + else + filebehave = FILE_NORMAL; if (filebehave == FILE_NORMAL) f2 = fopen(file2, "r"); if (filebehave == FILE_GZIP) Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 23:06:16 2012 (r240337) +++ soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 23:19:52 2012 (r240338) @@ -448,7 +448,7 @@ /* Checks for file extension to determine behavior. */ if (isgzip(filename1) || isgzip(filename2)) - filebehave = FILE_GZIP); + filebehave = FILE_GZIP; else filebehave = FILE_NORMAL; From owner-svn-soc-all@FreeBSD.ORG Tue Aug 14 01:29:20 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id B7ECF106564A for ; Tue, 14 Aug 2012 01:29:18 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Tue, 14 Aug 2012 01:29:18 +0000 Date: Tue, 14 Aug 2012 01:29:18 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120814012918.B7ECF106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240339 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 01:29:20 -0000 Author: jhagewood Date: Tue Aug 14 01:29:18 2012 New Revision: 240339 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240339 Log: Modified: soc2012/jhagewood/sdiff/TODO Modified: soc2012/jhagewood/sdiff/TODO ============================================================================== --- soc2012/jhagewood/sdiff/TODO Mon Aug 13 23:19:52 2012 (r240338) +++ soc2012/jhagewood/sdiff/TODO Tue Aug 14 01:29:18 2012 (r240339) @@ -28,3 +28,44 @@ -i Do a case-insensitive comparison. -t Expand tabs to spaces. -W Ignore all spaces (the -w flag is passed to diff(1)). + + +- gdb output for zsdiff: + +jesse@jesse /u/h/j/D/sdiff> gdb ./zsdiff +GNU gdb 6.1.1 [FreeBSD] +Copyright 2004 Free Software Foundation, Inc. +GDB is free software, covered by the GNU General Public License, and you +are +welcome to change it and/or distribute copies of it under certain +conditions. +Type "show copying" to see the conditions. +There is absolutely no warranty for GDB. Type "show warranty" for +details. +This GDB was configured as "amd64-marcel-freebsd"... +(gdb) run sdiff.gz sdiff.1.gz +Starting program: /usr/home/jesse/Documents/sdiff/zsdiff sdiff.gz +sdiff.1.gz + +Program received signal SIGBUS, Bus error. +0x0000000800d6bad8 in getdtablesize () from /lib/libc.so.7 +(gdb) where +#0 0x0000000800d6bad8 in getdtablesize () from /lib/libc.so.7 +#1 0x0000000800d4fae8 in funopen () from /lib/libc.so.7 +#2 0x0000000800d4f5ca in rewind () from /lib/libc.so.7 +#3 0x000000000040218a in istextfile (f=0x7fffffffdb77) at sdiff.c:558 +#4 0x0000000000402e44 in main (argc=2, argv=Variable "argv" is not +available. +) at sdiff.c:468 +(gdb) list +468 if (!istextfile(file1) || !istextfile(file2)) { +469 /* Close open files and pipe, delete temps */ +470 fclose(file1); +471 fclose(file2); +472 fclose(diffpipe); +473 if (tmp1) +474 if (unlink(tmp1)) +475 warn("Error deleting %s.", +tmp1); +476 if (tmp2) +477 if (unlink(tmp2)) From owner-svn-soc-all@FreeBSD.ORG Tue Aug 14 13:28:35 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 454A01065672 for ; Tue, 14 Aug 2012 13:28:33 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Tue, 14 Aug 2012 13:28:33 +0000 Date: Tue, 14 Aug 2012 13:28:33 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120814132833.454A01065672@hub.freebsd.org> Cc: Subject: socsvn commit: r240348 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf arm/ti arm/ti/am37x arm/ti/usb boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 13:28:35 -0000 Author: aleek Date: Tue Aug 14 13:28:32 2012 New Revision: 240348 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240348 Log: added usb UHH soft resetting. Ive found this one on u-boot source code Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_scm_padconf.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Tue Aug 14 12:15:01 2012 (r240347) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Tue Aug 14 13:28:32 2012 (r240348) @@ -113,7 +113,7 @@ device ehci device umass device scbus # SCSI bus (required for SCSI) -#device da # Direct Access (disks) +device da # Direct Access (disks) # Ethernet device loop Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_scm_padconf.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_scm_padconf.c Tue Aug 14 12:15:01 2012 (r240347) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_scm_padconf.c Tue Aug 14 13:28:32 2012 (r240348) @@ -43,10 +43,62 @@ #include #include #include +#include #include #include +#define CONTROL_PADCONF_WAKEUP_EVENT (1UL << 15) +#define CONTROL_PADCONF_WAKEUP_ENABLE (1UL << 14) +#define CONTROL_PADCONF_OFF_PULL_UP (1UL << 13) +#define CONTROL_PADCONF_OFF_PULL_ENABLE (1UL << 12) +#define CONTROL_PADCONF_OFF_OUT_HIGH (1UL << 11) +#define CONTROL_PADCONF_OFF_OUT_ENABLE (1UL << 10) +#define CONTROL_PADCONF_OFF_ENABLE (1UL << 9) +#define CONTROL_PADCONF_INPUT_ENABLE (1UL << 8) +#define CONTROL_PADCONF_PULL_UP (1UL << 4) +#define CONTROL_PADCONF_PULL_ENABLE (1UL << 3) +#define CONTROL_PADCONF_MUXMODE_MASK (0x7) + +#define CONTROL_PADCONF_SATE_MASK ( CONTROL_PADCONF_WAKEUP_EVENT \ + | CONTROL_PADCONF_WAKEUP_ENABLE \ + | CONTROL_PADCONF_OFF_PULL_UP \ + | CONTROL_PADCONF_OFF_PULL_ENABLE \ + | CONTROL_PADCONF_OFF_OUT_HIGH \ + | CONTROL_PADCONF_OFF_OUT_ENABLE \ + | CONTROL_PADCONF_OFF_ENABLE \ + | CONTROL_PADCONF_INPUT_ENABLE \ + | CONTROL_PADCONF_PULL_UP \ + | CONTROL_PADCONF_PULL_ENABLE ) + + + + + +/* Active pin states */ +#define PADCONF_PIN_OUTPUT 0 +#define PADCONF_PIN_INPUT CONTROL_PADCONF_INPUT_ENABLE +#define PADCONF_PIN_INPUT_PULLUP ( CONTROL_PADCONF_INPUT_ENABLE \ + | CONTROL_PADCONF_PULL_ENABLE \ + | CONTROL_PADCONF_PULL_UP) +#define PADCONF_PIN_INPUT_PULLDOWN ( CONTROL_PADCONF_INPUT_ENABLE \ + | CONTROL_PADCONF_PULL_ENABLE ) + +/* Off mode states */ +#define PADCONF_PIN_OFF_NONE 0 +#define PADCONF_PIN_OFF_OUTPUT_HIGH ( CONTROL_PADCONF_OFF_ENABLE \ + | CONTROL_PADCONF_OFF_OUT_ENABLE \ + | CONTROL_PADCONF_OFF_OUT_HIGH) +#define PADCONF_PIN_OFF_OUTPUT_LOW ( CONTROL_PADCONF_OFF_ENABLE \ + | CONTROL_PADCONF_OFF_OUT_ENABLE) +#define PADCONF_PIN_OFF_INPUT_PULLUP ( CONTROL_PADCONF_OFF_ENABLE \ + | CONTROL_PADCONF_OFF_PULL_ENABLE \ + | CONTROL_PADCONF_OFF_PULL_UP) +#define PADCONF_PIN_OFF_INPUT_PULLDOWN ( CONTROL_PADCONF_OFF_ENABLE \ + | CONTROL_PADCONF_OFF_PULL_ENABLE) +#define PADCONF_PIN_OFF_WAKEUPENABLE CONTROL_PADCONF_WAKEUP_ENABLE + + #define _PIN(r, b, gp, gm, m0, m1, m2, m3, m4, m5, m6, m7) \ { .reg_off = r, \ .gpio_pin = gp, \ @@ -289,8 +341,8 @@ }; const struct ti_scm_device ti_scm_dev = { - .padconf_muxmode_mask = 0x7, - .padconf_sate_mask = 0x78, + .padconf_muxmode_mask = CONTROL_PADCONF_MUXMODE_MASK, + .padconf_sate_mask = CONTROL_PADCONF_SATE_MASK, .padstate = (struct ti_scm_padstate *) &ti_padstate_devmap, .padconf = (struct ti_scm_padconf *) &ti_padconf_devmap, }; @@ -298,8 +350,19 @@ int ti_scm_padconf_set_gpioflags(uint32_t gpio, uint32_t flags) { - /* TODO */ - return (EINVAL); + unsigned int state = 0; + + if (flags & GPIO_PIN_OUTPUT) + state = PADCONF_PIN_OUTPUT; + else if (flags & GPIO_PIN_INPUT) { + if (flags & GPIO_PIN_PULLUP) + state = PADCONF_PIN_INPUT_PULLUP; + else if (flags & GPIO_PIN_PULLDOWN) + state = PADCONF_PIN_INPUT_PULLDOWN; + else + state = PADCONF_PIN_INPUT; + } + return ti_scm_padconf_set_gpiomode(gpio, state); } void Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c Tue Aug 14 12:15:01 2012 (r240347) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c Tue Aug 14 13:28:32 2012 (r240348) @@ -437,6 +437,8 @@ uint32_t mask = (1UL << (pin % PINS_PER_BANK)); uint32_t reg_val; + device_printf( sc->sc_dev, "%s:%d\n", __func__, __LINE__ ); + /* Sanity check the flags supplied are valid, i.e. not input and output */ if ((flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) == 0x0000) return (EINVAL); @@ -458,10 +460,12 @@ /* Set the GPIO mode and state */ if (ti_scm_padconf_set_gpioflags(pin, flags) != 0) { + device_printf( sc->sc_dev, "%s:%d\n", __func__, __LINE__ ); TI_GPIO_UNLOCK(sc); return (EINVAL); } + device_printf( sc->sc_dev, "%s:%d\n", __func__, __LINE__ ); /* If configuring as an output set the "output enable" bit */ reg_val = ti_gpio_read_4(sc, bank, TI_GPIO_OE); if (flags & GPIO_PIN_INPUT) @@ -470,6 +474,7 @@ reg_val &= ~mask; ti_gpio_write_4(sc, bank, TI_GPIO_OE, reg_val); + device_printf( sc->sc_dev, "%s:%d\n", __func__, __LINE__ ); TI_GPIO_UNLOCK(sc); @@ -808,3 +813,5 @@ static devclass_t ti_gpio_devclass; DRIVER_MODULE(ti_gpio, simplebus, ti_gpio_driver, ti_gpio_devclass, 0, 0); +MODULE_DEPEND(ti_gpio, ti_scm, 1, 1, 1); + Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Tue Aug 14 12:15:01 2012 (r240347) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Tue Aug 14 13:28:32 2012 (r240348) @@ -102,9 +102,6 @@ #include #include -#include -#include - #include #include "gpio_if.h" @@ -114,7 +111,6 @@ device_t sc_dev; device_t sc_gpio_dev; - device_t sc_vreg_dev; /* TLL register set */ struct resource* tll_mem_res; @@ -350,53 +346,30 @@ uint32_t reg = 0; int reset_performed = 0; int i; -// int gpio_val; device_printf(isc->sc_dev, "Starting TI EHCI USB Controller\n"); /* Enable Clocks for high speed USBHOST */ - if( ti_prcm_clk_enable(USBHSHOST_CLK) != 0 ) - { - device_printf( isc->sc_dev, "KURWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ); - } - - /* enabling TWL4030/TPS95950 voltage regulator */ - //twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb1v5", 1500); - //twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb1v8", 1800); - //twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb3v1", 3100); + ti_prcm_clk_enable(USBHSHOST_CLK); /* Hold the PHY in reset while configuring */ - /* for (int i = 0; i < 3; i++) { if (isc->phy_reset[i]) { - // Configure the GPIO to drive low (hold in reset) + /* Configure the GPIO to drive low (hold in reset) */ if ((isc->reset_gpio_pin[i] != -1) && (isc->sc_gpio_dev != NULL)) { GPIO_PIN_SETFLAGS(isc->sc_gpio_dev, isc->reset_gpio_pin[i], GPIO_PIN_OUTPUT); - if( GPIO_PIN_SET(isc->sc_gpio_dev, isc->reset_gpio_pin[i], - GPIO_PIN_LOW) != 0 ) - { - return ENXIO; - } - if( GPIO_PIN_SET(isc->sc_gpio_dev, 56, - GPIO_PIN_LOW) != 0 ) - { - return ENXIO; - } - GPIO_PIN_GET( isc->sc_gpio_dev, isc->reset_gpio_pin[i], &gpio_val ); - if( gpio_val != GPIO_PIN_LOW ) - { - return ENXIO; - } + GPIO_PIN_SET(isc->sc_gpio_dev, isc->reset_gpio_pin[i], + GPIO_PIN_LOW); reset_performed = 1; } } } -*/ + /* Hold the PHY in RESET for enough time till DIR is high */ - //if (reset_performed) - DELAY(100); + if (reset_performed) + DELAY(10); /* Read the UHH revision */ isc->ehci_rev = omap_uhh_read_4(isc, OMAP_USBHOST_UHH_REVISION); @@ -406,12 +379,26 @@ if (isc->ehci_rev == OMAP_EHCI_REV1) { /* Enable the USB TLL */ - if( ti_prcm_clk_enable(USBTLL_CLK) != 0 ) + ti_prcm_clk_enable(USBTLL_CLK); + + /* Set the timeout to 100ms*/ + timeout = (hz < 10) ? 1 : ((100 * hz) / 1000); + // perform a uhh reset + omap_uhh_write_4( isc, OMAP_USBHOST_UHH_SYSCONFIG, UHH_SYSCONFIG_SOFTRESET ); + + while( (omap_uhh_read_4( isc, OMAP_USBHOST_UHH_SYSSTATUS ) & 0x2) == 0 ) { - device_printf( isc->sc_dev, "AKURWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ); + /* Sleep for a tick */ + pause("USBRESET", 1); + + if (timeout-- == 0) { + device_printf(isc->sc_dev, "UHH reset operation timed out\n"); + ret = EINVAL; + goto err_sys_status; + } } - - //omap_ehci_write_4(isc, OMAP_USBHOST_INSNREG04, OMAP_USBHOST_INSNREG04_DISABLE_UNSUSPEND); + device_printf(isc->sc_dev, "UHH RESET DONE\n"); + /* Perform TLL soft reset, and wait until reset is complete */ omap_tll_write_4(isc, OMAP_USBTLL_SYSCONFIG, TLL_SYSCONFIG_SOFTRESET); @@ -483,10 +470,12 @@ UHH_SYSCONFIG_SIDLEMODE_SMARTIDLE | UHH_SYSCONFIG_MIDLEMODE_SMARTSTANDBY); } else if (isc->ehci_rev == OMAP_EHCI_REV2) { +#if 0 reg &= ~UHH_SYSCONFIG_IDLEMODE_MASK; reg |= UHH_SYSCONFIG_IDLEMODE_NOIDLE; reg &= ~UHH_SYSCONFIG_STANDBYMODE_MASK; reg |= UHH_SYSCONFIG_STANDBYMODE_NOSTDBY; +#endif } omap_uhh_write_4(isc, OMAP_USBHOST_UHH_SYSCONFIG, reg); device_printf(isc->sc_dev, "OMAP_UHH_SYSCONFIG: 0x%08x\n", reg); @@ -516,6 +505,7 @@ reg |= UHH_HOSTCONFIG_P1_ULPI_BYPASS; } else if (isc->ehci_rev == OMAP_EHCI_REV2) { +#if 0 reg |= UHH_HOSTCONFIG_APP_START_CLK; /* Clear port mode fields for PHY mode*/ @@ -531,6 +521,7 @@ reg |= UHH_HOSTCONFIG_P2_MODE_UTMI_PHY; else if (isc->port_mode[1] == EHCI_HCD_OMAP_MODE_HSIC) reg |= UHH_HOSTCONFIG_P2_MODE_HSIC; +#endif } omap_uhh_write_4(isc, OMAP_USBHOST_UHH_HOSTCONFIG, reg); @@ -545,9 +536,11 @@ * the root-hub is allowed to suspend. Writing 1 to this undocumented * register bit disables this feature and restores normal behavior." */ + omap_ehci_write_4(isc, OMAP_USBHOST_INSNREG04, OMAP_USBHOST_INSNREG04_DISABLE_UNSUSPEND); + /* If any of the ports are configured in TLL mode, enable them */ if ((isc->port_mode[0] == EHCI_HCD_OMAP_MODE_TLL) || (isc->port_mode[1] == EHCI_HCD_OMAP_MODE_TLL) || @@ -564,6 +557,7 @@ omap_ehci_utmi_init(isc, tll_ch_mask); } + /* Release the PHY reset signal now we have configured everything */ if (reset_performed) { @@ -577,17 +571,10 @@ && (isc->sc_gpio_dev != NULL)) { GPIO_PIN_SET(isc->sc_gpio_dev, isc->reset_gpio_pin[i], GPIO_PIN_HIGH); - GPIO_PIN_SET(isc->sc_gpio_dev, - 56, GPIO_PIN_HIGH); } } } - /* Soft reset the PHY using PHY reset command over ULPI */ - if (isc->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) - omap_ehci_soft_phy_reset(isc, 0); - if (isc->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) - omap_ehci_soft_phy_reset(isc, 1); /* Set the interrupt threshold control, it controls the maximum rate at * which the host controller issues interrupts. We set it to 1 microframe * at startup - the default is 8 mircoframes (equates to 1ms). @@ -597,6 +584,11 @@ reg |= (1 << 16); omap_ehci_write_4(isc, OMAP_USBHOST_USBCMD, reg); + /* Soft reset the PHY using PHY reset command over ULPI */ + if (isc->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) + omap_ehci_soft_phy_reset(isc, 0); + if (isc->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) + omap_ehci_soft_phy_reset(isc, 1); return(0); @@ -817,13 +809,13 @@ /* save the device */ isc->sc_dev = dev; - isc->sc_vreg_dev = devclass_get_device(devclass_find("twl_vreg"), 0); /* get all DMA memory */ if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev), &ehci_iterate_hw_softc)) { return (ENOMEM); } + /* When the EHCI driver is added to the tree it is expected that 3 * memory resources and 1 interrupt resource is assigned. The memory * resources should be: @@ -895,7 +887,6 @@ tuple_size = sizeof(pcell_t) * 3; node = ofw_bus_get_node(dev); - len = OF_getprop(node, "phy-config", phyconf, sizeof(phyconf)); if (len > 0) { if (len % tuple_size) @@ -912,7 +903,7 @@ phyconf_ptr += 3; } } - + /* Initialise the ECHI registers */ err = omap_ehci_init(isc); if (err) { @@ -1055,4 +1046,3 @@ static devclass_t ehci_devclass; DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0); -MODULE_DEPEND(ehci, twl_vreg, 1, 1, 1); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h Tue Aug 14 12:15:01 2012 (r240347) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h Tue Aug 14 13:28:32 2012 (r240348) @@ -199,6 +199,7 @@ #define UHH_HOSTCONFIG_P1_ULPI_BYPASS (1UL << 0) /* The following are on rev2 (OMAP44xx) of the EHCI only */ +#if 0 #define UHH_SYSCONFIG_IDLEMODE_MASK (3UL << 2) #define UHH_SYSCONFIG_IDLEMODE_NOIDLE (1UL << 2) #define UHH_SYSCONFIG_STANDBYMODE_MASK (3UL << 4) @@ -212,6 +213,7 @@ #define UHH_HOSTCONFIG_P2_MODE_ULPI_PHY (0UL << 18) #define UHH_HOSTCONFIG_P2_MODE_UTMI_PHY (1UL << 18) #define UHH_HOSTCONFIG_P2_MODE_HSIC (3UL << 18) +#endif #define ULPI_FUNC_CTRL_RESET (1 << 5) Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Tue Aug 14 12:15:01 2012 (r240347) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Tue Aug 14 13:28:32 2012 (r240348) @@ -94,7 +94,7 @@ "ad25", "gpio_147", "output", "ae7", "hsusb2_clk", "output", - "r8", "gpio_56", "output", + /*"r8", "gpio_56", "output",/* /* i2c */ "ic11", "i2c1_scl", "output", From owner-svn-soc-all@FreeBSD.ORG Tue Aug 14 17:40:58 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id A5A21106564A for ; Tue, 14 Aug 2012 17:40:56 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Tue, 14 Aug 2012 17:40:56 +0000 Date: Tue, 14 Aug 2012 17:40:56 +0000 From: gpf@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120814174056.A5A21106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240351 - in soc2012/gpf/pefs_kmod: sbin/pefs sys/fs/pefs X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 17:40:58 -0000 Author: gpf Date: Tue Aug 14 17:40:56 2012 New Revision: 240351 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240351 Log: minor fixes and some cosmetic changes Modified: soc2012/gpf/pefs_kmod/sbin/pefs/pefs_checksum.c soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.c soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.h soc2012/gpf/pefs_kmod/sys/fs/pefs/pefs_checksum.c Modified: soc2012/gpf/pefs_kmod/sbin/pefs/pefs_checksum.c ============================================================================== --- soc2012/gpf/pefs_kmod/sbin/pefs/pefs_checksum.c Tue Aug 14 14:07:34 2012 (r240350) +++ soc2012/gpf/pefs_kmod/sbin/pefs/pefs_checksum.c Tue Aug 14 17:40:56 2012 (r240351) @@ -53,11 +53,8 @@ #include -#include -#include #include #include -#include #include "pefs_ctl.h" @@ -86,7 +83,7 @@ TAILQ_HEAD(checksum_head, checksum); /* tail that contains all file headers that require integrity checking */ TAILQ_HEAD(file_header_head, file_header); -/* tail for all the file_headers that refere to the same inode */ +/* tail for all the file_headers that refer to the same inode */ TAILQ_HEAD(hardlink_fh_head, file_header); /* RB tree for hardlink counters */ @@ -99,20 +96,26 @@ #define PEFS_FH_SIZE 16 /* - * This struct is used to check if all hardlinks for a given inode are supplied - * by the user + * This struct is used to check if all hardlinks for a given inode are + * supplied by the user. */ struct hardlink_counter { - ino_t inode; /* inode number for the file in question */ - uint32_t total_links; /* total hardlinks of the file */ - uint32_t links_found; /* how many links are found in user supplied list */ - struct hardlink_fh_head file_headers; /* file headers of the links we have found */ - RB_ENTRY(hardlink_counter) hardlink_entries; /* entry in hardlink RB tree */ + /* inode number for the file in question */ + ino_t inode; + /* total hardlinks of the file */ + uint32_t total_links; + /* how many links are found in user supplied list */ + uint32_t links_found; + /* file headers of the links we have found */ + struct hardlink_fh_head file_headers; + /* entry in hardlink RB tree */ + RB_ENTRY(hardlink_counter) hardlink_entries; }; -/* XXXgpf: unions for on disk structs and move to a different header? */ - -/* this is the unique file header of the .pefs.checksum file, found in the beginning of the file */ +/* + * This is the unique file header of the .pefs.checksum file, found in + * the beginning of the file. + */ struct checksum_file_header { uint8_t version; uint8_t reserved; @@ -134,21 +137,39 @@ /* XXXgpf: [TODO] turns offsets to uint64_t? */ struct file_header { - /* on disk information */ - uint32_t nhashes; /* the number of hashes for the file */ - uint32_t offset_to_checksums; /* in file offset to start of checksums */ - union file_id fid; /* id is MAC tweak from filename (first 64 bits) */ - - /* in memory information */ - char path[MAXPATHLEN + 1]; /* fullpath for this file */ - char dirpath[MAXPATHLEN + 1]; /* fullpath for this file's parent dir */ - char filename[MAXNAMLEN + 1]; /* filename */ - char *target_path; /*fullpath to this symlink's immediate next target */ - int fd, pfd; /* file descriptors for the file and its parent dir */ - int found; /* mark that this entry was found during "verify" action */ - struct checksum_head checksums; /* this file's checksums */ - TAILQ_ENTRY(file_header) file_header_entries; /* entry in global file header tail */ - TAILQ_ENTRY(file_header) fh_hardlink_entries; /* entry in hardlink counter */ + /* + * on disk information + */ + + /* the number of hashes for the file */ + uint32_t nhashes; + /* in file offset to start of checksums */ + uint32_t offset_to_checksums; + /* id is MAC tweak from filename (first 64 bits) */ + union file_id fid; + + /* + * in memory information + */ + + /* fullpath for this file */ + char path[MAXPATHLEN + 1]; + /* fullpath for this file's parent dir */ + char dirpath[MAXPATHLEN + 1]; + /* filename */ + char filename[MAXNAMLEN + 1]; + /*fullpath to this symlink's immediate next target */ + char *target_path; + /* file descriptors for the file and its parent dir */ + int fd, pfd; + /* mark that this entry was found during "verify" action */ + int found; + /* this file's checksums */ + struct checksum_head checksums; + /* entry in global file header tail */ + TAILQ_ENTRY(file_header) file_header_entries; + /* entry in hardlink counter */ + TAILQ_ENTRY(file_header) fh_hardlink_entries; }; struct bucket { @@ -203,8 +224,37 @@ return 0; } +static struct file_header * +pefs_allocate_file_header(void) +{ + struct file_header *fhp; + + fhp = malloc(sizeof(struct file_header)); + if (fhp == NULL) { + pefs_warn("memory allocation error"); + return (NULL); + } + + fhp->nhashes = 0; + fhp->offset_to_checksums = 0; + fhp->fid.fid_num = 0; + fhp->fd = -1; + fhp->pfd = -1; + fhp->found = 0; + + fhp->target_path = NULL; + + fhp->path[0] = '\0'; + fhp->dirpath[0] = '\0'; + fhp->filename[0] = '\0'; + + TAILQ_INIT(&(fhp->checksums)); + + return (fhp); +} + static void -pefs_close_file(struct file_header *fhp) +pefs_close_files(struct file_header *fhp) { if (fhp->fd >= 0) { close(fhp->fd); @@ -216,6 +266,24 @@ } } +static void +pefs_free_file_header(struct file_header *fhp) +{ + struct checksum *csp, *tcsp; + if (fhp != NULL) { + pefs_close_files(fhp); + TAILQ_FOREACH_SAFE(csp, &(fhp->checksums), checksum_entries, tcsp) { + TAILQ_REMOVE(&(fhp->checksums), csp, checksum_entries); + if (csp->hash != NULL) + free(csp->hash); + free(csp); + } + if (fhp->target_path != NULL) + free(fhp->target_path); + free(fhp); + } +} + static int pefs_compute_symlink_checksum(struct file_header *fhp, const EVP_MD *md, uint8_t hash_len, int flags) @@ -355,10 +423,10 @@ EVP_DigestInit_ex(&mdctx, md, NULL); EVP_DigestUpdate(&mdctx, buf, buf_len); - //dprintf(("read %d bytes\n\n", buf_len)); - //dprintf(("printing contents of buffer:")); - //for (i=0; i < (int)buf_len; i++) dprintf(("%c", buf[i])); - //dprintf(("!\n")); + dprintf(("read %d bytes\n\n", buf_len)); + dprintf(("printing contents of buffer:")); + for (i=0; i < (int)buf_len; i++) dprintf(("%c", buf[i])); + dprintf(("!\n")); csp = malloc(sizeof(struct checksum)); if (csp == NULL) { @@ -464,53 +532,6 @@ return (0); } -static struct file_header * -pefs_allocate_file_header(void) -{ - struct file_header *fhp; - - fhp = malloc(sizeof(struct file_header)); - if (fhp == NULL) { - pefs_warn("memory allocation error"); - return (NULL); - } - - fhp->nhashes = 0; - fhp->offset_to_checksums = 0; - fhp->fid.fid_num = 0; - fhp->fd = -1; - fhp->pfd = -1; - fhp->found = 0; - - fhp->target_path = NULL; - - fhp->path[0] = '\0'; - fhp->dirpath[0] = '\0'; - fhp->filename[0] = '\0'; - - TAILQ_INIT(&(fhp->checksums)); - - return (fhp); -} - -static void -pefs_free_file_header(struct file_header *fhp) -{ - struct checksum *csp, *tcsp; - if (fhp != NULL) { - pefs_close_file(fhp); - TAILQ_FOREACH_SAFE(csp, &(fhp->checksums), checksum_entries, tcsp) { - TAILQ_REMOVE(&(fhp->checksums), csp, checksum_entries); - if (csp->hash != NULL) - free(csp->hash); - free(csp); - } - if (fhp->target_path != NULL) - free(fhp->target_path); - free(fhp); - } -} - static void pefs_free_hash_table(struct cuckoo_hash_table *chtp) { @@ -809,7 +830,7 @@ pefs_warn("target file %s of symlink %s was not " "found in inputlist", targetfh.path, fhp->path); } - pefs_close_file(&targetfh); + pefs_close_files(&targetfh); } } } @@ -1123,7 +1144,7 @@ * A1d) Open and store file descriptors to file & parent_directory. * A2) the file_id is retrieved. (filename MAC) * A3) list of checksums is computed for the file's 4k blocks. - * A4) file entry is added to universal fh_head. + * A4) file entry is added to the universal fh_head. * B) Print warnings for hardlinks if the number of links found in inputlist * isn't equal to the number of total inode links. * C) Hash tables are allocated. @@ -1133,7 +1154,7 @@ * and try again until we succeed. The possibility to fail twice in a row is * 1.5% * 1.5% = 0.0225% * E) For each symlink found in input list, print warnings if its target file - * was not found in input list as well since symlinks are not traversed. + * was not found in input list since symlinks are not traversed. */ static int pefs_create_in_memory_db(FILE *fpin, const EVP_MD *md, uint8_t hash_len, @@ -1174,7 +1195,7 @@ } TAILQ_INSERT_TAIL(&fh_head, fhp, file_header_entries); - pefs_close_file(fhp); + pefs_close_files(fhp); } /* checking I/O error from pefs_next_file() */ @@ -1594,7 +1615,6 @@ unsigned char *sign; int bytes, error, rval, sign_len; - /* read public key from .pefs.pkey */ pkey = pefs_read_dsa_pubkey(pk_fp); if (pkey == NULL) return (PEFS_ERR_SYS); @@ -1859,11 +1879,11 @@ } (*buckets_offset)+= sizeof(fhp->fid.fid_str); - //dprintf(("\nfile header offset = %d\n", *fh_offset)); - //dprintf(("\n++priting file header info++\n")); - //dprintf(("nhashes %d\noffset_to_checksums %u\n", - //fhp->nhashes, fhp->offset_to_checksums)); - //dprintf(("file id %llu\n", fhp->file_id)); + dprintf(("\nfile header offset = %d\n", *fh_offset)); + dprintf(("\n++priting file header info++\n")); + dprintf(("nhashes %d\noffset_to_checksums %u\n", + fhp->nhashes, fhp->offset_to_checksums)); + dprintf(("file id %llu\n", fhp->file_id)); return (0); } @@ -1874,7 +1894,7 @@ struct file_header *fhp; int error; - //dprintf(("bucket offset = %d\n", *buckets_offset)); + dprintf(("bucket offset = %d\n", *buckets_offset)); fhp = pefs_allocate_file_header(); if (fhp == NULL) return (PEFS_ERR_SYS); @@ -1889,7 +1909,7 @@ } bp->fhp = fhp; - //dprintf(("\n++priting bucket info++\n")); + dprintf(("\n++priting bucket info++\n")); return (0); } @@ -1907,8 +1927,8 @@ } (*hashes_offset)+= hash_len; - //dprintf(("hashes offset = %d\n", *hashes_offset)); - //dprintf(("hash %s\n", csp->hash)); + dprintf(("hashes offset = %d\n", *hashes_offset)); + dprintf(("hash %s\n", csp->hash)); return (0); } @@ -2041,6 +2061,10 @@ /* * Traverse the entire filesystem and for every regular file or symbolic link, * look it up in .pefs.checksum index and verify its checksums. + * + * This function will try to avoid returning due to errors encountered when + * checksums mismatch or immutable flags are missing so as to print as many + * warnings as possible. */ static int pefs_traverse_fs(struct cuckoo_hash_table *chtp, const EVP_MD *md, @@ -2058,14 +2082,11 @@ while (dirp) { sdp = readdir(dirp); if (sdp != NULL) { - /* XXXgpf: [TODO] Need to pay special attention to these files */ if (strcmp(sdp->d_name, "..") == 0 || strcmp(sdp->d_name, ".") == 0 || strcmp(sdp->d_name, ".pefs.db") == 0 || strcmp(sdp->d_name, ".pefs.conf") == 0 || - strcmp(sdp->d_name, ".pefs.checksum") == 0 || - strcmp(sdp->d_name, ".pefs.signature") == 0 || - strcmp(sdp->d_name, ".pefs.pkey") == 0) + strcmp(sdp->d_name, ".pefs.checksum") == 0) continue; dprintf(("dirent: %s\n", sdp->d_name)); @@ -2089,8 +2110,8 @@ * Look up the file and verify its checksums. * Total number of checksums should be the same and checksums * should match. - * Also, take notice of hardlinks & symlink warnings. - * After the traversal is done, we must have found all of our + * Also, take care of hardlinks & symlink warnings. + * After the traversal is done, we should have found all of the * entries in the checksum file. */ /* FALLTHROUGH */ @@ -2152,7 +2173,7 @@ } /* - * if error encountered during pefs_compare_cehcksums, + * if error encountered during pefs_compare_checksums, * keep on traversing the fs to find other errors as well. */ error = pefs_compare_checksums(fhp, indexfhp, hash_len); @@ -2160,7 +2181,7 @@ *checksum_error = error; TAILQ_INSERT_TAIL(fh_headp, fhp, file_header_entries); - pefs_close_file(fhp); + pefs_close_files(fhp); break; default: break; @@ -2280,7 +2301,6 @@ pefs_symlink_warn(&cht, &fh_head); error = pefs_found_all_entries(&cht); - if (error == 0 && checksum_error != 0) error = checksum_error; @@ -2324,4 +2344,5 @@ return (error); } -RB_GENERATE(hardlink_head, hardlink_counter, hardlink_entries, pefs_hardlink_cmp); +RB_GENERATE(hardlink_head, hardlink_counter, hardlink_entries, + pefs_hardlink_cmp); Modified: soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.c ============================================================================== --- soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.c Tue Aug 14 14:07:34 2012 (r240350) +++ soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.c Tue Aug 14 17:40:56 2012 (r240351) @@ -1019,6 +1019,8 @@ * * inputfile contains list of files that need integrity checking. If * the argument is not supplied, input is read from stdin by default. + * These files should be either regular files or symbolic links. + * Symlinks are not traversed. * * path defines where .pefs.checksum should be created. By default, * .pefs.checksum is created under $PWD. path should be a directory, @@ -1038,7 +1040,7 @@ pefs_addchecksum(int argc, char *argv[]) { char fsroot[MAXPATHLEN + 1]; - char csm_path[MAXPATHLEN + 1], pk_path[MAXPATHLEN + 1]; + char csm_path[MAXPATHLEN + 1]; struct stat sb; FILE *fpin, *pk_fp; int error, flags, i, j; @@ -1049,9 +1051,8 @@ pk_fp = NULL; /* by default use sha256 */ algo = supported_digests[0]; - /* by default create checksum files under $PWD */ + /* by default create checksum file under $PWD */ snprintf(csm_path, sizeof(csm_path), "./%s", PEFS_FILE_CHECKSUM); - snprintf(pk_path, sizeof(pk_path), "./%s", PEFS_FILE_PKEY); while ((i = getopt(argc, argv, "fa:i:k:p:")) != -1) switch(i) { @@ -1102,8 +1103,6 @@ snprintf(csm_path, sizeof(csm_path), "%s/%s", optarg, PEFS_FILE_CHECKSUM); - snprintf(pk_path, sizeof(pk_path), "%s/%s", optarg, - PEFS_FILE_PKEY); break; default: if (fpin != NULL) @@ -1286,6 +1285,8 @@ * * filepath may refer to any kind of file that is encrypted by pefs filesystem, * such as directories, regular files, symlinks, etc. + * + * Symlinks are not traversed. */ static int pefs_nameid(int argc, char *argv[]) Modified: soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.h ============================================================================== --- soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.h Tue Aug 14 14:07:34 2012 (r240350) +++ soc2012/gpf/pefs_kmod/sbin/pefs/pefs_ctl.h Tue Aug 14 17:40:56 2012 (r240351) @@ -43,8 +43,6 @@ #define PEFS_FILE_KEYCHAIN ".pefs.db" #define PEFS_FILE_KEYCONF ".pefs.conf" #define PEFS_FILE_CHECKSUM ".pefs.checksum" -#define PEFS_FILE_SIGNATURE ".pefs.signature" -#define PEFS_FILE_PKEY ".pefs.pkey" #define PEFS_NOKEY 0x0001 #define PEFS_UNMOUNTED 0x0002 Modified: soc2012/gpf/pefs_kmod/sys/fs/pefs/pefs_checksum.c ============================================================================== --- soc2012/gpf/pefs_kmod/sys/fs/pefs/pefs_checksum.c Tue Aug 14 14:07:34 2012 (r240350) +++ soc2012/gpf/pefs_kmod/sys/fs/pefs/pefs_checksum.c Tue Aug 14 17:40:56 2012 (r240351) @@ -48,65 +48,6 @@ const char *pefs_checksum_supported_digests[] = {"sha256","sha512"}; uint8_t pefs_checksum_supported_hash_lengths[] = {32, 64}; -/* XXXgpf: tmp 4 dbg purposes */ -//static void -//pefs_dbg_checksum_file(struct pefs_checksum *pcs) -//{ - //char *p; - //int i; - //uint32_t nhashes; - //uint32_t offset; - //uint64_t file_id; - - ///* print .pefs.checksum file header info */ - //printf("\n+++CHECKSUM FILE HEADER INFO+++\n"); - //printf("version = %x\nreserved = %d\nhash len = %d\noffset = %d\nsize = %d\nalgo = %s\n\n", - //pcs->pcs_version, pcs->pcs_reserved, pcs->pcs_hash_len, pcs->pcs_offset_to_hash_table, - //pcs->pcs_hash_table_size, pcs->pcs_hash_algo_name); - - ///* print table1 */ - //printf("+++HASH TABLE 1+++\n\n"); - //for (i = 0; i < pcs->pcs_hash_table_size; i++) { - //p = &(pcs->pcs_table1[i * PEFS_HT_CELL_SIZE]); - - //memcpy(&nhashes, p, sizeof(nhashes)); - //nhashes = le32toh(nhashes); - //if (nhashes != 0) { - //p+=sizeof(nhashes); - //memcpy(&offset, p, sizeof(offset)); - //offset = le32toh(offset); - //p+=sizeof(offset); - //memcpy(&file_id, p, sizeof(file_id)); - //printf("cell %d:\n", i); - //printf("\thashes = %d\n\toffset = %d\n\tfile id = %llu\n", - //nhashes, offset, file_id); - //} - //else - //printf("cell %d: empty\n", i); - //} - - ///* print table2 */ - //printf("\n+++HASH TABLE 2+++\n\n"); - //for (i = 0; i < pcs->pcs_hash_table_size; i++) { - //p = &(pcs->pcs_table2[i * PEFS_HT_CELL_SIZE]); - - //memcpy(&nhashes, p, sizeof(nhashes)); - //nhashes = le32toh(nhashes); - //if (nhashes != 0) { - //p+=sizeof(nhashes); - //memcpy(&offset, p, sizeof(offset)); - //offset = le32toh(offset); - //p+=sizeof(offset); - //memcpy(&file_id, p, sizeof(file_id)); - //printf("cell %d:\n", i); - //printf("\thashes = %d\n\toffset = %d\n\tfile id = %llu\n", - //nhashes, offset, file_id); - //} - //else - //printf("cell %d: empty\n", i); - //} -//} - /* sanitize .pefs.checkum's global file header that's read during VFS_MOUNT() */ int pefs_sanitize_checksum_header(struct pefs_checksum *pcs) @@ -164,7 +105,7 @@ return (nbucket); } -/* fill out pcie for from data pointed to by p */ +/* fill out pcie from data pointed to by p */ static void pefs_get_index_entry(char *p, struct pefs_checksum_index_entry *pcie) { @@ -251,12 +192,9 @@ || ((pn->pn_flags & PN_NO_CHECKSUM) != 0)) goto not_found; - /* XXXgpf: What if user wants integrity checking for .pefs.db or .conf? */ if (strncmp(enc_name, ".pefs.db", enc_name_len) == 0 || strncmp(enc_name, ".pefs.conf", enc_name_len) == 0 || - strncmp(enc_name, ".pefs.checksum", enc_name_len) == 0 || - strncmp(enc_name, ".pefs.signature", enc_name_len) == 0 || - strncmp(enc_name, ".pefs.pkey", enc_name_len) == 0) + strncmp(enc_name, ".pefs.checksum", enc_name_len) == 0) goto not_found; enc_name++; @@ -282,6 +220,10 @@ /* * Check to see if schg flag is set, if not mark the vnode so that all * read access is denied. + * + * XXXgpf: [TODO] I should make sure that the PN_WRONG_CHECKSUM flag is + * used in other parts of the pefs codebase to deny access to the file + * data. */ error = VOP_GETATTR(vp, &va, cred); if (error != 0) { @@ -406,10 +348,6 @@ dprintf(("integrity checking!\noffset %llu\n", offset)); - /* - * XXXgpf: For the moment, this flag's only purpose is to deny read access - * to the file. Should it do more? - */ if ((pn->pn_flags & PN_WRONG_CHECKSUM) != 0) return (EAUTH); From owner-svn-soc-all@FreeBSD.ORG Tue Aug 14 23:28:36 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 174841065672 for ; Tue, 14 Aug 2012 23:28:34 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Tue, 14 Aug 2012 23:28:34 +0000 Date: Tue, 14 Aug 2012 23:28:34 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120814232834.174841065672@hub.freebsd.org> Cc: Subject: socsvn commit: r240361 - in soc2012/aleek/beaglexm-armv6/sys: arm/ti arm/ti/twl arm/ti/usb boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 23:28:36 -0000 Author: aleek Date: Tue Aug 14 23:28:33 2012 New Revision: 240361 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240361 Log: fix some bugs in TWL driver. I am trying to initialize TWL during the bootup Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Tue Aug 14 22:34:22 2012 (r240360) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Tue Aug 14 23:28:33 2012 (r240361) @@ -180,6 +180,7 @@ static inline uint16_t ti_i2c_read_2(struct ti_i2c_softc *sc, bus_size_t off) { + device_printf(sc->sc_dev, "%s\n", __func__); return bus_read_2(sc->sc_mem_res, off); } @@ -198,6 +199,7 @@ static inline void ti_i2c_write_2(struct ti_i2c_softc *sc, bus_size_t off, uint16_t val) { + device_printf(sc->sc_dev, "%s\n", __func__); bus_write_2(sc->sc_mem_res, off, val); } @@ -217,6 +219,7 @@ static inline uint16_t ti_i2c_read_reg(struct ti_i2c_softc *sc, bus_size_t off) { + device_printf(sc->sc_dev, "%s\n", __func__); return bus_read_2(sc->sc_mem_res, off); } @@ -236,6 +239,7 @@ static inline void ti_i2c_write_reg(struct ti_i2c_softc *sc, bus_size_t off, uint16_t val) { + device_printf(sc->sc_dev, "%s\n", __func__); bus_write_2(sc->sc_mem_res, off, val); } @@ -285,6 +289,8 @@ struct ti_i2c_clock_config *clkcfg; uint16_t con_reg; + device_printf(dev, "%s\n", __func__); + clkcfg = ti_i2c_clock_configs; while (clkcfg->speed != -1) { if (clkcfg->speed == speed) @@ -349,6 +355,8 @@ struct ti_i2c_softc *sc = (struct ti_i2c_softc*) arg; uint16_t status; + device_printf(sc->sc_dev, "%s\n", __func__); + status = ti_i2c_read_reg(sc, I2C_REG_STAT); if (status == 0) return; @@ -746,6 +754,8 @@ uint16_t len; uint8_t *buf; + device_printf(sc->sc_dev, "%s\n", __func__); + TI_I2C_LOCK(sc); for (i = 0; i < nmsgs; i++) { @@ -793,6 +803,7 @@ ti_i2c_callback(device_t dev, int index, caddr_t data) { int error = 0; + device_printf(dev, "%s\n", __func__); switch (index) { case IIC_REQUEST_BUS: Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c Tue Aug 14 22:34:22 2012 (r240360) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c Tue Aug 14 23:28:33 2012 (r240361) @@ -177,6 +177,7 @@ int rc; sc = device_get_softc(dev); + device_printf(sc->sc_dev, "%s\n", __func__); TWL_LOCK(sc); addr = sc->sc_subaddr_map[nsub]; @@ -237,6 +238,7 @@ memcpy(&tmp_buf[1], buf, cnt); sc = device_get_softc(dev); + device_printf(sc->sc_dev, "%s\n", __func__); TWL_LOCK(sc); addr = sc->sc_subaddr_map[nsub]; @@ -328,7 +330,7 @@ TWL_UNLOCK(sc); /* Finished with the interrupt hook */ - config_intrhook_disestablish(&sc->sc_scan_hook); + //config_intrhook_disestablish(&sc->sc_scan_hook); } /** @@ -412,11 +414,12 @@ /* We have to wait until interrupts are enabled. I2C read and write * only works if the interrupts are available. */ - sc->sc_scan_hook.ich_func = twl_scan; - sc->sc_scan_hook.ich_arg = dev; + //sc->sc_scan_hook.ich_func = twl_scan; + //sc->sc_scan_hook.ich_arg = dev; - if (config_intrhook_establish(&sc->sc_scan_hook) != 0) - return (ENOMEM); + //if (config_intrhook_establish(&sc->sc_scan_hook) != 0) + // return (ENOMEM); + twl_scan( dev ); /* FIXME: should be in DTS file */ if ((sc->sc_vreg = device_add_child(dev, "twl_vreg", -1)) == NULL) Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Tue Aug 14 22:34:22 2012 (r240360) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Tue Aug 14 23:28:33 2012 (r240361) @@ -231,7 +231,7 @@ LIST_HEAD(twl_regulator_list, twl_regulator_entry) sc_vreg_list; }; - +#if 1 #define TWL_VREG_XLOCK(_sc) sx_xlock(&(_sc)->sc_sx) #define TWL_VREG_XUNLOCK(_sc) sx_xunlock(&(_sc)->sc_sx) #define TWL_VREG_SLOCK(_sc) sx_slock(&(_sc)->sc_sx) @@ -247,7 +247,21 @@ pause("twl_vreg_ex", (hz / 100)); \ } while(0) #define TWL_VREG_LOCK_DOWNGRADE(_sc) sx_downgrade(&(_sc)->sc_sx); +#endif +#if 0 +#define TWL_VREG_XLOCK(_sc) +#define TWL_VREG_XUNLOCK(_sc) +#define TWL_VREG_SLOCK(_sc) +#define TWL_VREG_SUNLOCK(_sc) +#define TWL_VREG_LOCK_INIT(_sc) +#define TWL_VREG_LOCK_DESTROY(_sc) + +#define TWL_VREG_ASSERT_LOCKED(_sc) + +#define TWL_VREG_LOCK_UPGRADE(_sc) +#define TWL_VREG_LOCK_DOWNGRADE(_sc) +#endif @@ -266,6 +280,7 @@ twl_vreg_read_1(struct twl_vreg_softc *sc, struct twl_regulator_entry *regulator, uint8_t off, uint8_t *val) { + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); return (twl_read(sc->sc_pdev, regulator->sub_dev, regulator->reg_off + off, val, 1)); } @@ -274,6 +289,7 @@ twl_vreg_write_1(struct twl_vreg_softc *sc, struct twl_regulator_entry *regulator, uint8_t off, uint8_t val) { + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); return (twl_write(sc->sc_pdev, regulator->sub_dev, regulator->reg_off + off, &val, 1)); } @@ -357,6 +373,8 @@ uint8_t state; int xlocked; + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); + if (enabled == NULL) return (EINVAL); @@ -430,6 +448,8 @@ uint8_t grp; int xlocked; + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); + TWL_VREG_ASSERT_LOCKED(sc); xlocked = sx_xlocked(&sc->sc_sx); @@ -493,6 +513,8 @@ uint8_t grp; int xlocked; + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); + TWL_VREG_ASSERT_LOCKED(sc); xlocked = sx_xlocked(&sc->sc_sx); @@ -559,6 +581,8 @@ uint8_t vsel; int xlocked; + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); + TWL_VREG_ASSERT_LOCKED(sc); /* If millivolts is zero then we simply disable the output */ @@ -627,20 +651,29 @@ int xlocked; uint8_t vsel; + device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); TWL_VREG_ASSERT_LOCKED(sc); + //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Need to upgrade the lock because checking enabled state and voltage * should be atomic. */ + //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); xlocked = sx_xlocked(&sc->sc_sx); if (!xlocked) TWL_VREG_LOCK_UPGRADE(sc); + //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Check if the regulator is currently enabled */ + //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); err = twl_vreg_is_regulator_enabled(sc, regulator, &en); if (err) + { + device_printf( sc->sc_dev, "Regulator %s is not enabled\n", regulator->name ); goto done; + } + //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); *millivolts = 0; if (!en) @@ -656,10 +689,14 @@ /* For variable voltages read the voltage register */ err = twl_vreg_read_1(sc, regulator, TWL_VREG_VSEL, &vsel); if (err) + { + device_printf( sc->sc_dev, "Error Reading %s regulator register\n", regulator->name ); goto done; + } vsel &= (regulator->num_supp_voltages - 1); if (regulator->supp_voltages[vsel] == UNDF) { + device_printf( sc->sc_dev, "siakis inny blad\n" ); err = EINVAL; goto done; } @@ -704,6 +741,8 @@ sc = device_get_softc(dev); + device_printf(sc->sc_dev, "%s - %s\n", __func__, name); + TWL_VREG_SLOCK(sc); LIST_FOREACH(regulator, &sc->sc_vreg_list, entries) { @@ -744,6 +783,8 @@ sc = device_get_softc(dev); + device_printf(sc->sc_dev, "%s - %s\n", __func__, name); + TWL_VREG_SLOCK(sc); LIST_FOREACH(regulator, &sc->sc_vreg_list, entries) { @@ -830,6 +871,8 @@ struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); struct twl_regulator_entry *new; + device_printf(sc->sc_dev, "%s - %s\n", __func__, name); + new = malloc(sizeof(struct twl_regulator_entry), M_DEVBUF, M_NOWAIT | M_ZERO); if (new == NULL) return (NULL); @@ -846,7 +889,6 @@ new->supp_voltages = voltages; new->num_supp_voltages = num_voltages; - /* Add a sysctl entry for the voltage */ new->oid = SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, name, CTLTYPE_INT | CTLFLAG_RD, sc, 0, @@ -887,6 +929,7 @@ int len = 0, prop_len; + device_printf(sc->sc_dev, "%s\n", __func__); /* Add the regulators from the list */ walker = ®ulators[0]; while (walker->name != NULL) { @@ -901,7 +944,6 @@ walker++; } - /* Check if the FDT is telling us to set any voltages */ child = ofw_bus_get_node(sc->sc_pdev); if (child) { @@ -928,7 +970,12 @@ } } } - + device_printf(sc->sc_dev, "%s\n", __func__); +#if 0 + twl_vreg_set_voltage(sc->sc_dev, "vusb1v5", 1500); + twl_vreg_set_voltage(sc->sc_dev, "vusb1v8", 1800); + twl_vreg_set_voltage(sc->sc_dev, "vusb3v1", 3100); +#endif // if (twl_vreg_debug) { @todo XXX LIST_FOREACH(entry, &sc->sc_vreg_list, entries) { @@ -958,6 +1005,7 @@ struct twl_vreg_softc *sc; sc = device_get_softc((device_t)dev); + device_printf(dev, "%s\n", __func__); TWL_VREG_XLOCK(sc); @@ -1006,6 +1054,7 @@ if (config_intrhook_establish(&sc->sc_init_hook) != 0) return (ENOMEM); + //twl_vreg_init( dev ); return (0); } Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Tue Aug 14 22:34:22 2012 (r240360) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Tue Aug 14 23:28:33 2012 (r240361) @@ -102,6 +102,9 @@ #include #include +#include +#include + #include #include "gpio_if.h" @@ -111,6 +114,7 @@ device_t sc_dev; device_t sc_gpio_dev; + device_t sc_vreg_dev; /* TLL register set */ struct resource* tll_mem_res; @@ -308,13 +312,13 @@ omap_ehci_write_4(isc, OMAP_USBHOST_INSNREG05_ULPI, reg); + device_printf(isc->sc_dev, "Waiting for phy reset operation\n"); /* Wait for ULPI access completion */ while ((omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI) & (1 << OMAP_USBHOST_INSNREG05_ULPI_CONTROL_SHIFT))) { /* Sleep for a tick */ pause("USBPHY_RESET", 1); - if (timeout-- == 0) { device_printf(isc->sc_dev, "PHY reset operation timed out\n"); break; @@ -346,9 +350,35 @@ uint32_t reg = 0; int reset_performed = 0; int i; + //int milivolts; device_printf(isc->sc_dev, "Starting TI EHCI USB Controller\n"); + device_printf( isc->sc_dev, "INSNREG05: 0x%08x\n", omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI ) ); +#if 0 + if( twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v5", &milivolts) != 0) + { + device_printf(isc->sc_dev, "dupa!\n"); + //return EINVAL; + } + device_printf( isc->sc_dev, "vusb1v5: %d\n", milivolts ); + twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v8", &milivolts); + device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); + twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb3v1", &milivolts); + device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); + + twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb1v5", 1500); + twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb1v8", 1800); + twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb3v1", 3100); + device_printf( isc->sc_dev, "INSNREG05: 0x%08x\n", omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI ) ); + twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v5", &milivolts); + device_printf( isc->sc_dev, "vusb1v5: %d\n", milivolts ); + twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v8", &milivolts); + device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); + twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb3v1", &milivolts); + device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); +#endif + /* Enable Clocks for high speed USBHOST */ ti_prcm_clk_enable(USBHSHOST_CLK); @@ -381,6 +411,9 @@ /* Enable the USB TLL */ ti_prcm_clk_enable(USBTLL_CLK); + //check, if the ph is in suspend mode + device_printf( isc->sc_dev, "INSNREG05: 0x%08x\n", omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI ) ); + /* Set the timeout to 100ms*/ timeout = (hz < 10) ? 1 : ((100 * hz) / 1000); // perform a uhh reset @@ -809,6 +842,7 @@ /* save the device */ isc->sc_dev = dev; + isc->sc_vreg_dev = devclass_get_device(devclass_find("twl_vreg"), 0); /* get all DMA memory */ if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev), @@ -1046,3 +1080,4 @@ static devclass_t ehci_devclass; DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0); +MODULE_DEPEND(ehci, twl_vreg, 1, 1, 1); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h Tue Aug 14 22:34:22 2012 (r240360) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h Tue Aug 14 23:28:33 2012 (r240361) @@ -132,8 +132,6 @@ - - /* TLL Register Set */ #define TLL_SYSCONFIG_CACTIVITY (1UL << 8) #define TLL_SYSCONFIG_SIDLE_SMART_IDLE (2UL << 3) @@ -216,6 +214,7 @@ #endif #define ULPI_FUNC_CTRL_RESET (1 << 5) +#define ULPI_FUNC_CTRL_SUSPENDM (1 << 6) /*-------------------------------------------------------------------------*/ Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Tue Aug 14 22:34:22 2012 (r240360) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Tue Aug 14 23:28:33 2012 (r240361) @@ -177,7 +177,7 @@ interrupts = < 12 13 14 15 >; interrupt-parent = <&AINTC>; }; - +/* mmchs@4809c000 { compatible = "ti,mmchs"; reg =<0x4809c000 0x1000 >; @@ -185,7 +185,7 @@ interrupt-parent = <&AINTC>; mmchs-device-id = <1>; }; - +*/ i2c1: i2c@48070000 { #address-cells = <1>; #size-cells = <0>; @@ -194,12 +194,14 @@ interrupts = <56>; interrupt-parent = <&AINTC>; i2c-device-id = <1>; - pmic@48 { + + twl4030@48 { compatible = "ti,twl4030"; reg = <0x48>; }; }; +/* ehci@48064800 { compatible = "ti,ehci"; /* @@ -212,17 +214,17 @@ * * reset indicates (if non-zero) if port reset is required * gpio_pin - GPIO pin that is used to perform reset - */ + * phy-config = < 1 0 0 1 1 147 0 0 0>; - reg = < 0x48064800 0x400 /* EHCI */ - 0x48064000 0x400 /* UHH */ - 0x48062000 0x1000 /* TLL */ >; + reg = < 0x48064800 0x400 /* EHCI * + 0x48064000 0x400 /* UHH * + 0x48062000 0x1000 /* TLL * >; interrupts = < 77 >; interrupt-parent = <&AINTC>; }; - +*/ }; chosen { From owner-svn-soc-all@FreeBSD.ORG Wed Aug 15 19:48:53 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id B9C15106566C for ; Wed, 15 Aug 2012 19:48:52 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Wed, 15 Aug 2012 19:48:52 +0000 Date: Wed, 15 Aug 2012 19:48:52 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120815194852.B9C15106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240408 - soc2012/jhagewood/diff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 19:48:53 -0000 Author: jhagewood Date: Wed Aug 15 19:48:51 2012 New Revision: 240408 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240408 Log: zdiff man file. Added: soc2012/jhagewood/diff/zdiff.1 Added: soc2012/jhagewood/diff/zdiff.1 ============================================================================== From owner-svn-soc-all@FreeBSD.ORG Wed Aug 15 19:49:29 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id B2112106564A for ; Wed, 15 Aug 2012 19:49:27 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Wed, 15 Aug 2012 19:49:27 +0000 Date: Wed, 15 Aug 2012 19:49:27 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120815194927.B2112106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240409 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 19:49:29 -0000 Author: jhagewood Date: Wed Aug 15 19:49:27 2012 New Revision: 240409 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240409 Log: zsdiff man file. Added: soc2012/jhagewood/sdiff/zsdiff.1 Added: soc2012/jhagewood/sdiff/zsdiff.1 ============================================================================== From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 01:55:40 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 9F08F106564A for ; Thu, 16 Aug 2012 01:55:39 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 01:55:39 +0000 Date: Thu, 16 Aug 2012 01:55:39 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816015539.9F08F106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240420 - soc2012/gmiller/locking-head X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 01:55:40 -0000 Author: gmiller Date: Thu Aug 16 01:55:38 2012 New Revision: 240420 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240420 Log: Modified: soc2012/gmiller/locking-head/ (props changed) From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 03:09:21 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 07063106564A for ; Thu, 16 Aug 2012 03:09:19 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 03:09:19 +0000 Date: Thu, 16 Aug 2012 03:09:19 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816030919.07063106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240422 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 03:09:21 -0000 Author: jhagewood Date: Thu Aug 16 03:09:18 2012 New Revision: 240422 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240422 Log: Modified: soc2012/jhagewood/diff/zdiff.1 soc2012/jhagewood/sdiff/zsdiff.1 Modified: soc2012/jhagewood/diff/zdiff.1 ============================================================================== --- soc2012/jhagewood/diff/zdiff.1 Thu Aug 16 02:35:44 2012 (r240421) +++ soc2012/jhagewood/diff/zdiff.1 Thu Aug 16 03:09:18 2012 (r240422) @@ -0,0 +1,511 @@ +.\" $FreeBSD$ +.\" $OpenBSD: diff.1,v 1.33 2007/05/31 19:20:09 jmc Exp $ +.\" +.\" Copyright (c) 1980, 1990, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)diff.1 8.1 (Berkeley) 6/30/93 +.\" +.Dd Apr 7, 2008 +.Dt DIFF 1 +.Os +.Sh NAME +.Nm diff +.Nd differential file and directory comparator +.Sh SYNOPSIS +.Nm diff +.Op Fl abdilpqTtw +.Op Fl I Ar pattern +.Oo +.Fl c | e | f | +.Fl n | u +.Oc +.Op Fl L Ar label +.Ar file1 file2 +.Nm diff +.Op Fl abdilpqTtw +.Op Fl I Ar pattern +.Op Fl L Ar label +.Fl C Op Ar number +.Ar file1 file2 +.Nm diff +.Op Fl abdilqtw +.Op Fl I Ar pattern +.Fl D Ar string +.Ar file1 file2 +.Nm diff +.Op Fl abdilpqTtw +.Op Fl I Ar pattern +.Op Fl L Ar label +.Fl U Ar number +.Ar file1 file2 +.Nm diff +.Op Fl abdilNPpqrsTtw +.Op Fl I Ar pattern +.Oo +.Fl c | e | f | +.Fl n | u +.Oc +.Bk -words +.Op Fl L Ar label +.Op Fl S Ar name +.Op Fl X Ar file +.Op Fl x Ar pattern +.Ek +.Ar dir1 dir2 +.Nm diff +.Op Fl v +.Sh DESCRIPTION +The +.Nm +utility compares the contents of +.Ar file1 +and +.Ar file2 +and writes to the standard output the list of changes necessary to +convert one file into the other. +No output is produced if the files are identical. +.Pp +Output options (mutually exclusive): +.Bl -tag -width Ds +.It Fl C Op Ar number , Fl Fl context Ns = Ns Op Ar number +Like +.Fl c +but produces a diff with +.Ar number +lines of context. +.It Fl c +Produces a diff with 3 lines of context. +With +.Fl c +the output format is modified slightly: +the output begins with identification of the files involved and +their creation dates and then each change is separated +by a line with fifteen +.Li * Ns 's . +The lines removed from +.Ar file1 +are marked with +.Sq \&-\ \& ; +those added to +.Ar file2 +are marked +.Sq \+\ \& . +Lines which are changed from one file to the other are marked in +both files with +.Sq !\ \& . +Changes which lie within 3 lines of each other are grouped together on +output. +.It Fl D Ar string , Fl Fl ifdef Ns = Ns Ar string +Creates a merged version of +.Ar file1 +and +.Ar file2 +on the standard output, with C preprocessor controls included so that +a compilation of the result without defining +.Ar string +is equivalent to compiling +.Ar file1 , +while defining +.Ar string +will yield +.Ar file2 . +.It Fl e , Fl Fl ed +Produces output in a form suitable as input for the editor utility, +.Xr ed 1 , +which can then be used to convert file1 into file2. +.Pp +Extra commands are added to the output when comparing directories with +.Fl e , +so that the result is a +.Xr sh 1 +script for converting text files which are common to the two directories +from their state in +.Ar dir1 +to their state in +.Ar dir2 . +.It Fl f +Identical output to that of the +.Fl e +flag, but in reverse order. +It cannot be digested by +.Xr ed 1 . +.It Fl n , Fl Fl rcs +Produces a script similar to that of +.Fl e , +but in the opposite order and with a count of changed lines on each +insert or delete command. +This is the form used by +.Xr rcsdiff 1 . +.It Fl q , Fl Fl brief +Just print a line when the files differ. +Does not output a list of changes. +.It Fl U Op Ar number , Fl Fl unified Ns = Ns Op Ar number +Like +.Fl u +but produces a diff with +.Ar number +lines of context. +.It Fl u +Produces a +.Em unified +diff with 3 lines of context. +A unified diff is similar to the context diff produced by the +.Fl c +option. +However, unlike with +.Fl c , +all lines to be changed (added and/or removed) are present in +a single section. +.El +.Pp +Comparison options: +.Bl -tag -width Ds +.It Fl a , Fl Fl text +Treat all files as +.Tn ASCII +text. +Normally +.Nm +will simply print +.Dq Binary files ... differ +if files contain binary characters. +Use of this option forces +.Nm +to produce a diff. +.It Fl b , Fl Fl ignore-space-change +Causes trailing blanks (spaces and tabs) to be ignored, and other +strings of blanks to compare equal. +.It Fl d , Fl Fl minimal +Try very hard to produce a diff as small as possible. +This may consume a lot of processing power and memory when processing +large files with many changes. +.It Fl I Ar pattern , Fl Fl ignore-matching-lines Ns = Ns Ar pattern +Ignores changes, insertions, and deletions whose lines match the +extended regular expression +.Ar pattern . +Multiple +.Fl I +patterns may be specified. +All lines in the change must match some pattern for the change to be +ignored. +See +.Xr re_format 7 +for more information on regular expression patterns. +.It Fl i , Fl Fl ignore-case +Ignores the case of letters. +E.g., +.Dq A +will compare equal to +.Dq a . +.It Fl L Ar label +Print +.Ar label +instead of the first (and second, if this option is specified twice) +file name and time in the context or unified diff header. +.It Fl l , Fl Fl paginate +Long output format; each text file +.Nm diff Ns \'d +is piped through +.Xr pr 1 +to paginate it; +other differences are remembered and summarized +after all text file differences are reported. +.It Fl p , Fl Fl show-c-function +With unified and context diffs, show with each change +the first 40 characters of the last line before the context beginning +with a letter, an underscore or a dollar sign. +For C source code following standard layout conventions, this will +show the prototype of the function the change applies to. +.It Fl T , Fl Fl initial-tab +Print a tab rather than a space before the rest of the line for the +normal, context or unified output formats. +This makes the alignment of tabs in the line consistent. +.It Fl t , Fl Fl expand-tabs +Will expand tabs in output lines. +Normal or +.Fl c +output adds character(s) to the front of each line which may screw up +the indentation of the original source lines and make the output listing +difficult to interpret. +This option will preserve the original source's indentation. +.It Fl w , Fl Fl ignore-all-space +Is similar to +.Fl b +but causes whitespace (blanks and tabs) to be totally ignored. +E.g., +.Dq if (\ \&a == b \&) +will compare equal to +.Dq if(a==b) . +.El +.Pp +Directory comparison options: +.Bl -tag -width Ds +.It Fl N , Fl Fl new-file +If a file is found in only one directory, act as if it was found in the +other directory too but was of zero size. +.It Fl P +If a file is found only in +.Ar dir2 , +act as if it was found in +.Ar dir1 +too but was of zero size. +.It Fl r , Fl Fl recursive +Causes application of +.Nm +recursively to common sub7 directories encountered. +.It Fl S Ar name , Fl starting-file Ns = Ns Ar name +Re-starts a directory +.Nm +in the middle, beginning with file +.Ar name . +.It Fl s , Fl Fl report-identical-files +Causes +.Nm +to report files which are the same, which are otherwise not mentioned. +.It Fl X Ar file , Fl Fl exclude-from Ns = Ns Ar file +Exclude files and subdirectories from comparison whose basenames match +lines in +.Ar file . +Multiple +.Fl X +options may be specified. +.It Fl x Ar pattern , Fl Fl exclude Ns = Ns Ar pattern +Exclude files and subdirectories from comparison whose basenames match +.Ar pattern . +Patterns are matched using shell-style globbing via +.Xr fnmatch 3 . +Multiple +.Fl x +options may be specified. +.It Fl v , Fl Fl version +Print version ino. +.El +.Pp +If both arguments are directories, +.Nm +sorts the contents of the directories by name, and then runs the +regular file +.Nm +algorithm, producing a change list, +on text files which are different. +Binary files which differ, +common subdirectories, and files which appear in only one directory +are described as such. +In directory mode only regular files and directories are compared. +If a non-regular file such as a device special file or +.Tn FIFO +is encountered, a diagnostic message is printed. +.Pp +If only one of +.Ar file1 +and +.Ar file2 +is a directory, +.Nm +is applied to the non-directory file and the file contained in +the directory file with a filename that is the same as the +last component of the non-directory file. +.Pp +If either +.Ar file1 +or +.Ar file2 +is +.Sq Fl , +the standard input is +used in its place. +.Ss Output Style +The default (without +.Fl e , +.Fl c , +or +.Fl n +.\" -C +options) +output contains lines of these forms, where +.Va XX , YY , ZZ , QQ +are line numbers respective of file order. +.Pp +.Bl -tag -width "XX,YYcZZ,QQ" -compact +.It Li XX Ns Ic a Ns Li YY +At (the end of) line +.Va XX +of +.Ar file1 , +append the contents +of line +.Va YY +of +.Ar file2 +to make them equal. +.It Li XX Ns Ic a Ns Li YY,ZZ +Same as above, but append the range of lines, +.Va YY +through +.Va ZZ +of +.Ar file2 +to line +.Va XX +of file1. +.It Li XX Ns Ic d Ns Li YY +At line +.Va XX +delete +the line. +The value +.Va YY +tells to which line the change would bring +.Ar file1 +in line with +.Ar file1 . +.It Li XX,YY Ns Ic d Ns Li ZZ +Delete the range of lines +.Va XX +through +.Va YY +in +.Ar file1 . +.It Li XX Ns Ic c Ns Li YY +Change the line +.Va XX +in +.Ar file1 +to the line +.Va YY +in +.Ar file2 . +.It Li XX,YY Ns Ic c Ns Li ZZ +Replace the range of specified lines with the line +.Va ZZ . +.It Li XX,YY Ns Ic c Ns Li ZZ,QQ +Replace the range +.Va XX , Ns Va YY +from +.Ar file1 +with the range +.Va ZZ , Ns Va QQ +from +.Ar file2 . +.El +.Pp +These lines resemble +.Xr ed 1 +subcommands to convert +.Ar file1 +into +.Ar file2 . +The line numbers before the action letters pertain to +.Ar file1 ; +those after pertain to +.Ar file2 . +Thus, by exchanging +.Ic a +for +.Ic d +and reading the line in reverse order, one can also +determine how to convert +.Ar file2 +into +.Ar file1 . +As in +.Xr ed 1 , +identical +pairs (where num1 = num2) are abbreviated as a single +number. +.Sh ENVIRONMENT +.Bl -tag -width TMPDIR +.It Ev TMPDIR +If the environment variable +.Ev TMPDIR +exists, +.Nm +will use the directory specified by +.Ev TMPDIR +as the temporary directory. +.El +.Sh FILES +.Bl -tag -width /tmp/diff.XXXXXXXX -compact +.It Pa /tmp/diff. Ns Ar XXXXXXXX +Temporary file used when comparing a device or the standard input. +Note that the temporary file is unlinked as soon as it is created +so it will not show up in a directory listing. +.El +.Sh DIAGNOSTICS +The +.Nm +utility exits with one of the following values: +.Pp +.Bl -tag -width Ds -compact -offset indent +.It 0 +No differences were found. +.It 1 +Differences were found. +.It \*(Gt1 +An error occurred. +.El +.Sh SEE ALSO +.Xr cmp 1 , +.Xr comm 1 , +.Xr diff3 1 , +.Xr ed 1 , +.Xr pr 1 , +.Xr sdiff 1 , +.Xr fnmatch 3 , +.Xr re_format 7 +.Sh STANDARDS +The +.Nm +utility is compliant with the +St -p1003.1-2004 +specification. +.Pp +The flags +.Op Fl aDdIiLlNnPpqSsTtUuwXx +are extensions to that specification. +.Sh HISTORY +A +.Nm +command appeared in +.At v6 . +.Sh BUGS +When comparing directories with the +.Fl b , +.Fl w +or +.Fl i +options specified, +.Nm +first compares the files ala +.Xr cmp 1 , +and then decides to run the +.Nm +algorithm if they are not equal. +This may cause a small amount of spurious output if the files +then turn out to be identical because the only differences are +insignificant whitespace or case differences. Modified: soc2012/jhagewood/sdiff/zsdiff.1 ============================================================================== --- soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 02:35:44 2012 (r240421) +++ soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 03:09:18 2012 (r240422) @@ -0,0 +1,174 @@ +.\" $FreeBSD$ +.\" $OpenBSD: sdiff.1,v 1.15 2007/06/29 14:48:07 jmc Exp $ +.\" +.\" Written by Raymond Lai . +.\" Public domain. +.\" +.Dd $Mdocdate: July 5 2012 $ +.Dt SDIFF 1 +.Os +.Sh NAME +.Nm sdiff +.Nd side-by-side diff +.Sh SYNOPSIS +.Nm +.Op Fl abdilstW +.Op Fl I Ar regexp +.Op Fl o Ar outfile +.Op Fl w Ar width +.Ar file1 +.Ar file2 +.Sh DESCRIPTION +.Nm +displays two files side by side, +with any differences between the two highlighted as follows: +new lines are marked with +.Sq \*(Gt ; +deleted lines are marked with +.Sq \*(Lt ; +and changed lines are marked with +.Sq \*(Ba . +.Pp +.Nm +can also be used to interactively merge two files, +prompting at each set of differences. +See the +.Fl o +option for an explanation. +.Pp +The options are: +.Bl -tag -width Ds +.It Fl l -left-column +Only print the left column for identical lines. +.It Fl o -output Ar outfile +Interactively merge +.Ar file1 +and +.Ar file2 +into +.Ar outfile . +In this mode, the user is prompted for each set of differences. +See +.Ev EDITOR +and +.Ev VISUAL , +below, +for details of which editor, if any, is invoked. +.Pp +The commands are as follows: +.Bl -tag -width Ds +.It Cm l | 1 +Choose left set of diffs. +.It Cm r | 2 +Choose right set of diffs. +.It Cm s +Silent mode \(en identical lines are not printed. +.It Cm v +Verbose mode \(en identical lines are printed. +.It Cm e +Start editing an empty file, which will be merged into +.Ar outfile +upon exiting the editor. +.It Cm e Cm l +Start editing file with left set of diffs. +.It Cm e Cm r +Start editing file with right set of diffs. +.It Cm e Cm b +Start editing file with both sets of diffs. +.It Cm q +Quit +.Nm . +.El +.It Fl s -suppress-common-lines +Skip identical lines. +.It Fl w -width Ar width +Print a maximum of +.Ar width +characters on each line. +The default is 130 characters. +.El +.Pp +Options passed to +.Xr diff 1 +are: +.Bl -tag -width Ds +.It Fl a -text +Treat +.Ar file1 +and +.Ar file2 +as text files. +.It Fl b -ignore-space-change +Ignore trailing blank spaces. +.It Fl d -minimal +Minimize diff size. +.It Fl I -ignore-matching-lines Ar regexp +Ignore line changes matching +.Ar regexp . +All lines in the change must match +.Ar regexp +for the change to be ignored. +.It Fl i -ignore-case +Do a case-insensitive comparison. +.It Fl t -expand-tabs +Expand tabs to spaces. +.It Fl W -ignore-all-space +Ignore all spaces. +.It Fl B -ignore-blank-lines +Ignore blank lines. +.It Fl E -ignore-tab-expansion +Treat tabs and eight spaces as the same. +.It Fl t -ignore-tabs +Ignore tabs. +.It Fl H -speed-large-files +Assume scattered small changes in a large file. +.It Fl -ignore-file-name-case +Ignore the case of file names. +.It Fl -no-ignore-file-name-case +Do not ignore file name case. +.It Fl -strip-trailing-cr +Skip identical lines. +.It Fl -tabsize Ar NUM +Change the size of tabs (default is 8.) +.El +.Sh ENVIRONMENT +.Bl -tag -width Ds +.It Ev EDITOR , VISUAL +Specifies an editor to use with the +.Fl o +option. +If both +.Ev EDITOR +and +.Ev VISUAL +are set, +.Ev VISUAL +takes precedence. +If neither +.Ev EDITOR +nor +.Ev VISUAL +are set, +the default is +.Xr vi 1 . +.It Ev TMPDIR +Specifies a directory for temporary files to be created. +The default is +.Pa /tmp . +.El +.Sh SEE ALSO +.Xr cmp 1 , +.Xr diff 1 , +.Xr diff3 1 , +.Xr vi 1 , +.Xr re_format 7 +.Sh AUTHORS +.Nm +was written from scratch for the public domain by +.An Ray Lai Aq ray@cyth.net . +.Sh CAVEATS +.Pp +Tabs are treated as anywhere from one to eight characters wide, +depending on the current column. +Terminals that treat tabs as eight characters wide will look best. + From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 03:36:21 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 85548106566B for ; Thu, 16 Aug 2012 03:36:19 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 03:36:19 +0000 Date: Thu, 16 Aug 2012 03:36:19 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816033619.85548106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240423 - soc2012/jhagewood/diff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 03:36:21 -0000 Author: jhagewood Date: Thu Aug 16 03:36:18 2012 New Revision: 240423 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240423 Log: Completed zdiff man page Modified: soc2012/jhagewood/diff/zdiff.1 Modified: soc2012/jhagewood/diff/zdiff.1 ============================================================================== --- soc2012/jhagewood/diff/zdiff.1 Thu Aug 16 03:09:18 2012 (r240422) +++ soc2012/jhagewood/diff/zdiff.1 Thu Aug 16 03:36:18 2012 (r240423) @@ -1,8 +1,6 @@ .\" $FreeBSD$ -.\" $OpenBSD: diff.1,v 1.33 2007/05/31 19:20:09 jmc Exp $ -.\" -.\" Copyright (c) 1980, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2012 Jesse Hagewood +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -12,14 +10,11 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. .\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -28,16 +23,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)diff.1 8.1 (Berkeley) 6/30/93 -.\" -.Dd Apr 7, 2008 -.Dt DIFF 1 +.\" zdiff.1 +.Dd Aug 15, 2012 +.Dt ZDIFF 1 .Os .Sh NAME -.Nm diff -.Nd differential file and directory comparator +.Nm zdiff +.Nd differential file and directory comparator for compressed files. .Sh SYNOPSIS -.Nm diff +.Nm zdiff .Op Fl abdilpqTtw .Op Fl I Ar pattern .Oo @@ -46,24 +40,24 @@ .Oc .Op Fl L Ar label .Ar file1 file2 -.Nm diff +.Nm zdiff .Op Fl abdilpqTtw .Op Fl I Ar pattern .Op Fl L Ar label .Fl C Op Ar number .Ar file1 file2 -.Nm diff +.Nm zdiff .Op Fl abdilqtw .Op Fl I Ar pattern .Fl D Ar string .Ar file1 file2 -.Nm diff +.Nm zdiff .Op Fl abdilpqTtw .Op Fl I Ar pattern .Op Fl L Ar label .Fl U Ar number .Ar file1 file2 -.Nm diff +.Nm zdiff .Op Fl abdilNPpqrsTtw .Op Fl I Ar pattern .Oo @@ -77,367 +71,18 @@ .Op Fl x Ar pattern .Ek .Ar dir1 dir2 -.Nm diff +.Nm zdiff .Op Fl v .Sh DESCRIPTION The .Nm -utility compares the contents of +utility compares the decompressed contents of gzip .Ar file1 and .Ar file2 and writes to the standard output the list of changes necessary to convert one file into the other. -No output is produced if the files are identical. -.Pp -Output options (mutually exclusive): -.Bl -tag -width Ds -.It Fl C Op Ar number , Fl Fl context Ns = Ns Op Ar number -Like -.Fl c -but produces a diff with -.Ar number -lines of context. -.It Fl c -Produces a diff with 3 lines of context. -With -.Fl c -the output format is modified slightly: -the output begins with identification of the files involved and -their creation dates and then each change is separated -by a line with fifteen -.Li * Ns 's . -The lines removed from -.Ar file1 -are marked with -.Sq \&-\ \& ; -those added to -.Ar file2 -are marked -.Sq \+\ \& . -Lines which are changed from one file to the other are marked in -both files with -.Sq !\ \& . -Changes which lie within 3 lines of each other are grouped together on -output. -.It Fl D Ar string , Fl Fl ifdef Ns = Ns Ar string -Creates a merged version of -.Ar file1 -and -.Ar file2 -on the standard output, with C preprocessor controls included so that -a compilation of the result without defining -.Ar string -is equivalent to compiling -.Ar file1 , -while defining -.Ar string -will yield -.Ar file2 . -.It Fl e , Fl Fl ed -Produces output in a form suitable as input for the editor utility, -.Xr ed 1 , -which can then be used to convert file1 into file2. -.Pp -Extra commands are added to the output when comparing directories with -.Fl e , -so that the result is a -.Xr sh 1 -script for converting text files which are common to the two directories -from their state in -.Ar dir1 -to their state in -.Ar dir2 . -.It Fl f -Identical output to that of the -.Fl e -flag, but in reverse order. -It cannot be digested by -.Xr ed 1 . -.It Fl n , Fl Fl rcs -Produces a script similar to that of -.Fl e , -but in the opposite order and with a count of changed lines on each -insert or delete command. -This is the form used by -.Xr rcsdiff 1 . -.It Fl q , Fl Fl brief -Just print a line when the files differ. -Does not output a list of changes. -.It Fl U Op Ar number , Fl Fl unified Ns = Ns Op Ar number -Like -.Fl u -but produces a diff with -.Ar number -lines of context. -.It Fl u -Produces a -.Em unified -diff with 3 lines of context. -A unified diff is similar to the context diff produced by the -.Fl c -option. -However, unlike with -.Fl c , -all lines to be changed (added and/or removed) are present in -a single section. -.El -.Pp -Comparison options: -.Bl -tag -width Ds -.It Fl a , Fl Fl text -Treat all files as -.Tn ASCII -text. -Normally -.Nm -will simply print -.Dq Binary files ... differ -if files contain binary characters. -Use of this option forces -.Nm -to produce a diff. -.It Fl b , Fl Fl ignore-space-change -Causes trailing blanks (spaces and tabs) to be ignored, and other -strings of blanks to compare equal. -.It Fl d , Fl Fl minimal -Try very hard to produce a diff as small as possible. -This may consume a lot of processing power and memory when processing -large files with many changes. -.It Fl I Ar pattern , Fl Fl ignore-matching-lines Ns = Ns Ar pattern -Ignores changes, insertions, and deletions whose lines match the -extended regular expression -.Ar pattern . -Multiple -.Fl I -patterns may be specified. -All lines in the change must match some pattern for the change to be -ignored. -See -.Xr re_format 7 -for more information on regular expression patterns. -.It Fl i , Fl Fl ignore-case -Ignores the case of letters. -E.g., -.Dq A -will compare equal to -.Dq a . -.It Fl L Ar label -Print -.Ar label -instead of the first (and second, if this option is specified twice) -file name and time in the context or unified diff header. -.It Fl l , Fl Fl paginate -Long output format; each text file -.Nm diff Ns \'d -is piped through -.Xr pr 1 -to paginate it; -other differences are remembered and summarized -after all text file differences are reported. -.It Fl p , Fl Fl show-c-function -With unified and context diffs, show with each change -the first 40 characters of the last line before the context beginning -with a letter, an underscore or a dollar sign. -For C source code following standard layout conventions, this will -show the prototype of the function the change applies to. -.It Fl T , Fl Fl initial-tab -Print a tab rather than a space before the rest of the line for the -normal, context or unified output formats. -This makes the alignment of tabs in the line consistent. -.It Fl t , Fl Fl expand-tabs -Will expand tabs in output lines. -Normal or -.Fl c -output adds character(s) to the front of each line which may screw up -the indentation of the original source lines and make the output listing -difficult to interpret. -This option will preserve the original source's indentation. -.It Fl w , Fl Fl ignore-all-space -Is similar to -.Fl b -but causes whitespace (blanks and tabs) to be totally ignored. -E.g., -.Dq if (\ \&a == b \&) -will compare equal to -.Dq if(a==b) . -.El -.Pp -Directory comparison options: -.Bl -tag -width Ds -.It Fl N , Fl Fl new-file -If a file is found in only one directory, act as if it was found in the -other directory too but was of zero size. -.It Fl P -If a file is found only in -.Ar dir2 , -act as if it was found in -.Ar dir1 -too but was of zero size. -.It Fl r , Fl Fl recursive -Causes application of -.Nm -recursively to common sub7 directories encountered. -.It Fl S Ar name , Fl starting-file Ns = Ns Ar name -Re-starts a directory -.Nm -in the middle, beginning with file -.Ar name . -.It Fl s , Fl Fl report-identical-files -Causes -.Nm -to report files which are the same, which are otherwise not mentioned. -.It Fl X Ar file , Fl Fl exclude-from Ns = Ns Ar file -Exclude files and subdirectories from comparison whose basenames match -lines in -.Ar file . -Multiple -.Fl X -options may be specified. -.It Fl x Ar pattern , Fl Fl exclude Ns = Ns Ar pattern -Exclude files and subdirectories from comparison whose basenames match -.Ar pattern . -Patterns are matched using shell-style globbing via -.Xr fnmatch 3 . -Multiple -.Fl x -options may be specified. -.It Fl v , Fl Fl version -Print version ino. -.El -.Pp -If both arguments are directories, -.Nm -sorts the contents of the directories by name, and then runs the -regular file -.Nm -algorithm, producing a change list, -on text files which are different. -Binary files which differ, -common subdirectories, and files which appear in only one directory -are described as such. -In directory mode only regular files and directories are compared. -If a non-regular file such as a device special file or -.Tn FIFO -is encountered, a diagnostic message is printed. -.Pp -If only one of -.Ar file1 -and -.Ar file2 -is a directory, -.Nm -is applied to the non-directory file and the file contained in -the directory file with a filename that is the same as the -last component of the non-directory file. -.Pp -If either -.Ar file1 -or -.Ar file2 -is -.Sq Fl , -the standard input is -used in its place. -.Ss Output Style -The default (without -.Fl e , -.Fl c , -or -.Fl n -.\" -C -options) -output contains lines of these forms, where -.Va XX , YY , ZZ , QQ -are line numbers respective of file order. -.Pp -.Bl -tag -width "XX,YYcZZ,QQ" -compact -.It Li XX Ns Ic a Ns Li YY -At (the end of) line -.Va XX -of -.Ar file1 , -append the contents -of line -.Va YY -of -.Ar file2 -to make them equal. -.It Li XX Ns Ic a Ns Li YY,ZZ -Same as above, but append the range of lines, -.Va YY -through -.Va ZZ -of -.Ar file2 -to line -.Va XX -of file1. -.It Li XX Ns Ic d Ns Li YY -At line -.Va XX -delete -the line. -The value -.Va YY -tells to which line the change would bring -.Ar file1 -in line with -.Ar file1 . -.It Li XX,YY Ns Ic d Ns Li ZZ -Delete the range of lines -.Va XX -through -.Va YY -in -.Ar file1 . -.It Li XX Ns Ic c Ns Li YY -Change the line -.Va XX -in -.Ar file1 -to the line -.Va YY -in -.Ar file2 . -.It Li XX,YY Ns Ic c Ns Li ZZ -Replace the range of specified lines with the line -.Va ZZ . -.It Li XX,YY Ns Ic c Ns Li ZZ,QQ -Replace the range -.Va XX , Ns Va YY -from -.Ar file1 -with the range -.Va ZZ , Ns Va QQ -from -.Ar file2 . -.El -.Pp -These lines resemble -.Xr ed 1 -subcommands to convert -.Ar file1 -into -.Ar file2 . -The line numbers before the action letters pertain to -.Ar file1 ; -those after pertain to -.Ar file2 . -Thus, by exchanging -.Ic a -for -.Ic d -and reading the line in reverse order, one can also -determine how to convert -.Ar file2 -into -.Ar file1 . -As in -.Xr ed 1 , -identical -pairs (where num1 = num2) are abbreviated as a single -number. +No output is produced if the files are identical. See diff(1) for program options. .Sh ENVIRONMENT .Bl -tag -width TMPDIR .It Ev TMPDIR @@ -470,42 +115,8 @@ An error occurred. .El .Sh SEE ALSO +.Xr diff 1 , .Xr cmp 1 , -.Xr comm 1 , .Xr diff3 1 , -.Xr ed 1 , -.Xr pr 1 , .Xr sdiff 1 , -.Xr fnmatch 3 , -.Xr re_format 7 -.Sh STANDARDS -The -.Nm -utility is compliant with the -St -p1003.1-2004 -specification. -.Pp -The flags -.Op Fl aDdIiLlNnPpqSsTtUuwXx -are extensions to that specification. -.Sh HISTORY -A -.Nm -command appeared in -.At v6 . -.Sh BUGS -When comparing directories with the -.Fl b , -.Fl w -or -.Fl i -options specified, -.Nm -first compares the files ala -.Xr cmp 1 , -and then decides to run the -.Nm -algorithm if they are not equal. -This may cause a small amount of spurious output if the files -then turn out to be identical because the only differences are -insignificant whitespace or case differences. +.Xr zsdiff 1 From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 03:36:35 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 5E8E2106567E for ; Thu, 16 Aug 2012 03:36:33 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 03:36:33 +0000 Date: Thu, 16 Aug 2012 03:36:33 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816033633.5E8E2106567E@hub.freebsd.org> Cc: Subject: socsvn commit: r240424 - in soc2012/gmiller/locking-head: . include lib/libwitness tools/regression/lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 03:36:35 -0000 Author: gmiller Date: Thu Aug 16 03:36:33 2012 New Revision: 240424 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240424 Log: r240389@FreeBSD-dev: root | 2012-08-15 00:20:46 -0500 If USE_LIBUNWIND is present in src.conf, attempt to use devel/libunwind to generate backtraces for the lock acquisitions that resulted in a LoR. Added: soc2012/gmiller/locking-head/lib/libwitness/unwind.c Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/include/pthread_np.h soc2012/gmiller/locking-head/lib/libwitness/Makefile soc2012/gmiller/locking-head/lib/libwitness/lists.c soc2012/gmiller/locking-head/lib/libwitness/logs.c soc2012/gmiller/locking-head/lib/libwitness/witness.h soc2012/gmiller/locking-head/lib/libwitness/xml.c soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Modified: soc2012/gmiller/locking-head/include/pthread_np.h ============================================================================== Modified: soc2012/gmiller/locking-head/lib/libwitness/Makefile ============================================================================== Modified: soc2012/gmiller/locking-head/lib/libwitness/lists.c ============================================================================== Modified: soc2012/gmiller/locking-head/lib/libwitness/logs.c ============================================================================== Added: soc2012/gmiller/locking-head/lib/libwitness/unwind.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/gmiller/locking-head/lib/libwitness/unwind.c Thu Aug 16 03:36:33 2012 (r240424) @@ -0,0 +1,101 @@ +/*- + * Copyright (c) 2012 Greg Miller .. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "witness.h" + +char * +trace_str(struct backtrace *trace) +{ + char *buffer; + int length = 1; + struct stack_frame *frame; + int count = 0; + char line_buf[MAX_FRAME_ID_LENGTH + 4]; + + buffer = malloc(1); + if (buffer != NULL) { + buffer[0] = '\0'; + + SLIST_FOREACH(frame, trace, frame_next) { + if (strncmp(frame->id, "pthread_", 8) == 0) { + break; + } + + sprintf(line_buf, "%d: %s\n", count, frame->id); + + length += strlen(line_buf); + buffer = reallocf(buffer, length); + + strcat(buffer, line_buf); + + if (++count == 10) { + break; + } + } + } + + return (buffer); +} + +#ifdef USE_LIBUNWIND + +#include + +void +record_backtrace(struct backtrace *trace) +{ + unw_context_t context; + unw_cursor_t cursor; + struct stack_frame *frame; + unw_word_t offset; + + free_frame(trace); + + unw_getcontext(&context); + unw_init_local(&cursor, &context); + while (unw_step(&cursor) > 0) { + frame = malloc(sizeof(struct stack_frame)); + if (frame == NULL) { + return; + } + + unw_get_proc_name(&cursor, frame->id, MAX_FRAME_ID_LENGTH, + &offset); + + SLIST_INSERT_HEAD(trace, frame, frame_next); + } +} + +#else + +void +record_backtrace(struct backtrace *trace) +{ + trace = trace; +} + +#endif Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h ============================================================================== Modified: soc2012/gmiller/locking-head/lib/libwitness/xml.c ============================================================================== Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile ============================================================================== From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 03:52:03 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 99942106564A for ; Thu, 16 Aug 2012 03:52:01 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 03:52:01 +0000 Date: Thu, 16 Aug 2012 03:52:01 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816035201.99942106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240425 - in soc2012/gmiller/locking-head: . include lib/libwitness tools/regression/lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 03:52:03 -0000 Author: gmiller Date: Thu Aug 16 03:52:01 2012 New Revision: 240425 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240425 Log: Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/include/pthread_np.h soc2012/gmiller/locking-head/lib/libwitness/Makefile soc2012/gmiller/locking-head/lib/libwitness/lists.c soc2012/gmiller/locking-head/lib/libwitness/logs.c soc2012/gmiller/locking-head/lib/libwitness/witness.h soc2012/gmiller/locking-head/lib/libwitness/xml.c soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Modified: soc2012/gmiller/locking-head/include/pthread_np.h ============================================================================== --- soc2012/gmiller/locking-head/include/pthread_np.h Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/include/pthread_np.h Thu Aug 16 03:52:01 2012 (r240425) @@ -63,7 +63,9 @@ struct pthread_lor_np { struct _pthread_lor_private *_pvt; char *name_first; + char *first_trace; char *name_second; + char *second_trace; }; struct _pthread_lockorder_private; Modified: soc2012/gmiller/locking-head/lib/libwitness/Makefile ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/Makefile Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/lib/libwitness/Makefile Thu Aug 16 03:52:01 2012 (r240425) @@ -4,11 +4,24 @@ LIB= witness SHLIB_MAJOR= 1 -SRCS= wrappers.c graph.c lists.c logs.c lockinfo.c xml.c +SRCS= wrappers.c graph.c lists.c logs.c lockinfo.c xml.c unwind.c DPADD= ${LIBTHR} LDADD= -lthr CSTD?= c99 WARNS?= 6 +.ifdef USE_LIBUNWIND + +.if ${MACHINE_CPUARCH} == "i386" +ARCH=x86 +.elif ${MACHINE_CPUARCH} == "amd64" +ARCH=x86_64 +.endif + +CFLAGS+=-I/usr/local/include -DUSE_LIBUNWIND +LDFLAGS+=-L/usr/local/lib -lunwind -lunwind-${ARCH} + +.endif + .include Modified: soc2012/gmiller/locking-head/lib/libwitness/lists.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/lists.c Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/lib/libwitness/lists.c Thu Aug 16 03:52:01 2012 (r240425) @@ -30,6 +30,7 @@ struct lock_entry { SLIST_ENTRY(lock_entry) lock_next; struct lock_info *lock; + struct backtrace trace; }; static _Thread_local SLIST_HEAD(lock_head, lock_entry) lock_head = @@ -40,22 +41,46 @@ static int exit_set = 0; void +free_frame(struct backtrace *trace) +{ + struct stack_frame *frame; + + while (!SLIST_EMPTY(trace)) { + frame = SLIST_FIRST(trace); + SLIST_REMOVE_HEAD(trace, frame_next); + + free(frame); + } + +} + +static void +free_entry(struct lock_entry *entry) +{ + free_frame(&entry->trace); + free(entry); +} + +void add_lock(void *lock) { struct lock_entry *entry; struct lock_entry *next; struct lock_instance *inst; struct lock_info *info; + static int in_add_lock = 0; if (exit_set == 0) { atexit(write_xml); exit_set = 1; } - if (lock == NULL) { + if (in_add_lock || lock == NULL) { return; } + in_add_lock = 1; + inst = lookup_lock(lock); info = get_lock_info(inst); @@ -63,9 +88,12 @@ entry = malloc(sizeof(*entry)); if (entry == NULL) { + in_add_lock = 0; return; } + SLIST_INIT(&entry->trace); + record_backtrace(&entry->trace); entry->lock = info; if (reset_count > thread_reset_count) { @@ -76,7 +104,7 @@ SLIST_REMOVE_HEAD(&lock_head, lock_next); - free(entry); + free_entry(entry); } next = NULL; @@ -85,8 +113,11 @@ SLIST_INSERT_HEAD(&lock_head, entry, lock_next); if (next != NULL && insert_lock(next->lock, entry->lock) < 0) { - log_reversal(entry->lock, next->lock); + log_reversal(entry->lock, &entry->trace, next->lock, + &next->trace); } + + in_add_lock = 0; } void @@ -103,7 +134,7 @@ SLIST_FOREACH_SAFE(entry, &lock_head, lock_next, temp) { if (entry->lock == info) { SLIST_REMOVE(&lock_head, entry, lock_entry, lock_next); - free(entry); + free_entry(entry); break; } Modified: soc2012/gmiller/locking-head/lib/libwitness/logs.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/logs.c Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/lib/libwitness/logs.c Thu Aug 16 03:52:01 2012 (r240425) @@ -32,7 +32,9 @@ struct lor_entry { STAILQ_ENTRY(lor_entry) lor_next; struct lock_info *lock_first; + char *first_trace; struct lock_info *lock_second; + char *second_trace; }; struct _pthread_lor_private { @@ -40,14 +42,17 @@ }; void -log_reversal(struct lock_info *lock, struct lock_info *previous) +log_reversal(struct lock_info *lock, struct backtrace *lock_trace, + struct lock_info *previous, struct backtrace *previous_trace) { struct lor_entry *entry; entry = malloc(sizeof(struct lor_entry)); if (entry != NULL) { entry->lock_first = previous; + entry->first_trace = trace_str(previous_trace); entry->lock_second = lock; + entry->second_trace = trace_str(lock_trace); STAILQ_INSERT_TAIL(&lor_head, entry, lor_next); } @@ -58,6 +63,11 @@ { int ret = 0; + lor->name_first = NULL; + lor->first_trace = NULL; + lor->name_second = NULL; + lor->second_trace = NULL; + /* The lock isn't needed to prevent races, but it is needed to ensure that any locks grabbed by malloc() don't get logged. @@ -71,9 +81,6 @@ lor->_pvt->last_record = NULL; } - lor->name_first = NULL; - lor->name_second = NULL; - pthread_mutex_unlock(&witness_mtx); return (ret); @@ -86,7 +93,7 @@ pthread_mutex_lock(&witness_mtx); - if (lor->_pvt->last_record == NULL) { + if (lor->_pvt == NULL || lor->_pvt->last_record == NULL) { lor->_pvt->last_record = STAILQ_FIRST(&lor_head); } else { lor->_pvt->last_record = @@ -96,8 +103,12 @@ if (lor->_pvt->last_record != NULL) { lor->name_first = strdup(get_lock_name(lor->_pvt->last_record->lock_first)); + lor->first_trace = + strdup(lor->_pvt->last_record->first_trace); lor->name_second = strdup(get_lock_name(lor->_pvt->last_record->lock_second)); + lor->second_trace = + strdup(lor->_pvt->last_record->second_trace); res = 1; } @@ -122,6 +133,14 @@ if (lor->name_second != NULL) { free(lor->name_second); } + + if (lor->first_trace != NULL) { + free(lor->first_trace); + } + + if (lor->second_trace != NULL) { + free(lor->second_trace); + } } void @@ -134,6 +153,15 @@ STAILQ_FOREACH_SAFE(lor, &lor_head, lor_next, lor_temp) { STAILQ_REMOVE(&lor_head, lor, lor_entry, lor_next); + + if (lor->first_trace != NULL) { + free(lor->first_trace); + } + + if (lor->second_trace != NULL) { + free(lor->second_trace); + } + free(lor); } Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/witness.h Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/lib/libwitness/witness.h Thu Aug 16 03:52:01 2012 (r240425) @@ -34,6 +34,8 @@ #include #include +#define MAX_FRAME_ID_LENGTH (80) + struct blessing { SLIST_ENTRY(blessing) bless_next; struct lock_info *lock; @@ -53,10 +55,18 @@ void *lock; }; +struct stack_frame { + SLIST_ENTRY(stack_frame) frame_next; + char id[MAX_FRAME_ID_LENGTH + 1]; +}; + +SLIST_HEAD(backtrace, stack_frame); + extern pthread_mutex_t witness_mtx; void add_lock(void *lock); void remove_lock(void *lock); +void free_frame(struct backtrace *trace); int insert_lock(struct lock_info *from, struct lock_info *to); @@ -64,7 +74,9 @@ void reset_lists(void); void log_reversal(struct lock_info *lock, - struct lock_info *previous); + struct backtrace *lock_trace, + struct lock_info *previous, + struct backtrace *previous_trace); int blessed(struct lock_info *first, struct lock_info *second); void reset_lock_info(void); @@ -77,3 +89,6 @@ void reset_lock_instance(void); void write_xml(void); + +void record_backtrace(struct backtrace *trace); +char *trace_str(struct backtrace *trace); Modified: soc2012/gmiller/locking-head/lib/libwitness/xml.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/xml.c Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/lib/libwitness/xml.c Thu Aug 16 03:52:01 2012 (r240425) @@ -25,9 +25,6 @@ * */ -#include -#include - #include "witness.h" static int xml_indent = 0; @@ -68,6 +65,14 @@ fprintf(xml_file, "<%s>%s\n", tag, str, tag); } +static void +write_element_block(const char *tag, const char *str) +{ + open_element(tag); + fputs(str, xml_file); + close_element(tag); +} + void write_xml(void) { @@ -84,8 +89,15 @@ while (pthread_lor_next_np(&lor)) { open_element("lor"); - write_element_string("first", lor.name_first); - write_element_string("second", lor.name_second); + open_element("first"); + write_element_string("name", lor.name_first); + write_element_block("backtrace", lor.first_trace); + close_element("first"); + + open_element("second"); + write_element_string("name", lor.name_second); + write_element_block("backtrace", lor.second_trace); + close_element("second"); close_element("lor"); } Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile ============================================================================== --- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Thu Aug 16 03:36:33 2012 (r240424) +++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/Makefile Thu Aug 16 03:52:01 2012 (r240425) @@ -1,7 +1,7 @@ # $FreeBSD$ TESTS= lor-basic setorder bless setname graph shared -CFLAGS+= -g -Wall -Wextra -Werror -lwitness -lpthread -static +CFLAGS+= -g -Wall -Wextra -Werror -lwitness -lpthread .PHONY: tests tests: ${TESTS} From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 04:13:19 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id E2249106566B for ; Thu, 16 Aug 2012 04:13:16 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 04:13:16 +0000 Date: Thu, 16 Aug 2012 04:13:16 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816041316.E2249106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240426 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 04:13:19 -0000 Author: jhagewood Date: Thu Aug 16 04:13:16 2012 New Revision: 240426 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240426 Log: Completed zsdiff man pages Modified: soc2012/jhagewood/sdiff/zsdiff.1 Modified: soc2012/jhagewood/sdiff/zsdiff.1 ============================================================================== --- soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 03:52:01 2012 (r240425) +++ soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 04:13:16 2012 (r240426) @@ -4,12 +4,12 @@ .\" Written by Raymond Lai . .\" Public domain. .\" -.Dd $Mdocdate: July 5 2012 $ -.Dt SDIFF 1 +.Dd $Mdocdate: Aug 16 2012 $ +.Dt ZSDIFF 1 .Os .Sh NAME -.Nm sdiff -.Nd side-by-side diff +.Nm zsdiff +.Nd side-by-side diff of compressed files. .Sh SYNOPSIS .Nm .Op Fl abdilstW @@ -32,105 +32,9 @@ .Nm can also be used to interactively merge two files, prompting at each set of differences. -See the -.Fl o -option for an explanation. .Pp -The options are: -.Bl -tag -width Ds -.It Fl l -left-column -Only print the left column for identical lines. -.It Fl o -output Ar outfile -Interactively merge -.Ar file1 -and -.Ar file2 -into -.Ar outfile . -In this mode, the user is prompted for each set of differences. -See -.Ev EDITOR -and -.Ev VISUAL , -below, -for details of which editor, if any, is invoked. -.Pp -The commands are as follows: -.Bl -tag -width Ds -.It Cm l | 1 -Choose left set of diffs. -.It Cm r | 2 -Choose right set of diffs. -.It Cm s -Silent mode \(en identical lines are not printed. -.It Cm v -Verbose mode \(en identical lines are printed. -.It Cm e -Start editing an empty file, which will be merged into -.Ar outfile -upon exiting the editor. -.It Cm e Cm l -Start editing file with left set of diffs. -.It Cm e Cm r -Start editing file with right set of diffs. -.It Cm e Cm b -Start editing file with both sets of diffs. -.It Cm q -Quit -.Nm . -.El -.It Fl s -suppress-common-lines -Skip identical lines. -.It Fl w -width Ar width -Print a maximum of -.Ar width -characters on each line. -The default is 130 characters. -.El +See sdiff(1) for options. .Pp -Options passed to -.Xr diff 1 -are: -.Bl -tag -width Ds -.It Fl a -text -Treat -.Ar file1 -and -.Ar file2 -as text files. -.It Fl b -ignore-space-change -Ignore trailing blank spaces. -.It Fl d -minimal -Minimize diff size. -.It Fl I -ignore-matching-lines Ar regexp -Ignore line changes matching -.Ar regexp . -All lines in the change must match -.Ar regexp -for the change to be ignored. -.It Fl i -ignore-case -Do a case-insensitive comparison. -.It Fl t -expand-tabs -Expand tabs to spaces. -.It Fl W -ignore-all-space -Ignore all spaces. -.It Fl B -ignore-blank-lines -Ignore blank lines. -.It Fl E -ignore-tab-expansion -Treat tabs and eight spaces as the same. -.It Fl t -ignore-tabs -Ignore tabs. -.It Fl H -speed-large-files -Assume scattered small changes in a large file. -.It Fl -ignore-file-name-case -Ignore the case of file names. -.It Fl -no-ignore-file-name-case -Do not ignore file name case. -.It Fl -strip-trailing-cr -Skip identical lines. -.It Fl -tabsize Ar NUM -Change the size of tabs (default is 8.) -.El .Sh ENVIRONMENT .Bl -tag -width Ds .It Ev EDITOR , VISUAL @@ -159,16 +63,8 @@ .Sh SEE ALSO .Xr cmp 1 , .Xr diff 1 , +.Xr zdiff 1 , .Xr diff3 1 , .Xr vi 1 , .Xr re_format 7 -.Sh AUTHORS -.Nm -was written from scratch for the public domain by -.An Ray Lai Aq ray@cyth.net . -.Sh CAVEATS -.Pp -Tabs are treated as anywhere from one to eight characters wide, -depending on the current column. -Terminals that treat tabs as eight characters wide will look best. From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 04:17:19 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 650271065674 for ; Thu, 16 Aug 2012 04:17:17 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 04:17:17 +0000 Date: Thu, 16 Aug 2012 04:17:17 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816041717.650271065674@hub.freebsd.org> Cc: Subject: socsvn commit: r240427 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 04:17:19 -0000 Author: jhagewood Date: Thu Aug 16 04:17:17 2012 New Revision: 240427 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240427 Log: Completed zsdiff man pages Modified: soc2012/jhagewood/sdiff/zsdiff.1 Modified: soc2012/jhagewood/sdiff/zsdiff.1 ============================================================================== --- soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 04:13:16 2012 (r240426) +++ soc2012/jhagewood/sdiff/zsdiff.1 Thu Aug 16 04:17:17 2012 (r240427) @@ -1,9 +1,32 @@ .\" $FreeBSD$ -.\" $OpenBSD: sdiff.1,v 1.15 2007/06/29 14:48:07 jmc Exp $ .\" .\" Written by Raymond Lai . .\" Public domain. .\" +.\" Copyright (c) 2012 Jesse Hagewood +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" .Dd $Mdocdate: Aug 16 2012 $ .Dt ZSDIFF 1 .Os From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 20:00:07 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 97E051065674 for ; Thu, 16 Aug 2012 20:00:05 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 20:00:05 +0000 Date: Thu, 16 Aug 2012 20:00:05 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816200005.97E051065674@hub.freebsd.org> Cc: Subject: socsvn commit: r240444 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf arm/ti arm/ti/twl boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 20:00:07 -0000 Author: aleek Date: Thu Aug 16 20:00:04 2012 New Revision: 240444 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240444 Log: refactoring part 1 - common.c and DTS file Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Thu Aug 16 18:31:50 2012 (r240443) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Thu Aug 16 20:00:04 2012 (r240444) @@ -63,20 +63,6 @@ options DEBUG -# NFS support -#options NFSCL -#options NFSSERVER #Network Filesystem Server -#options NFSCLIENT #Network Filesystem Client - -# Uncomment this for NFS root -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT -#options BOOTP_NFSROOT -#options BOOTP_COMPAT -#options BOOTP -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=cpsw0 - - # MMC/SD/SDIO card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards @@ -129,8 +115,3 @@ options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=beagleboardxm.dts - -#options MD_ROOT -#options MD_ROOT_SIZE=8192 -#makeoptions MFS_IMAGE=/home/alek/beaglexm-armv6/arm.ramfs -#options ROOTDEVNAME=\"ufs:md0\" Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c Thu Aug 16 18:31:50 2012 (r240443) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c Thu Aug 16 20:00:04 2012 (r240444) @@ -91,12 +91,8 @@ #ifdef SOC_OMAP4 &fdt_gic_decode_ic, #endif -#ifdef SOC_TI_AM335X +#if defined( SOC_TI_AM335X ) || defined( SOC_TI_AM37X ) &fdt_aintc_decode_ic, #endif -#ifdef SOC_TI_AM37X - &fdt_aintc_decode_ic, -#endif - NULL }; Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Thu Aug 16 18:31:50 2012 (r240443) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Thu Aug 16 20:00:04 2012 (r240444) @@ -403,13 +403,16 @@ int start_ticks = ticks; int rc; + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); TI_I2C_ASSERT_LOCKED(sc); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* check if the condition has already occured, the interrupt routine will * clear the status flags. */ if ((sc->sc_stat_flags & flags) == 0) { + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* condition(s) haven't occured so sleep on the IRQ */ while (waittime > 0) { @@ -431,6 +434,7 @@ } } + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* copy the actual status bits */ if (statp != NULL) *statp = sc->sc_stat_flags; @@ -505,12 +509,14 @@ uint32_t sofar = 0; uint32_t i; + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for the bus to become free */ err = ti_i2c_wait_for_free_bus(sc, timo); if (err != 0) { device_printf(sc->sc_dev, "bus never freed\n"); return (err); } + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* set the events to wait for */ events = I2C_IE_RDR | /* Receive draining interrupt */ @@ -522,9 +528,11 @@ /* enable interrupts for the events we want */ ti_i2c_set_intr_enable(sc, events); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* write the number of bytes to read */ ti_i2c_write_reg(sc, I2C_REG_CNT, len); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* clear the write bit and initiate the read transaction. Setting the STT * (start) bit initiates the transfer. */ @@ -533,15 +541,18 @@ con_reg |= I2C_CON_MST | I2C_CON_STT | I2C_CON_STP; ti_i2c_write_reg(sc, I2C_REG_CON, con_reg); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* reading loop */ while (1) { + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for an event */ err = ti_i2c_wait(sc, events, &status, timo); if (err != 0) { break; } + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* check for the error conditions */ if (status & I2C_STAT_NACK) { /* no ACK from slave */ @@ -600,6 +611,7 @@ ti_i2c_write_reg(sc, I2C_REG_STAT, I2C_STAT_RDR | I2C_STAT_RRDY); } + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* reset the registers regardless if there was an error or not */ ti_i2c_set_intr_enable(sc, 0x0000); ti_i2c_write_reg(sc, I2C_REG_CON, I2C_CON_I2C_EN | I2C_CON_MST | I2C_CON_STP); @@ -634,10 +646,12 @@ uint32_t sofar = 0; uint32_t i; + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for the bus to become free */ err = ti_i2c_wait_for_free_bus(sc, timo); if (err != 0) return (err); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* set the events to wait for */ events = I2C_IE_XDR | /* Transmit draining interrupt */ @@ -649,9 +663,11 @@ /* enable interrupts for the events we want*/ ti_i2c_set_intr_enable(sc, events); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* write the number of bytes to write */ ti_i2c_write_reg(sc, I2C_REG_CNT, len); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* set the write bit and initiate the write transaction. Setting the STT * (start) bit initiates the transfer. */ @@ -662,6 +678,7 @@ /* writing loop */ while (1) { + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for an event */ err = ti_i2c_wait(sc, events, &status, timo); if (err != 0) { @@ -1104,6 +1121,7 @@ device_printf(dev, "I2C revision %d.%d\n", sc->sc_rev >> 4, sc->sc_rev & 0xf); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Activate the H/W */ err = ti_i2c_activate(dev); if (err) { @@ -1111,19 +1129,23 @@ goto out; } + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* activate the interrupt */ err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, ti_i2c_intr, sc, &sc->sc_irq_h); if (err) goto out; + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Attach to the iicbus */ if ((sc->sc_iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Probe and attach the iicbus */ bus_generic_attach(dev); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); out: if (err) { ti_i2c_deactivate(dev); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c Thu Aug 16 18:31:50 2012 (r240443) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c Thu Aug 16 20:00:04 2012 (r240444) @@ -280,6 +280,7 @@ { struct iic_msg msg; uint8_t tmp; + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Set the address to read from */ msg.slave = addr; @@ -290,6 +291,7 @@ if (iicbus_transfer(sc->sc_dev, &msg, 1) != 0) return (EIO); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); return (0); } @@ -312,6 +314,7 @@ uint8_t base = TWL_CHIP_ID0; sc = device_get_softc((device_t)dev); + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); memset(devs, TWL_INVALID_CHIP_ID, TWL_MAX_SUBADDRS); @@ -324,6 +327,7 @@ device_printf(sc->sc_dev, "Found (sub)device at 0x%02x\n", (base + i)); } } + device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); TWL_LOCK(sc); memcpy(sc->sc_subaddr_map, devs, TWL_MAX_SUBADDRS); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Thu Aug 16 18:31:50 2012 (r240443) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Thu Aug 16 20:00:04 2012 (r240444) @@ -1016,7 +1016,7 @@ TWL_VREG_XUNLOCK(sc); - config_intrhook_disestablish(&sc->sc_init_hook); + //config_intrhook_disestablish(&sc->sc_init_hook); } static int @@ -1049,12 +1049,12 @@ /* We have to wait until interrupts are enabled. I2C read and write * only works if the interrupts are available. */ - sc->sc_init_hook.ich_func = twl_vreg_init; - sc->sc_init_hook.ich_arg = dev; + //sc->sc_init_hook.ich_func = twl_vreg_init; + //sc->sc_init_hook.ich_arg = dev; - if (config_intrhook_establish(&sc->sc_init_hook) != 0) - return (ENOMEM); - //twl_vreg_init( dev ); + //if (config_intrhook_establish(&sc->sc_init_hook) != 0) + // return (ENOMEM); + twl_vreg_init( dev ); return (0); } Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Thu Aug 16 18:31:50 2012 (r240443) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Thu Aug 16 20:00:04 2012 (r240444) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Damjan Marion + * Copyright (c) 2012 Aleksander Dutkowski * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -64,8 +64,8 @@ reg = < 0x48002000 0x2000 >; /* Set of triplets < padname, muxname, padstate> */ scm-pad-config = - /* USB */ - + /* USB OTG */ + /* "af10", "hsusb1_stp", "output", "ae10", "hsusb1_clk", "output", "af9", "hsusb1_dir", "input_pulldown", @@ -78,11 +78,12 @@ "ah9", "hsusb1_data5", "input_pulldown", "af13", "hsusb1_data6", "input_pulldown", "ae13", "hsusb1_data7", "input_pulldown", + */ + /* USB HS */ "af7", "hsusb2_stp", "output", "ag7", "hsusb2_dir", "input_pulldown", "ah7", "hsusb2_nxt", "input_pulldown", - "ag8", "hsusb2_data0", "input_pulldown", "ah8", "hsusb2_data1", "input_pulldown", "ab2", "hsusb2_data2", "input_pulldown", @@ -91,10 +92,8 @@ "y3", "hsusb2_data5", "input_pulldown", "y4", "hsusb2_data6", "input_pulldown", "aa3", "hsusb2_data7", "input_pulldown", - "ad25", "gpio_147", "output", "ae7", "hsusb2_clk", "output", - /*"r8", "gpio_56", "output",/* /* i2c */ "ic11", "i2c1_scl", "output", @@ -124,26 +123,7 @@ interrupts = < 29 30 31 32 33 34 >; interrupt-parent = <&AINTC>; }; -/* - gptimers@48318000 { - compatible = "ti,omap3_gptimer"; - #address-cells = <1>; - #size-cells = <1>; - reg = < 0x48318000 0x1000 - 0x49032000 0x1000 - 0x49034000 0x1000 - 0x49036000 0x1000 - 0x49038000 0x1000 - 0x4903a000 0x1000 - 0x4903c000 0x1000 - 0x4903e000 0x1000 - 0x49040000 0x1000 - 0x48086000 0x1000 - 0x48088000 0x1000 >; - interrupts = < 37 38 39 40 41 42 43 >; - interrupt-parent = <&AINTC>; - }; -*/ + gptimer_et@48086000 { compatible = "ti,omap3_gptimer_et"; #address-cells = <1>; From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 20:18:12 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id CAC0E1065691 for ; Thu, 16 Aug 2012 20:18:10 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 20:18:10 +0000 Date: Thu, 16 Aug 2012 20:18:10 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816201810.CAC0E1065691@hub.freebsd.org> Cc: Subject: socsvn commit: r240446 - soc2012/aleek/beaglexm-armv6/sys/arm/ti X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 20:18:13 -0000 Author: aleek Date: Thu Aug 16 20:18:10 2012 New Revision: 240446 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240446 Log: refactoring part2 - ti_machdep Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c Thu Aug 16 19:22:34 2012 (r240445) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c Thu Aug 16 20:18:10 2012 (r240446) @@ -253,12 +253,6 @@ cpu_last_char, AM335X_DEVREV(chip_revision)); } -/* static void -am37x_get_revision(void) -{ - // XXX @TODO fix this - printf( "Texas Instruments AM37x HABABABA Processor - FIXME bejbe\n" ); -}*/ /** * ti_cpu_ident - attempts to identify the chip we are running on * @dummy: ignored @@ -285,7 +279,6 @@ break; case CHIP_AM37X: omap3_get_revision(); - //am37x_get_revision(); break; default: panic("Unknown chip type, fixme!\n"); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Thu Aug 16 19:22:34 2012 (r240445) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Thu Aug 16 20:18:10 2012 (r240446) @@ -88,8 +88,9 @@ #include #include +#if defined(SOC_OMAP4) #include -#include +#endif #ifdef DEBUG #define debugf(fmt, args...) printf(fmt, ##args) @@ -299,30 +300,6 @@ phys_avail[j + 1] = 0; } -void -beagle_early_puts(char *s); - -void -beagle_early_puts(char *s) -{ - // 0xFFFFEE00 - volatile uint32_t *uart = (volatile uint32_t *)0x49020000; - volatile uint32_t *uart_lsr = (volatile uint32_t *)0x49020014; - while (*s) - { - while ((*uart_lsr & 0x20) == 0); - *uart = *s++; - - if (*(s-1) == '\n') - { - while ((*uart_lsr & 0x20) == 0); - *uart = '\r'; - } - } -} - - - void * initarm(void *mdp, void *unused __unused) { @@ -334,8 +311,6 @@ u_int l1pagetable; int i = 0, j = 0; - arm_early_puts( "BeagleBoard-XM revC FreeBSD booting...\n" ); - kmdp = NULL; lastaddr = 0; memsize = 0; @@ -395,8 +370,6 @@ &memsize) != 0) while(1); - eprintf( "Memory size: %d\n", memsize ); - // if (fdt_immr_addr(OMAP44XX_L4_PERIPH_VBASE) != 0) // while (1); @@ -655,7 +628,7 @@ fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE; fdt_devmap[i].pd_cache = PTE_DEVICE; i++; -#elif defined(SOC_TI_AM37X) +#elif defined(SOC_TI_AM37X) || defined(SOC_OMAP3) fdt_devmap[i].pd_va = 0xE8000000; fdt_devmap[i].pd_pa = 0x48000000; fdt_devmap[i].pd_size = 0x1000000; From owner-svn-soc-all@FreeBSD.ORG Thu Aug 16 20:55:23 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 189451065675 for ; Thu, 16 Aug 2012 20:55:21 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 16 Aug 2012 20:55:21 +0000 Date: Thu, 16 Aug 2012 20:55:21 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120816205521.189451065675@hub.freebsd.org> Cc: Subject: socsvn commit: r240447 - in soc2012/aleek/beaglexm-armv6/sys/arm: conf ti/am37x ti/omap3 X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 20:55:23 -0000 Author: aleek Date: Thu Aug 16 20:55:18 2012 New Revision: 240447 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240447 Log: I decided to get rid of the 'am37x' thing, since AM3730 is compatible with omap3 - linux kernel source is the same for both. So I moved all the code to omap3 folder and updated the files Added: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.beagleboardxm soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_early_uart.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_early_uart.h soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer_generic.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_prcm.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_scm_padconf.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/std.beagleboardxm Deleted: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_dmtimer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_early_uart.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_early_uart.h soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer.h soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer_tc.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_pmic.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_reg.h soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_scm_padconf.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.beagleboardxm soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/std.am37x soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/std.beagleboardxm soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_intr.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_timer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3var.h Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.omap3 soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/std.omap3 Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Thu Aug 16 20:18:10 2012 (r240446) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Thu Aug 16 20:55:18 2012 (r240447) @@ -20,7 +20,7 @@ ident BEAGLEBOARD-XM -include "../ti/am37x/std.beagleboardxm" +include "../ti/omap3/std.beagleboardxm" makeoptions MODULES_OVERRIDE="" makeoptions WITHOUT_MODULES="ahc" Added: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.beagleboardxm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.beagleboardxm Thu Aug 16 20:55:18 2012 (r240447) @@ -0,0 +1,5 @@ +#$FreeBSD$ + +arm/ti/twl/twl.c optional twl +arm/ti/twl/twl_vreg.c optional twl twl_vreg +arm/ti/twl/twl_clks.c optional twl twl_clks Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.omap3 ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.omap3 Thu Aug 16 20:18:10 2012 (r240446) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/files.omap3 Thu Aug 16 20:55:18 2012 (r240447) @@ -1,5 +1,10 @@ #$FreeBSD$ -arm/ti/omap3/omap3_intr.c standard -arm/ti/omap3/omap35x.c standard -arm/ti/omap3/omap3_prcm_clks.c standard +arm/ti/aintc.c standard +arm/ti/omap3/omap3_prcm.c standard +arm/ti/omap3/omap3_gptimer.c standard +arm/ti/omap3/omap3_scm_padconf.c standard +arm/ti/ti_sdma.c standard +arm/ti/omap3/omap3_early_uart.c standard +arm/ti/ti_mmchs.c optional mmc +arm/ti/usb/omap_ehci.c optional usb Added: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_early_uart.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_early_uart.c Thu Aug 16 20:55:18 2012 (r240447) @@ -0,0 +1,200 @@ +/*- + * Copyright (c) 2009 Guillaume Ballet + * Copyright (c) 2012 Aleksander Dutkowski + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Debugging functions for early uart for omap3530 and omap3 TI SoC's + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + + +void +arm_early_putc( char c ) +{ + volatile uint32_t *uart = (volatile uint32_t *)0xe9020000; + volatile uint32_t *uart_lsr = (volatile uint32_t *)0xe9020014; + + while ((*uart_lsr & 0x20) == 0); + *uart = c; + + if( c == '\n' ) + { + while ((*uart_lsr & 0x20) == 0); + *uart = '\r'; + } +} + +void +arm_early_puts(unsigned char *str) +{ + do { + arm_early_putc(*str); + } while (*++str != '\0'); +} + +void +eprintf(const char *fmt,...) +{ + va_list ap; + const char *hex = "0123456789abcdef"; + char buf[10]; + char *s; + unsigned u; + int c; + + va_start(ap, fmt); + while ((c = *fmt++)) { + if (c == '%') { + c = *fmt++; + switch (c) { + case 'c': + arm_early_putc(va_arg(ap, int)); + continue; + case 's': + for (s = va_arg(ap, char *); *s; s++) + arm_early_putc(*s); + continue; + case 'd': /* A lie, always prints unsigned */ + case 'u': + u = va_arg(ap, unsigned); + s = buf; + do + *s++ = '0' + u % 10U; + while (u /= 10U); + dumpbuf:; + while (--s >= buf) + arm_early_putc(*s); + continue; + case 'x': + u = va_arg(ap, unsigned); + s = buf; + do + *s++ = hex[u & 0xfu]; + while (u >>= 4); + goto dumpbuf; + } + } + arm_early_putc(c); + } + va_end(ap); + + return; +} + +void +dump_l2pagetable(uint32_t pta, uint32_t l1) +{ + int i; + volatile uint32_t *pt = (volatile uint32_t*)pta; + + for (i=0; i<256;i++) { + switch (pt[i] & 0x3) { + case 1: + eprintf("0x%x -> 0x%x 64K ",(i<<12) | l1, + pt[i]&0xFFFF0000); + eprintf("l2pt[0x%x]=0x%x ",i, pt[i]); + eprintf("s=%u ", (pt[i]>>10) &0x1); + eprintf("apx=%u ", (pt[i]>> 9) &0x1); + eprintf("tex=%u ", (pt[i]>>12) &0x7); + eprintf("ap=%u ", (pt[i]>> 4) &0x3); + eprintf("c=%u ", (pt[i]>> 3) &0x1); + eprintf("b=%u\n", (pt[i]>> 2) &0x1); + break; + case 2: + case 3: + eprintf("0x%x -> 0x%x 4K ",(i<<12) | l1, + pt[i]&0xFFFFF000); + eprintf("l2pt[0x%x]=0x%x ",i, pt[i]); + eprintf("s=%u ", (pt[i]>>10) &0x1); + eprintf("apx=%u ", (pt[i]>> 9) &0x1); + eprintf("tex=%u ", (pt[i]>> 6) &0x7); + eprintf("ap=%u ", (pt[i]>> 4) &0x3); + eprintf("c=%u ", (pt[i]>> 3) &0x1); + eprintf("b=%u\n", (pt[i]>> 2) &0x1); + break; + } + } +} + +void +dump_l1pagetable(uint32_t pta) +{ + int i; + eprintf("L1 pagetable starts at 0x%x\n",pta); + volatile uint32_t *pt = (volatile uint32_t*)pta; + for (i=0; i<4096;i++) { + switch (pt[i] & 0x3) { + case 1: + eprintf("0x%x -> L2 ",i<<20); + eprintf("l1pt[0x%x]=0x%x ",i, pt[i]); + eprintf("l2desc=0x%x ",pt[i] & 0xFFFFFC00); + eprintf("p=%u ",(pt[i]>>9) &0x1); + eprintf("domain=0x%x\n",(pt[i]>>5) &0xF); + dump_l2pagetable(pt[i] & 0xFFFFFC00, i<<20); + break; + case 2: + if (pt[i] &0x40000) { + eprintf("0x%x -> 0x%x 16M ",i<<20, pt[i] & 0xFF000000); + eprintf("l1pt[0x%x]=0x%x ",i, pt[i]); + eprintf("base=0x%x ", ((pt[i]>>24))); + } else { + eprintf("0x%x -> 0x%x 1M ",i<<20, pt[i] & 0xFFF00000); + eprintf("l1pt[0x%x]=0x%x ",i, pt[i]); + eprintf("base=0x%x ", (pt[i]>>20)); + } + eprintf("nG=%u ", (pt[i]>>17) &0x1); + eprintf("s=%u ", (pt[i]>>16) &0x1); + eprintf("apx=%u ", (pt[i]>>15) &0x1); + eprintf("tex=%u ", (pt[i]>>12) &0x7); + eprintf("ap=%u ", (pt[i]>>10) &0x3); + eprintf("p=%u ", (pt[i]>> 9) &0x1); + eprintf("domain=0x%x ", (pt[i]>> 5) &0xF); + eprintf("xn=%u ", (pt[i]>> 4) &0x1); + eprintf("c=%u ", (pt[i]>> 3) &0x1); + eprintf("b=%u\n", (pt[i]>> 2) &0x1); + break; + case 3: + eprintf("pt[0x%x] 0x%x RESV\n",i, pt[i]); + break; + } + } +} Added: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_early_uart.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_early_uart.h Thu Aug 16 20:55:18 2012 (r240447) @@ -0,0 +1,45 @@ +/*- + * Copyright (c) 2009 Guillaume Ballet + * Copyright (c) 2012 Aleksander Dutkowski + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef AM37X_EARLY_UART_INC +#define AM37X_EARLY_UART_INC + +void +arm_early_putc( char c ); + +void +arm_early_puts(unsigned char *str); + +void +eprintf(const char *fmt,...); + +void +dump_l1pagetable(uint32_t pta); + +void +dump_l2pagetable(uint32_t pta, uint32_t l1); +#endif /* ----- #ifndef AM37X_EARLY_UART_INC ----- */ Added: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Thu Aug 16 20:55:18 2012 (r240447) @@ -0,0 +1,927 @@ + +/*- + * Copyright (c) 2012 Aleksander Dutkowski + * All rights reserved. + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Based on gptimer driver by Ben Gray + */ +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#define gptimer_read_4(reg) bus_read_4( sc->mem_res, reg ) +#define gptimer_write_4(reg, val) bus_write_4( sc->mem_res, reg, val ) + +static struct omap3_gptimer_softc *g_omap3_gptimer_sc_tc = NULL; +static struct omap3_gptimer_softc *g_omap3_gptimer_sc_et = NULL; + +static unsigned int delay_loops_per_us = 100; + +/** + * Struct used by tc_init(), to init the timecounter + */ +static struct timecounter omap3_gptimer_tc = { + /* Name of the timecounter. */ + .tc_name = "OMAP3 Timecounter", + /* + * This function reads the counter. It is not required to + * mask any unimplemented bits out, as long as they are + * constant. + */ + .tc_get_timecount = omap3_gptimer_tc_get_timecount, + .tc_poll_pps = NULL, + /* This mask should mask off any unimplemented bits. */ + .tc_counter_mask = ~0u, + /* Frequency of the counter in Hz. */ + .tc_frequency = 0, + /* + * Used to determine if this timecounter is better than + * another timecounter higher means better. Negative + * means "only use at explicit request". + */ + .tc_quality = 1000, +}; + +static struct eventtimer omap3_gptimer_et; + +#define __omap3_delay(i) \ + do { \ + unsigned int cnt = (i); \ + __asm __volatile("1: subs %0, %0, 1\n" \ + " bne 1b\n" \ + : "+r" (cnt) : : "cc"); \ + } while(0) + +/** + * omap3_calibrate_delay_loop - uses the setup timecounter to configure delay + * + * This is not very scientfic, basically just use the timecount to measure the + * time to do 1000 delay loops (for loop with 1024 loops). + * + * + */ +static int +omap3_calibrate_delay_loop(struct omap3_gptimer_softc *sc, struct timecounter *tc) +{ + u_int oldirqstate; + unsigned int start, end; + uint64_t nanosecs; + + /* Disable interrupts to ensure they don't mess up the calculation */ + oldirqstate = disable_interrupts(I32_bit); + + start = omap3_gptimer_tc_get_timecount(tc); + //__omap3_delay(10240); + for (int usec=10240; usec > 0; usec--) + //for (int32_t counts = 200; counts > 0; counts--) + /* Prevent gcc from optimizing out the loop */ + cpufunc_nullop(); + + end = omap3_gptimer_tc_get_timecount(tc); + + restore_interrupts(oldirqstate); + + /* Calculate the number of loops in 1us */ + nanosecs = ((uint64_t)(end - start) * 1000000000ULL) / tc->tc_frequency; + delay_loops_per_us = (unsigned int)((uint64_t)(10240 * 1000) / nanosecs); + + device_printf( sc->sc_dev, "Delay loop calibrated to %u cycles\n", delay_loops_per_us); + + return (0); +} + + +static unsigned +omap3_gptimer_tc_get_timecount(struct timecounter *tc) +{ + uint32_t count; + omap3_gptimer_read_count(g_omap3_gptimer_sc_tc, &count); + return(count); + +} + +/** + * omap3_gptimer_read_count - reads the current timer value + * @n: the number of the timer (first timer is number 1) + * @cnt: + * + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_read_count(struct omap3_gptimer_softc *sc, uint32_t *cnt) +{ + int ret; + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + + /* Get a pointer to the individual sc struct */ + + OMAP3_GPTIMER_LOCK(sc); + + if (!(sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG)) { + ret = EINVAL; + } else { + *cnt = gptimer_read_4(OMAP3_GPT_TCRR); + ret = 0; + } + + OMAP3_GPTIMER_UNLOCK(sc); + + return (ret); +} + + +/** + * omap3_gptimer_write_count - writes a value into the current count + * @n: the number of the timer (first timer is number 1) + * @cnt: the value to put in the count register + * + * + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_write_count(struct omap3_gptimer_softc *sc, uint32_t cnt) +{ + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + + if (!(sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG)) + return (EINVAL); + + OMAP3_GPTIMER_LOCK(sc); + + gptimer_write_4(OMAP3_GPT_TCRR, cnt); + + OMAP3_GPTIMER_UNLOCK(sc); + + return (0); +} + + + +/** + * omap_gptimer_get_freq - gets the frequency of an activated timer + * @n: the number of the timer (first timer is number 1) + * @freq: unpon return will contain the current freq + * + * The timer must be activated, if not this function will return EINVAL. + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_get_freq(struct omap3_gptimer_softc *sc, uint32_t *freq) +{ + unsigned int src_freq; + unsigned int tmr_freq; + unsigned int prescaler; + uint32_t tclr, tldr; + int rc; + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + if (freq == NULL) + return (EINVAL); + + /* Get a pointer to the individual timer struct */ + if (!(sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG)) + return (EINVAL); + + /* We get the frequency by first reading the source frequency */ + if ((rc = ti_prcm_clk_get_source_freq(sc->source, &src_freq)) != 0) + return (rc); + + + OMAP3_GPTIMER_LOCK(sc); + + /* Determine if the pre-scalar is enabled and if so the prescaler value */ + tclr = gptimer_read_4(OMAP3_GPT_TCLR); + if (tclr & TCLR_PRE) + prescaler = 1UL << (((tclr & TCLR_PTV_MASK) >> 2) + 1); + else + prescaler = 1; + + /* Get the reload count */ + tldr = gptimer_read_4(OMAP3_GPT_TLDR); + + OMAP3_GPTIMER_UNLOCK(sc); + + + /* Calculate the tick freq */ + tmr_freq = (src_freq / prescaler); + + /* If auto-reload mode is set and the reload count is not zero then the + * frequency is the period between overflows. + */ + if ((tclr & TCLR_AR) && (tldr != 0x00000000)) { + tmr_freq /= ((0xffffffff - tldr) + 1); + } + + + if (freq != NULL) + *freq = tmr_freq; + + return (0); +} + + + +/** + * omap3_gptimer_activate - configures the timer + * @n: the number of the timer (first timer is number 1) + * @flags: defines the type of timer to turn on + * @time_ns: the period of the timer in nanoseconds + * @callback: if defined this function will be called when the timer overflows + * @data: data value to pass to the callback + * + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_activate(struct omap3_gptimer_softc *sc, unsigned int flags, unsigned int time_us, + void (*callback)(void *data), void *data) +{ + uint32_t val; + uint64_t tickcount; + unsigned int freq; + uint64_t freq64; + uint32_t prescaler; + uint32_t startcount; + + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + + /* Sanity check the timer is availabe and not activated */ + if (!(sc->flags & OMAP3_GPTIMER_AVAILABLE_FLAG)) { + device_printf(sc->sc_dev, "Error: timer not available\n"); + return (EINVAL); + } + if (sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG) { + device_printf(sc->sc_dev, "Error: timer already activated\n"); + return (EINVAL); + } + + /* Set up system clock information */ + if (ti_prcm_clk_valid(sc->source) != 0) { + device_printf(sc->sc_dev, "Error: failed to find source clock\n"); + return (EINVAL); + } + + OMAP3_GPTIMER_LOCK(sc); + + /* Enable the functional and interface clock */ + if (flags & OMAP3_GPTIMER_32KCLK_FLAG) + ti_prcm_clk_set_source(sc->source, F32KHZ_CLK); + else + ti_prcm_clk_set_source(sc->source, SYSCLK_CLK); + + ti_prcm_clk_enable(sc->source); + + + /* Store the flags in the timer context */ + sc->flags &= 0xFF000000; + sc->flags |= (0x00FFFFFF & flags); + + + /* Reset the timer and poll on the reset complete flag */ + if (sc->profile == OMAP_GPTIMER_PROFILE_OMAP3) { + gptimer_write_4(OMAP3_GPT_TIOCP_CFG, 0x2); + /* TODO: add a timeout */ + while ((gptimer_read_4(OMAP3_GPT_TISTAT) & 0x01) == 0x00) + continue; + + /* Clear the interrupt status */ + gptimer_write_4(OMAP3_GPT_TISR, TCAR | OVF | MAT); + } + + /* If the user supplied a zero value we set a free running timer */ + if (time_us == 0) { + /* Set the initial value and roll over value to 0 */ + startcount = 0x00000000; + } else { + /* We need to calculate the number of timer ticks in either the reload + * value (for periodic timers) or the overflow + */ + ti_prcm_clk_get_source_freq(sc->source, &freq); + freq64 = freq; + + /* Calculate the period of the timer, 64 bit calculations used to + * prevent rollover. + */ + tickcount = (freq64 * (uint64_t)time_us) / 1000000; + + /* Must have a count of at least 1 */ + if (tickcount == 0) + tickcount = 1; + + /* If the number is too large then see if by enabling the prescaler it + * will fit, otherwise just set the max count we can do. + */ + if (tickcount > 0xFFFFFFFFULL) { + + /* Try and find a prescaler that will match */ + for (prescaler = 0; prescaler < 7; prescaler++) { + if (tickcount < (0x1ULL << (32 + prescaler))) { + break; + } + } + + /* Adjust the count and apply the prescaler */ + tickcount >>= (prescaler + 1); + + val = gptimer_read_4(OMAP3_GPT_TCLR); + val &= ~TCLR_PTV_MASK; + val |= TCLR_PRE | (prescaler << 2); + gptimer_write_4(OMAP3_GPT_TCLR, val); + } + + /* Calculate the start value */ + startcount = 0xFFFFFFFFUL - (uint32_t)(tickcount & 0xFFFFFFFFUL); + + device_printf( sc->sc_dev, "%s, %d : freq64=%llu : tickcount=%llu : startcount=%u : time_us=%u\n", + __func__, __LINE__, freq64, tickcount, startcount, time_us); + } + + /* Load the start value into the count register */ + gptimer_write_4(OMAP3_GPT_TCRR, startcount); + + /* Enable autoload mode if configuring a periodic timer or system tick + * timer. Also set the reload count to match the period tick count. + */ + if (flags & OMAP3_GPTIMER_PERIODIC_FLAG) { + /* Enable auto reload */ + val = gptimer_read_4(OMAP3_GPT_TCLR); + val |= TCLR_AR; + gptimer_write_4(OMAP3_GPT_TCLR, val); + + /* Set the reload value */ + gptimer_write_4(OMAP3_GPT_TLDR, startcount); + } + + /* If a callback function has been supplied setup a overflow interrupt */ + if (callback != NULL) { + + /* Save the callback function and the data for it */ + sc->callback = callback; + sc->callback_data = data; + + /* Activate the interrupt */ + if (bus_setup_intr(sc->sc_dev, sc->irq_res, + INTR_TYPE_MISC | INTR_MPSAFE, NULL, omap3_gptimer_intr, + (void*)sc, &sc->irq_h)) { + device_printf(sc->sc_dev, "Error: failed to activate interrupt\n"); + } + + /* Enable the overflow interrupts. */ + if (sc->profile == OMAP_GPTIMER_PROFILE_OMAP3) { + val = gptimer_read_4(OMAP3_GPT_TIER); + val |= OVF; + gptimer_write_4(OMAP3_GPT_TIER, val); + } + } + + /* Finally set the activated flag */ + sc->flags |= OMAP3_GPTIMER_ACTIVATED_FLAG; + + OMAP3_GPTIMER_UNLOCK(sc); + return (0); +} + +/** + * omap3_gptimer_start - starts a one-shot or periodic timer + * @n: the number of the timer (first timer is number 1) + * + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_start_et(struct eventtimer *et, struct bintime *first, struct bintime *period) +{ + struct omap3_gptimer_softc *sc = (struct omap3_gptimer_softc *)et->et_priv; + uint32_t val; + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + if (!(sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG)) + return (EINVAL); + + OMAP3_GPTIMER_LOCK(sc); + + val = gptimer_read_4(OMAP3_GPT_TCLR); + val |= TCLR_ST; + gptimer_write_4(OMAP3_GPT_TCLR, val); + + OMAP3_GPTIMER_UNLOCK(sc); + + return 0; +} + +int +omap3_gptimer_start(struct omap3_gptimer_softc *sc) +{ + uint32_t val; + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + if (!(sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG)) + return (EINVAL); + + OMAP3_GPTIMER_LOCK(sc); + + val = gptimer_read_4(OMAP3_GPT_TCLR); + val |= TCLR_ST; + gptimer_write_4(OMAP3_GPT_TCLR, val); + + OMAP3_GPTIMER_UNLOCK(sc); + + return 0; +} +/** + * omap3_gptimer_stop - stops a one-shot or periodic timer + * @n: the number of the timer (first timer is number 1) + * + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_stop(struct eventtimer *et) +{ + struct omap3_gptimer_softc *sc = (struct omap3_gptimer_softc *)et->et_priv; + uint32_t val; + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + if (!(sc->flags & OMAP3_GPTIMER_ACTIVATED_FLAG)) + return (EINVAL); + + OMAP3_GPTIMER_LOCK(sc); + + val = gptimer_read_4(OMAP3_GPT_TCLR); + val &= ~TCLR_ST; + gptimer_write_4(OMAP3_GPT_TCLR, val); + + OMAP3_GPTIMER_UNLOCK(sc); + + return 0; +} + +/** + * omap3_gptimer_set_intr_filter - sets a filter + * @n: the number of the timer (first timer is number 1) + * + * + * RETURNS: + * Returns 0 on success, otherwise an error code + */ +int +omap3_gptimer_set_intr_filter(struct omap3_gptimer_softc *sc, driver_filter_t filter) +{ + uint32_t val; + + /* Sanity checks */ + if (sc == NULL) + return (ENOMEM); + + OMAP3_GPTIMER_LOCK(sc); + + /* If a callback is already installed this won't work */ + if (sc->callback != NULL) { + OMAP3_GPTIMER_UNLOCK(sc); + return(EINVAL); + } + + /* Sanity check the timer is already activated and periodic type */ + if ((sc->flags & (OMAP3_GPTIMER_ACTIVATED_FLAG | OMAP3_GPTIMER_PERIODIC_FLAG)) + != (OMAP3_GPTIMER_ACTIVATED_FLAG | OMAP3_GPTIMER_PERIODIC_FLAG)) { + OMAP3_GPTIMER_UNLOCK(sc); + return(EINVAL); + } + + + /* Attempt to activate the interrupt for the tick */ + if (bus_setup_intr(sc->sc_dev, sc->irq_res, INTR_TYPE_CLK, + filter, NULL, NULL, &sc->irq_h)) { + device_printf(sc->sc_dev, "Error: failed to activate interrupt\n"); + OMAP3_GPTIMER_UNLOCK(sc); + return(EINVAL); + } + + + /* Enable the overflow interrupts */ + if (sc->profile == OMAP_GPTIMER_PROFILE_OMAP3) { + val = gptimer_read_4(OMAP3_GPT_TIER); + val |= OVF; + gptimer_write_4(OMAP3_GPT_TIER, val); + } + + OMAP3_GPTIMER_UNLOCK(sc); + + return(0); +} + +/** + * omap3_gptimer_intr_filter_ack - acknowledges a timer interrupt + * @n: the number of the timer (first timer is number 1) + * + * This function should only be called from filter interrupt handler installed + * by calling the omap_gptimer_set_intr_filter() function. + * + * RETURNS: + * Nothing + */ +void +omap3_gptimer_intr_filter_ack(struct omap3_gptimer_softc *sc) +{ + uint32_t stat; + + OMAP3_GPTIMER_LOCK(sc); + + /* Read the interrupt status flag and clear it */ + /* Read the status and it with the enable flag */ + stat = gptimer_read_4(OMAP3_GPT_TISR); + stat &= gptimer_read_4(OMAP3_GPT_TIER); + + /* Clear the status flag */ + gptimer_write_4(OMAP3_GPT_TISR, stat); + OMAP3_GPTIMER_UNLOCK(sc); +} + + + +/** + * cpu_initclocks - function called by the system in init the tick clock/timer + * + * This is where both the timercount and system ticks timer are started. + * + * RETURNS: + * nothing + */ +void +cpu_initclocks(void) +{ + cpu_initclocks_bsp(); +} + +/** + * DELAY - Delay for at least N microseconds. + * @n: number of microseconds to delay by + * + * This function is called all over the kernel and is suppose to provide a + * consistent delay. It is a busy loop and blocks polling a timer when called. + * + * RETURNS: + * nothing + */ +void +DELAY(int usec) +{ + int32_t counts; + //uint32_t first, last; + + //if (g_omap3_gptimer_sc_tc == NULL) { + for (; usec > 0; usec--) + for (counts = 200; counts > 0; counts--) + /* Prevent gcc from optimizing out the loop */ + cpufunc_nullop(); + return; + //} +} + +static void +omap3_gptimer_intr(void *arg) +{ + struct omap3_gptimer_softc *sc = (struct omap3_gptimer_softc *)arg; + void (*callback)(void *data); + void* callback_data; + uint32_t stat = 0x0000; + + OMAP3_GPTIMER_LOCK(sc); + + /* Read the interrupt status flag and clear it */ + if (sc->profile == OMAP_GPTIMER_PROFILE_OMAP3) { + + /* Read the status and it with the enable flag */ + stat = gptimer_read_4(OMAP3_GPT_TISR); + stat &= gptimer_read_4(OMAP3_GPT_TIER); + + /* Clear the status flag */ + gptimer_write_4(OMAP3_GPT_TISR, stat); + } + + /* Store the callback details before releasing the lock */ + callback = sc->callback; + callback_data = sc->callback_data; + + OMAP3_GPTIMER_UNLOCK(sc); + + /* Check if an actual overflow interrupt */ + if ((stat & OVF) && (callback != NULL)) + callback(sc->callback_data); +} + +/** + * omap3_clk_intr - interrupt handler for the tick timer (GPTIMER10) + * @arg: the trapframe, needed for the hardclock system function. + * + * This interrupt is triggered every hz times a second. It's role is basically + * to just clear the interrupt status and set it up for triggering again, plus + * tell the system a tick timer has gone off by calling the hardclock() + * function from the kernel API. + * + * RETURNS: + * Always returns FILTER_HANDLED. + */ +static int +omap3_timer_tick_intr(void *arg) +{ + struct trapframe *frame = arg; +#if defined(OMAP3_HEARTBEAT_GPIO) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 11:31:34 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 5A35F1065678 for ; Fri, 17 Aug 2012 11:31:32 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 11:31:32 +0000 Date: Fri, 17 Aug 2012 11:31:32 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817113132.5A35F1065678@hub.freebsd.org> Cc: Subject: socsvn commit: r240464 - in soc2012/aleek/beaglexm-armv6/sys/arm/ti: . omap3 twl X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 11:31:34 -0000 Author: aleek Date: Fri Aug 17 11:31:31 2012 New Revision: 240464 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240464 Log: reverted TWL function to the original state. In this way, twl setup (voltage and clocks) is done after the bootup, but before root mounting. Also fixed few bugs Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_clks.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c Fri Aug 17 05:51:46 2012 (r240463) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/common.c Fri Aug 17 11:31:31 2012 (r240464) @@ -70,7 +70,7 @@ } #endif -#if defined( SOC_TI_AM335X ) || defined( SOC_TI_AM37X ) +#if defined( SOC_TI_AM335X ) || defined( SOC_OMAP3 ) static int fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, int *pol) @@ -91,7 +91,7 @@ #ifdef SOC_OMAP4 &fdt_gic_decode_ic, #endif -#if defined( SOC_TI_AM335X ) || defined( SOC_TI_AM37X ) +#if defined( SOC_TI_AM335X ) || defined( SOC_OMAP3 ) &fdt_aintc_decode_ic, #endif NULL Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Fri Aug 17 05:51:46 2012 (r240463) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Fri Aug 17 11:31:31 2012 (r240464) @@ -756,8 +756,6 @@ sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | RF_SHAREABLE); //@TODO XXX Why shareable? sc->profile = OMAP_GPTIMER_PROFILE_OMAP3; - //device_printf( dev, "done!\n" ); - return 0; } @@ -892,7 +890,7 @@ /* Restore interrupt state */ restore_interrupts(oldirqstate); - omap3_gptimer_et.et_name = "AM37x EventTimer0", + omap3_gptimer_et.et_name = "OMAP3 EventTimer0", omap3_gptimer_et.et_flags = ET_FLAGS_PERIODIC | ET_FLAGS_ONESHOT; omap3_gptimer_et.et_quality = 1000; omap3_gptimer_et.et_frequency = tick; //@todo XXX FIXIT Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Fri Aug 17 05:51:46 2012 (r240463) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Fri Aug 17 11:31:31 2012 (r240464) @@ -180,7 +180,6 @@ static inline uint16_t ti_i2c_read_2(struct ti_i2c_softc *sc, bus_size_t off) { - device_printf(sc->sc_dev, "%s\n", __func__); return bus_read_2(sc->sc_mem_res, off); } @@ -199,7 +198,6 @@ static inline void ti_i2c_write_2(struct ti_i2c_softc *sc, bus_size_t off, uint16_t val) { - device_printf(sc->sc_dev, "%s\n", __func__); bus_write_2(sc->sc_mem_res, off, val); } @@ -219,7 +217,6 @@ static inline uint16_t ti_i2c_read_reg(struct ti_i2c_softc *sc, bus_size_t off) { - device_printf(sc->sc_dev, "%s\n", __func__); return bus_read_2(sc->sc_mem_res, off); } @@ -239,7 +236,6 @@ static inline void ti_i2c_write_reg(struct ti_i2c_softc *sc, bus_size_t off, uint16_t val) { - device_printf(sc->sc_dev, "%s\n", __func__); bus_write_2(sc->sc_mem_res, off, val); } @@ -289,8 +285,6 @@ struct ti_i2c_clock_config *clkcfg; uint16_t con_reg; - device_printf(dev, "%s\n", __func__); - clkcfg = ti_i2c_clock_configs; while (clkcfg->speed != -1) { if (clkcfg->speed == speed) @@ -355,8 +349,6 @@ struct ti_i2c_softc *sc = (struct ti_i2c_softc*) arg; uint16_t status; - device_printf(sc->sc_dev, "%s\n", __func__); - status = ti_i2c_read_reg(sc, I2C_REG_STAT); if (status == 0) return; @@ -403,16 +395,13 @@ int start_ticks = ticks; int rc; - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); TI_I2C_ASSERT_LOCKED(sc); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* check if the condition has already occured, the interrupt routine will * clear the status flags. */ if ((sc->sc_stat_flags & flags) == 0) { - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* condition(s) haven't occured so sleep on the IRQ */ while (waittime > 0) { @@ -434,7 +423,6 @@ } } - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* copy the actual status bits */ if (statp != NULL) *statp = sc->sc_stat_flags; @@ -509,14 +497,12 @@ uint32_t sofar = 0; uint32_t i; - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for the bus to become free */ err = ti_i2c_wait_for_free_bus(sc, timo); if (err != 0) { device_printf(sc->sc_dev, "bus never freed\n"); return (err); } - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* set the events to wait for */ events = I2C_IE_RDR | /* Receive draining interrupt */ @@ -528,11 +514,9 @@ /* enable interrupts for the events we want */ ti_i2c_set_intr_enable(sc, events); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* write the number of bytes to read */ ti_i2c_write_reg(sc, I2C_REG_CNT, len); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* clear the write bit and initiate the read transaction. Setting the STT * (start) bit initiates the transfer. */ @@ -541,18 +525,14 @@ con_reg |= I2C_CON_MST | I2C_CON_STT | I2C_CON_STP; ti_i2c_write_reg(sc, I2C_REG_CON, con_reg); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* reading loop */ while (1) { - - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for an event */ err = ti_i2c_wait(sc, events, &status, timo); if (err != 0) { break; } - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* check for the error conditions */ if (status & I2C_STAT_NACK) { /* no ACK from slave */ @@ -611,7 +591,6 @@ ti_i2c_write_reg(sc, I2C_REG_STAT, I2C_STAT_RDR | I2C_STAT_RRDY); } - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* reset the registers regardless if there was an error or not */ ti_i2c_set_intr_enable(sc, 0x0000); ti_i2c_write_reg(sc, I2C_REG_CON, I2C_CON_I2C_EN | I2C_CON_MST | I2C_CON_STP); @@ -646,12 +625,10 @@ uint32_t sofar = 0; uint32_t i; - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for the bus to become free */ err = ti_i2c_wait_for_free_bus(sc, timo); if (err != 0) return (err); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* set the events to wait for */ events = I2C_IE_XDR | /* Transmit draining interrupt */ @@ -663,11 +640,9 @@ /* enable interrupts for the events we want*/ ti_i2c_set_intr_enable(sc, events); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* write the number of bytes to write */ ti_i2c_write_reg(sc, I2C_REG_CNT, len); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* set the write bit and initiate the write transaction. Setting the STT * (start) bit initiates the transfer. */ @@ -678,7 +653,6 @@ /* writing loop */ while (1) { - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* wait for an event */ err = ti_i2c_wait(sc, events, &status, timo); if (err != 0) { @@ -771,8 +745,6 @@ uint16_t len; uint8_t *buf; - device_printf(sc->sc_dev, "%s\n", __func__); - TI_I2C_LOCK(sc); for (i = 0; i < nmsgs; i++) { @@ -820,7 +792,6 @@ ti_i2c_callback(device_t dev, int index, caddr_t data) { int error = 0; - device_printf(dev, "%s\n", __func__); switch (index) { case IIC_REQUEST_BUS: @@ -1121,7 +1092,6 @@ device_printf(dev, "I2C revision %d.%d\n", sc->sc_rev >> 4, sc->sc_rev & 0xf); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Activate the H/W */ err = ti_i2c_activate(dev); if (err) { @@ -1129,23 +1099,19 @@ goto out; } - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* activate the interrupt */ err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, ti_i2c_intr, sc, &sc->sc_irq_h); if (err) goto out; - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Attach to the iicbus */ if ((sc->sc_iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Probe and attach the iicbus */ bus_generic_attach(dev); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); out: if (err) { ti_i2c_deactivate(dev); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c Fri Aug 17 05:51:46 2012 (r240463) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl.c Fri Aug 17 11:31:31 2012 (r240464) @@ -177,7 +177,6 @@ int rc; sc = device_get_softc(dev); - device_printf(sc->sc_dev, "%s\n", __func__); TWL_LOCK(sc); addr = sc->sc_subaddr_map[nsub]; @@ -238,7 +237,6 @@ memcpy(&tmp_buf[1], buf, cnt); sc = device_get_softc(dev); - device_printf(sc->sc_dev, "%s\n", __func__); TWL_LOCK(sc); addr = sc->sc_subaddr_map[nsub]; @@ -280,7 +278,6 @@ { struct iic_msg msg; uint8_t tmp; - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Set the address to read from */ msg.slave = addr; @@ -291,7 +288,6 @@ if (iicbus_transfer(sc->sc_dev, &msg, 1) != 0) return (EIO); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); return (0); } @@ -314,7 +310,7 @@ uint8_t base = TWL_CHIP_ID0; sc = device_get_softc((device_t)dev); - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); + device_printf(sc->sc_dev, "Running %s\n", __func__); memset(devs, TWL_INVALID_CHIP_ID, TWL_MAX_SUBADDRS); @@ -327,14 +323,13 @@ device_printf(sc->sc_dev, "Found (sub)device at 0x%02x\n", (base + i)); } } - device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); TWL_LOCK(sc); memcpy(sc->sc_subaddr_map, devs, TWL_MAX_SUBADDRS); TWL_UNLOCK(sc); /* Finished with the interrupt hook */ - //config_intrhook_disestablish(&sc->sc_scan_hook); + config_intrhook_disestablish(&sc->sc_scan_hook); } /** @@ -418,12 +413,11 @@ /* We have to wait until interrupts are enabled. I2C read and write * only works if the interrupts are available. */ - //sc->sc_scan_hook.ich_func = twl_scan; - //sc->sc_scan_hook.ich_arg = dev; + sc->sc_scan_hook.ich_func = twl_scan; + sc->sc_scan_hook.ich_arg = dev; - //if (config_intrhook_establish(&sc->sc_scan_hook) != 0) - // return (ENOMEM); - twl_scan( dev ); + if (config_intrhook_establish(&sc->sc_scan_hook) != 0) + return (ENOMEM); /* FIXME: should be in DTS file */ if ((sc->sc_vreg = device_add_child(dev, "twl_vreg", -1)) == NULL) Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_clks.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_clks.c Fri Aug 17 05:51:46 2012 (r240463) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_clks.c Fri Aug 17 11:31:31 2012 (r240464) @@ -586,6 +586,7 @@ struct twl_clks_softc *sc; sc = device_get_softc((device_t)dev); + device_printf(sc->sc_dev, "Running %s\n", __func__); if (twl_is_4030(sc->sc_pdev)) twl_clks_add_clocks(sc, twl4030_clocks); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Fri Aug 17 05:51:46 2012 (r240463) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Fri Aug 17 11:31:31 2012 (r240464) @@ -280,7 +280,6 @@ twl_vreg_read_1(struct twl_vreg_softc *sc, struct twl_regulator_entry *regulator, uint8_t off, uint8_t *val) { - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); return (twl_read(sc->sc_pdev, regulator->sub_dev, regulator->reg_off + off, val, 1)); } @@ -289,7 +288,6 @@ twl_vreg_write_1(struct twl_vreg_softc *sc, struct twl_regulator_entry *regulator, uint8_t off, uint8_t val) { - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); return (twl_write(sc->sc_pdev, regulator->sub_dev, regulator->reg_off + off, &val, 1)); } @@ -373,8 +371,6 @@ uint8_t state; int xlocked; - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); - if (enabled == NULL) return (EINVAL); @@ -448,8 +444,6 @@ uint8_t grp; int xlocked; - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); - TWL_VREG_ASSERT_LOCKED(sc); xlocked = sx_xlocked(&sc->sc_sx); @@ -513,8 +507,6 @@ uint8_t grp; int xlocked; - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); - TWL_VREG_ASSERT_LOCKED(sc); xlocked = sx_xlocked(&sc->sc_sx); @@ -581,8 +573,6 @@ uint8_t vsel; int xlocked; - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); - TWL_VREG_ASSERT_LOCKED(sc); /* If millivolts is zero then we simply disable the output */ @@ -651,29 +641,23 @@ int xlocked; uint8_t vsel; - device_printf(sc->sc_dev, "%s - %s\n", __func__, regulator->name); TWL_VREG_ASSERT_LOCKED(sc); - //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Need to upgrade the lock because checking enabled state and voltage * should be atomic. */ - //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); xlocked = sx_xlocked(&sc->sc_sx); if (!xlocked) TWL_VREG_LOCK_UPGRADE(sc); - //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); /* Check if the regulator is currently enabled */ - //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); err = twl_vreg_is_regulator_enabled(sc, regulator, &en); if (err) { device_printf( sc->sc_dev, "Regulator %s is not enabled\n", regulator->name ); goto done; } - //device_printf(sc->sc_dev, "%s:%d\n", __func__, __LINE__); *millivolts = 0; if (!en) @@ -741,8 +725,6 @@ sc = device_get_softc(dev); - device_printf(sc->sc_dev, "%s - %s\n", __func__, name); - TWL_VREG_SLOCK(sc); LIST_FOREACH(regulator, &sc->sc_vreg_list, entries) { @@ -783,7 +765,6 @@ sc = device_get_softc(dev); - device_printf(sc->sc_dev, "%s - %s\n", __func__, name); TWL_VREG_SLOCK(sc); @@ -871,8 +852,6 @@ struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); struct twl_regulator_entry *new; - device_printf(sc->sc_dev, "%s - %s\n", __func__, name); - new = malloc(sizeof(struct twl_regulator_entry), M_DEVBUF, M_NOWAIT | M_ZERO); if (new == NULL) return (NULL); @@ -929,7 +908,6 @@ int len = 0, prop_len; - device_printf(sc->sc_dev, "%s\n", __func__); /* Add the regulators from the list */ walker = ®ulators[0]; while (walker->name != NULL) { @@ -970,7 +948,6 @@ } } } - device_printf(sc->sc_dev, "%s\n", __func__); #if 0 twl_vreg_set_voltage(sc->sc_dev, "vusb1v5", 1500); twl_vreg_set_voltage(sc->sc_dev, "vusb1v8", 1800); @@ -1005,7 +982,7 @@ struct twl_vreg_softc *sc; sc = device_get_softc((device_t)dev); - device_printf(dev, "%s\n", __func__); + device_printf(sc->sc_dev, "Running %s\n", __func__); TWL_VREG_XLOCK(sc); @@ -1016,7 +993,7 @@ TWL_VREG_XUNLOCK(sc); - //config_intrhook_disestablish(&sc->sc_init_hook); + config_intrhook_disestablish(&sc->sc_init_hook); } static int @@ -1049,12 +1026,11 @@ /* We have to wait until interrupts are enabled. I2C read and write * only works if the interrupts are available. */ - //sc->sc_init_hook.ich_func = twl_vreg_init; - //sc->sc_init_hook.ich_arg = dev; + sc->sc_init_hook.ich_func = twl_vreg_init; + sc->sc_init_hook.ich_arg = dev; - //if (config_intrhook_establish(&sc->sc_init_hook) != 0) - // return (ENOMEM); - twl_vreg_init( dev ); + if (config_intrhook_establish(&sc->sc_init_hook) != 0) + return (ENOMEM); return (0); } From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 11:43:38 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id C3C0A106566C for ; Fri, 17 Aug 2012 11:43:36 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 11:43:36 +0000 Date: Fri, 17 Aug 2012 11:43:36 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817114336.C3C0A106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240465 - soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 11:43:38 -0000 Author: aleek Date: Fri Aug 17 11:43:36 2012 New Revision: 240465 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240465 Log: minor fixes in twl_vreg.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Fri Aug 17 11:31:31 2012 (r240464) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Fri Aug 17 11:43:36 2012 (r240465) @@ -949,9 +949,9 @@ } } #if 0 - twl_vreg_set_voltage(sc->sc_dev, "vusb1v5", 1500); - twl_vreg_set_voltage(sc->sc_dev, "vusb1v8", 1800); - twl_vreg_set_voltage(sc->sc_dev, "vusb3v1", 3100); + twl_vreg_set_voltage(sc->sc_dev, "vusb1v5", 0); + twl_vreg_set_voltage(sc->sc_dev, "vusb1v8", 0); + twl_vreg_set_voltage(sc->sc_dev, "vusb3v1", 0); #endif // if (twl_vreg_debug) { @todo XXX From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 12:15:35 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 5CA84106564A for ; Fri, 17 Aug 2012 12:15:33 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 12:15:33 +0000 Date: Fri, 17 Aug 2012 12:15:33 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817121533.5CA84106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240466 - in soc2012/aleek/beaglexm-armv6/sys: arm/ti/omap3 boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 12:15:35 -0000 Author: aleek Date: Fri Aug 17 12:15:32 2012 New Revision: 240466 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240466 Log: GPTimer refactored. Device ID of the timer is saved on DTS file, so the driver became independent of the selected clocks. Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Fri Aug 17 11:43:36 2012 (r240465) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Fri Aug 17 12:15:32 2012 (r240466) @@ -738,10 +738,20 @@ { struct omap3_gptimer_softc *sc = device_get_softc(dev); int rid=0; // resource id for device, unique + phandle_t node; + pcell_t did; //device_printf( dev, "Generic attaching the device...\n" ); sc->sc_dev = dev; + /* Get the i2c device id from FDT */ + node = ofw_bus_get_node(dev); + if ((OF_getprop(node, "device-id", &did, sizeof(did))) <= 0) { + device_printf(dev, "missing device-id attribute in FDT\n"); + return (ENXIO); + } + sc->device_id = fdt32_to_cpu(did); + /* First try and get the register addresses, if this fails we assume * there are no more timers. */ @@ -753,9 +763,14 @@ } /* Next try and get the interrupt resource, this is not fatal */ - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | RF_SHAREABLE); //@TODO XXX Why shareable? - sc->profile = OMAP_GPTIMER_PROFILE_OMAP3; + //@TODO XXX Why shareable? + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | RF_SHAREABLE); + sc->profile = OMAP_GPTIMER_PROFILE_OMAP3; + /* Set the clock source for the timer, this is just a one to one + * mapping of the clock id to timer, i.e. n=0 => GPTIMER1_CLK. + */ + sc->source = GPTIMER1_CLK + sc->device_id - 1; return 0; } @@ -780,12 +795,8 @@ struct omap3_gptimer_softc *sc = device_get_softc(dev); omap3_gptimer_attach_common(dev); + device_printf( dev, "Timecounter on GPTimer%d starting...\n", sc->device_id ); mtx_init(&sc->mtx, device_get_nameunit(dev), "omap3_gptimer_tc", MTX_SPIN ); - /* Set the clock source for the timer, this is just a one to one - * mapping of the clock id to timer, i.e. n=0 => GPTIMER1_CLK. - */ - sc->source = GPTIMER11_CLK; // @TODO XXX fix this - the timer number shouldn't be hardcoded - /* Finally mark the timer as available */ sc->flags = OMAP3_GPTIMER_AVAILABLE_FLAG; @@ -857,11 +868,9 @@ struct omap3_gptimer_softc *sc = device_get_softc(dev); omap3_gptimer_attach_common(dev); + + device_printf( dev, "EventTimer on GPTimer%d starting...\n", sc->device_id ); mtx_init(&sc->mtx, device_get_nameunit(dev), "omap3_gptimer_et", MTX_SPIN ); - /* Set the clock source for the timer, this is just a one to one - * mapping of the clock id to timer, i.e. n=0 => GPTIMER1_CLK. - */ - sc->source = GPTIMER10_CLK; // @TODO XXX fix this - the timer number shouldn't be hardcoded /* Finally mark the timer as available */ sc->flags = OMAP3_GPTIMER_AVAILABLE_FLAG; Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h Fri Aug 17 11:43:36 2012 (r240465) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h Fri Aug 17 12:15:32 2012 (r240466) @@ -108,7 +108,11 @@ /* The source clock to use */ unsigned int source; - + + /* Device ID of the timer. There is 11 GPTimers, so we have to know. + * which one we use. Counting from 1. + */ + unsigned int device_id; }; void Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Fri Aug 17 11:43:36 2012 (r240465) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Fri Aug 17 12:15:32 2012 (r240466) @@ -130,6 +130,7 @@ #size-cells = <1>; reg = < 0x48086000 0x1000 >; interrupts = < 46 >; + device-id = <10>; interrupt-parent = <&AINTC>; }; @@ -139,6 +140,7 @@ #size-cells = <1>; reg = < 0x48088000 0x1000 >; interrupts = < 47 >; + device-id = <11>; interrupt-parent = <&AINTC>; }; From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 12:23:22 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id E888F106564A for ; Fri, 17 Aug 2012 12:23:19 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 12:23:19 +0000 Date: Fri, 17 Aug 2012 12:23:19 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817122319.E888F106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240467 - soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3 X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 12:23:22 -0000 Author: aleek Date: Fri Aug 17 12:23:19 2012 New Revision: 240467 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240467 Log: minor cleanup in gptimer driver Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Fri Aug 17 12:15:32 2012 (r240466) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.c Fri Aug 17 12:23:19 2012 (r240467) @@ -895,7 +895,9 @@ panic("Error: failed to start system tick timer\n"); omap3_gptimer_get_freq(sc, &timer_freq); +#ifdef DEBUG device_printf(dev, "tick: timer_freq = %u\n", timer_freq); +#endif /* Restore interrupt state */ restore_interrupts(oldirqstate); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h Fri Aug 17 12:15:32 2012 (r240466) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_gptimer.h Fri Aug 17 12:23:19 2012 (r240467) @@ -110,7 +110,7 @@ unsigned int source; /* Device ID of the timer. There is 11 GPTimers, so we have to know. - * which one we use. Counting from 1. + * which one we use. This one is kept in DTS file. Counting from 1. */ unsigned int device_id; }; From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 16:12:01 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id B00E4106566B for ; Fri, 17 Aug 2012 16:11:59 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 16:11:59 +0000 Date: Fri, 17 Aug 2012 16:11:59 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817161159.B00E4106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240471 - in soc2012/aleek/beaglexm-armv6/sys: arm/ti arm/ti/omap3 arm/ti/twl boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 16:12:01 -0000 Author: aleek Date: Fri Aug 17 16:11:59 2012 New Revision: 240471 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240471 Log: minor fixes in TWL module Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_prcm.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_prcm.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_prcm.c Fri Aug 17 15:53:43 2012 (r240470) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/omap3/omap3_prcm.c Fri Aug 17 16:11:59 2012 (r240471) @@ -459,7 +459,6 @@ /* Read the input clock freq from the configuration register */ clknsel = prm_read_4(CLOCK_CTRL_PRM_OFFSET + 0x40); - //clknsel = bus_read_4(mem_res[PRM_INSTANCE_MEM_REGION], CLOCK_CTRL_PRM_OFFSET + 0x40); switch (clknsel & 0x7) { case 0x0: /* 12Mhz */ @@ -491,7 +490,6 @@ /* Read the value of the clock divider used for the system clock */ clksel = prm_read_4(CLOCK_CTRL_PRM_OFFSET + 0x70); - //clksel = bus_read_4(mem_res[PRM_INSTANCE_MEM_REGION], GLOBAL_PRM_OFFSET + 0x70); switch (clksel & 0xC0) { case 0x40: sysclk = oscclk; @@ -582,15 +580,6 @@ */ /* Try MAX_MODULE_ENABLE_WAIT number of times to check if enabled */ -// @TODO XXX trzeba to zrobic -#if 0 - if (omap3_clk_wait_on_reg(clk_mem_res, clk_details->idlest_offset, - (1UL << clk_details->bit_offset), 0) != 0) { - printf("Error: failed to enable module with clock %d\n", clkdev->id); - return (ETIMEDOUT); - } -#endif - for( unsigned int i=0; i< MAX_MODULE_ENABLE_WAIT; ++i ) { if( ( cm_read_4( clk_details->idlest_offset ) & (1UL << clk_details->bit_offset) ) == 0 ) @@ -761,7 +750,6 @@ /** * omap3_clk_usbhost_activate - activates a modules iinterface and func clock * @clkdev: pointer to the clock device structure. - * @mem_res: array of memory resources mapped when PRCM driver attached * * * @@ -775,7 +763,6 @@ omap3_clk_hsusbhost_activate(struct ti_clock_dev *clkdev) { const struct ti_clk_details* clk_details = omap3_clk_details(clkdev->id); - //struct resource* clk_mem_res = mem_res[CM_INSTANCE_MEM_REGION]; uint32_t fclken, iclken; unsigned int sysclk; @@ -819,13 +806,6 @@ /* Now poll on the IDLEST register to tell us if the module has come up. * TODO: We need to take into account the parent clocks. */ -#if 0 - if (omap3_clk_wait_on_reg(clk_mem_res, clk_details->idlest_offset, 0x02, - 0x00) != 0) { - printf("Error: failed to enable module with USB clock %d\n", clkdev->id); - return (ETIMEDOUT); - } -#endif for( int i=0; i< MAX_MODULE_ENABLE_WAIT; ++i ) { if( ( cm_read_4( clk_details->idlest_offset ) & 0x02 ) == 0x00 ) @@ -840,7 +820,6 @@ /** * omap3_clk_hsusbhost_deactivate - deactivates a modules clock * @clkdev: pointer to the clock device structure. - * @mem_res: array of memory resources mapped when PRCM driver attached * * * @@ -854,7 +833,6 @@ omap3_clk_hsusbhost_deactivate(struct ti_clock_dev *clkdev ) { const struct ti_clk_details* clk_details = omap3_clk_details(clkdev->id); - //struct resource* clk_mem_res = mem_res[CM_INSTANCE_MEM_REGION]; //@todo remove uint32_t fclken, iclken; if (clk_details == NULL) @@ -924,10 +902,6 @@ /* Wait until the DPLL5 is locked and there is clock activity */ -#if 0 - return (omap3_clk_wait_on_reg(cm_mem_res, (CLOCK_CTRL_CM_OFFSET + 0x24), - 0x01, 0x01)); -#endif for( int i=0; i< MAX_MODULE_ENABLE_WAIT; ++i ) { if( (cm_read_4( (CLOCK_CTRL_CM_OFFSET + 0x24) ) & 0x01 ) == 0x01 ) @@ -967,7 +941,6 @@ /** * omap3_clk_alwayson_null_func - dummy function for always on clocks * @clkdev: pointer to the clock device structure (ignored) - * @mem_res: array of memory resources mapped when PRCM driver attached (ignored) * * * Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Fri Aug 17 15:53:43 2012 (r240470) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_i2c.c Fri Aug 17 16:11:59 2012 (r240471) @@ -527,6 +527,7 @@ /* reading loop */ while (1) { + /* wait for an event */ err = ti_i2c_wait(sc, events, &status, timo); if (err != 0) { @@ -1080,9 +1081,7 @@ goto out; } - /* XXXOMAP3: FIXME get proper revision here */ /* First read the version number of the I2C module */ - //@todo aleek fix this change cause dmarion will be pissed ;) #if defined(SOC_TI_AM335X) || defined(SOC_OMAP4) sc->sc_rev = ti_i2c_read_2(sc, I2C_REG_REVNB_HI) & 0xff; #elif defined( SOC_TI_AM37X ) || defined( SOC_OMAP3 ) Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Fri Aug 17 15:53:43 2012 (r240470) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Fri Aug 17 16:11:59 2012 (r240471) @@ -75,9 +75,6 @@ #include "twl.h" #include "twl_vreg.h" -//static int twl_vreg_debug = 10; - - /* * Power Groups bits for the 4030 and 6030 devices */ @@ -610,10 +607,11 @@ if (!xlocked) TWL_VREG_LOCK_DOWNGRADE(sc); - //if ((twl_vreg_debug > 1) && !err) todo XXX +#ifdef DEBUG if (!err) device_printf(sc->sc_dev, "%s : setting voltage to %dmV (vsel: 0x%x)\n", regulator->name, millivolts, vsel); +#endif return (err); } @@ -691,10 +689,11 @@ if (!xlocked) TWL_VREG_LOCK_DOWNGRADE(sc); - //if ((twl_vreg_debug > 1) && !err) @todo XXX +#ifdef DEBUG if (!err) device_printf(sc->sc_dev, "%s : reading voltage is %dmV (vsel: 0x%x)\n", regulator->name, *millivolts, vsel); +#endif return (err); } @@ -942,25 +941,21 @@ LIST_FOREACH(entry, &sc->sc_vreg_list, entries) { if (strcmp(entry->name, name) == 0) { + device_printf( sc->sc_dev, "Setting %s voltage to %d\n", entry->name, millivolts ); twl_vreg_write_regulator_voltage(sc, entry, millivolts); break; } } } } -#if 0 - twl_vreg_set_voltage(sc->sc_dev, "vusb1v5", 0); - twl_vreg_set_voltage(sc->sc_dev, "vusb1v8", 0); - twl_vreg_set_voltage(sc->sc_dev, "vusb3v1", 0); -#endif -// if (twl_vreg_debug) { @todo XXX +#ifdef DEBUG LIST_FOREACH(entry, &sc->sc_vreg_list, entries) { err = twl_vreg_read_regulator_voltage(sc, entry, &millivolts); if (!err) device_printf(sc->sc_dev, "%s : %d mV\n", entry->name, millivolts); } -// } +#endif return (0); } Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Fri Aug 17 15:53:43 2012 (r240470) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Fri Aug 17 16:11:59 2012 (r240471) @@ -159,7 +159,7 @@ interrupts = < 12 13 14 15 >; interrupt-parent = <&AINTC>; }; -/* + mmchs@4809c000 { compatible = "ti,mmchs"; reg =<0x4809c000 0x1000 >; @@ -167,7 +167,7 @@ interrupt-parent = <&AINTC>; mmchs-device-id = <1>; }; -*/ + i2c1: i2c@48070000 { #address-cells = <1>; #size-cells = <0>; @@ -180,6 +180,10 @@ twl4030@48 { compatible = "ti,twl4030"; reg = <0x48>; + voltage-regulators = + "vusb1v5", "0", + "vusb1v8", "0", + "vusb3v1", "0"; }; }; From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 16:43:34 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 377C7106564A for ; Fri, 17 Aug 2012 16:43:32 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 16:43:32 +0000 Date: Fri, 17 Aug 2012 16:43:32 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817164332.377C7106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240472 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 16:43:34 -0000 Author: jhagewood Date: Fri Aug 17 16:43:31 2012 New Revision: 240472 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240472 Log: Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Fri Aug 17 16:11:59 2012 (r240471) +++ soc2012/jhagewood/diff/decompress.c Fri Aug 17 16:43:31 2012 (r240472) @@ -59,7 +59,8 @@ /* Decompresses a gzip file and returns a regular FILE. */ FILE * -decompressfile(char *filename, char *mode) { +decompressfile(char *filename, char *mode) +{ FILE *file; char *buf = ""; @@ -75,7 +76,8 @@ /* Checks for a gz file extension. */ int -isgzip(char *filename) { +isgzip(char *filename) +{ int length = (sizeof filename)-1; Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Fri Aug 17 16:11:59 2012 (r240471) +++ soc2012/jhagewood/sdiff/decompress.c Fri Aug 17 16:43:31 2012 (r240472) @@ -58,7 +58,8 @@ /* Decompresses a gzip file and returns a regular FILE. */ FILE * -decompressfile(char *filename, char *mode) { +decompressfile(char *filename, char *mode) +{ FILE *file; char *buf = ""; @@ -74,7 +75,8 @@ /* Checks for a gz file extension. */ int -isgzip(char *filename) { +isgzip(char *filename) +{ int length = (sizeof filename)-1; From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 16:47:23 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id EB009106564A for ; Fri, 17 Aug 2012 16:47:20 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 16:47:20 +0000 Date: Fri, 17 Aug 2012 16:47:20 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817164720.EB009106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240473 - soc2012/jhagewood/diff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 16:47:23 -0000 Author: jhagewood Date: Fri Aug 17 16:47:20 2012 New Revision: 240473 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240473 Log: Compiled zdiff man page Added: soc2012/jhagewood/diff/zdiff-man.txt Added: soc2012/jhagewood/diff/zdiff-man.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/jhagewood/diff/zdiff-man.txt Fri Aug 17 16:47:20 2012 (r240473) @@ -0,0 +1,42 @@ +ZDIFF(1) FreeBSD General Commands Manual ZDIFF(1) + +NNAAMMEE + zzddiiffff -- differential file and directory comparator for compressed files. + +SSYYNNOOPPSSIISS + zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--cc | --ee | --ff | --nn | --uu] [--LL _l_a_b_e_l] + _f_i_l_e_1 _f_i_l_e_2 + zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--LL _l_a_b_e_l] --CC [_n_u_m_b_e_r] _f_i_l_e_1 _f_i_l_e_2 + zzddiiffff [--aabbddiillqqttww] [--II _p_a_t_t_e_r_n] --DD _s_t_r_i_n_g _f_i_l_e_1 _f_i_l_e_2 + zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--LL _l_a_b_e_l] --UU _n_u_m_b_e_r _f_i_l_e_1 _f_i_l_e_2 + zzddiiffff [--aabbddiillNNPPppqqrrssTTttww] [--II _p_a_t_t_e_r_n] [--cc | --ee | --ff | --nn | --uu] [--LL _l_a_b_e_l] + [--SS _n_a_m_e] [--XX _f_i_l_e] [--xx _p_a_t_t_e_r_n] _d_i_r_1 _d_i_r_2 + zzddiiffff [--vv] + +DDEESSCCRRIIPPTTIIOONN + The zzddiiffff utility compares the decompressed contents of gzip _f_i_l_e_1 and + _f_i_l_e_2 and writes to the standard output the list of changes necessary to + convert one file into the other. No output is produced if the files are + identical. See diff(1) for program options. + +EENNVVIIRROONNMMEENNTT + TMPDIR If the environment variable TMPDIR exists, zzddiiffff will use the + directory specified by TMPDIR as the temporary directory. + +FFIILLEESS + _/_t_m_p_/_d_i_f_f_._X_X_X_X_X_X_X_X Temporary file used when comparing a device or the + standard input. Note that the temporary file is + unlinked as soon as it is created so it will not show + up in a directory listing. + +DDIIAAGGNNOOSSTTIICCSS + The zzddiiffff utility exits with one of the following values: + + 0 No differences were found. + 1 Differences were found. + >1 An error occurred. + +SSEEEE AALLSSOO + diff(1), cmp(1), diff3(1), sdiff(1), zsdiff(1) + +FreeBSD 9.0 August 15, 2012 FreeBSD 9.0 From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 16:51:21 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 389BC1065673 for ; Fri, 17 Aug 2012 16:51:19 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 16:51:19 +0000 Date: Fri, 17 Aug 2012 16:51:19 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817165119.389BC1065673@hub.freebsd.org> Cc: Subject: socsvn commit: r240474 - soc2012/jhagewood/diff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 16:51:21 -0000 Author: jhagewood Date: Fri Aug 17 16:51:18 2012 New Revision: 240474 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240474 Log: Modified: soc2012/jhagewood/diff/zdiff-man.txt Modified: soc2012/jhagewood/diff/zdiff-man.txt ============================================================================== --- soc2012/jhagewood/diff/zdiff-man.txt Fri Aug 17 16:47:20 2012 (r240473) +++ soc2012/jhagewood/diff/zdiff-man.txt Fri Aug 17 16:51:18 2012 (r240474) @@ -1,42 +1,43 @@ ZDIFF(1) FreeBSD General Commands Manual ZDIFF(1) -NNAAMMEE - zzddiiffff -- differential file and directory comparator for compressed files. +NAME + zdiff -- differential file and directory comparator for compressed files. -SSYYNNOOPPSSIISS - zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--cc | --ee | --ff | --nn | --uu] [--LL _l_a_b_e_l] - _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--LL _l_a_b_e_l] --CC [_n_u_m_b_e_r] _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillqqttww] [--II _p_a_t_t_e_r_n] --DD _s_t_r_i_n_g _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--LL _l_a_b_e_l] --UU _n_u_m_b_e_r _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillNNPPppqqrrssTTttww] [--II _p_a_t_t_e_r_n] [--cc | --ee | --ff | --nn | --uu] [--LL _l_a_b_e_l] - [--SS _n_a_m_e] [--XX _f_i_l_e] [--xx _p_a_t_t_e_r_n] _d_i_r_1 _d_i_r_2 - zzddiiffff [--vv] - -DDEESSCCRRIIPPTTIIOONN - The zzddiiffff utility compares the decompressed contents of gzip _f_i_l_e_1 and - _f_i_l_e_2 and writes to the standard output the list of changes necessary to +SYNOPSIS + zdiff [-abdilpqTtw] [-I pattern] [-c | -e | -f | -n | -u] [-L label] + file1 file2 + zdiff [-abdilpqTtw] [-I pattern] [-L label] -C [number] file1 file2 + zdiff [-abdilqtw] [-I pattern] -D string file1 file2 + zdiff [-abdilpqTtw] [-I pattern] [-L label] -U number file1 file2 + zdiff [-abdilNPpqrsTtw] [-I pattern] [-c | -e | -f | -n | -u] [-L label] + [-S name] [-X file] [-x pattern] dir1 dir2 + zdiff [-v] + +DESCRIPTION + The zdiff utility compares the decompressed contents of gzip file1 and + file2 and writes to the standard output the list of changes necessary to convert one file into the other. No output is produced if the files are identical. See diff(1) for program options. -EENNVVIIRROONNMMEENNTT - TMPDIR If the environment variable TMPDIR exists, zzddiiffff will use the +ENVIRONMENT + TMPDIR If the environment variable TMPDIR exists, zdiff will use the directory specified by TMPDIR as the temporary directory. -FFIILLEESS - _/_t_m_p_/_d_i_f_f_._X_X_X_X_X_X_X_X Temporary file used when comparing a device or the +FILES + /tmp/diff.XXXXXXXX Temporary file used when comparing a device or the standard input. Note that the temporary file is unlinked as soon as it is created so it will not show up in a directory listing. -DDIIAAGGNNOOSSTTIICCSS - The zzddiiffff utility exits with one of the following values: +DIAGNOSTICS + The zdiff utility exits with one of the following values: 0 No differences were found. 1 Differences were found. >1 An error occurred. -SSEEEE AALLSSOO +SEE ALSO diff(1), cmp(1), diff3(1), sdiff(1), zsdiff(1) FreeBSD 9.0 August 15, 2012 FreeBSD 9.0 + From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 17:02:43 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id CC129106568E for ; Fri, 17 Aug 2012 17:02:41 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 17:02:41 +0000 Date: Fri, 17 Aug 2012 17:02:41 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817170241.CC129106568E@hub.freebsd.org> Cc: Subject: socsvn commit: r240477 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 17:02:44 -0000 Author: jhagewood Date: Fri Aug 17 17:02:41 2012 New Revision: 240477 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240477 Log: compiled zdiff man file Added: soc2012/jhagewood/sdiff/zsdiff-man.txt Added: soc2012/jhagewood/sdiff/zsdiff-man.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/jhagewood/sdiff/zsdiff-man.txt Fri Aug 17 17:02:41 2012 (r240477) @@ -0,0 +1,32 @@ +ZSDIFF(1) FreeBSD General Commands Manual ZSDIFF(1) + +NAME + zsdiff -- side-by-side diff of compressed files. + +SYNOPSIS + zsdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2 + +DESCRIPTION + zsdiff displays two files side by side, with any differences between the + two highlighted as follows: new lines are marked with `>'; deleted lines + are marked with `<'; and changed lines are marked with `|'. + + zsdiff can also be used to interactively merge two files, prompting at + each set of differences. + + See sdiff(1) for options. + +ENVIRONMENT + EDITOR, VISUAL + Specifies an editor to use with the -o option. If both EDITOR + and VISUAL are set, VISUAL takes precedence. If neither EDITOR + nor VISUAL are set, the default is vi(1). + + TMPDIR Specifies a directory for temporary files to be created. The + default is /tmp. + +SEE ALSO + cmp(1), diff(1), zdiff(1), diff3(1), vi(1), re_format(7) + + +FreeBSD 9.0 August 16, 2012 FreeBSD 9.0 From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 23:05:47 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id EFC65106564A for ; Fri, 17 Aug 2012 23:05:44 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 23:05:44 +0000 Date: Fri, 17 Aug 2012 23:05:44 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817230544.EFC65106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240481 - in soc2012/gmiller/locking-head: . lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 23:05:47 -0000 Author: gmiller Date: Fri Aug 17 23:05:44 2012 New Revision: 240481 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240481 Log: r240502@FreeBSD-dev: root | 2012-08-15 14:29:18 -0500 Reorganize some witness code, cleaning up and correcting the code that prevents witness from including its own lock usage in the graphs. Added: soc2012/gmiller/locking-head/lib/libwitness/api.c - copied, changed from r240291, soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Deleted: soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/lib/libwitness/Makefile soc2012/gmiller/locking-head/lib/libwitness/lists.c soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c soc2012/gmiller/locking-head/lib/libwitness/logs.c soc2012/gmiller/locking-head/lib/libwitness/witness.h Modified: soc2012/gmiller/locking-head/lib/libwitness/Makefile ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/Makefile Fri Aug 17 20:15:01 2012 (r240480) +++ soc2012/gmiller/locking-head/lib/libwitness/Makefile Fri Aug 17 23:05:44 2012 (r240481) @@ -4,7 +4,7 @@ LIB= witness SHLIB_MAJOR= 1 -SRCS= wrappers.c graph.c lists.c logs.c lockinfo.c xml.c unwind.c +SRCS= api.c graph.c lists.c logs.c lockinfo.c xml.c unwind.c DPADD= ${LIBTHR} LDADD= -lthr Copied and modified: soc2012/gmiller/locking-head/lib/libwitness/api.c (from r240291, soc2012/gmiller/locking-head/lib/libwitness/wrappers.c) ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Sun Aug 12 07:09:25 2012 (r240291, copy source) +++ soc2012/gmiller/locking-head/lib/libwitness/api.c Fri Aug 17 23:05:44 2012 (r240481) @@ -50,21 +50,44 @@ pthread_mutex_t witness_mtx = PTHREAD_MUTEX_INITIALIZER; +static int witness_depth = 0; + +void +enter_witness(void) +{ + _pthread_mutex_lock(&witness_mtx); + + witness_depth++; +} + +void +leave_witness(void) +{ + witness_depth--; + + _pthread_mutex_unlock(&witness_mtx); +} + +int +in_witness(void) { + return (witness_depth); +} + int pthread_mutex_lock(pthread_mutex_t *mutex) { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(mutex, "mutex"); ret = _pthread_mutex_lock(mutex); - if (mutex != &witness_mtx && ret == 0) { + if (ret == 0) { add_lock(mutex); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -74,16 +97,16 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(mutex, "mutex"); ret = _pthread_mutex_trylock(mutex); - if (mutex != &witness_mtx && ret == 0) { + if (ret == 0) { add_lock(mutex); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -93,16 +116,16 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(mutex, "mutex"); ret = _pthread_mutex_timedlock(mutex, ts); - if (mutex != &witness_mtx && ret == 0) { + if (ret == 0) { add_lock(mutex); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -112,14 +135,14 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); ret = _pthread_mutex_unlock(mutex); - if (mutex != &witness_mtx && ret == 0) { + if (ret == 0) { remove_lock(mutex); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -129,12 +152,12 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); destroy_lock(mutex); ret = _pthread_mutex_destroy(mutex); - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -144,7 +167,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(rwlock, "rwlock"); @@ -153,7 +176,7 @@ add_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -163,7 +186,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(rwlock, "rwlock"); @@ -172,7 +195,7 @@ add_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -182,7 +205,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(rwlock, "rwlock"); @@ -191,7 +214,7 @@ add_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -201,7 +224,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(rwlock, "rwlock"); @@ -210,7 +233,7 @@ add_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -220,7 +243,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(rwlock, "rwlock"); @@ -229,7 +252,7 @@ add_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -239,7 +262,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(rwlock, "rwlock"); @@ -248,7 +271,7 @@ add_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -258,14 +281,14 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); ret = _pthread_rwlock_unlock(rwlock); if (ret == 0) { remove_lock(rwlock); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -275,12 +298,12 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); destroy_lock(rwlock); ret = _pthread_rwlock_destroy(rwlock); - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -290,7 +313,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(spin, "spinlock"); @@ -299,7 +322,7 @@ add_lock(spin); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -309,7 +332,7 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); check_default_name(spin, "spinlock"); @@ -318,7 +341,7 @@ add_lock(spin); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -328,14 +351,14 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); ret = _pthread_spin_unlock(spin); if (ret == 0) { remove_lock(spin); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -345,12 +368,12 @@ { int ret; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); destroy_lock(spin); ret = _pthread_spin_destroy(spin); - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -360,14 +383,14 @@ { int ret = 0; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); if (insert_lock(get_lock_info(lookup_lock(first)), get_lock_info(lookup_lock(second))) < 0) { ret = EINVAL; } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -383,7 +406,7 @@ struct blessing *second_bless = NULL; int ret = 0; - _pthread_mutex_lock(&witness_mtx); + enter_witness(); first_inst = lookup_lock(first_addr); second_inst = lookup_lock(second_addr); @@ -410,7 +433,7 @@ bless_next); } - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -418,29 +441,53 @@ void pthread_lockorder_reset_np(void) { - _pthread_mutex_lock(&witness_mtx); + enter_witness(); reset_lists(); reset_lock_instance(); reset_lock_info(); - _pthread_mutex_unlock(&witness_mtx); + leave_witness(); } int pthread_mutex_setname_np(pthread_mutex_t *mutex, const char *name) { - return (set_lock_name(mutex, name)); + int ret; + + enter_witness(); + + ret = set_lock_name(mutex, name); + + leave_witness(); + + return (ret); } int pthread_rwlock_setname_np(pthread_rwlock_t *rwlock, const char *name) { - return (set_lock_name(rwlock, name)); + int ret; + + enter_witness(); + + ret = set_lock_name(rwlock, name); + + leave_witness(); + + return (ret); } int pthread_spin_setname_np(pthread_spinlock_t *spin, const char *name) { - return (set_lock_name(spin, name)); + int ret; + + enter_witness(); + + ret = set_lock_name(spin, name); + + leave_witness(); + + return (ret); } Modified: soc2012/gmiller/locking-head/lib/libwitness/lists.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/lists.c Fri Aug 17 20:15:01 2012 (r240480) +++ soc2012/gmiller/locking-head/lib/libwitness/lists.c Fri Aug 17 23:05:44 2012 (r240481) @@ -68,19 +68,16 @@ struct lock_entry *next; struct lock_instance *inst; struct lock_info *info; - static int in_add_lock = 0; if (exit_set == 0) { atexit(write_xml); exit_set = 1; } - if (in_add_lock || lock == NULL) { + if (in_witness() > 1 || lock == NULL) { return; } - in_add_lock = 1; - inst = lookup_lock(lock); info = get_lock_info(inst); @@ -88,7 +85,6 @@ entry = malloc(sizeof(*entry)); if (entry == NULL) { - in_add_lock = 0; return; } @@ -116,8 +112,6 @@ log_reversal(entry->lock, &entry->trace, next->lock, &next->trace); } - - in_add_lock = 0; } void Modified: soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Fri Aug 17 20:15:01 2012 (r240480) +++ soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Fri Aug 17 23:05:44 2012 (r240481) @@ -241,11 +241,7 @@ { int ret = 0; - /* - The lock isn't needed to prevent races, but it is needed to ensure - that any locks grabbed by malloc() don't get logged. - */ - pthread_mutex_lock(&witness_mtx); + enter_witness(); node->_pvt = malloc(sizeof(struct _pthread_lockorder_private)); if (node->_pvt == NULL) { @@ -255,7 +251,7 @@ node->name = NULL; } - pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -267,6 +263,8 @@ return (0); } + enter_witness(); + if (node->_pvt->last_record == NULL) { node->_pvt->last_record = SLIST_FIRST(&lock_info_head); } else { @@ -275,15 +273,11 @@ } if (node->_pvt->last_record == NULL) { + leave_witness(); + return (0); } - /* - The lock isn't needed to prevent races, but it is needed to ensure - that any locks grabbed for memory allocation don't get logged. - */ - pthread_mutex_lock(&witness_mtx); - if (node->name != NULL) { free(node->name); } @@ -302,7 +296,7 @@ node->sibling = NULL; } - pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (1); } Modified: soc2012/gmiller/locking-head/lib/libwitness/logs.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/logs.c Fri Aug 17 20:15:01 2012 (r240480) +++ soc2012/gmiller/locking-head/lib/libwitness/logs.c Fri Aug 17 23:05:44 2012 (r240481) @@ -68,11 +68,7 @@ lor->name_second = NULL; lor->second_trace = NULL; - /* - The lock isn't needed to prevent races, but it is needed to ensure - that any locks grabbed by malloc() don't get logged. - */ - pthread_mutex_lock(&witness_mtx); + enter_witness(); lor->_pvt = malloc(sizeof(struct _pthread_lor_private)); if (lor->_pvt == NULL) { @@ -81,7 +77,7 @@ lor->_pvt->last_record = NULL; } - pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (ret); } @@ -91,7 +87,7 @@ { int res = 0; - pthread_mutex_lock(&witness_mtx); + enter_witness(); if (lor->_pvt == NULL || lor->_pvt->last_record == NULL) { lor->_pvt->last_record = STAILQ_FIRST(&lor_head); @@ -113,7 +109,7 @@ res = 1; } - pthread_mutex_unlock(&witness_mtx); + leave_witness(); return (res); } @@ -149,7 +145,7 @@ struct lor_entry *lor; struct lor_entry *lor_temp; - pthread_mutex_lock(&witness_mtx); + enter_witness(); STAILQ_FOREACH_SAFE(lor, &lor_head, lor_next, lor_temp) { STAILQ_REMOVE(&lor_head, lor, lor_entry, lor_next); @@ -165,5 +161,5 @@ free(lor); } - pthread_mutex_unlock(&witness_mtx); + leave_witness(); } Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/witness.h Fri Aug 17 20:15:01 2012 (r240480) +++ soc2012/gmiller/locking-head/lib/libwitness/witness.h Fri Aug 17 23:05:44 2012 (r240481) @@ -62,8 +62,6 @@ SLIST_HEAD(backtrace, stack_frame); -extern pthread_mutex_t witness_mtx; - void add_lock(void *lock); void remove_lock(void *lock); void free_frame(struct backtrace *trace); @@ -92,3 +90,7 @@ void record_backtrace(struct backtrace *trace); char *trace_str(struct backtrace *trace); + +void enter_witness(void); +void leave_witness(void); +int in_witness(void); From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 23:08:28 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 76D43106564A for ; Fri, 17 Aug 2012 23:08:26 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 23:08:26 +0000 Date: Fri, 17 Aug 2012 23:08:26 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817230826.76D43106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240482 - in soc2012/gmiller/locking-head: . lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 23:08:28 -0000 Author: gmiller Date: Fri Aug 17 23:08:26 2012 New Revision: 240482 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240482 Log: r240503@FreeBSD-dev: root | 2012-08-15 14:48:26 -0500 Move all of the remaining API functions into api.c. Deleted: soc2012/gmiller/locking-head/lib/libwitness/logs.c Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/lib/libwitness/Makefile soc2012/gmiller/locking-head/lib/libwitness/api.c soc2012/gmiller/locking-head/lib/libwitness/lists.c soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c soc2012/gmiller/locking-head/lib/libwitness/witness.h Modified: soc2012/gmiller/locking-head/lib/libwitness/Makefile ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/Makefile Fri Aug 17 23:05:44 2012 (r240481) +++ soc2012/gmiller/locking-head/lib/libwitness/Makefile Fri Aug 17 23:08:26 2012 (r240482) @@ -4,7 +4,7 @@ LIB= witness SHLIB_MAJOR= 1 -SRCS= api.c graph.c lists.c logs.c lockinfo.c xml.c unwind.c +SRCS= api.c graph.c lists.c lockinfo.c xml.c unwind.c DPADD= ${LIBTHR} LDADD= -lthr Modified: soc2012/gmiller/locking-head/lib/libwitness/api.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/api.c Fri Aug 17 23:05:44 2012 (r240481) +++ soc2012/gmiller/locking-head/lib/libwitness/api.c Fri Aug 17 23:08:26 2012 (r240482) @@ -491,3 +491,187 @@ return (ret); } +int +pthread_lor_begin_np(struct pthread_lor_np *lor) +{ + int ret = 0; + + lor->name_first = NULL; + lor->first_trace = NULL; + lor->name_second = NULL; + lor->second_trace = NULL; + + enter_witness(); + + lor->_pvt = malloc(sizeof(struct _pthread_lor_private)); + if (lor->_pvt == NULL) { + ret = ENOMEM; + } else { + lor->_pvt->last_record = NULL; + } + + leave_witness(); + + return (ret); +} + +int +pthread_lor_next_np(struct pthread_lor_np *lor) +{ + int res = 0; + + enter_witness(); + + if (lor->_pvt == NULL || lor->_pvt->last_record == NULL) { + lor->_pvt->last_record = STAILQ_FIRST(&lor_head); + } else { + lor->_pvt->last_record = + STAILQ_NEXT(lor->_pvt->last_record, lor_next); + } + + if (lor->_pvt->last_record != NULL) { + lor->name_first = + strdup(get_lock_name(lor->_pvt->last_record->lock_first)); + lor->first_trace = + strdup(lor->_pvt->last_record->first_trace); + lor->name_second = + strdup(get_lock_name(lor->_pvt->last_record->lock_second)); + lor->second_trace = + strdup(lor->_pvt->last_record->second_trace); + + res = 1; + } + + leave_witness(); + + return (res); +} + +void +pthread_lor_end_np(struct pthread_lor_np *lor) +{ + if (lor->_pvt != NULL) { + free(lor->_pvt); + lor->_pvt = NULL; + } + + if (lor->name_first != NULL) { + free(lor->name_first); + } + + if (lor->name_second != NULL) { + free(lor->name_second); + } + + if (lor->first_trace != NULL) { + free(lor->first_trace); + } + + if (lor->second_trace != NULL) { + free(lor->second_trace); + } +} + +void +pthread_lor_clear_np(void) +{ + struct lor_entry *lor; + struct lor_entry *lor_temp; + + enter_witness(); + + STAILQ_FOREACH_SAFE(lor, &lor_head, lor_next, lor_temp) { + STAILQ_REMOVE(&lor_head, lor, lor_entry, lor_next); + + if (lor->first_trace != NULL) { + free(lor->first_trace); + } + + if (lor->second_trace != NULL) { + free(lor->second_trace); + } + + free(lor); + } + + leave_witness(); +} + +int +pthread_lockorder_begin_np(struct pthread_lockorder_np *node) +{ + int ret = 0; + + enter_witness(); + + node->_pvt = malloc(sizeof(struct _pthread_lockorder_private)); + if (node->_pvt == NULL) { + ret = ENOMEM; + } else { + node->_pvt->last_record = NULL; + node->name = NULL; + } + + leave_witness(); + + return (ret); +} + +int +pthread_lockorder_next_np(struct pthread_lockorder_np *node) +{ + if (node->_pvt == NULL) { + return (0); + } + + enter_witness(); + + if (node->_pvt->last_record == NULL) { + node->_pvt->last_record = SLIST_FIRST(&lock_info_head); + } else { + node->_pvt->last_record = + SLIST_NEXT(node->_pvt->last_record, lock_info_next); + } + + if (node->_pvt->last_record == NULL) { + leave_witness(); + + return (0); + } + + if (node->name != NULL) { + free(node->name); + } + + node->name = strdup(get_lock_name(node->_pvt->last_record)); + if (node->_pvt->last_record->child != NULL) { + node->child = + strdup(get_lock_name(node->_pvt->last_record->child)); + } else { + node->child = NULL; + } + if (node->_pvt->last_record->sibling != NULL) { + node->sibling = + strdup(get_lock_name(node->_pvt->last_record->sibling)); + } else { + node->sibling = NULL; + } + + leave_witness(); + + return (1); +} + +void +pthread_lockorder_end_np(struct pthread_lockorder_np *node) +{ + if (node->_pvt != NULL) { + free(node->_pvt); + node->_pvt = NULL; + } + + if (node->name != NULL) { + free(node->name); + node->name = NULL; + } +} Modified: soc2012/gmiller/locking-head/lib/libwitness/lists.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/lists.c Fri Aug 17 23:05:44 2012 (r240481) +++ soc2012/gmiller/locking-head/lib/libwitness/lists.c Fri Aug 17 23:08:26 2012 (r240482) @@ -35,10 +35,27 @@ static _Thread_local SLIST_HEAD(lock_head, lock_entry) lock_head = SLIST_HEAD_INITIALIZER(lock_head); - static int reset_count = 0; static _Thread_local int thread_reset_count = 0; static int exit_set = 0; +struct lor_head lor_head = STAILQ_HEAD_INITIALIZER(lor_head); + +static void +log_reversal(struct lock_info *lock, struct backtrace *lock_trace, + struct lock_info *previous, struct backtrace *previous_trace) +{ + struct lor_entry *entry; + + entry = malloc(sizeof(struct lor_entry)); + if (entry != NULL) { + entry->lock_first = previous; + entry->first_trace = trace_str(previous_trace); + entry->lock_second = lock; + entry->second_trace = trace_str(lock_trace); + + STAILQ_INSERT_TAIL(&lor_head, entry, lor_next); + } +} void free_frame(struct backtrace *trace) Modified: soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Fri Aug 17 23:05:44 2012 (r240481) +++ soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Fri Aug 17 23:08:26 2012 (r240482) @@ -27,18 +27,11 @@ #include "witness.h" -#define MAX_DEFAULT_NAME_LENGTH (80) - -static SLIST_HEAD(lock_info_head, lock_info) lock_info_head = - SLIST_HEAD_INITIALIZER(lock_info_head); +struct lock_info_head lock_info_head = SLIST_HEAD_INITIALIZER(lock_info_head); static SLIST_HEAD(lock_instance_head, lock_instance) lock_instance_head = SLIST_HEAD_INITIALIZER(lock_instance_head); -struct _pthread_lockorder_private { - struct lock_info *last_record; -}; - struct lock_instance * lookup_lock(void *lock) { @@ -235,82 +228,3 @@ snprintf(info->name, MAX_DEFAULT_NAME_LENGTH, "%s_%p", prefix, lock); } - -int -pthread_lockorder_begin_np(struct pthread_lockorder_np *node) -{ - int ret = 0; - - enter_witness(); - - node->_pvt = malloc(sizeof(struct _pthread_lockorder_private)); - if (node->_pvt == NULL) { - ret = ENOMEM; - } else { - node->_pvt->last_record = NULL; - node->name = NULL; - } - - leave_witness(); - - return (ret); -} - -int -pthread_lockorder_next_np(struct pthread_lockorder_np *node) -{ - if (node->_pvt == NULL) { - return (0); - } - - enter_witness(); - - if (node->_pvt->last_record == NULL) { - node->_pvt->last_record = SLIST_FIRST(&lock_info_head); - } else { - node->_pvt->last_record = - SLIST_NEXT(node->_pvt->last_record, lock_info_next); - } - - if (node->_pvt->last_record == NULL) { - leave_witness(); - - return (0); - } - - if (node->name != NULL) { - free(node->name); - } - - node->name = strdup(get_lock_name(node->_pvt->last_record)); - if (node->_pvt->last_record->child != NULL) { - node->child = - strdup(get_lock_name(node->_pvt->last_record->child)); - } else { - node->child = NULL; - } - if (node->_pvt->last_record->sibling != NULL) { - node->sibling = - strdup(get_lock_name(node->_pvt->last_record->sibling)); - } else { - node->sibling = NULL; - } - - leave_witness(); - - return (1); -} - -void -pthread_lockorder_end_np(struct pthread_lockorder_np *node) -{ - if (node->_pvt != NULL) { - free(node->_pvt); - node->_pvt = NULL; - } - - if (node->name != NULL) { - free(node->name); - node->name = NULL; - } -} Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/witness.h Fri Aug 17 23:05:44 2012 (r240481) +++ soc2012/gmiller/locking-head/lib/libwitness/witness.h Fri Aug 17 23:08:26 2012 (r240482) @@ -34,7 +34,8 @@ #include #include -#define MAX_FRAME_ID_LENGTH (80) +#define MAX_FRAME_ID_LENGTH (80) +#define MAX_DEFAULT_NAME_LENGTH (80) struct blessing { SLIST_ENTRY(blessing) bless_next; @@ -49,6 +50,8 @@ char *name; }; +SLIST_HEAD(lock_info_head, lock_info); + struct lock_instance { SLIST_ENTRY(lock_instance) lock_instance_next; struct lock_info *info; @@ -62,6 +65,27 @@ SLIST_HEAD(backtrace, stack_frame); +struct lor_entry { + STAILQ_ENTRY(lor_entry) lor_next; + struct lock_info *lock_first; + char *first_trace; + struct lock_info *lock_second; + char *second_trace; +}; + +struct _pthread_lor_private { + struct lor_entry *last_record; +}; + +STAILQ_HEAD(lor_head, lor_entry); + +struct _pthread_lockorder_private { + struct lock_info *last_record; +}; + +extern struct lor_head lor_head; +extern struct lock_info_head lock_info_head; + void add_lock(void *lock); void remove_lock(void *lock); void free_frame(struct backtrace *trace); @@ -71,11 +95,6 @@ void reset_lists(void); -void log_reversal(struct lock_info *lock, - struct backtrace *lock_trace, - struct lock_info *previous, - struct backtrace *previous_trace); - int blessed(struct lock_info *first, struct lock_info *second); void reset_lock_info(void); void check_default_name(void *lock, const char *prefix); From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 23:08:45 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 6C939106567D for ; Fri, 17 Aug 2012 23:08:43 +0000 (UTC) (envelope-from gmiller@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 23:08:43 +0000 Date: Fri, 17 Aug 2012 23:08:43 +0000 From: gmiller@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817230843.6C939106567D@hub.freebsd.org> Cc: Subject: socsvn commit: r240483 - in soc2012/gmiller/locking-head: . lib/libwitness X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 23:08:45 -0000 Author: gmiller Date: Fri Aug 17 23:08:43 2012 New Revision: 240483 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240483 Log: r240504@FreeBSD-dev: root | 2012-08-15 14:51:32 -0500 Rename lists.c -> locklist.c to better describe its purpose. Added: soc2012/gmiller/locking-head/lib/libwitness/locklist.c - copied unchanged from r240482, soc2012/gmiller/locking-head/lib/libwitness/lists.c Deleted: soc2012/gmiller/locking-head/lib/libwitness/lists.c Modified: soc2012/gmiller/locking-head/ (props changed) soc2012/gmiller/locking-head/lib/libwitness/Makefile Modified: soc2012/gmiller/locking-head/lib/libwitness/Makefile ============================================================================== --- soc2012/gmiller/locking-head/lib/libwitness/Makefile Fri Aug 17 23:08:26 2012 (r240482) +++ soc2012/gmiller/locking-head/lib/libwitness/Makefile Fri Aug 17 23:08:43 2012 (r240483) @@ -4,7 +4,7 @@ LIB= witness SHLIB_MAJOR= 1 -SRCS= api.c graph.c lists.c lockinfo.c xml.c unwind.c +SRCS= api.c graph.c locklist.c lockinfo.c xml.c unwind.c DPADD= ${LIBTHR} LDADD= -lthr Copied: soc2012/gmiller/locking-head/lib/libwitness/locklist.c (from r240482, soc2012/gmiller/locking-head/lib/libwitness/lists.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/gmiller/locking-head/lib/libwitness/locklist.c Fri Aug 17 23:08:43 2012 (r240483, copy of r240482, soc2012/gmiller/locking-head/lib/libwitness/lists.c) @@ -0,0 +1,159 @@ +/*- + * Copyright (c) 2012 Greg Miller .. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "witness.h" + +struct lock_entry { + SLIST_ENTRY(lock_entry) lock_next; + struct lock_info *lock; + struct backtrace trace; +}; + +static _Thread_local SLIST_HEAD(lock_head, lock_entry) lock_head = + SLIST_HEAD_INITIALIZER(lock_head); +static int reset_count = 0; +static _Thread_local int thread_reset_count = 0; +static int exit_set = 0; +struct lor_head lor_head = STAILQ_HEAD_INITIALIZER(lor_head); + +static void +log_reversal(struct lock_info *lock, struct backtrace *lock_trace, + struct lock_info *previous, struct backtrace *previous_trace) +{ + struct lor_entry *entry; + + entry = malloc(sizeof(struct lor_entry)); + if (entry != NULL) { + entry->lock_first = previous; + entry->first_trace = trace_str(previous_trace); + entry->lock_second = lock; + entry->second_trace = trace_str(lock_trace); + + STAILQ_INSERT_TAIL(&lor_head, entry, lor_next); + } +} + +void +free_frame(struct backtrace *trace) +{ + struct stack_frame *frame; + + while (!SLIST_EMPTY(trace)) { + frame = SLIST_FIRST(trace); + SLIST_REMOVE_HEAD(trace, frame_next); + + free(frame); + } + +} + +static void +free_entry(struct lock_entry *entry) +{ + free_frame(&entry->trace); + free(entry); +} + +void +add_lock(void *lock) +{ + struct lock_entry *entry; + struct lock_entry *next; + struct lock_instance *inst; + struct lock_info *info; + + if (exit_set == 0) { + atexit(write_xml); + exit_set = 1; + } + + if (in_witness() > 1 || lock == NULL) { + return; + } + + inst = lookup_lock(lock); + info = get_lock_info(inst); + + next = SLIST_FIRST(&lock_head); + + entry = malloc(sizeof(*entry)); + if (entry == NULL) { + return; + } + + SLIST_INIT(&entry->trace); + record_backtrace(&entry->trace); + entry->lock = info; + + if (reset_count > thread_reset_count) { + thread_reset_count = reset_count; + + while (!SLIST_EMPTY(&lock_head)) { + entry = SLIST_FIRST(&lock_head); + + SLIST_REMOVE_HEAD(&lock_head, lock_next); + + free_entry(entry); + } + + next = NULL; + } + + SLIST_INSERT_HEAD(&lock_head, entry, lock_next); + + if (next != NULL && insert_lock(next->lock, entry->lock) < 0) { + log_reversal(entry->lock, &entry->trace, next->lock, + &next->trace); + } +} + +void +remove_lock(void *lock) +{ + struct lock_instance *inst; + struct lock_info *info; + struct lock_entry *entry; + struct lock_entry *temp; + + inst = lookup_lock(lock); + info = get_lock_info(inst); + + SLIST_FOREACH_SAFE(entry, &lock_head, lock_next, temp) { + if (entry->lock == info) { + SLIST_REMOVE(&lock_head, entry, lock_entry, lock_next); + free_entry(entry); + + break; + } + } +} + +void +reset_lists(void) +{ + reset_count++; +} From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 03:47:02 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 28F88106564A for ; Sat, 18 Aug 2012 03:47:00 +0000 (UTC) (envelope-from tzabal@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 03:47:00 +0000 Date: Sat, 18 Aug 2012 03:47:00 +0000 From: tzabal@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818034700.28F88106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240484 - in soc2012/tzabal/server-side/akcrs-website: . akcrs akcrs.egg-info akcrs/scripts akcrs/static akcrs/templates X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 03:47:02 -0000 Author: tzabal Date: Sat Aug 18 03:46:59 2012 New Revision: 240484 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240484 Log: The dynamic website of the system. Built with Pyramid. Added: soc2012/tzabal/server-side/akcrs-website/ soc2012/tzabal/server-side/akcrs-website/CHANGES.txt soc2012/tzabal/server-side/akcrs-website/MANIFEST.in soc2012/tzabal/server-side/akcrs-website/README.txt soc2012/tzabal/server-side/akcrs-website/akcrs/ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/PKG-INFO soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/SOURCES.txt soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/dependency_links.txt (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/entry_points.txt soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/not-zip-safe (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/requires.txt soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/top_level.txt soc2012/tzabal/server-side/akcrs-website/akcrs/.directory soc2012/tzabal/server-side/akcrs-website/akcrs/__init__.py soc2012/tzabal/server-side/akcrs-website/akcrs/models.py soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/ soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/__init__.py soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/initializedb.py soc2012/tzabal/server-side/akcrs-website/akcrs/static/ soc2012/tzabal/server-side/akcrs-website/akcrs/static/favicon.ico (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/static/footerbg.png (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/static/headerbg.png (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/static/ie6.css soc2012/tzabal/server-side/akcrs-website/akcrs/static/middlebg.png (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/static/pylons.css soc2012/tzabal/server-side/akcrs-website/akcrs/static/pyramid-small.png (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/static/pyramid.png (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/static/transparent.gif (contents, props changed) soc2012/tzabal/server-side/akcrs-website/akcrs/templates/ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/base.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/bug.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/bugs.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/edit_report.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/index.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/login.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/report.mako soc2012/tzabal/server-side/akcrs-website/akcrs/templates/reports.mako soc2012/tzabal/server-side/akcrs-website/akcrs/tests.py soc2012/tzabal/server-side/akcrs-website/akcrs/views.py soc2012/tzabal/server-side/akcrs-website/development.ini soc2012/tzabal/server-side/akcrs-website/production.ini soc2012/tzabal/server-side/akcrs-website/setup.cfg soc2012/tzabal/server-side/akcrs-website/setup.py Added: soc2012/tzabal/server-side/akcrs-website/CHANGES.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/CHANGES.txt Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,4 @@ +0.0 +--- + +- Initial version Added: soc2012/tzabal/server-side/akcrs-website/MANIFEST.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/MANIFEST.in Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,2 @@ +include *.txt *.ini *.cfg *.rst +recursive-include akcrs *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml Added: soc2012/tzabal/server-side/akcrs-website/README.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/README.txt Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,14 @@ +akcrs README +================== + +Getting Started +--------------- + +- cd + +- $venv/bin/python setup.py develop + +- $venv/bin/populate_akcrs development.ini + +- $venv/bin/pserve development.ini + Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/PKG-INFO ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/PKG-INFO Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,35 @@ +Metadata-Version: 1.1 +Name: akcrs +Version: 0.0 +Summary: akcrs +Home-page: UNKNOWN +Author: UNKNOWN +Author-email: UNKNOWN +License: UNKNOWN +Description: akcrs README + ================== + + Getting Started + --------------- + + - cd + + - $venv/bin/python setup.py develop + + - $venv/bin/populate_akcrs development.ini + + - $venv/bin/pserve development.ini + + + + 0.0 + --- + + - Initial version + +Keywords: web wsgi bfg pylons pyramid +Platform: UNKNOWN +Classifier: Programming Language :: Python +Classifier: Framework :: Pylons +Classifier: Topic :: Internet :: WWW/HTTP +Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/SOURCES.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/SOURCES.txt Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,30 @@ +CHANGES.txt +MANIFEST.in +README.txt +development.ini +production.ini +setup.cfg +setup.py +akcrs/__init__.py +akcrs/models.py +akcrs/tests.py +akcrs/views.py +akcrs.egg-info/PKG-INFO +akcrs.egg-info/SOURCES.txt +akcrs.egg-info/dependency_links.txt +akcrs.egg-info/entry_points.txt +akcrs.egg-info/not-zip-safe +akcrs.egg-info/requires.txt +akcrs.egg-info/top_level.txt +akcrs/scripts/__init__.py +akcrs/scripts/initializedb.py +akcrs/static/favicon.ico +akcrs/static/footerbg.png +akcrs/static/headerbg.png +akcrs/static/ie6.css +akcrs/static/middlebg.png +akcrs/static/pylons.css +akcrs/static/pyramid-small.png +akcrs/static/pyramid.png +akcrs/static/transparent.gif +akcrs/templates/mytemplate.pt \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/dependency_links.txt ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/entry_points.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/entry_points.txt Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,5 @@ + [paste.app_factory] + main = akcrs:main + [console_scripts] + initialize_akcrs_db = akcrs.scripts.initializedb:main + \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/not-zip-safe ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/requires.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/requires.txt Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,8 @@ +pyramid +SQLAlchemy +transaction +pyramid_tm +pyramid_debugtoolbar +zope.sqlalchemy +waitress +docutils \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/top_level.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs.egg-info/top_level.txt Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1 @@ +akcrs Added: soc2012/tzabal/server-side/akcrs-website/akcrs/.directory ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/.directory Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,2 @@ +[Dolphin] +Timestamp=2012,8,16,18,4,46 Added: soc2012/tzabal/server-side/akcrs-website/akcrs/__init__.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/__init__.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,31 @@ +from pyramid.authentication import AuthTktAuthenticationPolicy +from pyramid.authorization import ACLAuthorizationPolicy +from pyramid.config import Configurator +from sqlalchemy import engine_from_config + +from .models import DBSession + +def main(global_config, **settings): + """ This function returns a Pyramid WSGI application.""" + engine = engine_from_config(settings, 'sqlalchemy.') + DBSession.configure(bind=engine) + authn_policy = AuthTktAuthenticationPolicy('z3VfW0PhQy7g') + authz_policy = ACLAuthorizationPolicy() + config = Configurator(settings=settings) + # Authentication and Authorization + config.set_authentication_policy(authn_policy) + config.set_authorization_policy(authz_policy) + # Static + config.add_static_view('static', 'static', cache_max_age=3600) + # Routes + config.add_route('index', '/') + config.add_route('reports', '/reports') + config.add_route('report', '/report/{id}') + config.add_route('edit_report', '/report/{id}/edit_report') + config.add_route('bugs', '/bugs') + config.add_route('bug', '/bug/{id}') + config.add_route('login', '/login') + config.add_route('logout', '/logout') + # Scan + config.scan() + return config.make_wsgi_app() \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/models.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/models.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,86 @@ +import datetime + +from sqlalchemy.dialects.postgresql import ARRAY +from sqlalchemy.dialects.postgresql import ENUM +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import relationship +from sqlalchemy.orm import scoped_session +from sqlalchemy.orm import sessionmaker +from sqlalchemy.schema import Column +from sqlalchemy.schema import ForeignKey +from sqlalchemy.schema import Sequence +from sqlalchemy.types import Boolean +from sqlalchemy.types import CHAR +from sqlalchemy.types import Integer +from sqlalchemy.types import String +from sqlalchemy.types import Text +from sqlalchemy.types import TIMESTAMP +from zope.sqlalchemy import ZopeTransactionExtension + + +DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) +Base = declarative_base() + + +class User(Base): + __tablename__ = 'users' + + id = Column(Integer, Sequence('users_id_seq'), primary_key=True) + email = Column(String(254), nullable=False) + password = Column(CHAR(64), nullable=False) + is_developer = Column(Boolean, default='false') + + reports = relationship('Report') + + +class Bug(Base): + __tablename__ = 'bugs' + + id = Column(Integer, Sequence('bugs_id_seq'), primary_key=True) + state = Column(ENUM('NOSTATE', 'Open', 'Analyzed', 'Feedback', 'Closed', 'Suspended', name='bugstate'), nullable=False) + reported = Column(Integer, nullable=False) + + reports = relationship('Report') + + +class Report(Base): + __tablename__ = 'reports' + + id = Column(Integer, Sequence('reports_id_seq'), primary_key=True) + bug_id = Column(Integer, ForeignKey('bugs.id'), nullable=False) + user_id = Column(Integer, ForeignKey('users.id'), nullable=False) + received_datetime = Column(TIMESTAMP, default=datetime.datetime.now) + confirmation_code = Column(CHAR(length=16), nullable=False) + confirmed = Column(Boolean, default='false') + crashtype = Column(Text) + crashdate = Column(Text) + hostname = Column(Text) + ostype = Column(Text) + osrelease = Column(Text) + version = Column(Text) + machine = Column(Text) + panic = Column(Text) + backtrace = Column(Text) + top_significant_func = Column(Text) + rem_significant_funcs = Column(ARRAY(Text)) + ps_axl = Column(Text) + vmstat_s = Column(Text) + vmstat_m = Column(Text) + vmstat_z = Column(Text) + vmstat_i = Column(Text) + pstat_t = Column(Text) + pstat_s = Column(Text) + iostat = Column(Text) + ipcs_a = Column(Text) + ipcs_t = Column(Text) + nfsstat = Column(Text) + netstat_s = Column(Text) + netstat_m = Column(Text) + netstat_id = Column(Text) + netstat_anr = Column(Text) + netstat_ana = Column(Text) + netstat_al = Column(Text) + fstat = Column(Text) + dmesg = Column(Text) + kernelconfig = Column(Text) + ddbcapturebuffer = Column(Text) \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/__init__.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/__init__.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1 @@ +# package Added: soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/initializedb.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/scripts/initializedb.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,37 @@ +import os +import sys +import transaction + +from sqlalchemy import engine_from_config + +from pyramid.paster import ( + get_appsettings, + setup_logging, + ) + +from ..models import ( + DBSession, + User, + Bug, + Report, + Base, + ) + +def usage(argv): + cmd = os.path.basename(argv[0]) + print('usage: %s \n' + '(example: "%s development.ini")' % (cmd, cmd)) + sys.exit(1) + +def main(argv=sys.argv): + if len(argv) != 2: + usage(argv) + config_uri = argv[1] + setup_logging(config_uri) + settings = get_appsettings(config_uri) + engine = engine_from_config(settings, 'sqlalchemy.') + DBSession.configure(bind=engine) + Base.metadata.create_all(engine) + #with transaction.manager: + # model = MyModel(name='one', value=1) + # DBSession.add(model) Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/favicon.ico ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/footerbg.png ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/headerbg.png ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/ie6.css ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/static/ie6.css Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,8 @@ +* html img, +* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", +this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')", +this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), +this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')", +this.runtimeStyle.backgroundImage = "none")),this.pngSet=true) +);} +#wrap{display:table;height:100%} Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/middlebg.png ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/pylons.css ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/static/pylons.css Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,65 @@ +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;/* 16px */ +vertical-align:baseline;background:transparent;} +body{line-height:1;} +ol,ul{list-style:none;} +blockquote,q{quotes:none;} +blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;} +:focus{outline:0;} +ins{text-decoration:none;} +del{text-decoration:line-through;} +table{border-collapse:collapse;border-spacing:0;} +sub{vertical-align:sub;font-size:smaller;line-height:normal;} +sup{vertical-align:super;font-size:smaller;line-height:normal;} +ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;} +ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;} +li{display:list-item;} +ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;} +ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;} +ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;} +.hidden{display:none;} +p{line-height:1.5em;} +h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;} +h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;} +h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;} +h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;} +html,body{width:100%;height:100%;} +body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "NobileRegular","Lucida Grande",Lucida,Verdana,sans-serif;} +a{color:#1b61d6;text-decoration:none;} +a:hover{color:#e88f00;text-decoration:underline;} +body h1, +body h2, +body h3, +body h4, +body h5, +body h6{font-family:"NeutonRegular","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;} +#wrap{min-height:100%;} +#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;} +#header{background:#000000;top:0;font-size:14px;} +#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;} +.header,.footer{width:750px;margin-right:auto;margin-left:auto;} +.wrapper{width:100%} +#top,#top-small,#bottom{width:100%;} +#top{color:#000000;height:230px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;} +#top-small{color:#000000;height:60px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;} +#bottom{color:#222;background-color:#ffffff;} +.top,.top-small,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;} +.top{padding-top:40px;} +.top-small{padding-top:10px;} +#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;} +.app-welcome{margin-top:25px;} +.app-name{color:#000000;font-weight:bold;} +.bottom{padding-top:50px;} +#left{width:350px;float:left;padding-right:25px;} +#right{width:350px;float:right;padding-left:25px;} +.align-left{text-align:left;} +.align-right{text-align:right;} +.align-center{text-align:center;} +ul.links{margin:0;padding:0;} +ul.links li{list-style-type:none;font-size:14px;} +form{border-style:none;} +fieldset{border-style:none;} +input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;} +input[type=text],input[type=password]{width:205px;} +input[type=submit]{background-color:#ddd;font-weight:bold;} +/*Opera Fix*/ +body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;} Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/pyramid-small.png ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/pyramid.png ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/static/transparent.gif ============================================================================== Binary file. No diff available. Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/base.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/base.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,27 @@ + + + + + Automated Kernel Crash Reporting System + + + + + + + ${next.body()} + + \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/bug.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/bug.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,22 @@ +<%inherit file='base.mako'/> +<%block name="header"> + Details of Bug with ID ${request.matchdict['id']} + +

All the data of the requested bug.

+ + + + + + + + + +
StateReported
${bug.state}${bug.reported}
+

This bug has been reported ${bug.reported} times. The crash reports that refers to it are: +

    + % for report in reports: +
  • Report
    • + %endfor +
+

\ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/bugs.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/bugs.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,20 @@ +<%inherit file='base.mako'/> +<%block name="header"> + Kernel Crash Bugs + + +

A list that contains all the bugs that we have identified.

+ + + + + + + % for bug in bugs: + + + + + + % endfor +
StateReportedMore Details
${bug.state}${bug.reported}Bug
\ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/edit_report.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/edit_report.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,4 @@ +<%inherit file='base.mako'/> +<%block name="header"> + Edit the Crash Report with ID ${request.matchdict['id']} + \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/index.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/index.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,4 @@ +<%inherit file='base.mako'/> +<%block name="header"> + Welcome to AKCRS! + \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/login.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/login.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,20 @@ +<%inherit file='base.mako'/> +<%block name="header"> + Login + + +% if failed_attempt: +

Invalid credentials, try again.

+% endif + +
+

+
+ +

+

+
+ +

+ +
\ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/report.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/report.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,28 @@ +<%inherit file='base.mako'/> +<%block name="header"> + Details of Crash Report with ID ${request.matchdict['id']} + +

All the crash data of the requested report.

+ + + + + + + + + + + + + +
Crash DateOperating SystemReleaseArchitecture
${report.crashdate}${report.ostype}${report.osrelease}${report.machine}
+% if is_developer: +

+ As a developer you can perform the following actions: +

+Do you think that this report refers correctly to the bug? +

+% endif \ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/templates/reports.mako ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/templates/reports.mako Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,24 @@ +<%inherit file="base.mako"/> +<%block name="header"> + Kernel Crash Reports + + +

A list that contains all the crash reports that we have collected.

+ + + + + + + + + % for report in reports: + + + + + + + + % endfor +
ReleaseArchitecturePanic MessageMore DetailsRefers to
${report.osrelease}${report.machine}${report.panic}ReportBug
\ No newline at end of file Added: soc2012/tzabal/server-side/akcrs-website/akcrs/tests.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/tests.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,32 @@ +import unittest +import transaction + +from pyramid import testing + +from .models import DBSession + +class TestMyView(unittest.TestCase): + def setUp(self): + self.config = testing.setUp() + from sqlalchemy import create_engine + engine = create_engine('sqlite://') + from .models import ( + Base, + MyModel, + ) + DBSession.configure(bind=engine) + Base.metadata.create_all(engine) + with transaction.manager: + model = MyModel(name='one', value=55) + DBSession.add(model) + + def tearDown(self): + DBSession.remove() + testing.tearDown() + + def test_it(self): + from .views import my_view + request = testing.DummyRequest() + info = my_view(request) + self.assertEqual(info['one'].name, 'one') + self.assertEqual(info['project'], 'akcrs') Added: soc2012/tzabal/server-side/akcrs-website/akcrs/views.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/akcrs/views.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,112 @@ +import hashlib + +from pyramid.httpexceptions import HTTPForbidden +from pyramid.httpexceptions import HTTPFound +from pyramid.httpexceptions import HTTPNotFound +from pyramid.security import authenticated_userid +from pyramid.security import forget +from pyramid.security import remember +from pyramid.view import view_config +from sqlalchemy.exc import DBAPIError + +from .models import DBSession, User, Bug, Report + + +@view_config(route_name='index', renderer='index.mako') +def index(request): + logged_in = authenticated_userid(request) + return {'logged_in': logged_in} + + +@view_config(route_name='login', renderer='login.mako') +def login(request): + logged_in = authenticated_userid(request) + if logged_in: + goto = request.route_url('index') + return HTTPFound(location=goto) + + if request.method == 'POST': + email = request.POST.get('email') + password = request.POST.get('password') + + if email and password: + query = DBSession.query(User).filter(User.email == email) + try: + user = query.one() + except: + pass # either no such email in db or more than 2 times in db! + else: + hashobj = hashlib.sha256() + hashobj.update(password) + hashpass = hashobj.hexdigest() + if hashpass == user.password: + goto = request.route_url('index') + headers = remember(request, email) + return HTTPFound(location=goto, headers=headers) + + return {'failed_attempt': True} + + return {'failed_attempt': False, 'logged_in': logged_in} + + +@view_config(route_name='logout') +def logout(request): + logged_in = authenticated_userid(request) + if not logged_in: + goto = request.route_url('index') + return HTTPFound(location=goto) + headers = forget(request) + goto = request.route_url('index') + return HTTPFound(location=goto, headers=headers) + + + +@view_config(route_name='reports', renderer='reports.mako') +def reports(request): + logged_in = authenticated_userid(request) + reports = DBSession.query(Report).filter(Report.confirmed == True).all() + return {'reports': reports, 'logged_in': logged_in} + + +@view_config(route_name='report', renderer='report.mako') +def report(request): + logged_in = authenticated_userid(request) + is_developer = None + if logged_in: + user = DBSession.query(User).filter(User.email == logged_in).one() + is_developer = user.is_developer + + id = request.matchdict['id'] + query = DBSession.query(Report).filter(Report.confirmed == True, Report.id == id) + report = query.one() + return {'report': report, 'logged_in': logged_in, 'is_developer': is_developer} + + +@view_config(route_name='edit_report', renderer='edit_report.mako') +def edit_report(request): + return {} + + +@view_config(route_name='bugs', renderer='bugs.mako') +def bugs(request): + logged_in = authenticated_userid(request) + bugs = DBSession.query(Bug).filter(Bug.reported > 0).all() + return {'bugs': bugs, 'logged_in': logged_in} + + +@view_config(route_name='bug', renderer='bug.mako') +def bug(request): + logged_in = authenticated_userid(request) + id = request.matchdict['id'] + + # All the data related to the requested bug + # A bug is considered valid when it is reported from at least one report + # A bug can have reported equals to zero if the report that refers to it + # is unconfirmed. + query = DBSession.query(Bug).filter(Bug.reported > 0, Bug.id == id) + bug = query.one() + + # The reports that refer to the requested bug + query = DBSession.query(Report).filter(Report.bug_id == id, Report.confirmed == True) + reports = query.all() + return {'bug': bug, 'reports': reports, 'logged_in': logged_in} Added: soc2012/tzabal/server-side/akcrs-website/development.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/development.ini Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,61 @@ +[app:main] +use = egg:akcrs + +pyramid.reload_templates = true +pyramid.debug_authorization = false +pyramid.debug_notfound = false +pyramid.debug_routematch = false +pyramid.default_locale_name = en +pyramid.includes = + pyramid_debugtoolbar + pyramid_tm + +# SQLAlchemy engine creation for PostgreSQL using the Psycopg2 driver +sqlalchemy.url = postgresql+psycopg2://akcrs:freebsd@localhost/akcrsdb + +# Mako Directories +mako.directories = akcrs:templates + +[server:main] +use = egg:waitress#main +host = 0.0.0.0 +port = 6543 + +# Begin logging configuration + +[loggers] +keys = root, akcrs, sqlalchemy + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = INFO +handlers = console + +[logger_akcrs] +level = DEBUG +handlers = +qualname = akcrs + +[logger_sqlalchemy] +level = INFO +handlers = +qualname = sqlalchemy.engine +# "level = INFO" logs SQL queries. +# "level = DEBUG" logs SQL queries and results. +# "level = WARN" logs neither. (Recommended for production systems.) + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s + +# End logging configuration Added: soc2012/tzabal/server-side/akcrs-website/production.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/production.ini Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,56 @@ +[app:main] +use = egg:akcrs + +pyramid.reload_templates = false +pyramid.debug_authorization = false +pyramid.debug_notfound = false +pyramid.debug_routematch = false +pyramid.default_locale_name = en +pyramid.includes = + pyramid_tm + +sqlalchemy.url = sqlite:///%(here)s/akcrs.db + +[server:main] +use = egg:waitress#main +host = 0.0.0.0 +port = 6543 + +# Begin logging configuration + +[loggers] +keys = root, akcrs, sqlalchemy + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console + +[logger_akcrs] +level = WARN +handlers = +qualname = akcrs + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine +# "level = INFO" logs SQL queries. +# "level = DEBUG" logs SQL queries and results. +# "level = WARN" logs neither. (Recommended for production systems.) + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s + +# End logging configuration Added: soc2012/tzabal/server-side/akcrs-website/setup.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/setup.cfg Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,27 @@ +[nosetests] +match=^test +nocapture=1 +cover-package=akcrs +with-coverage=1 +cover-erase=1 + +[compile_catalog] +directory = akcrs/locale +domain = akcrs +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = akcrs/locale/akcrs.pot +width = 80 + +[init_catalog] +domain = akcrs +input_file = akcrs/locale/akcrs.pot +output_dir = akcrs/locale + +[update_catalog] +domain = akcrs +input_file = akcrs/locale/akcrs.pot +output_dir = akcrs/locale +previous = true Added: soc2012/tzabal/server-side/akcrs-website/setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/tzabal/server-side/akcrs-website/setup.py Sat Aug 18 03:46:59 2012 (r240484) @@ -0,0 +1,47 @@ +import os + +from setuptools import setup, find_packages + +here = os.path.abspath(os.path.dirname(__file__)) +README = open(os.path.join(here, 'README.txt')).read() +CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() + +requires = [ + 'pyramid', + 'SQLAlchemy', + 'transaction', + 'pyramid_tm', + 'pyramid_debugtoolbar', + 'zope.sqlalchemy', + 'waitress', + # tutorial added dependency. maybe remove (docutils) + 'docutils', + ] + +setup(name='akcrs', + version='0.0', + description='akcrs', + long_description=README + '\n\n' + CHANGES, + classifiers=[ + "Programming Language :: Python", + "Framework :: Pylons", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", + ], + author='', + author_email='', + url='', + keywords='web wsgi bfg pylons pyramid', + packages=find_packages(), + include_package_data=True, + zip_safe=False, + test_suite='akcrs', + install_requires=requires, + entry_points="""\ + [paste.app_factory] + main = akcrs:main + [console_scripts] + initialize_akcrs_db = akcrs.scripts.initializedb:main + """, + ) + From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 14:05:19 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 64785106564A for ; Sat, 18 Aug 2012 14:05:17 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 14:05:17 +0000 Date: Sat, 18 Aug 2012 14:05:17 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818140517.64785106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240495 - soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 14:05:19 -0000 Author: aleek Date: Sat Aug 18 14:05:16 2012 New Revision: 240495 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240495 Log: workaround for the I2C bug. It turns out, that there is bug in SCM, so the pin muxing is being done wrong. Fortunately, u-boot configures everything so we rely on it until SCM module is not fixed Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Aug 18 12:37:07 2012 (r240494) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Aug 18 14:05:16 2012 (r240495) @@ -63,7 +63,7 @@ compatible = "ti,scm"; reg = < 0x48002000 0x2000 >; /* Set of triplets < padname, muxname, padstate> */ - scm-pad-config = + /*scm-pad-config =*/ /* USB OTG */ /* "af10", "hsusb1_stp", "output", @@ -81,6 +81,7 @@ */ /* USB HS */ + /* "af7", "hsusb2_stp", "output", "ag7", "hsusb2_dir", "input_pulldown", "ah7", "hsusb2_nxt", "input_pulldown", @@ -93,11 +94,13 @@ "y4", "hsusb2_data6", "input_pulldown", "aa3", "hsusb2_data7", "input_pulldown", "ad25", "gpio_147", "output", - "ae7", "hsusb2_clk", "output", + "ae7", "hsusb2_clk", "output"; */ /* i2c */ - "ic11", "i2c1_scl", "output", - "ic12", "i2c1_sda", "output"; + /* ths needs to be fixed. The gpio pins are configured by u-boot + so they work even without SCM configuration. It is need to be fixed */ + /*"ic11", "i2c1_scl", "input_pullup_inact", + "ic12", "i2c1_sda", "input_pullup_inact";*/ }; @@ -179,7 +182,7 @@ twl4030@48 { compatible = "ti,twl4030"; - reg = <0x48>; + reg = < 0x48 >; voltage-regulators = "vusb1v5", "0", "vusb1v8", "0", @@ -210,7 +213,7 @@ interrupts = < 77 >; interrupt-parent = <&AINTC>; }; -*/ + */ }; chosen { From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 16:50:15 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 0D9761065670 for ; Sat, 18 Aug 2012 16:50:13 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 16:50:13 +0000 Date: Sat, 18 Aug 2012 16:50:13 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818165013.0D9761065670@hub.freebsd.org> Cc: Subject: socsvn commit: r240496 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf arm/ti/twl arm/ti/usb boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 16:50:15 -0000 Author: aleek Date: Sat Aug 18 16:50:12 2012 New Revision: 240496 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240496 Log: fixing the TWL VREG module Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Aug 18 14:05:16 2012 (r240495) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Aug 18 16:50:12 2012 (r240496) @@ -60,7 +60,7 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options DIAGNOSTIC -options DEBUG +#options DEBUG # MMC/SD/SDIO card slot support Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Sat Aug 18 14:05:16 2012 (r240495) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Sat Aug 18 16:50:12 2012 (r240496) @@ -90,6 +90,7 @@ * Register offsets within a LDO regulator register set */ #define TWL_VREG_GRP 0x00 /* Regulator GRP register */ +#define TWL_VREG_TYPE 0x01 #define TWL_VREG_STATE 0x02 #define TWL_VREG_VSEL 0x03 /* Voltage select register */ @@ -169,22 +170,22 @@ { name, subdev, reg, voltage, NULL, 0 } static const struct twl_regulator twl4030_regulators[] = { - TWL_REGULATOR_ADJUSTABLE("vaux1", 0, 0x17, twl4030_vaux1_voltages), - TWL_REGULATOR_ADJUSTABLE("vaux2", 0, 0x1B, twl4030_vaux2_voltages), - TWL_REGULATOR_ADJUSTABLE("vaux3", 0, 0x1F, twl4030_vaux3_voltages), - TWL_REGULATOR_ADJUSTABLE("vaux4", 0, 0x23, twl4030_vaux4_voltages), - TWL_REGULATOR_ADJUSTABLE("vmmc1", 0, 0x27, twl4030_vmmc1_voltages), - TWL_REGULATOR_ADJUSTABLE("vmmc2", 0, 0x2B, twl4030_vmmc2_voltages), - TWL_REGULATOR_ADJUSTABLE("vpll1", 0, 0x2F, twl4030_vpll1_voltages), - TWL_REGULATOR_ADJUSTABLE("vpll2", 0, 0x33, twl4030_vpll2_voltages), - TWL_REGULATOR_ADJUSTABLE("vsim", 0, 0x37, twl4030_vsim_voltages), - TWL_REGULATOR_ADJUSTABLE("vdac", 0, 0x3B, twl4030_vdac_voltages), - TWL_REGULATOR_ADJUSTABLE("vintana2", 0, 0x43, twl4030_vintana2_voltages), - TWL_REGULATOR_FIXED("vintana1", 0, 0x3F, 1500), - TWL_REGULATOR_FIXED("vintdig", 0, 0x47, 1500), - TWL_REGULATOR_FIXED("vusb1v5", 0, 0x71, 1500), - TWL_REGULATOR_FIXED("vusb1v8", 0, 0x74, 1800), - TWL_REGULATOR_FIXED("vusb3v1", 0, 0x77, 3100), + TWL_REGULATOR_ADJUSTABLE("vaux1", 3, 0x72, twl4030_vaux1_voltages), + TWL_REGULATOR_ADJUSTABLE("vaux2", 3, 0x76, twl4030_vaux2_voltages), + TWL_REGULATOR_ADJUSTABLE("vaux3", 3, 0x7A, twl4030_vaux3_voltages), + TWL_REGULATOR_ADJUSTABLE("vaux4", 3, 0x7E, twl4030_vaux4_voltages), + TWL_REGULATOR_ADJUSTABLE("vmmc1", 3, 0x82, twl4030_vmmc1_voltages), + TWL_REGULATOR_ADJUSTABLE("vmmc2", 3, 0x86, twl4030_vmmc2_voltages), + TWL_REGULATOR_ADJUSTABLE("vpll1", 0, 0x8A, twl4030_vpll1_voltages), + TWL_REGULATOR_ADJUSTABLE("vpll2", 0, 0x8E, twl4030_vpll2_voltages), + TWL_REGULATOR_ADJUSTABLE("vsim", 0, 0x92, twl4030_vsim_voltages), + TWL_REGULATOR_ADJUSTABLE("vdac", 0, 0x96, twl4030_vdac_voltages), + TWL_REGULATOR_ADJUSTABLE("vintana2", 0, 0x9E, twl4030_vintana2_voltages), + TWL_REGULATOR_FIXED("vintana1", 3, 0x92, 1500), + TWL_REGULATOR_FIXED("vintdig", 3, 0xA2, 1500), + TWL_REGULATOR_FIXED("vusb1v5", 3, 0xCC, 1500), + TWL_REGULATOR_FIXED("vusb1v8", 3, 0xCF, 1800), + TWL_REGULATOR_FIXED("vusb3v1", 3, 0xD2, 3100), { NULL, 0, 0x00, 0, NULL, 0 } }; @@ -512,8 +513,9 @@ err = twl_vreg_read_1(sc, regulator, TWL_VREG_GRP, &grp); - if (err) + if (err){ goto done; + } /* Enable the regulator by ensuring it's in the application power group * and is in the "on" state. @@ -525,6 +527,8 @@ */ grp |= TWL4030_P1_GRP; err = twl_vreg_write_1(sc, regulator, TWL_VREG_GRP, grp); + twl_vreg_write_1(sc, regulator, TWL_VREG_TYPE, 0x00); + } else if (twl_is_6030(sc->sc_pdev) || twl_is_6025(sc->sc_pdev)) { @@ -570,11 +574,14 @@ uint8_t vsel; int xlocked; + TWL_VREG_ASSERT_LOCKED(sc); /* If millivolts is zero then we simply disable the output */ if (millivolts == 0) + { return (twl_vreg_disable_regulator(sc, regulator)); + } /* If the regulator has a fixed voltage then check the setting matches * and simply enable. @@ -597,7 +604,6 @@ if (!xlocked) TWL_VREG_LOCK_UPGRADE(sc); - /* Set voltage and enable (atomically) */ err = twl_vreg_write_1(sc, regulator, TWL_VREG_VSEL, (vsel & 0x1f)); if (!err) { @@ -607,11 +613,11 @@ if (!xlocked) TWL_VREG_LOCK_DOWNGRADE(sc); -#ifdef DEBUG +//#ifdef DEBUG if (!err) device_printf(sc->sc_dev, "%s : setting voltage to %dmV (vsel: 0x%x)\n", regulator->name, millivolts, vsel); -#endif +//#endif return (err); } @@ -689,11 +695,11 @@ if (!xlocked) TWL_VREG_LOCK_DOWNGRADE(sc); -#ifdef DEBUG +//#ifdef DEBUG if (!err) device_printf(sc->sc_dev, "%s : reading voltage is %dmV (vsel: 0x%x)\n", regulator->name, *millivolts, vsel); -#endif +//#endif return (err); } @@ -897,7 +903,6 @@ twl_vreg_add_regulators(struct twl_vreg_softc *sc, const struct twl_regulator *regulators) { - int err; int millivolts; const struct twl_regulator *walker; struct twl_regulator_entry *entry; @@ -905,6 +910,15 @@ char rnames[256]; char *name, *voltage; int len = 0, prop_len; + uint8_t val; + + /* Enable writing to power configuration registers */ + if (twl_is_4030(sc->sc_pdev)) { + val = 0xC0; + twl_write( sc->sc_pdev, 3, 0x44, &val, 1 ); + val = 0x0C; + twl_write( sc->sc_pdev, 3, 0x44, &val, 1 ); + } /* Add the regulators from the list */ @@ -942,20 +956,24 @@ LIST_FOREACH(entry, &sc->sc_vreg_list, entries) { if (strcmp(entry->name, name) == 0) { device_printf( sc->sc_dev, "Setting %s voltage to %d\n", entry->name, millivolts ); - twl_vreg_write_regulator_voltage(sc, entry, millivolts); + if( twl_vreg_write_regulator_voltage(sc, entry, millivolts) != 0 ) + { + device_printf( sc->sc_dev, "Falied setting %s voltage to %d\n", entry->name, millivolts ); + } break; } } } } -#ifdef DEBUG +//#ifdef DEBUG + int err; LIST_FOREACH(entry, &sc->sc_vreg_list, entries) { err = twl_vreg_read_regulator_voltage(sc, entry, &millivolts); if (!err) device_printf(sc->sc_dev, "%s : %d mV\n", entry->name, millivolts); } -#endif +//#endif return (0); } Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Sat Aug 18 14:05:16 2012 (r240495) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Sat Aug 18 16:50:12 2012 (r240496) @@ -102,9 +102,6 @@ #include #include -#include -#include - #include #include "gpio_if.h" @@ -114,7 +111,6 @@ device_t sc_dev; device_t sc_gpio_dev; - device_t sc_vreg_dev; /* TLL register set */ struct resource* tll_mem_res; @@ -312,13 +308,13 @@ omap_ehci_write_4(isc, OMAP_USBHOST_INSNREG05_ULPI, reg); - device_printf(isc->sc_dev, "Waiting for phy reset operation\n"); /* Wait for ULPI access completion */ while ((omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI) & (1 << OMAP_USBHOST_INSNREG05_ULPI_CONTROL_SHIFT))) { /* Sleep for a tick */ pause("USBPHY_RESET", 1); + if (timeout-- == 0) { device_printf(isc->sc_dev, "PHY reset operation timed out\n"); break; @@ -350,35 +346,9 @@ uint32_t reg = 0; int reset_performed = 0; int i; - //int milivolts; device_printf(isc->sc_dev, "Starting TI EHCI USB Controller\n"); - device_printf( isc->sc_dev, "INSNREG05: 0x%08x\n", omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI ) ); -#if 0 - if( twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v5", &milivolts) != 0) - { - device_printf(isc->sc_dev, "dupa!\n"); - //return EINVAL; - } - device_printf( isc->sc_dev, "vusb1v5: %d\n", milivolts ); - twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v8", &milivolts); - device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); - twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb3v1", &milivolts); - device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); - - twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb1v5", 1500); - twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb1v8", 1800); - twl_vreg_set_voltage(isc->sc_vreg_dev, "vusb3v1", 3100); - device_printf( isc->sc_dev, "INSNREG05: 0x%08x\n", omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI ) ); - twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v5", &milivolts); - device_printf( isc->sc_dev, "vusb1v5: %d\n", milivolts ); - twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb1v8", &milivolts); - device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); - twl_vreg_get_voltage(isc->sc_vreg_dev, "vusb3v1", &milivolts); - device_printf( isc->sc_dev, "vusb1v8: %d\n", milivolts ); -#endif - /* Enable Clocks for high speed USBHOST */ ti_prcm_clk_enable(USBHSHOST_CLK); @@ -411,28 +381,6 @@ /* Enable the USB TLL */ ti_prcm_clk_enable(USBTLL_CLK); - //check, if the ph is in suspend mode - device_printf( isc->sc_dev, "INSNREG05: 0x%08x\n", omap_ehci_read_4(isc, OMAP_USBHOST_INSNREG05_ULPI ) ); - - /* Set the timeout to 100ms*/ - timeout = (hz < 10) ? 1 : ((100 * hz) / 1000); - // perform a uhh reset - omap_uhh_write_4( isc, OMAP_USBHOST_UHH_SYSCONFIG, UHH_SYSCONFIG_SOFTRESET ); - - while( (omap_uhh_read_4( isc, OMAP_USBHOST_UHH_SYSSTATUS ) & 0x2) == 0 ) - { - /* Sleep for a tick */ - pause("USBRESET", 1); - - if (timeout-- == 0) { - device_printf(isc->sc_dev, "UHH reset operation timed out\n"); - ret = EINVAL; - goto err_sys_status; - } - } - device_printf(isc->sc_dev, "UHH RESET DONE\n"); - - /* Perform TLL soft reset, and wait until reset is complete */ omap_tll_write_4(isc, OMAP_USBTLL_SYSCONFIG, TLL_SYSCONFIG_SOFTRESET); @@ -466,13 +414,14 @@ TLL_SYSCONFIG_CACTIVITY); } else if (isc->ehci_rev == OMAP_EHCI_REV2) { -#if 0 + /* For OMAP44xx devices you have to enable the per-port clocks: * PHY_MODE - External ULPI clock * TTL_MODE - Internal UTMI clock * HSIC_MODE - Internal 480Mhz and 60Mhz clocks */ if (isc->ehci_rev == OMAP_EHCI_REV2) { +#if 0 if (isc->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) { ti_prcm_clk_set_source(USBP1_PHY_CLK, EXT_CLK); ti_prcm_clk_enable(USBP1_PHY_CLK); @@ -488,8 +437,8 @@ ti_prcm_clk_enable(USBP2_UTMI_CLK); else if (isc->port_mode[1] == EHCI_HCD_OMAP_MODE_HSIC) ti_prcm_clk_enable(USBP2_HSIC_CLK); - } #endif + } } /* Put UHH in SmartIdle/SmartStandby mode */ @@ -569,10 +518,10 @@ * the root-hub is allowed to suspend. Writing 1 to this undocumented * register bit disables this feature and restores normal behavior." */ - +#if 0 omap_ehci_write_4(isc, OMAP_USBHOST_INSNREG04, OMAP_USBHOST_INSNREG04_DISABLE_UNSUSPEND); - +#endif /* If any of the ports are configured in TLL mode, enable them */ if ((isc->port_mode[0] == EHCI_HCD_OMAP_MODE_TLL) || @@ -842,7 +791,6 @@ /* save the device */ isc->sc_dev = dev; - isc->sc_vreg_dev = devclass_get_device(devclass_find("twl_vreg"), 0); /* get all DMA memory */ if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev), @@ -1080,4 +1028,3 @@ static devclass_t ehci_devclass; DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0); -MODULE_DEPEND(ehci, twl_vreg, 1, 1, 1); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h Sat Aug 18 14:05:16 2012 (r240495) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_usb.h Sat Aug 18 16:50:12 2012 (r240496) @@ -132,6 +132,8 @@ + + /* TLL Register Set */ #define TLL_SYSCONFIG_CACTIVITY (1UL << 8) #define TLL_SYSCONFIG_SIDLE_SMART_IDLE (2UL << 3) @@ -197,7 +199,6 @@ #define UHH_HOSTCONFIG_P1_ULPI_BYPASS (1UL << 0) /* The following are on rev2 (OMAP44xx) of the EHCI only */ -#if 0 #define UHH_SYSCONFIG_IDLEMODE_MASK (3UL << 2) #define UHH_SYSCONFIG_IDLEMODE_NOIDLE (1UL << 2) #define UHH_SYSCONFIG_STANDBYMODE_MASK (3UL << 4) @@ -211,10 +212,8 @@ #define UHH_HOSTCONFIG_P2_MODE_ULPI_PHY (0UL << 18) #define UHH_HOSTCONFIG_P2_MODE_UTMI_PHY (1UL << 18) #define UHH_HOSTCONFIG_P2_MODE_HSIC (3UL << 18) -#endif #define ULPI_FUNC_CTRL_RESET (1 << 5) -#define ULPI_FUNC_CTRL_SUSPENDM (1 << 6) /*-------------------------------------------------------------------------*/ Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Aug 18 14:05:16 2012 (r240495) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Aug 18 16:50:12 2012 (r240496) @@ -184,12 +184,15 @@ compatible = "ti,twl4030"; reg = < 0x48 >; voltage-regulators = + "vusb1v5", "1500", + "vusb1v8", "1800", + "vusb3v1", "3100", "vusb1v5", "0", "vusb1v8", "0", - "vusb3v1", "0"; + "vusb3v1", "0", + "vaux2", "0"; }; }; - /* ehci@48064800 { compatible = "ti,ehci"; @@ -212,8 +215,7 @@ 0x48062000 0x1000 /* TLL * >; interrupts = < 77 >; interrupt-parent = <&AINTC>; - }; - */ + };*/ }; chosen { From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 17:18:03 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id BC371106566B for ; Sat, 18 Aug 2012 17:18:01 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 17:18:01 +0000 Date: Sat, 18 Aug 2012 17:18:01 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818171801.BC371106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240499 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 17:18:03 -0000 Author: jhagewood Date: Sat Aug 18 17:18:01 2012 New Revision: 240499 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240499 Log: Fixed file decompression Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Sat Aug 18 16:14:50 2012 (r240498) +++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 17:18:01 2012 (r240499) @@ -63,13 +63,25 @@ { FILE *file; - char *buf = ""; + char buf[MAXBUFSIZE]; + char ch; + int i = 0; + int length; gzFile comprfile; - if (comprfile = gzopen(filename, mode) == Z_NULL) - err(1, "Could not open compressed file %s.", filename); - gzread(comprfile, buf, MAXBUFSIZE); - fputs(buf, file); + file = fopen("./temp", "r+w"); + comprfile = gzopen(filename, mode); + + if (comprfile == Z_NULL) + err(1, "Could not open compressed file."); + + for (ch = '\0'; ch != NULL; ch = gzgetc(comprfile)) { + buf[i] = ch; + i++; + } + for (i = 0; buf[i] != EOF; i++) { + fputs(buf, file); + } return file; } Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 16:14:50 2012 (r240498) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 17:18:01 2012 (r240499) @@ -62,13 +62,25 @@ { FILE *file; - char *buf = ""; + char buf[MAXBUFSIZE]; + char ch; + int i = 0; + int length; gzFile comprfile; - if (comprfile = gzopen(filename, mode) == Z_NULL) - err(1, "Could not open compressed file %s.", filename); - gzread(comprfile, buf, MAXBUFSIZE); - fputs(buf, file); + file = fopen("./temp", "r+w"); + comprfile = gzopen(filename, mode); + + if (comprfile == Z_NULL) + err(1, "Could not open compressed file."); + + for (ch = '\0'; ch != NULL; ch = gzgetc(comprfile)) { + buf[i] = ch; + i++; + } + for (i = 0; buf[i] != EOF; i++) { + fputs(buf, file); + } return file; } From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 17:20:38 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 4C6FC106564A for ; Sat, 18 Aug 2012 17:20:36 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 17:20:36 +0000 Date: Sat, 18 Aug 2012 17:20:36 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818172036.4C6FC106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240500 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 17:20:38 -0000 Author: jhagewood Date: Sat Aug 18 17:20:35 2012 New Revision: 240500 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240500 Log: Fixed file decompression Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Sat Aug 18 17:18:01 2012 (r240499) +++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 17:20:35 2012 (r240500) @@ -69,7 +69,7 @@ int length; gzFile comprfile; - file = fopen("./temp", "r+w"); + file = tmpfile(); comprfile = gzopen(filename, mode); if (comprfile == Z_NULL) Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 17:18:01 2012 (r240499) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 17:20:35 2012 (r240500) @@ -68,7 +68,7 @@ int length; gzFile comprfile; - file = fopen("./temp", "r+w"); + file = tmpfile(); comprfile = gzopen(filename, mode); if (comprfile == Z_NULL) From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 19:25:03 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 1CCA8106567F for ; Sat, 18 Aug 2012 19:25:01 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 19:25:01 +0000 Date: Sat, 18 Aug 2012 19:25:01 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818192501.1CCA8106567F@hub.freebsd.org> Cc: Subject: socsvn commit: r240503 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 19:25:03 -0000 Author: jhagewood Date: Sat Aug 18 19:25:00 2012 New Revision: 240503 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240503 Log: working decompression Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Sat Aug 18 18:26:25 2012 (r240502) +++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 19:25:00 2012 (r240503) @@ -66,23 +66,24 @@ char buf[MAXBUFSIZE]; char ch; int i = 0; - int length; - gzFile comprfile; + gzFile *comprfile; - file = tmpfile(); + file = fopen("/tmp/zdiff.XXXXXXXX", "w+"); comprfile = gzopen(filename, mode); if (comprfile == Z_NULL) err(1, "Could not open compressed file."); - - for (ch = '\0'; ch != NULL; ch = gzgetc(comprfile)) { + + for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) { buf[i] = ch; i++; } + for (i = 0; buf[i] != EOF; i++) { - fputs(buf, file); - } - + fputc(buf[i], file); + } + rewind(file); + return file; } Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 18:26:25 2012 (r240502) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 19:25:00 2012 (r240503) @@ -65,23 +65,24 @@ char buf[MAXBUFSIZE]; char ch; int i = 0; - int length; - gzFile comprfile; + gzFile *comprfile; - file = tmpfile(); + file = fopen("/tmp/zdiff.XXXXXXXX", "w+"); comprfile = gzopen(filename, mode); if (comprfile == Z_NULL) err(1, "Could not open compressed file."); - - for (ch = '\0'; ch != NULL; ch = gzgetc(comprfile)) { + + for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) { buf[i] = ch; i++; } + for (i = 0; buf[i] != EOF; i++) { - fputs(buf, file); - } - + fputc(buf[i], file); + } + rewind(file); + return file; } From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 20:26:52 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 24851106564A for ; Sat, 18 Aug 2012 20:26:50 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 20:26:50 +0000 Date: Sat, 18 Aug 2012 20:26:50 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818202650.24851106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240504 - soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 20:26:52 -0000 Author: aleek Date: Sat Aug 18 20:26:49 2012 New Revision: 240504 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240504 Log: fixed bug in twl_vreg module. The reg offset was not right - need to change it correctly to the datasheet. Remember to check both linux kernel AND datasheet :) Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Sat Aug 18 19:25:00 2012 (r240503) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Sat Aug 18 20:26:49 2012 (r240504) @@ -176,12 +176,12 @@ TWL_REGULATOR_ADJUSTABLE("vaux4", 3, 0x7E, twl4030_vaux4_voltages), TWL_REGULATOR_ADJUSTABLE("vmmc1", 3, 0x82, twl4030_vmmc1_voltages), TWL_REGULATOR_ADJUSTABLE("vmmc2", 3, 0x86, twl4030_vmmc2_voltages), - TWL_REGULATOR_ADJUSTABLE("vpll1", 0, 0x8A, twl4030_vpll1_voltages), - TWL_REGULATOR_ADJUSTABLE("vpll2", 0, 0x8E, twl4030_vpll2_voltages), - TWL_REGULATOR_ADJUSTABLE("vsim", 0, 0x92, twl4030_vsim_voltages), - TWL_REGULATOR_ADJUSTABLE("vdac", 0, 0x96, twl4030_vdac_voltages), - TWL_REGULATOR_ADJUSTABLE("vintana2", 0, 0x9E, twl4030_vintana2_voltages), - TWL_REGULATOR_FIXED("vintana1", 3, 0x92, 1500), + TWL_REGULATOR_ADJUSTABLE("vpll1", 3, 0x8A, twl4030_vpll1_voltages), + TWL_REGULATOR_ADJUSTABLE("vpll2", 3, 0x8E, twl4030_vpll2_voltages), + TWL_REGULATOR_ADJUSTABLE("vsim", 3, 0x92, twl4030_vsim_voltages), + TWL_REGULATOR_ADJUSTABLE("vdac", 3, 0x96, twl4030_vdac_voltages), + TWL_REGULATOR_ADJUSTABLE("vintana2", 3, 0x9E, twl4030_vintana2_voltages), + TWL_REGULATOR_FIXED("vintana1", 3, 0x9A, 1500), TWL_REGULATOR_FIXED("vintdig", 3, 0xA2, 1500), TWL_REGULATOR_FIXED("vusb1v5", 3, 0xCC, 1500), TWL_REGULATOR_FIXED("vusb1v8", 3, 0xCF, 1800), @@ -229,7 +229,7 @@ LIST_HEAD(twl_regulator_list, twl_regulator_entry) sc_vreg_list; }; -#if 1 + #define TWL_VREG_XLOCK(_sc) sx_xlock(&(_sc)->sc_sx) #define TWL_VREG_XUNLOCK(_sc) sx_xunlock(&(_sc)->sc_sx) #define TWL_VREG_SLOCK(_sc) sx_slock(&(_sc)->sc_sx) @@ -245,21 +245,6 @@ pause("twl_vreg_ex", (hz / 100)); \ } while(0) #define TWL_VREG_LOCK_DOWNGRADE(_sc) sx_downgrade(&(_sc)->sc_sx); -#endif - -#if 0 -#define TWL_VREG_XLOCK(_sc) -#define TWL_VREG_XUNLOCK(_sc) -#define TWL_VREG_SLOCK(_sc) -#define TWL_VREG_SUNLOCK(_sc) -#define TWL_VREG_LOCK_INIT(_sc) -#define TWL_VREG_LOCK_DESTROY(_sc) - -#define TWL_VREG_ASSERT_LOCKED(_sc) - -#define TWL_VREG_LOCK_UPGRADE(_sc) -#define TWL_VREG_LOCK_DOWNGRADE(_sc) -#endif @@ -697,7 +682,7 @@ //#ifdef DEBUG if (!err) - device_printf(sc->sc_dev, "%s : reading voltage is %dmV (vsel: 0x%x)\n", + device_printf(sc->sc_dev, "%s : read voltage is %dmV (vsel: 0x%x)\n", regulator->name, *millivolts, vsel); //#endif From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 22:04:54 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id D617D106566C for ; Sat, 18 Aug 2012 22:04:52 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 22:04:52 +0000 Date: Sat, 18 Aug 2012 22:04:52 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818220452.D617D106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240505 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 22:04:54 -0000 Author: jhagewood Date: Sat Aug 18 22:04:52 2012 New Revision: 240505 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240505 Log: Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/diff/diffreg.c soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Sat Aug 18 20:26:49 2012 (r240504) +++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 22:04:52 2012 (r240505) @@ -74,10 +74,11 @@ if (comprfile == Z_NULL) err(1, "Could not open compressed file."); - for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) { + for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) { buf[i] = ch; i++; } + buf[i] = '\0'; for (i = 0; buf[i] != EOF; i++) { fputc(buf[i], file); Modified: soc2012/jhagewood/diff/diffreg.c ============================================================================== --- soc2012/jhagewood/diff/diffreg.c Sat Aug 18 20:26:49 2012 (r240504) +++ soc2012/jhagewood/diff/diffreg.c Sat Aug 18 22:04:52 2012 (r240505) @@ -396,9 +396,11 @@ } if (!istextfile(f1) || !istextfile(f2)) { - rval = D_BINARY; - status |= 1; - goto CLOSEM; + if (filebehave == FILE_NORMAL) { + rval = D_BINARY; + status |= 1; + goto CLOSEM; + } } if (lflag) { /* redirect stdout to pr */ Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 20:26:49 2012 (r240504) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:04:52 2012 (r240505) @@ -73,10 +73,11 @@ if (comprfile == Z_NULL) err(1, "Could not open compressed file."); - for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) { + for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) { buf[i] = ch; i++; } + buf[i] = '\0'; for (i = 0; buf[i] != EOF; i++) { fputc(buf[i], file); From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 22:39:01 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id CB334106564A for ; Sat, 18 Aug 2012 22:38:59 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 22:38:59 +0000 Date: Sat, 18 Aug 2012 22:38:59 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818223859.CB334106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240506 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 22:39:02 -0000 Author: jhagewood Date: Sat Aug 18 22:38:59 2012 New Revision: 240506 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240506 Log: Modified: soc2012/jhagewood/sdiff/decompress.c soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:04:52 2012 (r240505) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:38:59 2012 (r240506) @@ -86,17 +86,3 @@ return file; } - -/* Checks for a gz file extension. */ -int -isgzip(char *filename) -{ - - int length = (sizeof filename)-1; - - if (filename[length-1] == 'g' && filename[length] == 'z') - return 1; - - return 0; - -} Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Sat Aug 18 22:04:52 2012 (r240505) +++ soc2012/jhagewood/sdiff/sdiff.c Sat Aug 18 22:38:59 2012 (r240506) @@ -62,7 +62,6 @@ }; extern FILE *decompressfile(char *, char *); -extern int isgzip(char *); static void astrcat(char **, const char *); static void enqueue(char *, char, char *); @@ -444,14 +443,7 @@ /* Open pipe to diff command. */ if ((diffpipe = fdopen(fd[0], "r")) == NULL) err(2, "could not open diff pipe"); - } - - /* Checks for file extension to determine behavior. */ - if (isgzip(filename1) || isgzip(filename2)) - filebehave = FILE_GZIP; - else - filebehave = FILE_NORMAL; - + } if (filebehave == FILE_NORMAL) { if ((file1 = fopen(filename1, "r")) == NULL) err(2, "could not open %s", filename1); From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 22:41:45 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 80724106566C for ; Sat, 18 Aug 2012 22:41:43 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 22:41:43 +0000 Date: Sat, 18 Aug 2012 22:41:43 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818224143.80724106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r240507 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 22:41:45 -0000 Author: jhagewood Date: Sat Aug 18 22:41:43 2012 New Revision: 240507 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240507 Log: Modified: soc2012/jhagewood/sdiff/TODO Modified: soc2012/jhagewood/sdiff/TODO ============================================================================== --- soc2012/jhagewood/sdiff/TODO Sat Aug 18 22:38:59 2012 (r240506) +++ soc2012/jhagewood/sdiff/TODO Sat Aug 18 22:41:43 2012 (r240507) @@ -6,7 +6,7 @@ Add more information to man file. COMPLETE Fix sdiff to work with binary data COMPLETE TODO: Add some error checking Replace goto statements COMPLETE -zsdiff integration IN PROGRESS +zsdiff integration COMPLETE NOTES: - In diff, 'w' is used for --ignore-all-spaces instead of 'W'. When 'W' is passed to sdiff, it must be passed to diff as 'w'. From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 22:56:53 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id C1B80106564A for ; Sat, 18 Aug 2012 22:56:51 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 22:56:51 +0000 Date: Sat, 18 Aug 2012 22:56:51 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818225651.C1B80106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240508 - soc2012/jhagewood/diff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 22:56:54 -0000 Author: jhagewood Date: Sat Aug 18 22:56:50 2012 New Revision: 240508 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240508 Log: Modified: soc2012/jhagewood/diff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Sat Aug 18 22:41:43 2012 (r240507) +++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 22:56:50 2012 (r240508) @@ -74,7 +74,7 @@ if (comprfile == Z_NULL) err(1, "Could not open compressed file."); - for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) { + for (ch = '\2'; ch != EOF ; ch = gzgetc(comprfile)) { buf[i] = ch; i++; } From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 22:57:01 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id E3D8B106567E for ; Sat, 18 Aug 2012 22:56:59 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 22:56:59 +0000 Date: Sat, 18 Aug 2012 22:56:59 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818225659.E3D8B106567E@hub.freebsd.org> Cc: Subject: socsvn commit: r240509 - soc2012/jhagewood/sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 22:57:01 -0000 Author: jhagewood Date: Sat Aug 18 22:56:59 2012 New Revision: 240509 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240509 Log: Modified: soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:56:50 2012 (r240508) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:56:59 2012 (r240509) @@ -73,7 +73,7 @@ if (comprfile == Z_NULL) err(1, "Could not open compressed file."); - for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) { + for (ch = '\2'; ch != EOF ; ch = gzgetc(comprfile)) { buf[i] = ch; i++; } From owner-svn-soc-all@FreeBSD.ORG Sat Aug 18 23:06:39 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 60F4B106564A for ; Sat, 18 Aug 2012 23:06:37 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 18 Aug 2012 23:06:37 +0000 Date: Sat, 18 Aug 2012 23:06:37 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120818230637.60F4B106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240511 - in soc2012/jhagewood: diff sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 23:06:39 -0000 Author: jhagewood Date: Sat Aug 18 23:06:37 2012 New Revision: 240511 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240511 Log: Modified: soc2012/jhagewood/diff/decompress.c soc2012/jhagewood/diff/diffreg.c soc2012/jhagewood/sdiff/decompress.c Modified: soc2012/jhagewood/diff/decompress.c ============================================================================== --- soc2012/jhagewood/diff/decompress.c Sat Aug 18 22:59:06 2012 (r240510) +++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 23:06:37 2012 (r240511) @@ -68,7 +68,7 @@ int i = 0; gzFile *comprfile; - file = fopen("/tmp/zdiff.XXXXXXXX", "w+"); + file = tmpfile(); comprfile = gzopen(filename, mode); if (comprfile == Z_NULL) @@ -87,17 +87,3 @@ return file; } - -/* Checks for a gz file extension. */ -int -isgzip(char *filename) -{ - - int length = (sizeof filename)-1; - - if (filename[length-1] == 'g' && filename[length] == 'z') - return 1; - - return 0; - -} Modified: soc2012/jhagewood/diff/diffreg.c ============================================================================== --- soc2012/jhagewood/diff/diffreg.c Sat Aug 18 22:59:06 2012 (r240510) +++ soc2012/jhagewood/diff/diffreg.c Sat Aug 18 23:06:37 2012 (r240511) @@ -192,7 +192,6 @@ }; extern FILE *decompressfile(char *, char *); -extern int isgzip(char *); static FILE *opentemp(const char *); static void output(char *, FILE *, char *, FILE *, int); @@ -339,10 +338,6 @@ } else if (strcmp(file1, "-") == 0) f1 = stdin; else { - if (isgzip(file1)) - filebehave = FILE_GZIP; - else - filebehave = FILE_NORMAL; if (filebehave == FILE_NORMAL) f1 = fopen(file1, "r"); if (filebehave == FILE_GZIP) { @@ -369,10 +364,6 @@ } else if (strcmp(file2, "-") == 0) f2 = stdin; else { - if (isgzip(file1)) - filebehave = FILE_GZIP; - else - filebehave = FILE_NORMAL; if (filebehave == FILE_NORMAL) f2 = fopen(file2, "r"); if (filebehave == FILE_GZIP) Modified: soc2012/jhagewood/sdiff/decompress.c ============================================================================== --- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:59:06 2012 (r240510) +++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 23:06:37 2012 (r240511) @@ -67,7 +67,7 @@ int i = 0; gzFile *comprfile; - file = fopen("/tmp/zdiff.XXXXXXXX", "w+"); + file = tmpfile(); comprfile = gzopen(filename, mode); if (comprfile == Z_NULL)