From owner-svn-src-projects@FreeBSD.ORG Sun Jun 24 00:32:15 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA9F5106567A; Sun, 24 Jun 2012 00:32:15 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A5A068FC0C; Sun, 24 Jun 2012 00:32:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5O0WFo4073469; Sun, 24 Jun 2012 00:32:15 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5O0WFXu073467; Sun, 24 Jun 2012 00:32:15 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <201206240032.q5O0WFXu073467@svn.freebsd.org> From: Tim Kientzle Date: Sun, 24 Jun 2012 00:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237514 - projects/armv6/lib/libc/arm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2012 00:32:15 -0000 Author: kientzle Date: Sun Jun 24 00:32:15 2012 New Revision: 237514 URL: http://svn.freebsd.org/changeset/base/237514 Log: Merge from -CURRENT: __flt_rounds (expanded from FLT_ROUNDS) is part of the public API. Modified: projects/armv6/lib/libc/arm/Symbol.map Directory Properties: projects/armv6/lib/libc/ (props changed) Modified: projects/armv6/lib/libc/arm/Symbol.map ============================================================================== --- projects/armv6/lib/libc/arm/Symbol.map Sat Jun 23 22:54:25 2012 (r237513) +++ projects/armv6/lib/libc/arm/Symbol.map Sun Jun 24 00:32:15 2012 (r237514) @@ -33,6 +33,10 @@ FBSD_1.0 { sbrk; }; +FBSD_1.3 { + __flt_rounds; +}; + FBSDprivate_1.0 { /* PSEUDO syscalls */ __sys_getlogin; @@ -70,7 +74,6 @@ FBSDprivate_1.0 { __divdf3; __floatsisf; __floatsidf; - __flt_rounds; __fixsfsi; __fixdfsi; __fixunssfsi; From owner-svn-src-projects@FreeBSD.ORG Sun Jun 24 16:56:49 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84D591065677; Sun, 24 Jun 2012 16:56:49 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7112A8FC14; Sun, 24 Jun 2012 16:56:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5OGunvc020956; Sun, 24 Jun 2012 16:56:49 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5OGunIU020953; Sun, 24 Jun 2012 16:56:49 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <201206241656.q5OGunIU020953@svn.freebsd.org> From: Tim Kientzle Date: Sun, 24 Jun 2012 16:56:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237535 - in projects/armv6/sys/modules: . cpsw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2012 16:56:49 -0000 Author: kientzle Date: Sun Jun 24 16:56:48 2012 New Revision: 237535 URL: http://svn.freebsd.org/changeset/base/237535 Log: Allow cpsw to be built as a module. Added: projects/armv6/sys/modules/cpsw/ projects/armv6/sys/modules/cpsw/Makefile Modified: projects/armv6/sys/modules/Makefile Modified: projects/armv6/sys/modules/Makefile ============================================================================== --- projects/armv6/sys/modules/Makefile Sun Jun 24 13:39:41 2012 (r237534) +++ projects/armv6/sys/modules/Makefile Sun Jun 24 16:56:48 2012 (r237535) @@ -71,6 +71,7 @@ SUBDIR= ${_3dfx} \ ${_coff} \ ${_coretemp} \ ${_cp} \ + ${_cpsw} \ ${_cpuctl} \ ${_cpufreq} \ ${_crypto} \ @@ -721,6 +722,7 @@ _zfs= zfs .if ${MACHINE_CPUARCH} == "arm" _cfi= cfi +_cpsw= cpsw .endif .if ${MACHINE_CPUARCH} == "ia64" Added: projects/armv6/sys/modules/cpsw/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/armv6/sys/modules/cpsw/Makefile Sun Jun 24 16:56:48 2012 (r237535) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../arm/ti/cpsw + +KMOD= if_cpsw +SRCS= if_cpsw.c device_if.h bus_if.h ofw_bus_if.h miibus_if.h + +.include From owner-svn-src-projects@FreeBSD.ORG Mon Jun 25 22:07:09 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AEFD7106564A; Mon, 25 Jun 2012 22:07:09 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 810EA8FC15; Mon, 25 Jun 2012 22:07:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PM79Dk098127; Mon, 25 Jun 2012 22:07:09 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PM797l098124; Mon, 25 Jun 2012 22:07:09 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201206252207.q5PM797l098124@svn.freebsd.org> From: "David E. O'Brien" Date: Mon, 25 Jun 2012 22:07:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237575 - in projects/bmake: share/mk usr.sbin/crunch/crunchgen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 22:07:09 -0000 Author: obrien Date: Mon Jun 25 22:07:09 2012 New Revision: 237575 URL: http://svn.freebsd.org/changeset/base/237575 Log: MFC: r237574: crunchen uses the same make binary as the rest of the build Modified: projects/bmake/share/mk/bsd.crunchgen.mk projects/bmake/usr.sbin/crunch/crunchgen/crunchgen.c Directory Properties: projects/bmake/ (props changed) Modified: projects/bmake/share/mk/bsd.crunchgen.mk ============================================================================== --- projects/bmake/share/mk/bsd.crunchgen.mk Mon Jun 25 21:56:36 2012 (r237574) +++ projects/bmake/share/mk/bsd.crunchgen.mk Mon Jun 25 22:07:09 2012 (r237575) @@ -105,7 +105,7 @@ $(CONF): Makefile .MAKEFLAGS:= ${.MAKEFLAGS:N-P} .ORDER: $(OUTPUTS) objs $(OUTPUTS): $(CONF) - MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \ + MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \ -c $(OUTC) $(CONF) $(PROG): $(OUTPUTS) objs Modified: projects/bmake/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- projects/bmake/usr.sbin/crunch/crunchgen/crunchgen.c Mon Jun 25 21:56:36 2012 (r237574) +++ projects/bmake/usr.sbin/crunch/crunchgen/crunchgen.c Mon Jun 25 22:07:09 2012 (r237575) @@ -92,6 +92,7 @@ char outmkname[MAXPATHLEN], outcfname[MA char tempfname[MAXPATHLEN], cachename[MAXPATHLEN], curfilename[MAXPATHLEN]; char outhdrname[MAXPATHLEN] ; /* user-supplied header for *.mk */ char *objprefix; /* where are the objects ? */ +char *path_make; int linenum = -1; int goterror = 0; @@ -127,6 +128,10 @@ int main(int argc, char **argv) readcache = 1; *outmkname = *outcfname = *execfname = '\0'; + path_make = getenv("MAKE"); + if (path_make == NULL || *path_make == '\0') + path_make = "make"; + p = getenv("MAKEOBJDIRPREFIX"); if (p == NULL || *p == '\0') objprefix = "/usr/obj"; /* default */ @@ -599,7 +604,8 @@ void gen_outputs(void) gen_output_makefile(); status(""); fprintf(stderr, - "Run \"make -f %s\" to build crunched binary.\n", outmkname); + "Run \"%s -f %s\" to build crunched binary.\n", + path_make, outmkname); } /* @@ -720,16 +726,16 @@ void fillin_program_objs(prog_t *p, char fprintf(f, "loop:\n\t@echo 'OBJS= '${%s}\n", objvar); fprintf(f, "crunchgen_objs:\n" - "\t@cd %s && make -f %s $(BUILDOPTS) $(%s_OPTS)", - p->srcdir, tempfname, p->ident); + "\t@cd %s && %s -f %s $(BUILDOPTS) $(%s_OPTS)", + p->srcdir, path_make, tempfname, p->ident); for (s = p->buildopts; s != NULL; s = s->next) fprintf(f, " %s", s->str); fprintf(f, " loop\n"); fclose(f); - snprintf(line, MAXLINELEN, "cd %s && make -f %s -B crunchgen_objs", - p->srcdir, tempfname); + snprintf(line, MAXLINELEN, "cd %s && %s -f %s -B crunchgen_objs", + p->srcdir, path_make, tempfname); if ((f = popen(line, "r")) == NULL) { warn("submake pipe"); goterror = 1; From owner-svn-src-projects@FreeBSD.ORG Mon Jun 25 22:14:25 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99713106566C; Mon, 25 Jun 2012 22:14:25 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8485E8FC15; Mon, 25 Jun 2012 22:14:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PMEPFa098569; Mon, 25 Jun 2012 22:14:25 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PMEP4c098564; Mon, 25 Jun 2012 22:14:25 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206252214.q5PMEP4c098564@svn.freebsd.org> From: Davide Italiano Date: Mon, 25 Jun 2012 22:14:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237576 - in projects/calloutng/sys: kern sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 22:14:25 -0000 Author: davide Date: Mon Jun 25 22:14:24 2012 New Revision: 237576 URL: http://svn.freebsd.org/changeset/base/237576 Log: General cleanup and cosmetic. - Rename callout_tick() in a more appropriate callout_process. Rename also some fields in the cpu_callout stucture. While here, trim an unused field. - Remove a comment that is surely invalid in the new world order, and fix some typos in another. - Remove a redundant assignment in callout_cpu_init(). Reviewed by: mav Modified: projects/calloutng/sys/kern/kern_clock.c projects/calloutng/sys/kern/kern_clocksource.c projects/calloutng/sys/kern/kern_timeout.c projects/calloutng/sys/sys/callout.h Modified: projects/calloutng/sys/kern/kern_clock.c ============================================================================== --- projects/calloutng/sys/kern/kern_clock.c Mon Jun 25 22:07:09 2012 (r237575) +++ projects/calloutng/sys/kern/kern_clock.c Mon Jun 25 22:14:24 2012 (r237576) @@ -459,7 +459,7 @@ hardclock_cpu(int usermode) if (td->td_intr_frame != NULL) PMC_SOFT_CALL_TF( , , clock, hard, td->td_intr_frame); #endif - callout_tick(); + callout_process(); } /* Modified: projects/calloutng/sys/kern/kern_clocksource.c ============================================================================== --- projects/calloutng/sys/kern/kern_clocksource.c Mon Jun 25 22:07:09 2012 (r237575) +++ projects/calloutng/sys/kern/kern_clocksource.c Mon Jun 25 22:14:24 2012 (r237576) @@ -239,7 +239,7 @@ handleevents(struct bintime *now, int fa if (bintime_cmp(now, &state->nextcall, >=) && (state->nextcall.sec != -1)) { state->nextcall.sec = -1; - callout_tick(); + callout_process(); } #ifdef KDTRACE_HOOKS Modified: projects/calloutng/sys/kern/kern_timeout.c ============================================================================== --- projects/calloutng/sys/kern/kern_timeout.c Mon Jun 25 22:07:09 2012 (r237575) +++ projects/calloutng/sys/kern/kern_timeout.c Mon Jun 25 22:14:24 2012 (r237576) @@ -102,35 +102,21 @@ struct cc_mig_ent { /* * There is one struct callout_cpu per cpu, holding all relevant * state for the callout processing thread on the individual CPU. - * In particular: - * cc_ticks is incremented once per tick in callout_cpu(). - * It tracks the global 'ticks' but in a way that the individual - * threads should not worry about races in the order in which - * hardclock() and hardclock_cpu() run on the various CPUs. - * cc_softclock is advanced in callout_cpu() to point to the - * first entry in cc_callwheel that may need handling. In turn, - * a softclock() is scheduled so it can serve the various entries i - * such that cc_softclock <= i <= cc_ticks . - * XXX maybe cc_softclock and cc_ticks should be volatile ? - * - * cc_ticks is also used in callout_reset_cpu() to determine - * when the callout should be served. */ struct callout_cpu { struct cc_mig_ent cc_migrating_entity; struct mtx cc_lock; struct callout *cc_callout; struct callout_tailq *cc_callwheel; + struct callout_tailq *cc_localexp; struct callout_list cc_callfree; struct callout *cc_next; struct callout *cc_curr; + struct bintime cc_firstevent; + struct bintime cc_lastscan; void *cc_cookie; - struct bintime cc_ticks; - struct bintime cc_softticks; int cc_cancel; int cc_waiting; - struct bintime cc_firsttick; - struct callout_tailq *cc_localexp; }; #ifdef SMP @@ -165,19 +151,19 @@ static MALLOC_DEFINE(M_CALLOUT, "callout /** * Locked by cc_lock: - * cc_curr - If a callout is in progress, it is curr_callout. - * If curr_callout is non-NULL, threads waiting in + * cc_curr - If a callout is in progress, it is cc_curr. + * If cc_curr is non-NULL, threads waiting in * callout_drain() will be woken up as soon as the * relevant callout completes. - * cc_cancel - Changing to 1 with both callout_lock and c_lock held + * cc_cancel - Changing to 1 with both callout_lock and cc_lock held * guarantees that the current callout will not run. * The softclock() function sets this to 0 before it * drops callout_lock to acquire c_lock, and it calls * the handler only if curr_cancelled is still 0 after - * c_lock is successfully acquired. + * cc_lock is successfully acquired. * cc_waiting - If a thread is waiting in callout_drain(), then * callout_wait is nonzero. Set only when - * curr_callout is non-NULL. + * cc_curr is non-NULL. */ /* @@ -261,8 +247,6 @@ callout_cpu_init(struct callout_cpu *cc) c->c_flags = CALLOUT_LOCAL_ALLOC; SLIST_INSERT_HEAD(&cc->cc_callfree, c, c_links.sle); } - cc->cc_softticks.sec = 0; - cc->cc_softticks.frac = 0; } #ifdef SMP @@ -357,7 +341,7 @@ get_bucket(struct bintime *bt) } void -callout_tick(void) +callout_process(void) { struct bintime limit, max, min, next, now, tmp_max, tmp_min; struct callout *tmp; @@ -374,7 +358,7 @@ callout_tick(void) mtx_lock_spin_flags(&cc->cc_lock, MTX_QUIET); binuptime(&now); cpu = curcpu; - first = callout_hash(&cc->cc_softticks); + first = callout_hash(&cc->cc_lastscan); last = callout_hash(&now); /* * Check if we wrapped around the entire wheel from the last scan. @@ -470,10 +454,10 @@ callout_tick(void) next.frac |= ((uint64_t)1 << 63); next.sec >>= 1; } - cc->cc_firsttick = next; + cc->cc_firstevent = next; if (callout_new_inserted != NULL) (*callout_new_inserted)(cpu, next); - cc->cc_softticks = now; + cc->cc_lastscan = now; mtx_unlock_spin_flags(&cc->cc_lock, MTX_QUIET); /* * swi_sched acquires the thread lock, so we don't want to call it @@ -517,8 +501,8 @@ callout_cc_add(struct callout *c, struct int bucket; CC_LOCK_ASSERT(cc); - if (bintime_cmp(&to_bintime, &cc->cc_softticks, <)) { - to_bintime = cc->cc_softticks; + if (bintime_cmp(&to_bintime, &cc->cc_lastscan, <)) { + to_bintime = cc->cc_lastscan; } c->c_arg = arg; c->c_flags |= (CALLOUT_ACTIVE | CALLOUT_PENDING); @@ -552,9 +536,9 @@ callout_cc_add(struct callout *c, struct * that has been inserted. */ if (callout_new_inserted != NULL && - (bintime_cmp(&to_bintime, &cc->cc_firsttick, <) || - (cc->cc_firsttick.sec == 0 && cc->cc_firsttick.frac == 0))) { - cc->cc_firsttick = to_bintime; + (bintime_cmp(&to_bintime, &cc->cc_firstevent, <) || + (cc->cc_firstevent.sec == 0 && cc->cc_firstevent.frac == 0))) { + cc->cc_firstevent = to_bintime; (*callout_new_inserted)(cpu, to_bintime); } } Modified: projects/calloutng/sys/sys/callout.h ============================================================================== --- projects/calloutng/sys/sys/callout.h Mon Jun 25 22:07:09 2012 (r237575) +++ projects/calloutng/sys/sys/callout.h Mon Jun 25 22:14:24 2012 (r237576) @@ -94,7 +94,7 @@ int callout_schedule_on(struct callout * callout_schedule_on((c), (on_tick), PCPU_GET(cpuid)) #define callout_stop(c) _callout_stop_safe(c, 0) int _callout_stop_safe(struct callout *, int); -void callout_tick(void); +void callout_process(void); extern void (*callout_new_inserted)(int cpu, struct bintime bt); #endif From owner-svn-src-projects@FreeBSD.ORG Mon Jun 25 22:21:26 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D6B8E106566B; Mon, 25 Jun 2012 22:21:26 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCC598FC19; Mon, 25 Jun 2012 22:21:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PMLQd7099078; Mon, 25 Jun 2012 22:21:26 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PMLQmO099067; Mon, 25 Jun 2012 22:21:26 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201206252221.q5PMLQmO099067@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 25 Jun 2012 22:21:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237579 - in projects/altix2: . bin/rcp bin/rm cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zhack cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztest ... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 22:21:27 -0000 Author: marcel Date: Mon Jun 25 22:21:25 2012 New Revision: 237579 URL: http://svn.freebsd.org/changeset/base/237579 Log: Merge ^/head@237576 Added: projects/altix2/cddl/contrib/opensolaris/cmd/zhack/ - copied from r237574, head/cddl/contrib/opensolaris/cmd/zhack/ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 - copied unchanged from r237574, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 projects/altix2/cddl/lib/libdtrace/io.d - copied unchanged from r237574, head/cddl/lib/libdtrace/io.d projects/altix2/cddl/usr.sbin/zhack/ - copied from r237574, head/cddl/usr.sbin/zhack/ projects/altix2/lib/libc/amd64/sys/__vdso_gettc.c - copied unchanged from r237574, head/lib/libc/amd64/sys/__vdso_gettc.c projects/altix2/lib/libc/i386/sys/__vdso_gettc.c - copied unchanged from r237574, head/lib/libc/i386/sys/__vdso_gettc.c projects/altix2/lib/libc/sys/__vdso_gettimeofday.c - copied unchanged from r237574, head/lib/libc/sys/__vdso_gettimeofday.c projects/altix2/lib/libc/sys/clock_gettime.c - copied unchanged from r237574, head/lib/libc/sys/clock_gettime.c projects/altix2/lib/libc/sys/gettimeofday.c - copied unchanged from r237574, head/lib/libc/sys/gettimeofday.c projects/altix2/lib/libz/test/ - copied from r237574, head/lib/libz/test/ projects/altix2/sbin/camcontrol/progress.c - copied unchanged from r237574, head/sbin/camcontrol/progress.c projects/altix2/sbin/camcontrol/progress.h - copied unchanged from r237574, head/sbin/camcontrol/progress.h projects/altix2/share/man/man4/est.4 - copied unchanged from r237574, head/share/man/man4/est.4 projects/altix2/share/man/man4/filemon.4 - copied unchanged from r237574, head/share/man/man4/filemon.4 projects/altix2/sys/amd64/include/vdso.h - copied unchanged from r237574, head/sys/amd64/include/vdso.h projects/altix2/sys/arm/include/atags.h - copied unchanged from r237574, head/sys/arm/include/atags.h projects/altix2/sys/arm/include/vdso.h - copied unchanged from r237574, head/sys/arm/include/vdso.h projects/altix2/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c - copied unchanged from r237574, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c projects/altix2/sys/contrib/dev/acpica/common/ahpredef.c - copied unchanged from r237574, head/sys/contrib/dev/acpica/common/ahpredef.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h - copied unchanged from r237574, head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h projects/altix2/sys/dev/cxgbe/tom/ - copied from r237574, head/sys/dev/cxgbe/tom/ projects/altix2/sys/dev/filemon/ - copied from r237574, head/sys/dev/filemon/ projects/altix2/sys/i386/include/vdso.h - copied unchanged from r237574, head/sys/i386/include/vdso.h projects/altix2/sys/ia64/include/vdso.h - copied unchanged from r237574, head/sys/ia64/include/vdso.h projects/altix2/sys/kern/kern_sharedpage.c - copied unchanged from r237574, head/sys/kern/kern_sharedpage.c projects/altix2/sys/kern/subr_dummy_vdso_tc.c - copied unchanged from r237574, head/sys/kern/subr_dummy_vdso_tc.c projects/altix2/sys/mips/include/vdso.h - copied unchanged from r237574, head/sys/mips/include/vdso.h projects/altix2/sys/modules/cxgbe/tom/ - copied from r237574, head/sys/modules/cxgbe/tom/ projects/altix2/sys/modules/filemon/ - copied from r237574, head/sys/modules/filemon/ projects/altix2/sys/modules/toecore/ - copied from r237574, head/sys/modules/toecore/ projects/altix2/sys/netinet/toecore.c - copied unchanged from r237574, head/sys/netinet/toecore.c projects/altix2/sys/netinet/toecore.h - copied unchanged from r237574, head/sys/netinet/toecore.h projects/altix2/sys/pc98/include/vdso.h - copied unchanged from r237574, head/sys/pc98/include/vdso.h projects/altix2/sys/powerpc/include/vdso.h - copied unchanged from r237574, head/sys/powerpc/include/vdso.h projects/altix2/sys/sparc64/include/vdso.h - copied unchanged from r237574, head/sys/sparc64/include/vdso.h projects/altix2/sys/sys/vdso.h - copied unchanged from r237574, head/sys/sys/vdso.h projects/altix2/sys/x86/acpica/acpi_wakeup.c - copied unchanged from r237574, head/sys/x86/acpica/acpi_wakeup.c projects/altix2/sys/x86/include/vdso.h - copied unchanged from r237574, head/sys/x86/include/vdso.h projects/altix2/tools/regression/filemon/ - copied from r237574, head/tools/regression/filemon/ projects/altix2/tools/regression/usr.bin/make/variables/modifier_t/ - copied from r237574, head/tools/regression/usr.bin/make/variables/modifier_t/ projects/altix2/tools/tools/ath/athaggrstats/ - copied from r237574, head/tools/tools/ath/athaggrstats/ projects/altix2/tools/tools/ifpifa/ - copied from r237574, head/tools/tools/ifpifa/ Deleted: projects/altix2/etc/auth.conf projects/altix2/lib/libutil/auth.3 projects/altix2/lib/libutil/auth.conf.5 projects/altix2/lib/libz/example.c projects/altix2/lib/libz/minigzip.c projects/altix2/sys/amd64/acpica/acpi_switch.S projects/altix2/sys/amd64/acpica/acpi_wakeup.c projects/altix2/sys/arm/at91/files.at91sam9 projects/altix2/sys/dev/cxgb/cxgb_offload.c projects/altix2/sys/dev/cxgb/t3cdev.h projects/altix2/sys/dev/cxgb/ulp/toecore/ projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_ddp.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_defs.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_tcp.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c projects/altix2/sys/i386/acpica/acpi_wakeup.c projects/altix2/sys/modules/cxgb/toecore/ projects/altix2/sys/netinet/toedev.h Modified: projects/altix2/Makefile.inc1 projects/altix2/ObsoleteFiles.inc projects/altix2/UPDATING projects/altix2/bin/rcp/rcp.1 projects/altix2/bin/rm/rm.c projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/altix2/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/altix2/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c projects/altix2/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/altix2/cddl/lib/libnvpair/Makefile projects/altix2/cddl/lib/libzfs/Makefile projects/altix2/cddl/sbin/zpool/Makefile projects/altix2/cddl/usr.bin/ztest/Makefile projects/altix2/cddl/usr.sbin/Makefile projects/altix2/contrib/bind9/CHANGES projects/altix2/contrib/bind9/lib/dns/rdata.c projects/altix2/contrib/bind9/lib/dns/rdataslab.c projects/altix2/contrib/bind9/version projects/altix2/contrib/bsnmp/lib/bsnmpclient.3 projects/altix2/contrib/bsnmp/lib/bsnmplib.3 projects/altix2/contrib/bsnmp/snmp_mibII/mibII_tcp.c projects/altix2/contrib/bsnmp/snmp_target/snmp_target.3 projects/altix2/contrib/bsnmp/snmp_usm/snmp_usm.3 projects/altix2/contrib/bsnmp/snmp_vacm/snmp_vacm.3 projects/altix2/contrib/gcc/ChangeLog.gcc43 projects/altix2/contrib/gcc/config/arm/freebsd.h projects/altix2/contrib/gcc/fold-const.c projects/altix2/contrib/gcc/gimplify.c projects/altix2/contrib/gcc/tree-ssa-ccp.c projects/altix2/contrib/gcc/tree-ssa-pre.c projects/altix2/contrib/libstdc++/include/bits/locale_facets.tcc projects/altix2/contrib/libstdc++/include/bits/stl_bvector.h projects/altix2/contrib/libstdc++/include/bits/stl_deque.h projects/altix2/contrib/libstdc++/include/bits/stl_list.h projects/altix2/contrib/libstdc++/include/bits/stl_map.h projects/altix2/contrib/libstdc++/include/bits/stl_multimap.h projects/altix2/contrib/libstdc++/include/bits/stl_multiset.h projects/altix2/contrib/libstdc++/include/bits/stl_set.h projects/altix2/contrib/libstdc++/include/bits/stl_tree.h projects/altix2/contrib/libstdc++/include/bits/stl_vector.h projects/altix2/contrib/telnet/telnet/telnet.1 projects/altix2/crypto/openssh/ssh-keyscan.1 projects/altix2/crypto/openssh/ssh-keyscan.c projects/altix2/etc/Makefile projects/altix2/etc/login.conf projects/altix2/etc/mtree/BSD.include.dist projects/altix2/etc/periodic/daily/400.status-disks projects/altix2/gnu/lib/libgomp/config.h projects/altix2/gnu/lib/libstdc++/config.h projects/altix2/gnu/lib/libsupc++/Version.map projects/altix2/include/Makefile projects/altix2/include/fmtmsg.h projects/altix2/include/paths.h projects/altix2/include/wchar.h projects/altix2/lib/libc++/Makefile projects/altix2/lib/libc/amd64/sys/Makefile.inc projects/altix2/lib/libc/arm/Symbol.map projects/altix2/lib/libc/gen/aux.c projects/altix2/lib/libc/gen/fstab.c projects/altix2/lib/libc/gen/getnetgrent.c projects/altix2/lib/libc/gen/posix_spawnattr_getflags.3 projects/altix2/lib/libc/gen/signal.3 projects/altix2/lib/libc/gen/syslog.c projects/altix2/lib/libc/i386/sys/Makefile.inc projects/altix2/lib/libc/include/libc_private.h projects/altix2/lib/libc/include/port_before.h projects/altix2/lib/libc/locale/setrunelocale.c projects/altix2/lib/libc/net/Makefile.inc projects/altix2/lib/libc/net/getaddrinfo.c projects/altix2/lib/libc/stdlib/Makefile.inc projects/altix2/lib/libc/stdlib/getopt_long.c projects/altix2/lib/libc/stdlib/realpath.c projects/altix2/lib/libc/stdlib/strfmon.3 projects/altix2/lib/libc/stdtime/Makefile.inc projects/altix2/lib/libc/stdtime/strftime.3 projects/altix2/lib/libc/stdtime/strftime.c projects/altix2/lib/libc/stdtime/strptime.3 projects/altix2/lib/libc/string/Makefile.inc projects/altix2/lib/libc/string/strcasecmp.3 projects/altix2/lib/libc/string/strcoll.3 projects/altix2/lib/libc/string/strstr.3 projects/altix2/lib/libc/string/strxfrm.3 projects/altix2/lib/libc/sys/Makefile.inc projects/altix2/lib/libc/sys/posix_fadvise.2 projects/altix2/lib/libc/sys/stat.2 projects/altix2/lib/libcrypt/Makefile projects/altix2/lib/libcrypt/crypt.3 projects/altix2/lib/libcrypt/crypt.c projects/altix2/lib/libcxxrt/Makefile projects/altix2/lib/libcxxrt/Version.map projects/altix2/lib/libedit/common.c projects/altix2/lib/libedit/editline.3 projects/altix2/lib/libedit/editrc.5 projects/altix2/lib/libedit/el.c projects/altix2/lib/libedit/el.h projects/altix2/lib/libedit/histedit.h projects/altix2/lib/libedit/history.c projects/altix2/lib/libedit/key.c projects/altix2/lib/libedit/key.h projects/altix2/lib/libedit/prompt.c projects/altix2/lib/libedit/prompt.h projects/altix2/lib/libedit/read.c projects/altix2/lib/libedit/refresh.c projects/altix2/lib/libedit/search.c projects/altix2/lib/libedit/sig.c projects/altix2/lib/libedit/sig.h projects/altix2/lib/libedit/term.c projects/altix2/lib/libedit/term.h projects/altix2/lib/libedit/tty.c projects/altix2/lib/libedit/vi.c projects/altix2/lib/libelf/Makefile projects/altix2/lib/libelf/elf.3 projects/altix2/lib/libelf/elf_begin.3 projects/altix2/lib/libelf/gelf.3 projects/altix2/lib/libgpib/gpib.3 projects/altix2/lib/libgssapi/gss_accept_sec_context.3 projects/altix2/lib/libgssapi/gss_acquire_cred.3 projects/altix2/lib/libgssapi/gss_add_cred.3 projects/altix2/lib/libgssapi/gss_add_oid_set_member.3 projects/altix2/lib/libgssapi/gss_canonicalize_name.3 projects/altix2/lib/libgssapi/gss_compare_name.3 projects/altix2/lib/libgssapi/gss_context_time.3 projects/altix2/lib/libgssapi/gss_create_empty_oid_set.3 projects/altix2/lib/libgssapi/gss_delete_sec_context.3 projects/altix2/lib/libgssapi/gss_display_name.3 projects/altix2/lib/libgssapi/gss_display_status.3 projects/altix2/lib/libgssapi/gss_duplicate_name.3 projects/altix2/lib/libgssapi/gss_export_name.3 projects/altix2/lib/libgssapi/gss_export_sec_context.3 projects/altix2/lib/libgssapi/gss_get_mic.3 projects/altix2/lib/libgssapi/gss_import_name.3 projects/altix2/lib/libgssapi/gss_import_sec_context.3 projects/altix2/lib/libgssapi/gss_indicate_mechs.3 projects/altix2/lib/libgssapi/gss_init_sec_context.3 projects/altix2/lib/libgssapi/gss_inquire_context.3 projects/altix2/lib/libgssapi/gss_inquire_cred.3 projects/altix2/lib/libgssapi/gss_inquire_cred_by_mech.3 projects/altix2/lib/libgssapi/gss_inquire_mechs_for_name.3 projects/altix2/lib/libgssapi/gss_inquire_names_for_mech.3 projects/altix2/lib/libgssapi/gss_process_context_token.3 projects/altix2/lib/libgssapi/gss_release_buffer.3 projects/altix2/lib/libgssapi/gss_release_cred.3 projects/altix2/lib/libgssapi/gss_release_name.3 projects/altix2/lib/libgssapi/gss_release_oid_set.3 projects/altix2/lib/libgssapi/gss_test_oid_set_member.3 projects/altix2/lib/libgssapi/gss_unwrap.3 projects/altix2/lib/libgssapi/gss_verify_mic.3 projects/altix2/lib/libgssapi/gss_wrap.3 projects/altix2/lib/libgssapi/gss_wrap_size_limit.3 projects/altix2/lib/libgssapi/gssapi.3 projects/altix2/lib/libgssapi/mech.5 projects/altix2/lib/libkiconv/Makefile projects/altix2/lib/libpmc/pmc.3 projects/altix2/lib/libprocstat/libprocstat.c projects/altix2/lib/librpcsec_gss/rpc_gss_get_error.3 projects/altix2/lib/librpcsec_gss/rpc_gss_get_mech_info.3 projects/altix2/lib/librpcsec_gss/rpc_gss_get_principal_name.3 projects/altix2/lib/librpcsec_gss/rpc_gss_get_versions.3 projects/altix2/lib/librpcsec_gss/rpc_gss_getcred.3 projects/altix2/lib/librpcsec_gss/rpc_gss_is_installed.3 projects/altix2/lib/librpcsec_gss/rpc_gss_max_data_length.3 projects/altix2/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 projects/altix2/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 projects/altix2/lib/librpcsec_gss/rpc_gss_qop_to_num.3 projects/altix2/lib/librpcsec_gss/rpc_gss_seccreate.3 projects/altix2/lib/librpcsec_gss/rpc_gss_set_callback.3 projects/altix2/lib/librpcsec_gss/rpc_gss_set_defaults.3 projects/altix2/lib/librpcsec_gss/rpc_gss_set_svc_name.3 projects/altix2/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 projects/altix2/lib/libstand/Makefile projects/altix2/lib/libusb/Makefile projects/altix2/lib/libusb/libusb10.c projects/altix2/lib/libusb/libusb10_io.c projects/altix2/lib/libusb/libusb20.3 projects/altix2/lib/libutil/Makefile projects/altix2/lib/libutil/auth.c projects/altix2/lib/libutil/login.conf.5 projects/altix2/lib/libutil/property.3 projects/altix2/lib/libutil/pw_util.c projects/altix2/lib/libz/ChangeLog projects/altix2/lib/libz/FAQ projects/altix2/lib/libz/FREEBSD-upgrade (contents, props changed) projects/altix2/lib/libz/Makefile (contents, props changed) projects/altix2/lib/libz/README projects/altix2/lib/libz/Symbol.map (contents, props changed) projects/altix2/lib/libz/Versions.def (contents, props changed) projects/altix2/lib/libz/adler32.c projects/altix2/lib/libz/contrib/asm686/match.S (contents, props changed) projects/altix2/lib/libz/crc32.c projects/altix2/lib/libz/crc32.h projects/altix2/lib/libz/deflate.c projects/altix2/lib/libz/deflate.h projects/altix2/lib/libz/doc/algorithm.txt (contents, props changed) projects/altix2/lib/libz/gzguts.h (contents, props changed) projects/altix2/lib/libz/gzlib.c projects/altix2/lib/libz/gzread.c projects/altix2/lib/libz/gzwrite.c projects/altix2/lib/libz/infback.c projects/altix2/lib/libz/inffixed.h projects/altix2/lib/libz/inflate.c projects/altix2/lib/libz/inftrees.c projects/altix2/lib/libz/trees.c projects/altix2/lib/libz/zconf.h projects/altix2/lib/libz/zlib.3 projects/altix2/lib/libz/zlib.h projects/altix2/lib/libz/zopen.c (contents, props changed) projects/altix2/lib/libz/zutil.c projects/altix2/lib/libz/zutil.h projects/altix2/libexec/rshd/rshd.8 projects/altix2/libexec/rtld-elf/map_object.c projects/altix2/release/picobsd/tinyware/passwd/passwd.c projects/altix2/sbin/camcontrol/Makefile projects/altix2/sbin/camcontrol/camcontrol.8 projects/altix2/sbin/camcontrol/camcontrol.c projects/altix2/sbin/camcontrol/camcontrol.h projects/altix2/sbin/camcontrol/fwdownload.c projects/altix2/sbin/devfs/devfs.8 projects/altix2/sbin/fsck_ffs/suj.c projects/altix2/sbin/hastd/primary.c projects/altix2/sbin/hastd/synch.h projects/altix2/sbin/ifconfig/ifconfig.8 projects/altix2/sbin/ifconfig/ifconfig.c projects/altix2/sbin/ipfw/ipfw.8 projects/altix2/sbin/natd/natd.8 projects/altix2/sbin/setkey/setkey.8 projects/altix2/share/examples/csh/dot.cshrc projects/altix2/share/examples/etc/README.examples projects/altix2/share/examples/mdoc/example.4 projects/altix2/share/man/man4/Makefile projects/altix2/share/man/man4/acpi_ibm.4 projects/altix2/share/man/man4/acpi_panasonic.4 projects/altix2/share/man/man4/ahci.4 projects/altix2/share/man/man4/ata.4 projects/altix2/share/man/man4/bce.4 projects/altix2/share/man/man4/cpufreq.4 projects/altix2/share/man/man4/firewire.4 projects/altix2/share/man/man4/hptrr.4 projects/altix2/share/man/man4/io.4 projects/altix2/share/man/man4/ip.4 projects/altix2/share/man/man4/mac_lomac.4 projects/altix2/share/man/man4/man4.i386/sbni.4 projects/altix2/share/man/man4/mps.4 projects/altix2/share/man/man4/mpt.4 projects/altix2/share/man/man4/mvs.4 projects/altix2/share/man/man4/ng_ksocket.4 projects/altix2/share/man/man4/ng_netflow.4 projects/altix2/share/man/man4/run.4 projects/altix2/share/man/man4/scsi.4 projects/altix2/share/man/man4/siis.4 projects/altix2/share/man/man4/snd_hda.4 projects/altix2/share/man/man4/usb.4 projects/altix2/share/man/man4/vlan.4 projects/altix2/share/man/man5/make.conf.5 projects/altix2/share/man/man5/rc.conf.5 projects/altix2/share/man/man7/development.7 projects/altix2/share/man/man9/disk.9 projects/altix2/share/man/man9/rmlock.9 projects/altix2/share/man/man9/rwlock.9 projects/altix2/share/misc/committers-src.dot projects/altix2/share/mk/bsd.crunchgen.mk projects/altix2/share/mk/bsd.lib.mk projects/altix2/share/mk/bsd.own.mk projects/altix2/share/mk/bsd.sys.mk projects/altix2/sys/amd64/acpica/acpi_wakecode.S projects/altix2/sys/amd64/amd64/cpu_switch.S projects/altix2/sys/amd64/amd64/genassym.c projects/altix2/sys/amd64/amd64/minidump_machdep.c projects/altix2/sys/amd64/amd64/mp_machdep.c projects/altix2/sys/amd64/amd64/pmap.c projects/altix2/sys/amd64/amd64/trap.c projects/altix2/sys/amd64/conf/GENERIC projects/altix2/sys/amd64/include/atomic.h projects/altix2/sys/amd64/include/elf.h projects/altix2/sys/amd64/include/pcb.h projects/altix2/sys/amd64/include/pmap.h projects/altix2/sys/amd64/include/smp.h projects/altix2/sys/arm/arm/bcopyinout_xscale.S projects/altix2/sys/arm/arm/bootconfig.c projects/altix2/sys/arm/arm/busdma_machdep.c projects/altix2/sys/arm/arm/cpufunc.c projects/altix2/sys/arm/arm/cpufunc_asm.S projects/altix2/sys/arm/arm/cpufunc_asm_arm10.S projects/altix2/sys/arm/arm/cpufunc_asm_arm11.S projects/altix2/sys/arm/arm/cpufunc_asm_arm7tdmi.S projects/altix2/sys/arm/arm/cpufunc_asm_arm8.S projects/altix2/sys/arm/arm/cpufunc_asm_arm9.S projects/altix2/sys/arm/arm/cpufunc_asm_armv4.S projects/altix2/sys/arm/arm/cpufunc_asm_armv5.S projects/altix2/sys/arm/arm/cpufunc_asm_sa1.S projects/altix2/sys/arm/arm/cpufunc_asm_xscale.S projects/altix2/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/altix2/sys/arm/arm/db_disasm.c projects/altix2/sys/arm/arm/db_interface.c projects/altix2/sys/arm/arm/db_trace.c projects/altix2/sys/arm/arm/disassem.c projects/altix2/sys/arm/arm/dump_machdep.c projects/altix2/sys/arm/arm/elf_trampoline.c projects/altix2/sys/arm/arm/exception.S projects/altix2/sys/arm/arm/gdb_machdep.c projects/altix2/sys/arm/arm/in_cksum.c projects/altix2/sys/arm/arm/intr.c projects/altix2/sys/arm/arm/irq_dispatch.S projects/altix2/sys/arm/arm/locore.S projects/altix2/sys/arm/arm/machdep.c projects/altix2/sys/arm/arm/mem.c projects/altix2/sys/arm/arm/nexus.c projects/altix2/sys/arm/arm/pmap.c projects/altix2/sys/arm/arm/support.S projects/altix2/sys/arm/arm/swtch.S projects/altix2/sys/arm/arm/sys_machdep.c projects/altix2/sys/arm/arm/trap.c projects/altix2/sys/arm/arm/undefined.c projects/altix2/sys/arm/arm/vectors.S projects/altix2/sys/arm/arm/vm_machdep.c projects/altix2/sys/arm/at91/at91.c projects/altix2/sys/arm/at91/at91_machdep.c projects/altix2/sys/arm/at91/at91_mci.c projects/altix2/sys/arm/at91/at91_pio.c projects/altix2/sys/arm/at91/at91_pio_rm9200.h projects/altix2/sys/arm/at91/at91_pit.c projects/altix2/sys/arm/at91/at91_pitreg.h projects/altix2/sys/arm/at91/at91_pmc.c projects/altix2/sys/arm/at91/at91_pmcvar.h projects/altix2/sys/arm/at91/at91_reset.S projects/altix2/sys/arm/at91/at91_rst.c projects/altix2/sys/arm/at91/at91_spi.c projects/altix2/sys/arm/at91/at91_spireg.h projects/altix2/sys/arm/at91/at91_ssc.c projects/altix2/sys/arm/at91/at91_st.c projects/altix2/sys/arm/at91/at91_twi.c projects/altix2/sys/arm/at91/at91_wdtreg.h projects/altix2/sys/arm/at91/at91reg.h projects/altix2/sys/arm/at91/at91rm9200.c projects/altix2/sys/arm/at91/at91rm92reg.h projects/altix2/sys/arm/at91/at91sam9260.c projects/altix2/sys/arm/at91/at91sam9260reg.h projects/altix2/sys/arm/at91/at91sam9g20.c projects/altix2/sys/arm/at91/at91sam9g20reg.h projects/altix2/sys/arm/at91/at91var.h projects/altix2/sys/arm/at91/board_qila9g20.c projects/altix2/sys/arm/at91/board_sam9g20ek.c projects/altix2/sys/arm/at91/files.at91 projects/altix2/sys/arm/at91/if_macb.c projects/altix2/sys/arm/at91/std.at91 projects/altix2/sys/arm/at91/std.at91sam9 projects/altix2/sys/arm/at91/uart_cpu_at91rm9200usart.c projects/altix2/sys/arm/conf/AVILA projects/altix2/sys/arm/conf/BWCT projects/altix2/sys/arm/conf/CAMBRIA projects/altix2/sys/arm/conf/CNS11XXNAS projects/altix2/sys/arm/conf/CRB projects/altix2/sys/arm/conf/EP80219 projects/altix2/sys/arm/conf/ETHERNUT5 projects/altix2/sys/arm/conf/GUMSTIX projects/altix2/sys/arm/conf/GUMSTIX-QEMU projects/altix2/sys/arm/conf/HL200 projects/altix2/sys/arm/conf/HL201 projects/altix2/sys/arm/conf/IQ31244 projects/altix2/sys/arm/conf/KB920X projects/altix2/sys/arm/conf/LN2410SBC projects/altix2/sys/arm/conf/NSLU projects/altix2/sys/arm/conf/QILA9G20 projects/altix2/sys/arm/conf/QILA9G20.hints projects/altix2/sys/arm/conf/SAM9G20EK projects/altix2/sys/arm/conf/SAM9G20EK.hints projects/altix2/sys/arm/conf/SIMICS projects/altix2/sys/arm/econa/econa_machdep.c projects/altix2/sys/arm/include/_stdint.h projects/altix2/sys/arm/include/_types.h projects/altix2/sys/arm/include/armreg.h projects/altix2/sys/arm/include/asmacros.h projects/altix2/sys/arm/include/atomic.h projects/altix2/sys/arm/include/blockio.h projects/altix2/sys/arm/include/cpu.h projects/altix2/sys/arm/include/cpufunc.h projects/altix2/sys/arm/include/elf.h projects/altix2/sys/arm/include/endian.h projects/altix2/sys/arm/include/fdt.h projects/altix2/sys/arm/include/fp.h projects/altix2/sys/arm/include/frame.h projects/altix2/sys/arm/include/ieee.h projects/altix2/sys/arm/include/in_cksum.h projects/altix2/sys/arm/include/intr.h projects/altix2/sys/arm/include/katelib.h projects/altix2/sys/arm/include/machdep.h projects/altix2/sys/arm/include/param.h projects/altix2/sys/arm/include/pmap.h projects/altix2/sys/arm/include/pmc_mdep.h projects/altix2/sys/arm/include/profile.h projects/altix2/sys/arm/include/pte.h projects/altix2/sys/arm/include/resource.h projects/altix2/sys/arm/include/stack.h projects/altix2/sys/arm/include/vmparam.h projects/altix2/sys/arm/mv/mv_machdep.c projects/altix2/sys/arm/mv/mvwin.h projects/altix2/sys/arm/mv/std.mv projects/altix2/sys/arm/s3c2xx0/s3c2410reg.h projects/altix2/sys/arm/s3c2xx0/s3c2440reg.h projects/altix2/sys/arm/s3c2xx0/s3c24x0.c projects/altix2/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/altix2/sys/arm/s3c2xx0/s3c24x0reg.h projects/altix2/sys/arm/sa11x0/assabet_machdep.c projects/altix2/sys/arm/sa11x0/sa11x0.c projects/altix2/sys/arm/sa11x0/sa11x0_gpioreg.h projects/altix2/sys/arm/sa11x0/sa11x0_io_asm.S projects/altix2/sys/arm/sa11x0/sa11x0_irq.S projects/altix2/sys/arm/sa11x0/sa11x0_ost.c projects/altix2/sys/arm/sa11x0/sa11x0_ostreg.h projects/altix2/sys/arm/sa11x0/sa11x0_var.h projects/altix2/sys/arm/sa11x0/uart_dev_sa1110.c projects/altix2/sys/arm/xscale/i80321/ep80219_machdep.c projects/altix2/sys/arm/xscale/i80321/i80321.c projects/altix2/sys/arm/xscale/i80321/i80321_aau.c projects/altix2/sys/arm/xscale/i80321/i80321_dma.c projects/altix2/sys/arm/xscale/i80321/i80321_intr.h projects/altix2/sys/arm/xscale/i80321/i80321_pci.c projects/altix2/sys/arm/xscale/i80321/i80321_space.c projects/altix2/sys/arm/xscale/i80321/i80321_timer.c projects/altix2/sys/arm/xscale/i80321/i80321reg.h projects/altix2/sys/arm/xscale/i80321/iq31244_7seg.c projects/altix2/sys/arm/xscale/i80321/iq31244_machdep.c projects/altix2/sys/arm/xscale/i80321/iq80321.c projects/altix2/sys/arm/xscale/i80321/obio.c projects/altix2/sys/arm/xscale/i8134x/crb_machdep.c projects/altix2/sys/arm/xscale/i8134x/i81342.c projects/altix2/sys/arm/xscale/i8134x/i81342_mcu.c projects/altix2/sys/arm/xscale/i8134x/i81342_pci.c projects/altix2/sys/arm/xscale/i8134x/i81342_space.c projects/altix2/sys/arm/xscale/i8134x/i81342reg.h projects/altix2/sys/arm/xscale/i8134x/iq81342_7seg.c projects/altix2/sys/arm/xscale/i8134x/obio.c projects/altix2/sys/arm/xscale/i8134x/uart_cpu_i81342.c projects/altix2/sys/arm/xscale/ixp425/avila_ata.c projects/altix2/sys/arm/xscale/ixp425/avila_gpio.c projects/altix2/sys/arm/xscale/ixp425/avila_machdep.c projects/altix2/sys/arm/xscale/ixp425/cambria_exp_space.c projects/altix2/sys/arm/xscale/ixp425/if_npe.c projects/altix2/sys/arm/xscale/ixp425/if_npereg.h projects/altix2/sys/arm/xscale/ixp425/ixp425.c projects/altix2/sys/arm/xscale/ixp425/ixp425_iic.c projects/altix2/sys/arm/xscale/ixp425/ixp425_npe.c projects/altix2/sys/arm/xscale/ixp425/ixp425_npereg.h projects/altix2/sys/arm/xscale/ixp425/ixp425_pci.c projects/altix2/sys/arm/xscale/ixp425/ixp425_pci_space.c projects/altix2/sys/arm/xscale/ixp425/ixp425_qmgr.c projects/altix2/sys/arm/xscale/ixp425/ixp425_qmgr.h projects/altix2/sys/arm/xscale/ixp425/ixp425reg.h projects/altix2/sys/arm/xscale/pxa/if_smc_smi.c projects/altix2/sys/arm/xscale/pxa/pxa_machdep.c projects/altix2/sys/arm/xscale/pxa/pxareg.h projects/altix2/sys/boot/common/load_elf.c projects/altix2/sys/boot/common/load_elf_obj.c projects/altix2/sys/boot/ofw/libofw/ofw_disk.c projects/altix2/sys/boot/sparc64/loader/main.c projects/altix2/sys/boot/userboot/libstand/Makefile projects/altix2/sys/boot/zfs/zfsimpl.c projects/altix2/sys/cam/ata/ata_da.c projects/altix2/sys/cam/ata/ata_pmp.c projects/altix2/sys/cam/ata/ata_xpt.c projects/altix2/sys/cam/cam.h projects/altix2/sys/cam/cam_ccb.h projects/altix2/sys/cam/cam_debug.h projects/altix2/sys/cam/cam_periph.c projects/altix2/sys/cam/cam_periph.h projects/altix2/sys/cam/cam_xpt.c projects/altix2/sys/cam/cam_xpt.h projects/altix2/sys/cam/cam_xpt_periph.h projects/altix2/sys/cam/scsi/scsi_all.c projects/altix2/sys/cam/scsi/scsi_all.h projects/altix2/sys/cam/scsi/scsi_cd.c projects/altix2/sys/cam/scsi/scsi_da.c projects/altix2/sys/cam/scsi/scsi_da.h projects/altix2/sys/cam/scsi/scsi_enc.c projects/altix2/sys/cam/scsi/scsi_pass.c projects/altix2/sys/cam/scsi/scsi_pt.c projects/altix2/sys/cam/scsi/scsi_sa.c projects/altix2/sys/cam/scsi/scsi_target.c projects/altix2/sys/cam/scsi/scsi_xpt.c projects/altix2/sys/cddl/boot/zfs/zfsimpl.h projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/Makefile.files projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h projects/altix2/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/altix2/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/altix2/sys/conf/NOTES projects/altix2/sys/conf/files projects/altix2/sys/conf/files.amd64 projects/altix2/sys/conf/files.arm projects/altix2/sys/conf/files.i386 projects/altix2/sys/conf/files.ia64 projects/altix2/sys/conf/files.mips projects/altix2/sys/conf/files.powerpc projects/altix2/sys/conf/files.sparc64 projects/altix2/sys/conf/kern.post.mk projects/altix2/sys/conf/options projects/altix2/sys/conf/options.arm projects/altix2/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/altix2/sys/contrib/dev/acpica/common/dmextern.c projects/altix2/sys/contrib/dev/acpica/common/dmrestag.c projects/altix2/sys/contrib/dev/acpica/compiler/aslcompile.c projects/altix2/sys/contrib/dev/acpica/compiler/aslerror.c projects/altix2/sys/contrib/dev/acpica/compiler/aslfiles.c projects/altix2/sys/contrib/dev/acpica/compiler/asllookup.c projects/altix2/sys/contrib/dev/acpica/compiler/aslmain.c projects/altix2/sys/contrib/dev/acpica/compiler/aslsupport.l projects/altix2/sys/contrib/dev/acpica/compiler/aslutils.c projects/altix2/sys/contrib/dev/acpica/compiler/dttemplate.c projects/altix2/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/altix2/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/altix2/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/altix2/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/altix2/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/altix2/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/altix2/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/altix2/sys/contrib/dev/acpica/components/events/evgpe.c projects/altix2/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/altix2/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/altix2/sys/contrib/dev/acpica/components/executer/exconfig.c projects/altix2/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/altix2/sys/contrib/dev/acpica/include/acdebug.h projects/altix2/sys/contrib/dev/acpica/include/acdisasm.h projects/altix2/sys/contrib/dev/acpica/include/acglobal.h projects/altix2/sys/contrib/dev/acpica/include/aclocal.h projects/altix2/sys/contrib/dev/acpica/include/acpixf.h projects/altix2/sys/contrib/dev/acpica/include/acpredef.h projects/altix2/sys/contrib/dev/acpica/include/acutils.h projects/altix2/sys/contrib/pf/net/pf.c projects/altix2/sys/contrib/rdma/krping/krping.c projects/altix2/sys/contrib/rdma/krping/krping.h projects/altix2/sys/contrib/rdma/krping/krping_dev.c projects/altix2/sys/contrib/rdma/rdma_addr.c projects/altix2/sys/contrib/rdma/rdma_cache.c projects/altix2/sys/dev/acpi_support/acpi_ibm.c projects/altix2/sys/dev/acpica/acpi_video.c projects/altix2/sys/dev/acpica/acpivar.h projects/altix2/sys/dev/adb/adb_kbd.c projects/altix2/sys/dev/ae/if_ae.c projects/altix2/sys/dev/agp/agp_i810.c projects/altix2/sys/dev/ahci/ahci.c projects/altix2/sys/dev/aic7xxx/aicasm/Makefile projects/altix2/sys/dev/aic7xxx/aicasm/aicasm.c projects/altix2/sys/dev/ata/ata-all.c projects/altix2/sys/dev/ata/chipsets/ata-ite.c projects/altix2/sys/dev/ath/ath_dfs/null/dfs_null.c projects/altix2/sys/dev/ath/ath_hal/ah_desc.h projects/altix2/sys/dev/ath/ath_hal/ah_internal.h projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c projects/altix2/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/altix2/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c projects/altix2/sys/dev/ath/ath_rate/amrr/amrr.c projects/altix2/sys/dev/ath/ath_rate/onoe/onoe.c projects/altix2/sys/dev/ath/ath_rate/sample/sample.c projects/altix2/sys/dev/ath/if_ath.c projects/altix2/sys/dev/ath/if_ath_ahb.c projects/altix2/sys/dev/ath/if_ath_debug.c projects/altix2/sys/dev/ath/if_ath_misc.h projects/altix2/sys/dev/ath/if_ath_rx.c projects/altix2/sys/dev/ath/if_ath_sysctl.c projects/altix2/sys/dev/ath/if_ath_tx.c projects/altix2/sys/dev/ath/if_ath_tx.h projects/altix2/sys/dev/ath/if_ath_tx_ht.c projects/altix2/sys/dev/ath/if_athdfs.h projects/altix2/sys/dev/ath/if_athioctl.h projects/altix2/sys/dev/ath/if_athvar.h projects/altix2/sys/dev/bge/if_bge.c projects/altix2/sys/dev/bge/if_bgereg.h projects/altix2/sys/dev/cxgb/common/cxgb_ctl_defs.h projects/altix2/sys/dev/cxgb/cxgb_adapter.h projects/altix2/sys/dev/cxgb/cxgb_main.c projects/altix2/sys/dev/cxgb/cxgb_offload.h projects/altix2/sys/dev/cxgb/cxgb_osdep.h projects/altix2/sys/dev/cxgb/cxgb_sge.c projects/altix2/sys/dev/cxgb/sys/mvec.h projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h projects/altix2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_l2t.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_l2t.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_listen.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_tom.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_tom.h projects/altix2/sys/dev/cxgbe/adapter.h projects/altix2/sys/dev/cxgbe/common/common.h projects/altix2/sys/dev/cxgbe/common/t4_hw.c projects/altix2/sys/dev/cxgbe/common/t4_msg.h projects/altix2/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/altix2/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/altix2/sys/dev/cxgbe/firmware/t4fw_interface.h projects/altix2/sys/dev/cxgbe/offload.h projects/altix2/sys/dev/cxgbe/osdep.h projects/altix2/sys/dev/cxgbe/t4_l2t.c projects/altix2/sys/dev/cxgbe/t4_l2t.h projects/altix2/sys/dev/cxgbe/t4_main.c projects/altix2/sys/dev/cxgbe/t4_sge.c projects/altix2/sys/dev/drm2/drm_pciids.h projects/altix2/sys/dev/drm2/i915/i915_gem.c projects/altix2/sys/dev/fb/fbreg.h projects/altix2/sys/dev/flash/at45d.c projects/altix2/sys/dev/hptrr/hptrr_osm_bsd.c projects/altix2/sys/dev/hwpmc/hwpmc_arm.c projects/altix2/sys/dev/hwpmc/hwpmc_intel.c projects/altix2/sys/dev/isp/isp.c projects/altix2/sys/dev/isp/isp_freebsd.c projects/altix2/sys/dev/isp/isp_freebsd.h projects/altix2/sys/dev/isp/isp_pci.c projects/altix2/sys/dev/isp/ispmbox.h projects/altix2/sys/dev/isp/ispreg.h projects/altix2/sys/dev/isp/ispvar.h projects/altix2/sys/dev/ispfw/asm_2400.h projects/altix2/sys/dev/ispfw/asm_2500.h projects/altix2/sys/dev/iwn/if_iwn.c projects/altix2/sys/dev/ixgbe/ixgbe.c projects/altix2/sys/dev/jme/if_jme.c projects/altix2/sys/dev/mfi/mfi_tbolt.c projects/altix2/sys/dev/mmc/mmc.c projects/altix2/sys/dev/mmc/mmcsd.c projects/altix2/sys/dev/mps/mps_sas.c projects/altix2/sys/dev/mpt/mpt_cam.c projects/altix2/sys/dev/mvs/mvs.c projects/altix2/sys/dev/mvs/mvs.h projects/altix2/sys/dev/mvs/mvs_soc.c projects/altix2/sys/dev/pci/pci_pci.c projects/altix2/sys/dev/puc/puc_cfg.h projects/altix2/sys/dev/puc/pucdata.c projects/altix2/sys/dev/re/if_re.c projects/altix2/sys/dev/siis/siis.c projects/altix2/sys/dev/sym/sym_conf.h projects/altix2/sys/dev/sym/sym_hipd.c projects/altix2/sys/dev/twa/tw_osl_cam.c projects/altix2/sys/dev/usb/quirk/usb_quirk.c projects/altix2/sys/dev/usb/serial/uftdi.c projects/altix2/sys/dev/usb/serial/uftdi_reg.h projects/altix2/sys/dev/usb/usbdevs projects/altix2/sys/dev/usb/wlan/if_rum.c projects/altix2/sys/dev/usb/wlan/if_run.c projects/altix2/sys/dev/usb/wlan/if_ural.c projects/altix2/sys/dev/viawd/viawd.c projects/altix2/sys/dev/xen/balloon/balloon.c projects/altix2/sys/dev/xen/blkfront/blkfront.c projects/altix2/sys/fs/nfsclient/nfs_clbio.c projects/altix2/sys/fs/nfsclient/nfs_clnode.c projects/altix2/sys/fs/nfsclient/nfs_clvfsops.c projects/altix2/sys/geom/geom.h projects/altix2/sys/geom/geom_disk.c projects/altix2/sys/geom/geom_disk.h projects/altix2/sys/geom/geom_subr.c projects/altix2/sys/geom/multipath/g_multipath.c projects/altix2/sys/geom/part/g_part_gpt.c projects/altix2/sys/i386/acpica/acpi_wakecode.S projects/altix2/sys/i386/conf/GENERIC projects/altix2/sys/i386/conf/XEN projects/altix2/sys/i386/i386/elf_machdep.c projects/altix2/sys/i386/i386/machdep.c projects/altix2/sys/i386/i386/minidump_machdep.c projects/altix2/sys/i386/i386/mp_machdep.c projects/altix2/sys/i386/i386/pmap.c projects/altix2/sys/i386/i386/swtch.s projects/altix2/sys/i386/include/atomic.h projects/altix2/sys/i386/include/elf.h projects/altix2/sys/i386/include/pcb.h projects/altix2/sys/i386/include/pmap.h projects/altix2/sys/i386/include/smp.h projects/altix2/sys/i386/include/vmparam.h projects/altix2/sys/i386/xen/pmap.c projects/altix2/sys/ia64/include/_stdint.h projects/altix2/sys/ia64/include/_types.h projects/altix2/sys/ia64/include/elf.h projects/altix2/sys/ia64/include/pmap.h projects/altix2/sys/kern/imgact_elf.c projects/altix2/sys/kern/kern_descrip.c projects/altix2/sys/kern/kern_event.c projects/altix2/sys/kern/kern_exec.c projects/altix2/sys/kern/kern_fork.c projects/altix2/sys/kern/kern_shutdown.c projects/altix2/sys/kern/kern_tc.c projects/altix2/sys/kern/subr_firmware.c projects/altix2/sys/kern/subr_smp.c projects/altix2/sys/kern/subr_trap.c projects/altix2/sys/kern/sys_capability.c projects/altix2/sys/kern/sys_generic.c projects/altix2/sys/kern/sys_procdesc.c projects/altix2/sys/kern/tty.c projects/altix2/sys/kern/uipc_syscalls.c projects/altix2/sys/kern/uipc_usrreq.c projects/altix2/sys/kern/vfs_bio.c projects/altix2/sys/kern/vfs_default.c projects/altix2/sys/kern/vfs_subr.c projects/altix2/sys/kern/vfs_syscalls.c projects/altix2/sys/kern/vfs_vnops.c projects/altix2/sys/libkern/iconv.c projects/altix2/sys/mips/include/_stdint.h projects/altix2/sys/mips/include/_types.h projects/altix2/sys/mips/include/elf.h projects/altix2/sys/mips/include/pmap.h projects/altix2/sys/mips/mips/pmap.c projects/altix2/sys/mips/rmi/rootfs_list.txt projects/altix2/sys/modules/Makefile projects/altix2/sys/modules/cxgb/Makefile projects/altix2/sys/modules/cxgb/cxgb/Makefile projects/altix2/sys/modules/cxgb/iw_cxgb/Makefile projects/altix2/sys/modules/cxgb/tom/Makefile projects/altix2/sys/modules/cxgbe/Makefile projects/altix2/sys/modules/rdma/krping/Makefile projects/altix2/sys/modules/wpi/Makefile projects/altix2/sys/modules/zfs/Makefile projects/altix2/sys/net/bpf.c projects/altix2/sys/net/if.h projects/altix2/sys/net/if_bridge.c projects/altix2/sys/net/if_gif.c projects/altix2/sys/net/if_tap.c projects/altix2/sys/net/if_var.h projects/altix2/sys/net/if_vlan.c projects/altix2/sys/net80211/ieee80211_output.c projects/altix2/sys/net80211/ieee80211_radiotap.c projects/altix2/sys/net80211/ieee80211_var.h projects/altix2/sys/netgraph/netflow/netflow.c projects/altix2/sys/netgraph/netflow/netflow_v9.c projects/altix2/sys/netgraph/netflow/ng_netflow.c projects/altix2/sys/netgraph/netflow/ng_netflow.h projects/altix2/sys/netinet/icmp_var.h projects/altix2/sys/netinet/if_ether.c projects/altix2/sys/netinet/if_ether.h projects/altix2/sys/netinet/in.c projects/altix2/sys/netinet/in.h projects/altix2/sys/netinet/in_pcb.c projects/altix2/sys/netinet/in_pcb.h projects/altix2/sys/netinet/ip_icmp.c projects/altix2/sys/netinet/ip_input.c projects/altix2/sys/netinet/ip_output.c projects/altix2/sys/netinet/ipfw/ip_fw_table.c projects/altix2/sys/netinet/libalias/libalias.3 projects/altix2/sys/netinet/sctp_asconf.c projects/altix2/sys/netinet/sctp_bsd_addr.c projects/altix2/sys/netinet/sctp_bsd_addr.h projects/altix2/sys/netinet/sctp_indata.c projects/altix2/sys/netinet/sctp_indata.h projects/altix2/sys/netinet/sctp_input.c projects/altix2/sys/netinet/sctp_input.h projects/altix2/sys/netinet/sctp_os_bsd.h projects/altix2/sys/netinet/sctp_output.c projects/altix2/sys/netinet/sctp_output.h projects/altix2/sys/netinet/sctp_pcb.c projects/altix2/sys/netinet/sctp_sysctl.c projects/altix2/sys/netinet/sctp_sysctl.h projects/altix2/sys/netinet/sctp_usrreq.c projects/altix2/sys/netinet/sctputil.c projects/altix2/sys/netinet/sctputil.h projects/altix2/sys/netinet/tcp_input.c projects/altix2/sys/netinet/tcp_offload.c projects/altix2/sys/netinet/tcp_offload.h projects/altix2/sys/netinet/tcp_output.c projects/altix2/sys/netinet/tcp_subr.c projects/altix2/sys/netinet/tcp_syncache.c projects/altix2/sys/netinet/tcp_syncache.h projects/altix2/sys/netinet/tcp_timer.c projects/altix2/sys/netinet/tcp_usrreq.c projects/altix2/sys/netinet/tcp_var.h projects/altix2/sys/netinet/udp_usrreq.c projects/altix2/sys/netinet6/in6.c projects/altix2/sys/netinet6/in6_src.c projects/altix2/sys/netinet6/ip6_input.c projects/altix2/sys/netinet6/sctp6_usrreq.c projects/altix2/sys/netsmb/smb_dev.c projects/altix2/sys/ofed/drivers/infiniband/core/cma.c projects/altix2/sys/ofed/drivers/infiniband/core/iwcm.c projects/altix2/sys/ofed/include/linux/net.h projects/altix2/sys/ofed/include/linux/workqueue.h projects/altix2/sys/ofed/include/net/netevent.h projects/altix2/sys/ofed/include/rdma/iw_cm.h projects/altix2/sys/powerpc/include/_stdint.h projects/altix2/sys/powerpc/include/_types.h projects/altix2/sys/powerpc/include/elf.h projects/altix2/sys/powerpc/include/pmap.h projects/altix2/sys/sparc64/include/_stdint.h projects/altix2/sys/sparc64/include/_types.h projects/altix2/sys/sparc64/include/elf.h projects/altix2/sys/sparc64/include/pmap.h projects/altix2/sys/sys/_types.h projects/altix2/sys/sys/buf.h projects/altix2/sys/sys/cdefs.h projects/altix2/sys/sys/file.h projects/altix2/sys/sys/filedesc.h projects/altix2/sys/sys/kernel.h projects/altix2/sys/sys/param.h projects/altix2/sys/sys/smp.h projects/altix2/sys/sys/stdint.h projects/altix2/sys/sys/sysent.h projects/altix2/sys/sys/vnode.h projects/altix2/sys/ufs/ffs/ffs_softdep.c projects/altix2/sys/ufs/ffs/ffs_vnops.c projects/altix2/sys/vm/pmap.h projects/altix2/sys/vm/swap_pager.c projects/altix2/sys/vm/vm_map.c projects/altix2/sys/vm/vm_object.h projects/altix2/sys/vm/vm_page.c projects/altix2/sys/vm/vm_page.h projects/altix2/sys/vm/vm_pageout.c projects/altix2/sys/vm/vnode_pager.c projects/altix2/sys/x86/include/_stdint.h projects/altix2/sys/x86/include/_types.h projects/altix2/sys/x86/x86/dump_machdep.c projects/altix2/sys/x86/x86/tsc.c projects/altix2/tools/regression/bin/sh/builtins/wait3.0 projects/altix2/tools/regression/usr.bin/make/common.sh projects/altix2/tools/tools/ath/Makefile projects/altix2/tools/tools/ath/athdebug/athdebug.c projects/altix2/tools/tools/net80211/w00t/redir/buddy.c projects/altix2/tools/tools/net80211/wesside/dics/dics.c projects/altix2/tools/tools/net80211/wlanstats/main.c projects/altix2/tools/tools/syscall_timing/syscall_timing.c projects/altix2/tools/tools/tinybsd/README projects/altix2/usr.bin/calendar/calendars/calendar.freebsd projects/altix2/usr.bin/cut/cut.1 projects/altix2/usr.bin/cut/cut.c projects/altix2/usr.bin/find/find.1 projects/altix2/usr.bin/gzip/zmore.1 projects/altix2/usr.bin/kdump/kdump.1 projects/altix2/usr.bin/kdump/kdump.c projects/altix2/usr.bin/login/login.1 projects/altix2/usr.bin/make/Makefile projects/altix2/usr.bin/makewhatis/makewhatis.c projects/altix2/usr.bin/man/man.conf.5 projects/altix2/usr.bin/minigzip/Makefile projects/altix2/usr.bin/netstat/inet.c projects/altix2/usr.bin/passwd/passwd.1 projects/altix2/usr.bin/rlogin/rlogin.1 projects/altix2/usr.bin/rsh/rsh.1 projects/altix2/usr.bin/sockstat/sockstat.c projects/altix2/usr.bin/sort/coll.c projects/altix2/usr.bin/sort/sort.h projects/altix2/usr.bin/touch/touch.1 projects/altix2/usr.bin/touch/touch.c projects/altix2/usr.bin/usbhidctl/usbhidctl.1 projects/altix2/usr.sbin/acpi/iasl/Makefile projects/altix2/usr.sbin/adduser/rmuser.8 projects/altix2/usr.sbin/apmd/apmd.8 projects/altix2/usr.sbin/arp/arp.4 projects/altix2/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 projects/altix2/usr.sbin/bluetooth/btpand/btpand.8 projects/altix2/usr.sbin/bluetooth/hccontrol/hccontrol.8 projects/altix2/usr.sbin/bluetooth/l2control/l2control.8 projects/altix2/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 projects/altix2/usr.sbin/bsdinstall/partedit/diskeditor.c projects/altix2/usr.sbin/bsdinstall/partedit/part_wizard.c projects/altix2/usr.sbin/cpucontrol/amd.c projects/altix2/usr.sbin/crunch/crunchgen/crunchgen.c projects/altix2/usr.sbin/crunch/crunchide/exec_elf32.c projects/altix2/usr.sbin/ctladm/ctladm.8 projects/altix2/usr.sbin/ctladm/ctladm.c projects/altix2/usr.sbin/daemon/daemon.8 projects/altix2/usr.sbin/daemon/daemon.c projects/altix2/usr.sbin/digictl/digictl.8 projects/altix2/usr.sbin/flowctl/flowctl.8 projects/altix2/usr.sbin/flowctl/flowctl.c projects/altix2/usr.sbin/fwcontrol/fwcontrol.8 projects/altix2/usr.sbin/gssd/gssd.8 projects/altix2/usr.sbin/ifmcstat/ifmcstat.c projects/altix2/usr.sbin/inetd/inetd.c projects/altix2/usr.sbin/inetd/inetd.h projects/altix2/usr.sbin/jail/jail.8 projects/altix2/usr.sbin/jail/jail.conf.5 projects/altix2/usr.sbin/kbdmap/kbdmap.c projects/altix2/usr.sbin/kldxref/ef.c projects/altix2/usr.sbin/mfiutil/Makefile projects/altix2/usr.sbin/mfiutil/mfi_cmd.c projects/altix2/usr.sbin/mfiutil/mfi_config.c projects/altix2/usr.sbin/mfiutil/mfi_drive.c projects/altix2/usr.sbin/mfiutil/mfi_evt.c projects/altix2/usr.sbin/mfiutil/mfi_flash.c projects/altix2/usr.sbin/mfiutil/mfi_patrol.c projects/altix2/usr.sbin/mfiutil/mfi_show.c projects/altix2/usr.sbin/mfiutil/mfi_volume.c projects/altix2/usr.sbin/mfiutil/mfiutil.c projects/altix2/usr.sbin/mfiutil/mfiutil.h projects/altix2/usr.sbin/ndiscvt/ndiscvt.8 projects/altix2/usr.sbin/newsyslog/newsyslog.8 projects/altix2/usr.sbin/newsyslog/newsyslog.conf.5 projects/altix2/usr.sbin/pmcstat/pmcstat.8 projects/altix2/usr.sbin/pmcstat/pmcstat_log.c projects/altix2/usr.sbin/setfib/setfib.1 projects/altix2/usr.sbin/syslogd/syslogd.8 Directory Properties: projects/altix2/ (props changed) projects/altix2/cddl/contrib/opensolaris/ (props changed) projects/altix2/contrib/bind9/ (props changed) projects/altix2/contrib/gcc/ (props changed) projects/altix2/contrib/libstdc++/ (props changed) projects/altix2/crypto/openssh/ (props changed) projects/altix2/gnu/lib/ (props changed) projects/altix2/lib/libc/ (props changed) projects/altix2/lib/libc/stdtime/ (props changed) projects/altix2/lib/libutil/ (props changed) projects/altix2/lib/libz/ (props changed) projects/altix2/lib/libz/contrib/ (props changed) projects/altix2/lib/libz/contrib/README.contrib (props changed) projects/altix2/lib/libz/contrib/asm686/ (props changed) projects/altix2/lib/libz/contrib/asm686/README.686 (props changed) projects/altix2/lib/libz/contrib/gcc_gvmat64/ (props changed) projects/altix2/lib/libz/contrib/gcc_gvmat64/gvmat64.S (props changed) projects/altix2/lib/libz/doc/ (props changed) projects/altix2/lib/libz/doc/rfc1950.txt (props changed) projects/altix2/lib/libz/doc/rfc1951.txt (props changed) projects/altix2/lib/libz/doc/rfc1952.txt (props changed) projects/altix2/lib/libz/doc/txtvsbin.txt (props changed) projects/altix2/lib/libz/gzclose.c (props changed) projects/altix2/sbin/ (props changed) projects/altix2/sbin/ipfw/ (props changed) projects/altix2/share/man/man4/ (props changed) projects/altix2/sys/ (props changed) projects/altix2/sys/boot/ (props changed) projects/altix2/sys/cddl/contrib/opensolaris/ (props changed) projects/altix2/sys/conf/ (props changed) projects/altix2/sys/contrib/dev/acpica/ (props changed) projects/altix2/sys/contrib/dev/acpica/common/ (props changed) projects/altix2/sys/contrib/dev/acpica/compiler/ (props changed) projects/altix2/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/altix2/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/altix2/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/altix2/sys/contrib/dev/acpica/components/events/ (props changed) projects/altix2/sys/contrib/dev/acpica/components/executer/ (props changed) projects/altix2/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/altix2/sys/contrib/dev/acpica/include/ (props changed) projects/altix2/sys/contrib/pf/ (props changed) projects/altix2/usr.bin/calendar/ (props changed) projects/altix2/usr.sbin/jail/ (props changed) projects/altix2/usr.sbin/ndiscvt/ (props changed) Modified: projects/altix2/Makefile.inc1 ============================================================================== --- projects/altix2/Makefile.inc1 Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/Makefile.inc1 Mon Jun 25 22:21:25 2012 (r237579) @@ -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 @@ SUBDIR+=etc # 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 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ 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 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ 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 @@ build32: .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 @@ buildkernel: 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 @@ buildkernel: 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) @@ -1272,6 +1274,11 @@ _ofed_lib= contrib/ofed/usr.lib/ .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 Modified: projects/altix2/ObsoleteFiles.inc ============================================================================== --- projects/altix2/ObsoleteFiles.inc Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/ObsoleteFiles.inc Mon Jun 25 22:21:25 2012 (r237579) @@ -38,8 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 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 +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 Modified: projects/altix2/UPDATING ============================================================================== --- projects/altix2/UPDATING Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/UPDATING Mon Jun 25 22:21:25 2012 (r237579) @@ -24,6 +24,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +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: projects/altix2/bin/rcp/rcp.1 ============================================================================== --- projects/altix2/bin/rcp/rcp.1 Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/bin/rcp/rcp.1 Mon Jun 25 22:21:25 2012 (r237579) @@ -116,17 +116,11 @@ The .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: projects/altix2/bin/rm/rm.c ============================================================================== --- projects/altix2/bin/rm/rm.c Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/bin/rm/rm.c Mon Jun 25 22:21:25 2012 (r237579) @@ -301,10 +301,16 @@ rm_tree(char **argv) 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 @@ rm_file(char **argv) 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 @@ rm_overwrite(char *file, struct stat *sb 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: projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Jun 25 22:21:25 2012 (r237579) @@ -18,8 +18,10 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ #include @@ -54,6 +56,7 @@ #include #include #include +#include #undef ZFS_MAXNAMELEN #undef verify #include @@ -63,7 +66,8 @@ #define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ zio_checksum_table[(idx)].ci_name : "UNKNOWN") #define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ - dmu_ot[(idx)].ot_name : "UNKNOWN") + dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \ + dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN") #define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES) #ifndef lint @@ -1088,7 +1092,7 @@ dump_dsl_dataset(objset_t *os, uint64_t ASSERT(size == sizeof (*ds)); crtime = ds->ds_creation_time; - zdb_nicenum(ds->ds_used_bytes, used); + zdb_nicenum(ds->ds_referenced_bytes, used); zdb_nicenum(ds->ds_compressed_bytes, compressed); zdb_nicenum(ds->ds_uncompressed_bytes, uncompressed); zdb_nicenum(ds->ds_unique_bytes, unique); @@ -1132,6 +1136,44 @@ dump_dsl_dataset(objset_t *os, uint64_t /* ARGSUSED */ static int +dump_bptree_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx) +{ + char blkbuf[BP_SPRINTF_LEN]; + + if (bp->blk_birth != 0) { + sprintf_blkptr(blkbuf, bp); + (void) printf("\t%s\n", blkbuf); + } + return (0); +} + +static void +dump_bptree(objset_t *os, uint64_t obj, char *name) +{ + char bytes[32]; + bptree_phys_t *bt; + dmu_buf_t *db; + + if (dump_opt['d'] < 3) + return; + + VERIFY3U(0, ==, dmu_bonus_hold(os, obj, FTAG, &db)); + bt = db->db_data; + zdb_nicenum(bt->bt_bytes, bytes); + (void) printf("\n %s: %llu datasets, %s\n", + name, (unsigned long long)(bt->bt_end - bt->bt_begin), bytes); + dmu_buf_rele(db, FTAG); + + if (dump_opt['d'] < 5) + return; + + (void) printf("\n"); + + (void) bptree_iterate(os, obj, B_FALSE, dump_bptree_cb, NULL, NULL); +} + +/* ARGSUSED */ +static int dump_bpobj_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx) { char blkbuf[BP_SPRINTF_LEN]; @@ -1883,11 +1925,13 @@ typedef struct zdb_blkstats { */ #define ZDB_OT_DEFERRED (DMU_OT_NUMTYPES + 0) #define ZDB_OT_DITTO (DMU_OT_NUMTYPES + 1) -#define ZDB_OT_TOTAL (DMU_OT_NUMTYPES + 2) +#define ZDB_OT_OTHER (DMU_OT_NUMTYPES + 2) +#define ZDB_OT_TOTAL (DMU_OT_NUMTYPES + 3) static char *zdb_ot_extname[] = { "deferred free", "dedup ditto", + "other", "Total", }; @@ -1968,9 +2012,10 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog type = BP_GET_TYPE(bp); - zdb_count_block(zcb, zilog, bp, type); + zdb_count_block(zcb, zilog, bp, + (type & DMU_OT_NEWTYPE) ? ZDB_OT_OTHER : type); - is_metadata = (BP_GET_LEVEL(bp) != 0 || dmu_ot[type].ot_metadata); + is_metadata = (BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type)); if (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata)) { int ioerr; @@ -2197,6 +2242,12 @@ dump_block_stats(spa_t *spa) (void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj, count_block_cb, &zcb, NULL); } + if (spa_feature_is_active(spa, + &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset, + spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb, + &zcb, NULL)); + } if (dump_opt['c'] > 1) flags |= TRAVERSE_PREFETCH_DATA; @@ -2373,7 +2424,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilo } if (BP_IS_HOLE(bp) || BP_GET_CHECKSUM(bp) == ZIO_CHECKSUM_OFF || - BP_GET_LEVEL(bp) > 0 || dmu_ot[BP_GET_TYPE(bp)].ot_metadata) + BP_GET_LEVEL(bp) > 0 || DMU_OT_IS_METADATA(BP_GET_TYPE(bp))) return (0); ddt_key_fill(&zdde_search.zdde_key, bp); @@ -2478,7 +2529,14 @@ dump_zpool(spa_t *spa) dump_bpobj(&spa->spa_deferred_bpobj, "Deferred frees"); if (spa_version(spa) >= SPA_VERSION_DEADLISTS) { dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj, - "Pool frees"); + "Pool snapshot frees"); + } + + if (spa_feature_is_active(spa, + &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + dump_bptree(spa->spa_meta_objset, + spa->spa_dsl_pool->dp_bptree_obj, + "Pool dataset frees"); } dump_dtl(spa->spa_root_vdev, 0); } Copied: projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 (from r237574, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 Mon Jun 25 22:21:25 2012 (r237579, copy of r237574, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5) @@ -0,0 +1,174 @@ +'\" te +.\" Copyright (c) 2012, Martin Matuska . +.\" All Rights Reserved. +.\" +.\" The contents of this file are subject to the terms of the +.\" Common Development and Distribution License (the "License"). +.\" You may not use this file except in compliance with the License. +.\" +.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +.\" or http://www.opensolaris.org/os/licensing. +.\" See the License for the specific language governing permissions +.\" and limitations under the License. +.\" +.\" When distributing Covered Code, include this CDDL HEADER in each +.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE. +.\" If applicable, add the following below this CDDL HEADER, with the +.\" fields enclosed by brackets "[]" replaced with your own identifying +.\" information: Portions Copyright [yyyy] [name of copyright owner] +.\" +.\" Copyright (c) 2012 by Delphix. All rights reserved. +.\" +.\" $FreeBSD$ +.\" +.Dd May 28, 2012 +.Dt ZPOOL-FEATURES 8 +.Os +.Sh NAME +.Nm zpool-features +.Nd ZFS pool feature descriptions +.Sh DESCRIPTION +ZFS pool on\-disk format versions are specified via "features" which replace +the old on\-disk format numbers (the last supported on\-disk format number is +28). +To enable a feature on a pool use the +.Xr zpool 8 +command to set the +.Sy feature@feature_name +property to +.Ar enabled . +.Pp +The pool format does not affect file system version compatibility or the ability +to send file systems between pools. +.Pp +Since most features can be enabled independently of each other the on\-disk +format of the pool is specified by the set of all features marked as +.Sy active +on the pool. If the pool was created by another software version this set may +include unsupported features. +.Ss Identifying features +Every feature has a guid of the form +.Sy com.example:feature_name . +The reverse DNS name ensures that the feature's guid is unique across all ZFS +implementations. When unsupported features are encountered on a pool they will +be identified by their guids. +Refer to the documentation for the ZFS implementation that created the pool +for information about those features. +.Pp +Each supported feature also has a short name. +By convention a feature's short name is the portion of its guid which follows +the ':' (e.g. +.Sy com.example:feature_name +would have the short name +.Sy feature_name ), +however a feature's short name may differ across ZFS implementations if +following the convention would result in name conflicts. +.Ss Feature states +Features can be in one of three states: +.Bl -tag +.It Sy active +This feature's on\-disk format changes are in effect on the pool. +Support for this feature is required to import the pool in read\-write mode. +If this feature is not read-only compatible, support is also required to +import the pool in read\-only mode (see "Read\-only compatibility"). +.It Sy enabled +An administrator has marked this feature as enabled on the pool, but the +feature's on\-disk format changes have not been made yet. +The pool can still be imported by software that does not support this feature, +but changes may be made to the on\-disk format at any time which will move +the feature to the +.Sy active +state. +Some features may support returning to the +.Sy enabled +state after becoming +.Sy active . +See feature\-specific documentation for details. +.It Sy disabled +This feature's on\-disk format changes have not been made and will not be made +unless an administrator moves the feature to the +.Sy enabled +state. +Features cannot be disabled once they have been enabled. +.El +The state of supported features is exposed through pool properties of the form +.Sy feature@short_name . +.Ss Read\-only compatibility +Some features may make on\-disk format changes that do not interfere with other +software's ability to read from the pool. +These features are referred to as "read\-only compatible". +If all unsupported features on a pool are read\-only compatible, the pool can +be imported in read\-only mode by setting the +.Sy readonly +property during import (see +.Xr zpool 8 +for details on importing pools). +.Ss Unsupported features +For each unsupported feature enabled on an imported pool a pool property +named +.Sy unsupported@feature_guid +will indicate why the import was allowed despite the unsupported feature. +Possible values for this property are: +.Bl -tag +.It Sy inactive +The feature is in the +.Sy enabled +state and therefore the pool's on\-disk format is still compatible with +software that does not support this feature. +.It Sy readonly +The feature is read\-only compatible and the pool has been imported in +read\-only mode. +.El +.Ss Feature dependencies +Some features depend on other features being enabled in order to function +properly. +Enabling a feature will automatically enable any features it depends on. +.Sh FEATURES +The following features are supported on this system: +.Bl -tag +.It Sy async_destroy +.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:async_destroy" +.It GUID Ta com.delphix:async_destroy +.It READ\-ONLY COMPATIBLE Ta yes +.It DEPENDENCIES Ta none +.El +.Pp +Destroying a file system requires traversing all of its data in order to +return its used space to the pool. +Without +.Sy async_destroy +the file system is not fully removed until all space has been reclaimed. +If the destroy operation is interrupted by a reboot or power outage the next +attempt to open the pool will need to complete the destroy operation +synchronously. +.Pp +When +.Sy async_destroy +is enabled the file system's data will be reclaimed by a background process, +allowing the destroy operation to complete without traversing the entire file +system. +The background process is able to resume interrupted destroys after the pool +has been opened, eliminating the need to finish interrupted destroys as part +of the open operation. +The amount of space remaining to be reclaimed by the background process is +available through the +.Sy freeing +property. +.Sh SEE ALSO +.Xr zpool 8 +.Sh AUTHORS +This manual page is a +.Xr mdoc 7 +reimplementation of the +.Tn illumos +manual page +.Em zpool-features(5) , +modified and customized for +.Fx +and licensed under the Common Development and Distribution License +.Pq Tn CDDL . +.Pp +The +.Xr mdoc 7 +implementation of this manual page was initially written by +.An Martin Matuska Aq mm@FreeBSD.org . Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Mon Jun 25 22:21:25 2012 (r237579) @@ -1,5 +1,5 @@ '\" te -.\" Copyright (c) 2011, Martin Matuska . +.\" Copyright (c) 2012, Martin Matuska . .\" All Rights Reserved. .\" .\" The contents of this file are subject to the terms of the @@ -20,6 +20,7 @@ .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2011, Justin T. Gibbs +.\" Copyright (c) 2012 by Delphix. All Rights Reserved. .\" .\" $FreeBSD$ .\" @@ -47,7 +48,7 @@ .Op Ar device .Nm .Cm create -.Op Fl fn +.Op Fl fnd .Op Fl o Ar property Ns = Ns Ar value .Ar ... .Op Fl O Ar file-system-property Ns = Ns Ar value @@ -189,7 +190,7 @@ for information on managing datasets. A .Qq virtual device .Pq No vdev -describes a single device or a collection of devices organized according to +describes a single device or a collection of devices organized according to certain performance and fault characteristics. The following virtual devices are supported: .Bl -tag @@ -237,7 +238,7 @@ A group can have single-, double- , or triple parity, meaning that the .No raidz group can sustain one, two, or three failures, respectively, without -losing any data. The +losing any data. The .Sy raidz1 No vdev type specifies a single-parity .No raidz @@ -287,7 +288,7 @@ writes are load-balanced between devices .No raidz .No vdev types are not supported for the intent log. For more information, -see the +see the .Qq Sx Intent Log section. .It Sy cache @@ -309,13 +310,13 @@ A pool can have any number of virtual de (known as .Qq root .No vdev Ns s). -Data is dynamically distributed across all top-level devices to balance data +Data is dynamically distributed across all top-level devices to balance data among devices. As new virtual devices are added, .Tn ZFS automatically places data on the newly available devices. .Pp Virtual devices are specified one at a time on the command line, separated by -whitespace. The keywords +whitespace. The keywords .Qq mirror and .Qq raidz @@ -428,7 +429,7 @@ allows devices to be associated with poo .Qq hot spares . These devices are not actively used in the pool, but when an active device fails, it is automatically replaced by a hot spare. To create a pool with hot -spares, specify a +spares, specify a .Qq spare .No vdev with any number of devices. For example, @@ -458,7 +459,7 @@ pools. .Pp Spares cannot replace log devices. .Ss Intent Log -The +The .Tn ZFS Intent Log .Pq Tn ZIL @@ -537,6 +538,16 @@ value of 1.76 indicates that 1.76 units for a description of the deduplication feature. .It Sy free Number of blocks within the pool that are not allocated. +.It Sy freeing +After a file system or snapshot is destroyed, the space it was using is +returned to the pool asynchronously. +.Sy freeing +is the amount of space remaining to be reclaimed. +Over time +.Sy freeing +will decrease while +.Sy free +increases. .It Sy expandsize This property has currently no value on FreeBSD. .It Sy guid @@ -552,11 +563,16 @@ or .Qq Sy UNAVAIL . .It Sy size Total size of the storage pool. +.It Sy unsupported@ Ns Ar feature_guid +Information about unsupported features that are enabled on the pool. +See +.Xr zpool-features 5 +for details. .It Sy used Amount of storage space used within the pool. .El .Pp -These space usage properties report actual physical space available to the +The space usage properties report actual physical space available to the storage pool. The physical space can be different from the total amount of space that any contained datasets can actually use. The amount of space used in a @@ -582,7 +598,7 @@ the typical paths are not valid. .Sy altroot is not a persistent property. It is valid only while the system is up. Setting -.Sy altroot +.Sy altroot defaults to using .Cm cachefile=none , though this may be overridden using an explicit setting. @@ -627,9 +643,9 @@ This property can also be referred to by .It Sy autoreplace Ns = Ns Cm on No | Cm off Controls automatic device replacement. If set to .Qq Cm off , -device replacement must be initiated by the administrator by using the +device replacement must be initiated by the administrator by using the .Qq Nm Cm replace -command. If set to +command. If set to .Qq Cm on , any new device, found in the same physical location as a device that previously belonged to the pool, is @@ -650,13 +666,18 @@ pool configuration in a different locati .Qq Nm Cm import Fl c . Setting it to the special value .Qq Cm none -creates a temporary pool that is never cached, and the special value +creates a temporary pool that is never cached, and the special value .Cm '' (empty string) uses the default location. +.It Sy comment Ns = Ns Ar text +A text string consisting of printable ASCII characters that will be stored +such that it is available even if the pool becomes faulted. +An administrator can provide additional information about a pool using this +property. .It Sy dedupditto Ns = Ns Ar number Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block -is automatically stored. Deafult setting is +is automatically stored. Default setting is .Cm 0 . .It Sy delegation Ns = Ns Cm on No | Cm off Controls whether a non-privileged user is granted access based on the dataset @@ -686,6 +707,17 @@ requests that have yet to be committed t .It Sy panic Prints out a message to the console and generates a system crash dump. .El +.It Sy feature@ Ns Ar feature_name Ns = Ns Sy enabled +The value of this property is the current state of +.Ar feature_name . +The only valid value when setting this property is +.Sy enabled +which moves +.Ar feature_name +to the enabled state. +See +.Xr zpool-features 5 +for details on feature states. .It Sy listsnaps Ns = Ns Cm on No | Cm off Controls whether information about snapshots associated with this pool is output when @@ -699,9 +731,9 @@ The current on-disk version of the pool. decreased. The preferred method of updating pools is with the .Qq Nm Cm upgrade command, though this property can be used when a specific version is needed -for backwards compatibility. This property can be any number between 1 and the -current version reported by -.Qo Ic zpool upgrade -v Qc . +for backwards compatibility. +Once feature flags is enabled on a pool this property will no longer have a +value. .El .Sh SUBCOMMANDS All subcommands that modify state are logged persistently to the pool in their @@ -810,7 +842,7 @@ do not actually discard any transactions .It Xo .Nm .Cm create -.Op Fl fn +.Op Fl fnd .Op Fl o Ar property Ns = Ns Ar value .Ar ... .Op Fl O Ar file-system-property Ns = Ns Ar value @@ -859,9 +891,13 @@ The mount point must not exist or must b root dataset cannot be mounted. This can be overridden with the .Fl m option. +.Pp +By default all supported features are enabled on the new pool unless the +.Fl d +option is specified. .Bl -tag -width indent .It Fl f -Forces use of +Forces use of .Ar vdev Ns s, even if they appear in use or specify a conflicting replication level. Not all devices can be overridden in this manner. @@ -869,6 +905,17 @@ Not all devices can be overridden in thi Displays the configuration that would be used without actually creating the pool. The actual pool creation can still fail due to insufficient privileges or device sharing. +.It Fl d +Do not enable any features on the new pool. +Individual features can be enabled by setting their corresponding properties +to +.Sy enabled +with the +.Fl o +option. +See +.Xr zpool-features 5 +for details about feature properties. .It Xo .Fl o Ar property Ns = Ns Ar value .Op Fl o Ar property Ns = Ns Ar value @@ -897,7 +944,7 @@ or .Qq Cm altroot Ns Pa /pool if .Sy altroot -is specified. The mount point must be an absolute path, +is specified. The mount point must be an absolute path, .Qq Cm legacy , or .Qq Cm none . @@ -1234,7 +1281,7 @@ seconds until .Sy Ctrl-C is pressed. If no .Ar pools -are specified, statistics for every pool in the system is shown. If +are specified, statistics for every pool in the system is shown. If .Ar count is specified, the command exits after .Ar count @@ -1292,7 +1339,7 @@ When given an interval, the output is pr .Ar interval seconds until .Sy Ctrl-C -is pressed. If +is pressed. If .Ar count is specified, the command exits after .Ar count @@ -1301,6 +1348,8 @@ reports are printed. .It Fl H Scripted mode. Do not display headers, and separate fields by a single tab instead of arbitrary space. +.It Fl v +Show more detailed information. .It Fl o Ar property Ns Op , Ns Ar ... Comma-separated list of properties to display. See the .Qq Sx Properties @@ -1396,7 +1445,7 @@ This is equivalent to attaching waiting for it to resilver, and then detaching .Ar old_device . .Pp -The size of +The size of .Ar new_device must be greater than or equal to the minimum size of all the devices in a mirror or @@ -1407,7 +1456,7 @@ configuration. is required if the pool is not redundant. If .Ar new_device is not specified, it defaults to -.Ar old_device . +.Ar old_device . This form of replacement is useful after an existing disk has failed and has been physically replaced. In this case, the new disk may have the same .Pa /dev @@ -1494,12 +1543,12 @@ unless overridden by a device specificat .Pp When using a .Ar device -argument, +argument, .Cm split -includes the specified device(s) in a new pool and, should any devices remain +includes the specified device(s) in a new pool and, should any devices remain unspecified, assigns the last device in each mirror .No vdev -to that pool, as it does normally. If you are uncertain about the outcome of a +to that pool, as it does normally. If you are uncertain about the outcome of a .Cm split command, use the .Fl n @@ -1552,7 +1601,7 @@ When given an interval, the output is pr .Ar interval seconds until .Sy Ctrl-C -is pressed. If +is pressed. If .Ar count is specified, the command exits after .Ar count @@ -1873,6 +1922,7 @@ Invalid command line options were specif .El .Sh SEE ALSO .Xr zfs 8 +.Xr zpool-features 5 .Sh AUTHORS This manual page is a .Xr mdoc 7 Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Jun 25 22:20:51 2012 (r237578) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Jun 25 22:21:25 2012 (r237579) @@ -54,6 +54,7 @@ #include "zpool_util.h" #include "zfs_comutil.h" +#include "zfeature_common.h" #include "statcommon.h" @@ -207,7 +208,7 @@ get_usage(zpool_help_t idx) { case HELP_CLEAR: return (gettext("\tclear [-nF] [device]\n")); case HELP_CREATE: - return (gettext("\tcreate [-fn] [-o property=value] ... \n" + return (gettext("\tcreate [-fnd] [-o property=value] ... \n" "\t [-O file-system-property=value] ... \n" "\t [-m mountpoint] [-R root] ...\n")); case HELP_DESTROY: @@ -234,7 +235,7 @@ get_usage(zpool_help_t idx) { case HELP_LABELCLEAR: return (gettext("\tlabelclear [-f] \n")); case HELP_LIST: - return (gettext("\tlist [-H] [-o property[,...]] " + return (gettext("\tlist [-Hv] [-o property[,...]] " "[-T d|u] [pool] ... [interval [count]]\n")); case HELP_OFFLINE: return (gettext("\toffline [-t] ...\n")); @@ -339,6 +340,12 @@ usage(boolean_t requested) /* Iterate over all properties */ (void) zprop_iter(print_prop_cb, fp, B_FALSE, B_TRUE, ZFS_TYPE_POOL); + + (void) fprintf(fp, "\t%-15s ", "feature@..."); + (void) fprintf(fp, "YES disabled | enabled | active\n"); + + (void) fprintf(fp, gettext("\nThe feature@ properties must be " + "appended with a feature name.\nSee zpool-features(5).\n")); } /* @@ -405,12 +412,16 @@ add_prop_list(const char *propname, char proplist = *props; if (poolprop) { - if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL) { + if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL && + !zpool_prop_feature(propname)) { (void) fprintf(stderr, gettext("property '%s' is " "not a valid pool property\n"), propname); return (2); } - normnm = zpool_prop_to_name(prop); + if (zpool_prop_feature(propname)) + normnm = propname; + else + normnm = zpool_prop_to_name(prop); } else { if ((fprop = zfs_name_to_prop(propname)) != ZPROP_INVAL) { normnm = zfs_prop_to_name(fprop); @@ -701,7 +712,7 @@ errout: } /* - * zpool create [-fn] [-o property=value] ... + * zpool create [-fnd] [-o property=value] ... * [-O file-system-property=value] ... * [-R root] [-m mountpoint] ... * @@ -710,8 +721,10 @@ errout: * were to be created. * -R Create a pool under an alternate root * -m Set default mountpoint for the root dataset. By default it's - * '/' + * '/' * -o Set property=value. + * -d Don't automatically enable all supported pool features + * (individual features can be enabled with -o). * -O Set fsproperty=value in the pool's root file system * * Creates the named pool according to the given vdev specification. The @@ -724,6 +737,7 @@ zpool_do_create(int argc, char **argv) { boolean_t force = B_FALSE; boolean_t dryrun = B_FALSE; + boolean_t enable_all_pool_feat = B_TRUE; int c; nvlist_t *nvroot = NULL; char *poolname; @@ -735,7 +749,7 @@ zpool_do_create(int argc, char **argv) char *propval; /* check options */ - while ((c = getopt(argc, argv, ":fnR:m:o:O:")) != -1) { + while ((c = getopt(argc, argv, ":fndR:m:o:O:")) != -1) { switch (c) { case 'f': force = B_TRUE; @@ -743,6 +757,9 @@ zpool_do_create(int argc, char **argv) case 'n': dryrun = B_TRUE; break; + case 'd': + enable_all_pool_feat = B_FALSE; + break; case 'R': altroot = optarg; if (add_prop_list(zpool_prop_to_name( @@ -770,6 +787,21 @@ zpool_do_create(int argc, char **argv) if (add_prop_list(optarg, propval, &props, B_TRUE)) goto errout; + + /* + * If the user is creating a pool that doesn't support + * feature flags, don't enable any features. + */ + if (zpool_name_to_prop(optarg) == ZPOOL_PROP_VERSION) { + char *end; + u_longlong_t ver; + + ver = strtoull(propval, &end, 10); + if (*end == '\0' && + ver < SPA_VERSION_FEATURES) { + enable_all_pool_feat = B_FALSE; + } + } break; case 'O': if ((propval = strchr(optarg, '=')) == NULL) { @@ -835,7 +867,6 @@ zpool_do_create(int argc, char **argv) goto errout; } - if (altroot != NULL && altroot[0] != '/') { (void) fprintf(stderr, gettext("invalid alternate root '%s': " "must be an absolute path\n"), altroot); @@ -917,6 +948,27 @@ zpool_do_create(int argc, char **argv) /* * Hand off to libzfs. */ + if (enable_all_pool_feat) { + int i; + for (i = 0; i < SPA_FEATURES; i++) { + char propname[MAXPATHLEN]; + zfeature_info_t *feat = &spa_feature_table[i]; + + (void) snprintf(propname, sizeof (propname), + "feature@%s", feat->fi_uname); + + /* + * Skip feature if user specified it manually + * on the command line. + */ + if (nvlist_exists(props, propname)) + continue; + + if (add_prop_list(propname, ZFS_FEATURE_ENABLED, + &props, B_TRUE) != 0) + goto errout; + } + } if (zpool_create(g_zfs, poolname, nvroot, props, fsprops) == 0) { zfs_handle_t *pool = zfs_open(g_zfs, poolname, @@ -1249,6 +1301,10 @@ print_status_config(zpool_handle_t *zhp, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Jun 25 23:01:36 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3AE6A106566B; Mon, 25 Jun 2012 23:01:36 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2414A8FC16; Mon, 25 Jun 2012 23:01:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PN1aXX001222; Mon, 25 Jun 2012 23:01:36 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PN1ZGA001200; Mon, 25 Jun 2012 23:01:35 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201206252301.q5PN1ZGA001200@svn.freebsd.org> From: "David E. O'Brien" Date: Mon, 25 Jun 2012 23:01:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237582 - in projects/bmake/external/bsd/bmake/dist: . unit-tests X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 23:01:36 -0000 Author: obrien Date: Mon Jun 25 23:01:35 2012 New Revision: 237582 URL: http://svn.freebsd.org/changeset/base/237582 Log: Update to the r237578 20-June-2012 release import. Added: projects/bmake/external/bsd/bmake/dist/unit-tests/forloop - copied unchanged from r237581, vendor/NetBSD/bmake/dist/unit-tests/forloop Modified: projects/bmake/external/bsd/bmake/dist/ChangeLog projects/bmake/external/bsd/bmake/dist/FILES projects/bmake/external/bsd/bmake/dist/Makefile.in projects/bmake/external/bsd/bmake/dist/arch.c projects/bmake/external/bsd/bmake/dist/bsd.after-import.mk projects/bmake/external/bsd/bmake/dist/compat.c projects/bmake/external/bsd/bmake/dist/cond.c projects/bmake/external/bsd/bmake/dist/configure projects/bmake/external/bsd/bmake/dist/configure.in projects/bmake/external/bsd/bmake/dist/dir.c projects/bmake/external/bsd/bmake/dist/job.c projects/bmake/external/bsd/bmake/dist/main.c projects/bmake/external/bsd/bmake/dist/make.c projects/bmake/external/bsd/bmake/dist/make.h projects/bmake/external/bsd/bmake/dist/make_malloc.c projects/bmake/external/bsd/bmake/dist/nonints.h projects/bmake/external/bsd/bmake/dist/parse.c projects/bmake/external/bsd/bmake/dist/targ.c projects/bmake/external/bsd/bmake/dist/unit-tests/Makefile.in projects/bmake/external/bsd/bmake/dist/unit-tests/test.exp projects/bmake/external/bsd/bmake/dist/var.c Directory Properties: projects/bmake/external/bsd/bmake/dist/ (props changed) Modified: projects/bmake/external/bsd/bmake/dist/ChangeLog ============================================================================== --- projects/bmake/external/bsd/bmake/dist/ChangeLog Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/ChangeLog Mon Jun 25 23:01:35 2012 (r237582) @@ -1,3 +1,24 @@ +2012-06-20 Simon J. Gerraty + + * Makefile.in (MAKE_VERSION): bump version to 20120620 + Merge with NetBSD make, pick up + o make_malloc.c: avoid including make_malloc.h again + + * Makefile.in: avoid bmake only syntax or protect with + .if defined(.MAKE.LEVEL) + * bsd.after-import.mk: replace .-include with .sinclude + ensure? SRCTOP gets a value + * configure.in: look for filemon.h in /usr/include/dev/filemon first. + +2012-06-19 Simon J. Gerraty + + * Makefile.in (MAKE_VERSION): bump version to 20120612 + Merge with NetBSD make, pick up + o use MAKE_ATTR_* rather than those defined by cdefs.h or compiler + for greater portability. + o unit-tests/forloop: check that .for works as expected wrt + number of times and with "quoted strings". + 2012-06-06 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120606 Modified: projects/bmake/external/bsd/bmake/dist/FILES ============================================================================== --- projects/bmake/external/bsd/bmake/dist/FILES Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/FILES Mon Jun 25 23:01:35 2012 (r237582) @@ -100,6 +100,7 @@ unit-tests/dotwait unit-tests/error unit-tests/export unit-tests/export-all +unit-tests/forloop unit-tests/forsubst unit-tests/hash unit-tests/misc Modified: projects/bmake/external/bsd/bmake/dist/Makefile.in ============================================================================== --- projects/bmake/external/bsd/bmake/dist/Makefile.in Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/Makefile.in Mon Jun 25 23:01:35 2012 (r237582) @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $ # @(#)Makefile 5.2 (Berkeley) 12/28/90 -# $Id: Makefile.in,v 1.161 2012/06/06 20:02:32 sjg Exp $ +# $Id: Makefile.in,v 1.164 2012/06/20 22:44:26 sjg Exp $ PROG= bmake SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \ @@ -21,7 +21,7 @@ srcdir= @srcdir@ CC?= @CC@ # Base version on src date -MAKE_VERSION= 20120606 +MAKE_VERSION= 20120620 MACHINE=@machine@ MACHINE_ARCH=@machine_arch@ DEFAULT_SYS_PATH = @default_sys_path@ @@ -40,7 +40,7 @@ SRCS+= ${LIBOBJS:T:.o=.c} .endif USE_META ?= @use_meta@ -.if ${USE_META:tl} != "no" +.if ${USE_META} != "no" SRCS+= meta.c CPPFLAGS+= -DUSE_META FILEMON_H ?= @filemon_h@ @@ -83,9 +83,11 @@ SRCS+= sigcompat.c CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART .endif .endif +.if defined(.MAKE.LEVEL) .if make(obj) || make(clean) SUBDIR+= unit-tests .endif +.endif # many systems use gcc these days CC_IS_GCC=@GCC@ @@ -132,9 +134,11 @@ _mfromdir=${srcdir} # sigh, FreeBSD at least includes bsd.subdir.mk via bsd.obj.mk # so the inclusion below, results in complaints about re-defined # targets. For NetBSD though we need to explicitly include it. +.if defined(.MAKE.LEVEL) .if defined(SUBDIR) && !target(${SUBDIR:[1]}) .-include .endif +.endif CPPFLAGS+= -DMAKE_NATIVE COPTS.var.c += -Wno-cast-qual Modified: projects/bmake/external/bsd/bmake/dist/arch.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/arch.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/arch.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.62 2010/11/27 16:00:09 christos Exp $ */ +/* $NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: arch.c,v 1.62 2010/11/27 16:00:09 christos Exp $"; +static char rcsid[] = "$NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: arch.c,v 1.62 2010/11/27 16:00:09 christos Exp $"); +__RCSID("$NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -1077,7 +1077,7 @@ Arch_Touch(GNode *gn) */ void #if !defined(RANLIBMAG) -Arch_TouchLib(GNode *gn __unused) +Arch_TouchLib(GNode *gn MAKE_ATTR_UNUSED) #else Arch_TouchLib(GNode *gn) #endif Modified: projects/bmake/external/bsd/bmake/dist/bsd.after-import.mk ============================================================================== --- projects/bmake/external/bsd/bmake/dist/bsd.after-import.mk Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/bsd.after-import.mk Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -# $Id: bsd.after-import.mk,v 1.3 2012/06/06 17:48:14 sjg Exp $ +# $Id: bsd.after-import.mk,v 1.5 2012/06/20 22:45:07 sjg Exp $ # This makefile is for use when integrating bmake into a BSD build # system. Use this makefile after importing bmake. @@ -13,12 +13,24 @@ all: ${.CURDIR}/Makefile all: after-import # we rely on bmake +.if !defined(.MAKE.LEVEL) +.error this makefile requires bmake +.endif + _this := ${MAKEFILE:tA} BMAKE_SRC := ${.PARSEDIR} # it helps to know where the top of the tree is. .if !defined(SRCTOP) srctop := ${.MAKE.MAKEFILES:M*src/share/mk/sys.mk:H:H:H} +.if empty(srctop) +# likely locations? +.for d in contrib/bmake external/bsd/bmake/dist +.if ${BMAKE_SRC:M*/$d} != "" +srctop := ${BMAKE_SRC:tA:S,/$d,,} +.endif +.endfor +.endif .if !empty(srctop) SRCTOP := ${srctop} .endif @@ -47,6 +59,7 @@ bootstrap: ${BMAKE_SRC}/boot-strap ${MAK # Makefiles need a little more tweaking than say config.h MAKEFILE_SED = sed -e '/^MACHINE/d' \ -e '/^PROG/s,bmake,${.CURDIR:T},' \ + -e 's,^.-include,.sinclude,' \ -e 's,${SRCTOP},$${SRCTOP},g' # These are the simple files we want to capture @@ -55,11 +68,13 @@ configured_files= config.h unit-tests/Ma after-import: bootstrap ${MAKEFILE} .for f in ${configured_files:N*Makefile} @echo Capturing $f + @mkdir -p ${${.CURDIR}/$f:L:H} @cmp -s ${.CURDIR}/$f ${HOST_OS}/$f || \ cp ${HOST_OS}/$f ${.CURDIR}/$f .endfor .for f in ${configured_files:M*Makefile} @echo Capturing $f + @mkdir -p ${${.CURDIR}/$f:L:H} @${MAKEFILE_SED} ${HOST_OS}/$f > ${.CURDIR}/$f .endfor @@ -68,6 +83,8 @@ ${.CURDIR}/Makefile: bootstrap ${MAKEFIL @echo Generating ${.TARGET:T} @(echo '# This is a generated file, do NOT edit!'; \ echo '# See ${_this:S,${SRCTOP}/,,}'; \ + echo '#'; echo '# $$${OS}$$'; echo; \ + echo 'SRCTOP?= $${.CURDIR:${.CURDIR:S,${SRCTOP}/,,:C,[^/]+,H,g:S,/,:,g}}'; echo; \ echo; echo '# look here first for config.h'; \ echo 'CFLAGS+= -I$${.CURDIR}'; echo; \ ${MAKEFILE_SED} ${HOST_OS}/Makefile; \ @@ -79,7 +96,7 @@ ${.CURDIR}/Makefile: bootstrap ${MAKEFIL echo 'CLEANFILES+= bootstrap'; \ echo; echo 'after-import: ${_this:S,${SRCTOP},\${SRCTOP},}'; \ echo ' cd $${.CURDIR} && $${.MAKE} -f ${_this:S,${SRCTOP},\${SRCTOP},}'; \ - echo; echo '.-include "Makefile.inc"'; \ + echo; echo '.sinclude "Makefile.inc"'; \ echo ) > ${.TARGET:T}.new @mv ${.TARGET:T}.new ${.TARGET} Modified: projects/bmake/external/bsd/bmake/dist/compat.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/compat.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/compat.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.88 2012/06/05 17:31:04 sjg Exp $ */ +/* $NetBSD: compat.c,v 1.89 2012/06/10 21:44:01 wiz Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.88 2012/06/05 17:31:04 sjg Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.89 2012/06/10 21:44:01 wiz Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.88 2012/06/05 17:31:04 sjg Exp $"); +__RCSID("$NetBSD: compat.c,v 1.89 2012/06/10 21:44:01 wiz Exp $"); #endif #endif /* not lint */ #endif @@ -124,7 +124,7 @@ static char meta[256]; static GNode *curTarg = NULL; static GNode *ENDNode; -static void CompatInterrupt(int) __dead; +static void CompatInterrupt(int); static void Compat_Init(void) Modified: projects/bmake/external/bsd/bmake/dist/cond.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/cond.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/cond.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: cond.c,v 1.63 2012/05/21 06:30:02 sjg Exp $ */ +/* $NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: cond.c,v 1.63 2012/05/21 06:30:02 sjg Exp $"; +static char rcsid[] = "$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: cond.c,v 1.63 2012/05/21 06:30:02 sjg Exp $"); +__RCSID("$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -327,7 +327,7 @@ CondGetArg(char **linePtr, char **argPtr *----------------------------------------------------------------------- */ static Boolean -CondDoDefined(int argLen __unused, const char *arg) +CondDoDefined(int argLen MAKE_ATTR_UNUSED, const char *arg) { char *p1; Boolean result; @@ -376,7 +376,7 @@ CondStrMatch(const void *string, const v *----------------------------------------------------------------------- */ static Boolean -CondDoMake(int argLen __unused, const char *arg) +CondDoMake(int argLen MAKE_ATTR_UNUSED, const char *arg) { return Lst_Find(create, arg, CondStrMatch) != NULL; } @@ -395,7 +395,7 @@ CondDoMake(int argLen __unused, const ch *----------------------------------------------------------------------- */ static Boolean -CondDoExists(int argLen __unused, const char *arg) +CondDoExists(int argLen MAKE_ATTR_UNUSED, const char *arg) { Boolean result; char *path; @@ -428,7 +428,7 @@ CondDoExists(int argLen __unused, const *----------------------------------------------------------------------- */ static Boolean -CondDoTarget(int argLen __unused, const char *arg) +CondDoTarget(int argLen MAKE_ATTR_UNUSED, const char *arg) { GNode *gn; @@ -452,7 +452,7 @@ CondDoTarget(int argLen __unused, const *----------------------------------------------------------------------- */ static Boolean -CondDoCommands(int argLen __unused, const char *arg) +CondDoCommands(int argLen MAKE_ATTR_UNUSED, const char *arg) { GNode *gn; @@ -790,7 +790,7 @@ done: } static int -get_mpt_arg(char **linePtr, char **argPtr, const char *func __unused) +get_mpt_arg(char **linePtr, char **argPtr, const char *func MAKE_ATTR_UNUSED) { /* * Use Var_Parse to parse the spec in parens and return @@ -831,7 +831,7 @@ get_mpt_arg(char **linePtr, char **argPt } static Boolean -CondDoEmpty(int arglen, const char *arg __unused) +CondDoEmpty(int arglen, const char *arg MAKE_ATTR_UNUSED) { return arglen == 1; } Modified: projects/bmake/external/bsd/bmake/dist/configure ============================================================================== Binary file (source and/or target). No diff available. Modified: projects/bmake/external/bsd/bmake/dist/configure.in ============================================================================== --- projects/bmake/external/bsd/bmake/dist/configure.in Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/configure.in Mon Jun 25 23:01:35 2012 (r237582) @@ -1,10 +1,10 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.44 2012/06/06 17:48:14 sjg Exp $ +dnl $Id: configure.in,v 1.45 2012/06/20 22:43:41 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_INIT([bmake], [20120606], [sjg@NetBSD.org]) +AC_INIT([bmake], [20120620], [sjg@NetBSD.org]) AC_CONFIG_HEADER(config.h) dnl @@ -39,7 +39,7 @@ AC_ARG_WITH(filemon, esac], [ OS=`uname -s` -for d in "$srcdir/filemon" "$srcdir/../filemon" "$srcdir/../../sys/dev/filemon" +for d in "/usr/include/dev/filemon" "$prefix/include/dev/filemon" "$srcdir/filemon" "$srcdir/../filemon" "$srcdir/../../sys/dev/filemon" do for x in "/$OS" "" do Modified: projects/bmake/external/bsd/bmake/dist/dir.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/dir.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/dir.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.64 2012/04/07 18:29:08 christos Exp $ */ +/* $NetBSD: dir.c,v 1.65 2012/06/12 19:21:50 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: dir.c,v 1.64 2012/04/07 18:29:08 christos Exp $"; +static char rcsid[] = "$NetBSD: dir.c,v 1.65 2012/06/12 19:21:50 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: dir.c,v 1.64 2012/04/07 18:29:08 christos Exp $"); +__RCSID("$NetBSD: dir.c,v 1.65 2012/06/12 19:21:50 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -860,8 +860,8 @@ Dir_Expand(const char *word, Lst path, L *----------------------------------------------------------------------- */ static char * -DirLookup(Path *p, const char *name __unused, const char *cp, - Boolean hasSlash __unused) +DirLookup(Path *p, const char *name MAKE_ATTR_UNUSED, const char *cp, + Boolean hasSlash MAKE_ATTR_UNUSED) { char *file; /* the current filename to check */ @@ -1004,7 +1004,7 @@ DirLookupAbs(Path *p, const char *name, *----------------------------------------------------------------------- */ static char * -DirFindDot(Boolean hasSlash __unused, const char *name, const char *cp) +DirFindDot(Boolean hasSlash MAKE_ATTR_UNUSED, const char *name, const char *cp) { if (Hash_FindEntry(&dot->files, cp) != NULL) { Modified: projects/bmake/external/bsd/bmake/dist/job.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/job.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/job.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.161 2012/04/07 18:29:08 christos Exp $ */ +/* $NetBSD: job.c,v 1.162 2012/06/12 19:21:50 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.161 2012/04/07 18:29:08 christos Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.162 2012/06/12 19:21:50 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.161 2012/04/07 18:29:08 christos Exp $"); +__RCSID("$NetBSD: job.c,v 1.162 2012/06/12 19:21:50 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -365,7 +365,7 @@ static int JobStart(GNode *, int); static char *JobOutput(Job *, char *, char *, int); static void JobDoOutput(Job *, Boolean); static Shell *JobMatchShell(const char *); -static void JobInterrupt(int, int) __dead; +static void JobInterrupt(int, int) MAKE_ATTR_DEAD; static void JobRestartJobs(void); static void JobTokenAdd(void); static void JobSigLock(sigset_t *); @@ -488,7 +488,7 @@ JobCondPassSig(int signo) *----------------------------------------------------------------------- */ static void -JobChildSig(int signo __unused) +JobChildSig(int signo MAKE_ATTR_UNUSED) { write(childExitJob.outPipe, CHILD_EXIT, 1); } @@ -511,7 +511,7 @@ JobChildSig(int signo __unused) *----------------------------------------------------------------------- */ static void -JobContinueSig(int signo __unused) +JobContinueSig(int signo MAKE_ATTR_UNUSED) { /* * Defer sending to SIGCONT to our stopped children until we return @@ -536,14 +536,14 @@ JobContinueSig(int signo __unused) * *----------------------------------------------------------------------- */ -__dead static void +MAKE_ATTR_DEAD static void JobPassSig_int(int signo) { /* Run .INTERRUPT target then exit */ JobInterrupt(TRUE, signo); } -__dead static void +MAKE_ATTR_DEAD static void JobPassSig_term(int signo) { /* Dont run .INTERRUPT target then exit */ Modified: projects/bmake/external/bsd/bmake/dist/main.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/main.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/main.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.199 2012/04/24 20:35:04 sjg Exp $ */ +/* $NetBSD: main.c,v 1.200 2012/06/12 19:21:51 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.199 2012/04/24 20:35:04 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.200 2012/06/12 19:21:51 joerg Exp $"; #else #include #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.199 2012/04/24 20:35:04 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.200 2012/06/12 19:21:51 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -180,7 +180,7 @@ static char * Check_Cwd_av(int, char ** #endif static void MainParseArgs(int, char **); static int ReadMakefile(const void *, const void *); -static void usage(void) __dead; +static void usage(void) MAKE_ATTR_DEAD; static Boolean ignorePWD; /* if we use -C, PWD is meaningless */ static char objdir[MAXPATHLEN + 1]; /* where we chdir'ed to */ @@ -736,7 +736,7 @@ str2Lst_Append(Lst lp, char *str, const #ifdef SIGINFO /*ARGSUSED*/ static void -siginfo(int signo __unused) +siginfo(int signo MAKE_ATTR_UNUSED) { char dir[MAXPATHLEN]; char str[2 * MAXPATHLEN]; @@ -1340,7 +1340,7 @@ main(int argc, char **argv) * lots */ static int -ReadMakefile(const void *p, const void *q __unused) +ReadMakefile(const void *p, const void *q MAKE_ATTR_UNUSED) { const char *fname = p; /* makefile to read */ int fd; Modified: projects/bmake/external/bsd/bmake/dist/make.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/make.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/make.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.86 2012/05/10 19:53:26 christos Exp $ */ +/* $NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: make.c,v 1.86 2012/05/10 19:53:26 christos Exp $"; +static char rcsid[] = "$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: make.c,v 1.86 2012/05/10 19:53:26 christos Exp $"); +__RCSID("$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -139,7 +139,7 @@ static int MakeCheckOrder(void *, void * static int MakeBuildChild(void *, void *); static int MakeBuildParent(void *, void *); -__dead static void +MAKE_ATTR_DEAD static void make_abort(GNode *gn, int line) { static int two = 2; @@ -867,7 +867,7 @@ Make_Update(GNode *cgn) *----------------------------------------------------------------------- */ static int -MakeUnmark(void *cgnp, void *pgnp __unused) +MakeUnmark(void *cgnp, void *pgnp MAKE_ATTR_UNUSED) { GNode *cgn = (GNode *)cgnp; @@ -1005,7 +1005,7 @@ Make_DoAllVar(GNode *gn) */ static int -MakeCheckOrder(void *v_bn, void *ignore __unused) +MakeCheckOrder(void *v_bn, void *ignore MAKE_ATTR_UNUSED) { GNode *bn = v_bn; Modified: projects/bmake/external/bsd/bmake/dist/make.h ============================================================================== --- projects/bmake/external/bsd/bmake/dist/make.h Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/make.h Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.88 2012/06/04 20:34:20 sjg Exp $ */ +/* $NetBSD: make.h,v 1.89 2012/06/12 19:21:51 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -98,26 +98,33 @@ #include #include -#if !defined(__GNUC_PREREQ__) #if defined(__GNUC__) -#define __GNUC_PREREQ__(x, y) \ +#define MAKE_GNUC_PREREQ(x, y) \ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ (__GNUC__ > (x))) #else /* defined(__GNUC__) */ -#define __GNUC_PREREQ__(x, y) 0 +#define MAKE_GNUC_PREREQx, y) 0 #endif /* defined(__GNUC__) */ -#endif /* !defined(__GNUC_PREREQ__) */ -#if !defined(__unused) -#if __GNUC_PREREQ__(2, 7) -#define __unused __attribute__((__unused__)) +#if MAKE_GNUC_PREREQ(2, 7) +#define MAKE_ATTR_UNUSED __attribute__((__unused__)) #else -#define __unused /* delete */ +#define MAKE_ATTR_UNUSED /* delete */ #endif + +#if MAKE_GNUC_PREREQ(2, 5) +#define MAKE_ATTR_DEAD __attribute__((__noreturn__)) +#elif defined(__GNUC__) +#define MAKE_ATTR_DEAD __volatile +#else +#define MAKE_ATTR_DEAD /* delete */ #endif -#if !defined(__dead) -#define __dead +#if MAKE_GNUC_PREREQ(2, 7) +#define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg) \ + __attribute__((__format__ (__printf__, fmtarg, firstvararg))) +#else +#define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg) /* delete */ #endif #include "sprite.h" Modified: projects/bmake/external/bsd/bmake/dist/make_malloc.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/make_malloc.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/make_malloc.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: make_malloc.c,v 1.7 2012/05/18 02:28:16 sjg Exp $ */ +/* $NetBSD: make_malloc.c,v 1.10 2012/06/20 17:46:28 sjg Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ #ifdef MAKE_NATIVE #include -__RCSID("$NetBSD: make_malloc.c,v 1.7 2012/05/18 02:28:16 sjg Exp $"); +__RCSID("$NetBSD: make_malloc.c,v 1.10 2012/06/20 17:46:28 sjg Exp $"); #endif #include @@ -36,15 +36,15 @@ __RCSID("$NetBSD: make_malloc.c,v 1.7 20 #include #include -#include "make_malloc.h" +#include "make.h" #ifndef USE_EMALLOC +static void enomem(void) MAKE_ATTR_DEAD; + /* * enomem -- * die when out of memory. */ -extern char *progname; - static void enomem(void) { Modified: projects/bmake/external/bsd/bmake/dist/nonints.h ============================================================================== --- projects/bmake/external/bsd/bmake/dist/nonints.h Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/nonints.h Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: nonints.h,v 1.63 2011/09/16 15:38:04 joerg Exp $ */ +/* $NetBSD: nonints.h,v 1.64 2012/06/12 19:21:51 joerg Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 @@ -72,11 +72,6 @@ * from: @(#)nonints.h 8.3 (Berkeley) 3/19/94 */ -#ifndef MAKE_NATIVE -#undef __attribute__ -#define __attribute__(x) -#endif - /* arch.c */ ReturnStatus Arch_ParseArchive(char **, Lst, GNode *); void Arch_Touch(GNode *); @@ -116,21 +111,18 @@ void Main_ParseArgLine(const char *); void MakeMode(const char *); int main(int, char **); char *Cmd_Exec(const char *, const char **); -void Error(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -void Fatal(const char *, ...) - __attribute__((__format__(__printf__, 1, 2),__noreturn__)); -void Punt(const char *, ...) - __attribute__((__format__(__printf__, 1, 2),__noreturn__)); -void DieHorribly(void) __attribute__((__noreturn__)); +void Error(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2); +void Fatal(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2) MAKE_ATTR_DEAD; +void Punt(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2) MAKE_ATTR_DEAD; +void DieHorribly(void) MAKE_ATTR_DEAD; int PrintAddr(void *, void *); -void Finish(int) __dead; +void Finish(int) MAKE_ATTR_DEAD; int eunlink(const char *); void execError(const char *, const char *); char *getTmpdir(void); /* parse.c */ -void Parse_Error(int, const char *, ...) - __attribute__((__format__(__printf__, 2, 3))); +void Parse_Error(int, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3); Boolean Parse_AnyExport(void); Boolean Parse_IsVar(char *); void Parse_DoVar(char *, GNode *); Modified: projects/bmake/external/bsd/bmake/dist/parse.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/parse.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/parse.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.184 2012/04/24 20:12:16 sjg Exp $ */ +/* $NetBSD: parse.c,v 1.185 2012/06/12 19:21:51 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.184 2012/04/24 20:12:16 sjg Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.185 2012/06/12 19:21:51 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.184 2012/04/24 20:12:16 sjg Exp $"); +__RCSID("$NetBSD: parse.c,v 1.185 2012/06/12 19:21:51 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -347,9 +347,9 @@ static const struct { static int ParseIsEscaped(const char *, const char *); static void ParseErrorInternal(const char *, size_t, int, const char *, ...) - __attribute__((__format__(__printf__, 4, 5))); + MAKE_ATTR_PRINTFLIKE(4,5); static void ParseVErrorInternal(FILE *, const char *, size_t, int, const char *, va_list) - __attribute__((__format__(__printf__, 5, 0))); + MAKE_ATTR_PRINTFLIKE(5, 0); static int ParseFindKeyword(const char *); static int ParseLinkSrc(void *, void *); static int ParseDoOp(void *, void *); Modified: projects/bmake/external/bsd/bmake/dist/targ.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/targ.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/targ.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: targ.c,v 1.56 2010/11/25 21:31:09 christos Exp $ */ +/* $NetBSD: targ.c,v 1.57 2012/06/12 19:21:51 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: targ.c,v 1.56 2010/11/25 21:31:09 christos Exp $"; +static char rcsid[] = "$NetBSD: targ.c,v 1.57 2012/06/12 19:21:51 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)targ.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: targ.c,v 1.56 2010/11/25 21:31:09 christos Exp $"); +__RCSID("$NetBSD: targ.c,v 1.57 2012/06/12 19:21:51 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -512,7 +512,7 @@ Targ_SetMain(GNode *gn) } static int -TargPrintName(void *gnp, void *pflags __unused) +TargPrintName(void *gnp, void *pflags MAKE_ATTR_UNUSED) { GNode *gn = (GNode *)gnp; @@ -717,7 +717,7 @@ Targ_PrintNode(void *gnp, void *passp) *----------------------------------------------------------------------- */ static int -TargPrintOnlySrc(void *gnp, void *dummy __unused) +TargPrintOnlySrc(void *gnp, void *dummy MAKE_ATTR_UNUSED) { GNode *gn = (GNode *)gnp; if (!OP_NOP(gn->type)) @@ -790,7 +790,7 @@ Targ_PrintGraph(int pass) *----------------------------------------------------------------------- */ static int -TargPropagateNode(void *gnp, void *junk __unused) +TargPropagateNode(void *gnp, void *junk MAKE_ATTR_UNUSED) { GNode *gn = (GNode *)gnp; Modified: projects/bmake/external/bsd/bmake/dist/unit-tests/Makefile.in ============================================================================== --- projects/bmake/external/bsd/bmake/dist/unit-tests/Makefile.in Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/unit-tests/Makefile.in Mon Jun 25 23:01:35 2012 (r237582) @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.37 2011/10/01 20:30:30 sjg Exp $ +# $Id: Makefile.in,v 1.38 2012/06/19 23:38:48 sjg Exp $ # -# $NetBSD: Makefile,v 1.33 2011/09/29 23:38:04 sjg Exp $ +# $NetBSD: Makefile,v 1.34 2012/06/19 23:25:53 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -30,6 +30,7 @@ SUBFILES= \ export-all \ doterror \ dotwait \ + forloop \ forsubst \ hash \ misc \ Copied: projects/bmake/external/bsd/bmake/dist/unit-tests/forloop (from r237581, vendor/NetBSD/bmake/dist/unit-tests/forloop) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/bsd/bmake/dist/unit-tests/forloop Mon Jun 25 23:01:35 2012 (r237582, copy of r237581, vendor/NetBSD/bmake/dist/unit-tests/forloop) @@ -0,0 +1,45 @@ +# $Id: forloop,v 1.1.1.1 2012/06/19 23:30:49 sjg Exp $ + +all: for-loop + +LIST = one "two and three" four "five" + +.if make(for-fail) +for-fail: + +XTRA_LIST = xtra +.else + +.for x in ${LIST} +X!= echo 'x=$x' >&2; echo +.endfor + +CFL = -I/this -I"This or that" -Ithat "-DTHIS=\"this and that\"" +cfl= +.for x in ${CFL} +X!= echo 'x=$x' >&2; echo +.if empty(cfl) +cfl= $x +.else +cfl+= $x +.endif +.endfor +X!= echo 'cfl=${cfl}' >&2; echo + +.if ${cfl} != ${CFL} +.error ${.newline}'${cfl}' != ${.newline}'${CFL}' +.endif + +.for a b in ${EMPTY} +X!= echo 'a=$a b=$b' >&2; echo +.endfor +.endif + +.for a b in ${LIST} ${LIST:tu} ${XTRA_LIST} +X!= echo 'a=$a b=$b' >&2; echo +.endfor + +for-loop: + @echo We expect an error next: + @(cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} for-fail) && \ + { echo "Oops that should have failed!"; exit 1; } || echo OK Modified: projects/bmake/external/bsd/bmake/dist/unit-tests/test.exp ============================================================================== --- projects/bmake/external/bsd/bmake/dist/unit-tests/test.exp Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/unit-tests/test.exp Mon Jun 25 23:01:35 2012 (r237582) @@ -80,6 +80,24 @@ make: Graph cycles through `cycle.2.98' make: Graph cycles through `cycle.2.97' cycle.1.99 cycle.1.99 +x=one +x="two and three" +x=four +x="five" +x=-I/this +x=-I"This or that" +x=-Ithat +x="-DTHIS=\"this and that\"" +cfl=-I/this -I"This or that" -Ithat "-DTHIS=\"this and that\"" +a=one b="two and three" +a=four b="five" +a=ONE b="TWO AND THREE" +a=FOUR b="FIVE" +We expect an error next: +make: "forloop" line 38: Wrong number of words (9) in .for substitution list with 2 vars +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +OK .for with :S;... OK b2af338b 3360ac65 Modified: projects/bmake/external/bsd/bmake/dist/var.c ============================================================================== --- projects/bmake/external/bsd/bmake/dist/var.c Mon Jun 25 22:39:37 2012 (r237581) +++ projects/bmake/external/bsd/bmake/dist/var.c Mon Jun 25 23:01:35 2012 (r237582) @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.170 2012/06/04 20:34:20 sjg Exp $ */ +/* $NetBSD: var.c,v 1.171 2012/06/12 19:21:51 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.170 2012/06/04 20:34:20 sjg Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.171 2012/06/12 19:21:51 joerg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: var.c,v 1.170 2012/06/04 20:34:20 sjg Exp $"); +__RCSID("$NetBSD: var.c,v 1.171 2012/06/12 19:21:51 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -1145,7 +1145,7 @@ Var_Value(const char *name, GNode *ctxt, *----------------------------------------------------------------------- */ static Boolean -VarHead(GNode *ctx __unused, Var_Parse_State *vpstate, +VarHead(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *dummy) { @@ -1193,7 +1193,7 @@ VarHead(GNode *ctx __unused, Var_Parse_S *----------------------------------------------------------------------- */ static Boolean -VarTail(GNode *ctx __unused, Var_Parse_State *vpstate, +VarTail(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *dummy) { @@ -1235,7 +1235,7 @@ VarTail(GNode *ctx __unused, Var_Parse_S *----------------------------------------------------------------------- */ static Boolean -VarSuffix(GNode *ctx __unused, Var_Parse_State *vpstate, +VarSuffix(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *dummy) { @@ -1276,7 +1276,7 @@ VarSuffix(GNode *ctx __unused, Var_Parse *----------------------------------------------------------------------- */ static Boolean -VarRoot(GNode *ctx __unused, Var_Parse_State *vpstate, +VarRoot(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *dummy) { @@ -1320,7 +1320,7 @@ VarRoot(GNode *ctx __unused, Var_Parse_S *----------------------------------------------------------------------- */ static Boolean -VarMatch(GNode *ctx __unused, Var_Parse_State *vpstate, +VarMatch(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *pattern) { @@ -1411,7 +1411,7 @@ VarSYSVMatch(GNode *ctx, Var_Parse_State *----------------------------------------------------------------------- */ static Boolean -VarNoMatch(GNode *ctx __unused, Var_Parse_State *vpstate, +VarNoMatch(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *pattern) { @@ -1448,7 +1448,7 @@ VarNoMatch(GNode *ctx __unused, Var_Pars *----------------------------------------------------------------------- */ static Boolean -VarSubstitute(GNode *ctx __unused, Var_Parse_State *vpstate, +VarSubstitute(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, char *word, Boolean addSpace, Buffer *buf, void *patternp) { @@ -1644,7 +1644,8 @@ VarREError(int errnum, regex_t *pat, con *----------------------------------------------------------------------- */ static Boolean -VarRESubstitute(GNode *ctx __unused, Var_Parse_State *vpstate __unused, +VarRESubstitute(GNode *ctx MAKE_ATTR_UNUSED, + Var_Parse_State *vpstate MAKE_ATTR_UNUSED, char *word, Boolean addSpace, Buffer *buf, void *patternp) { @@ -1784,7 +1785,8 @@ VarRESubstitute(GNode *ctx __unused, Var *----------------------------------------------------------------------- */ static Boolean -VarLoopExpand(GNode *ctx __unused, Var_Parse_State *vpstate __unused, +VarLoopExpand(GNode *ctx MAKE_ATTR_UNUSED, + Var_Parse_State *vpstate MAKE_ATTR_UNUSED, char *word, Boolean addSpace, Buffer *buf, void *loopp) { @@ -1827,7 +1829,7 @@ VarLoopExpand(GNode *ctx __unused, Var_P *----------------------------------------------------------------------- */ static char * -VarSelectWords(GNode *ctx __unused, Var_Parse_State *vpstate, +VarSelectWords(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate, const char *str, VarSelectWords_t *seldata) { Buffer buf; /* Buffer for the new string */ @@ -1902,9 +1904,9 @@ VarSelectWords(GNode *ctx __unused, Var_ * if successful. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Jun 25 23:22:43 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D23F31065670; Mon, 25 Jun 2012 23:22:43 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B21098FC08; Mon, 25 Jun 2012 23:22:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PNMhg5002105; Mon, 25 Jun 2012 23:22:43 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PNMhSn002099; Mon, 25 Jun 2012 23:22:43 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201206252322.q5PNMhSn002099@svn.freebsd.org> From: "David E. O'Brien" Date: Mon, 25 Jun 2012 23:22:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237583 - in projects/bmake/external: . bsd bsd/bmake bsd/bmake/usr.bin bsd/bmake/usr.bin/unit-tests X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 23:22:43 -0000 Author: obrien Date: Mon Jun 25 23:22:43 2012 New Revision: 237583 URL: http://svn.freebsd.org/changeset/base/237583 Log: Add Makefiles for building bmake. Submitted by: Simon Gerraty Added: projects/bmake/external/Makefile projects/bmake/external/bsd/Makefile projects/bmake/external/bsd/bmake/Makefile projects/bmake/external/bsd/bmake/usr.bin/Makefile projects/bmake/external/bsd/bmake/usr.bin/config.h projects/bmake/external/bsd/bmake/usr.bin/unit-tests/ projects/bmake/external/bsd/bmake/usr.bin/unit-tests/Makefile Added: projects/bmake/external/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/Makefile Mon Jun 25 23:22:43 2012 (r237583) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= bsd + +.include Added: projects/bmake/external/bsd/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/bsd/Makefile Mon Jun 25 23:22:43 2012 (r237583) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= bmake + +.include Added: projects/bmake/external/bsd/bmake/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/bsd/bmake/Makefile Mon Jun 25 23:22:43 2012 (r237583) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= usr.bin + +.include Added: projects/bmake/external/bsd/bmake/usr.bin/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/bsd/bmake/usr.bin/Makefile Mon Jun 25 23:22:43 2012 (r237583) @@ -0,0 +1,207 @@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk + +# look here first for config.h +CFLAGS+= -I${.CURDIR} + +# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $ +# @(#)Makefile 5.2 (Berkeley) 12/28/90 + +# $Id: Makefile.in,v 1.164 2012/06/20 22:44:26 sjg Exp $ + +# $FreeBSD$ + +PROG= bmake +SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \ + make.c parse.c str.c suff.c targ.c trace.c var.c util.c +SRCS+= strlist.c +SRCS+= make_malloc.c +SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \ + lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \ + lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \ + lstInit.c lstInsert.c lstIsAtEnd.c lstIsEmpty.c lstLast.c \ + lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c +SRCS += lstPrev.c + +# you can use this Makefile if you have an earlier version of bmake. +prefix= /usr +srcdir= ${.CURDIR}/../dist + +# Base version on src date +MAKE_VERSION= 20120620 +DEFAULT_SYS_PATH = .../share/mk:/usr/share/mk + +CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\" +CFLAGS+= -I. -I${srcdir} -DHAVE_CONFIG_H ${XDEFS} -DMAKE_NATIVE +CFLAGS+= ${CFLAGS_${.TARGET:T}} +CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}} +COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\"" +LDFLAGS= +LIBOBJS= ${LIBOBJDIR}stresep$U.o +LDADD= + +.if !empty(LIBOBJS) +SRCS+= ${LIBOBJS:T:.o=.c} +.endif + +USE_META ?= yes +.if ${USE_META:tl} != "no" +SRCS+= meta.c +CPPFLAGS+= -DUSE_META +COPTS.meta.c += -DHAVE_FILEMON_H +.endif + +.PATH: ${srcdir} +.PATH: ${srcdir}/lst.lib + +OS!= uname -s +ARCH!= uname -p 2>/dev/null || uname -m +MAKEVER!= ${MAKE} -f /dev/null -V MAKE_VERSION +.if ${MAKEVER} < 1197001010 +# Bmake vs. FreeBSD's traditional make ('MAKE_VERSION' format: RYYYYMMDDX) +IS_BMAKE= yes +.endif + +# list of OS's which are derrived from BSD4.4 +isBSD44= NetBSD FreeBSD OpenBSD DragonFly + +.if ${OS} == "NetBSD" +# Don't set these for anyone else since we don't know what the effect may be. +# On FreeBSD WARNS=2 sets a bunch of -W flags that make does not handle. +WFORMAT= 1 +WARNS=4 +.NOPATH: bmake.cat1 +.if make(install) && exists(${DESTDIR}/usr/share/doc) +SUBDIR= PSD.doc +.endif +.endif +.if ${OS} == "FreeBSD" +WARNS?= 6 +.endif + +.if empty(isBSD44:M${OS}) +# XXX not sure if we still want this given that configure +# lets us force or not the definition of MACHINE. +CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\"" +MANTARGET=cat +INSTALL?=${srcdir}/install-sh +.if (${MACHINE} == "sun386") +# even I don't have one of these anymore :-) +CFLAGS+= -DPORTAR +.elif (${MACHINE} != "sunos") +SRCS+= sigcompat.c +CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART +.endif +.endif +.if make(obj) || make(clean) +.if defined(IS_BMAKE) +SUBDIR+= unit-tests +.endif +.endif + +# many systems use gcc these days +CC_IS_GCC=yes +.if ${CC_IS_GCC} == "yes" +# problem with gcc3 +CFLAGS_var.o+= -Wno-cast-qual +.endif + +CFLAGS_main.o+= "-DMACHINE=\"${MACHINE}\"" "-DMACHINE_ARCH=\"${MACHINE_ARCH}\"" + +EXTRACT_MAN=no + +MAN=${PROG}.1 +.if (${PROG} != "make") +${MAN}: make.1 + @echo making ${PROG}.1 + @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh HISTORY/,$$d' ${srcdir}/make.1 > $@ + @(echo ".Sh HISTORY"; \ + echo ".Nm"; \ + echo "is derived from NetBSD"; \ + echo ".Xr make 1 ."; \ + echo It uses autoconf to facilitate portability to other platforms.) >> $@ + +.endif + +.if !empty(isBSD44:M${OS}) +.if "${OS}" != "NetBSD" +MAN1=${MAN} +.endif +MANTARGET?=man +.endif + +MANTARGET?= cat +MANDEST?= ${MANDIR}/${MANTARGET}1 + +.if ${MANTARGET} == "cat" +_mfromdir=${srcdir} +.endif + +.if exists(${srcdir}/../Makefile.inc) +.include "${srcdir}/../Makefile.inc" +.endif +.sinclude +# sigh, FreeBSD at least includes bsd.subdir.mk via bsd.obj.mk +# so the inclusion below, results in complaints about re-defined +# targets. For NetBSD though we need to explicitly include it. +#.if defined(SUBDIR) && !target(${SUBDIR:[1]}) +#.-include +#.endif + +CPPFLAGS+= -DMAKE_NATIVE +COPTS.var.c += -Wno-cast-qual +COPTS.job.c += -Wno-format-nonliteral +COPTS.parse.c += -Wno-format-nonliteral +COPTS.var.c += -Wno-format-nonliteral + +# Force these +BINDIR= ${prefix}/bin +MANDIR= ${prefix}/share/man + +arch.o: config.h +# make sure that MAKE_VERSION gets updated. +main.o: ${SRCS} ${MAKEFILE} + +MK?=${prefix}/share/mk +MKSRC?=mk +INSTALL?=${srcdir}/install-sh + +beforeinstall: + test -d ${DESTDIR}${BINDIR} || ${INSTALL} -m 775 -d ${DESTDIR}${BINDIR} + test -d ${DESTDIR}${MANDEST} || ${INSTALL} -m 775 -d ${DESTDIR}${MANDEST} + +# latest version of *.mk includes an installer. +# you should not need to set USE_OS +install-mk: +.if exists(${MKSRC}/install-mk) + test -d ${DESTDIR}${MK} || ${INSTALL} -m 775 -d ${DESTDIR}${MK} + ${MKSRC}/install-mk -v -m 644 ${DESTDIR}${MK} ${USE_OS} +.else + @echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false +.endif + +.ifdef TOOLDIR +# this is a native netbsd build, +# use libutil rather than the local emalloc etc. +CPPFLAGS+= -DUSE_EMALLOC +LDADD+=-lutil +DPADD+=${LIBUTIL} +.endif + +# A simple unit-test driver to help catch regressions +accept test: + cd ${.CURDIR}/unit-tests && MAKEFLAGS= ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET} + +# override some simple things +BINDIR= /usr/bin +MANDIR= /usr/share/man + +# make sure we get this +CFLAGS+= ${COPTS.${.IMPSRC:T}} +CLEANFILES+= bootstrap + +after-import: ${.CURDIR}/../dist/bsd.after-import.mk + cd ${.CURDIR} && ${.MAKE} -f ${.CURDIR}/../dist/bsd.after-import.mk + +.sinclude "Makefile.inc" + Added: projects/bmake/external/bsd/bmake/usr.bin/config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/bsd/bmake/usr.bin/config.h Mon Jun 25 23:22:43 2012 (r237583) @@ -0,0 +1,315 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Path of default shell */ +/* #undef DEFSHELL_CUSTOM */ + +/* Shell spec to use by default */ +/* #undef DEFSHELL_INDEX */ + +/* Define to 1 if you have the header file. */ +#define HAVE_AR_H 1 + +/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_SIGLIST 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the `err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the `errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getenv' function. */ +#define HAVE_GETENV 1 + +/* Define to 1 if you have the `getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the `getwd' function. */ +#define HAVE_GETWD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mmap' function. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_RANLIB_H 1 + +/* Define to 1 if you have the `realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setpgid' function. */ +#define HAVE_SETPGID 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the `sigvec' function. */ +#define HAVE_SIGVEC 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `stresep' function. */ +/* #undef HAVE_STRESEP */ + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the `strtod' function. */ +#define HAVE_STRTOD 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if `struct stat' is a member of `st_rdev'. */ +#define HAVE_STRUCT_STAT_ST_RDEV 1 + +/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use + `HAVE_STRUCT_STAT_ST_RDEV' instead. */ +#define HAVE_ST_RDEV 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `unsetenv' function. */ +#define HAVE_UNSETENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `wait3' function. */ +#define HAVE_WAIT3 1 + +/* Define to 1 if you have the `wait4' function. */ +#define HAVE_WAIT4 1 + +/* Define to 1 if you have the `waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the `warn' function. */ +#define HAVE_WARN 1 + +/* Define to 1 if you have the `warnx' function. */ +#define HAVE_WARNX 1 + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* define if your compiler has __attribute__ */ +/* #undef HAVE___ATTRIBUTE__ */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "sjg@NetBSD.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "bmake" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "bmake 20120606" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bmake" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "20120606" + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ Added: projects/bmake/external/bsd/bmake/usr.bin/unit-tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/external/bsd/bmake/usr.bin/unit-tests/Makefile Mon Jun 25 23:22:43 2012 (r237583) @@ -0,0 +1,98 @@ +# $Id: Makefile.in,v 1.38 2012/06/19 23:38:48 sjg Exp $ +# +# $NetBSD: Makefile,v 1.34 2012/06/19 23:25:53 sjg Exp $ +# +# $FreeBSD$ +# +# Unit tests for make(1) +# The main targets are: +# +# all: run all the tests +# test: run 'all', capture output and compare to expected results +# accept: move generated output to expected results +# +# Adding a test case. +# Each feature should get its own set of tests in its own suitably +# named makefile which should be added to SUBFILES to hook it in. +# + +srcdir= ${.CURDIR}/../../dist/unit-tests + +.MAIN: all + +UNIT_TESTS:= ${srcdir} + +# Simple sub-makefiles - we run them as a black box +# keep the list sorted. +SUBFILES= \ + comment \ + cond1 \ + error \ + export \ + export-all \ + doterror \ + dotwait \ + forloop \ + forsubst \ + hash \ + misc \ + moderrs \ + modmatch \ + modmisc \ + modorder \ + modts \ + modword \ + phony-end \ + posix \ + qequals \ + sysv \ + ternary \ + unexport \ + unexport-env \ + varcmd + +all: ${SUBFILES} + +flags.doterror= + +# the tests are actually done with sub-makes. +.PHONY: ${SUBFILES} +.PRECIOUS: ${SUBFILES} +${SUBFILES}: + -@${.MAKE} ${flags.$@:U-k} -f ${UNIT_TESTS}/$@ + +clean: + rm -f *.out *.fail *.core + +.-include + +TEST_MAKE?= ${.MAKE} +TOOL_SED?= sed +TOOL_TR?= tr +TOOL_DIFF?= diff +DIFF_FLAGS?= -u + +# ensure consistent results from sort(1) +LC_ALL= C +LANG= C +.export LANG LC_ALL + +# The driver. +# We always pretend .MAKE was called 'make' +# and strip ${.CURDIR}/ from the output +# and replace anything after 'stopped in' with unit-tests +# so the results can be compared. +test: + @echo "${TEST_MAKE} -f ${MAKEFILE} > ${.TARGET}.out 2>&1" + @cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \ + ${TOOL_TR} -d '\015' | \ + ${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}:,make:,' \ + -e '/stopped/s, /.*, unit-tests,' \ + -e 's,${.CURDIR:C/\./\\\./g}/,,g' \ + -e 's,${UNIT_TESTS:C/\./\\\./g}/,,g' > ${.TARGET}.out || { \ + tail ${.TARGET}.out; mv ${.TARGET}.out ${.TARGET}.fail; exit 1; } + ${TOOL_DIFF} ${DIFF_FLAGS} ${UNIT_TESTS}/${.TARGET}.exp ${.TARGET}.out + +accept: + mv test.out ${srcdir}/test.exp + From owner-svn-src-projects@FreeBSD.ORG Tue Jun 26 19:07:06 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 20258106566C; Tue, 26 Jun 2012 19:07:06 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6DC48FC27; Tue, 26 Jun 2012 19:07:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5QJ755F057241; Tue, 26 Jun 2012 19:07:05 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5QJ75XH057239; Tue, 26 Jun 2012 19:07:05 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206261907.q5QJ75XH057239@svn.freebsd.org> From: Davide Italiano Date: Tue, 26 Jun 2012 19:07:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237606 - projects/calloutng/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2012 19:07:06 -0000 Author: davide Date: Tue Jun 26 19:07:05 2012 New Revision: 237606 URL: http://svn.freebsd.org/changeset/base/237606 Log: Don't call binuptime() more than needed. Replace it with getbinuptime() as far as we don't need so much precision in this piece of code. Reviewed by: mav Modified: projects/calloutng/sys/netinet/tcp_timer.c Modified: projects/calloutng/sys/netinet/tcp_timer.c ============================================================================== --- projects/calloutng/sys/netinet/tcp_timer.c Tue Jun 26 18:08:03 2012 (r237605) +++ projects/calloutng/sys/netinet/tcp_timer.c Tue Jun 26 19:07:05 2012 (r237606) @@ -670,45 +670,43 @@ void tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer, struct xtcp_timer *xtimer) { struct bintime now; - struct bintime tmp; + struct bintime bt; bzero(xtimer, sizeof(struct xtcp_timer)); if (timer == NULL) return; - + getbinuptime(&now); + bt.sec = 0; + bt.frac = 0; + if (callout_active(&timer->tt_delack)) { - binuptime(&now); - tmp = timer->tt_delack.c_time; - bintime_sub(&tmp,&now); - xtimer->tt_delack = bintime_to_msecs(tmp); + bt = timer->tt_delack.c_time; + bintime_sub(&bt,&now); + xtimer->tt_delack = bintime_to_msecs(bt); } if (callout_active(&timer->tt_rexmt)) { - binuptime(&now); - tmp = timer->tt_rexmt.c_time; - bintime_sub(&tmp,&now); - xtimer->tt_rexmt = bintime_to_msecs(tmp); + bt = timer->tt_rexmt.c_time; + bintime_sub(&bt,&now); + xtimer->tt_rexmt = bintime_to_msecs(bt); } if (callout_active(&timer->tt_persist)) { - binuptime(&now); - tmp = timer->tt_persist.c_time; - bintime_sub(&tmp,&now); - xtimer->tt_persist = bintime_to_msecs(tmp); + bt = timer->tt_persist.c_time; + bintime_sub(&bt,&now); + xtimer->tt_persist = bintime_to_msecs(bt); } if (callout_active(&timer->tt_keep)) { - binuptime(&now); - tmp = timer->tt_keep.c_time; - bintime_sub(&tmp,&now); - xtimer->tt_keep = bintime_to_msecs(tmp); + bt = timer->tt_keep.c_time; + bintime_sub(&bt,&now); + xtimer->tt_keep = bintime_to_msecs(bt); } if (callout_active(&timer->tt_2msl)) { - binuptime(&now); - tmp = timer->tt_2msl.c_time; - bintime_sub(&tmp,&now); - xtimer->tt_2msl = bintime_to_msecs(tmp); + bt = timer->tt_2msl.c_time; + bintime_sub(&bt,&now); + xtimer->tt_2msl = bintime_to_msecs(bt); } xtimer->t_rcvtime = ticks_to_msecs(ticks - tp->t_rcvtime); From owner-svn-src-projects@FreeBSD.ORG Thu Jun 28 07:02:16 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63AC3106566C; Thu, 28 Jun 2012 07:02:16 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F52E8FC0C; Thu, 28 Jun 2012 07:02:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5S72GjY058500; Thu, 28 Jun 2012 07:02:16 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5S72GhP058497; Thu, 28 Jun 2012 07:02:16 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201206280702.q5S72GhP058497@svn.freebsd.org> From: Mark Linimon Date: Thu, 28 Jun 2012 07:02:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237690 - projects/portbuild/scripts X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2012 07:02:16 -0000 Author: linimon (doc,ports committer) Date: Thu Jun 28 07:02:15 2012 New Revision: 237690 URL: http://svn.freebsd.org/changeset/base/237690 Log: add mips. Modified: projects/portbuild/scripts/zbackup projects/portbuild/scripts/zexpire Modified: projects/portbuild/scripts/zbackup ============================================================================== --- projects/portbuild/scripts/zbackup Thu Jun 28 07:01:48 2012 (r237689) +++ projects/portbuild/scripts/zbackup Thu Jun 28 07:02:15 2012 (r237690) @@ -14,7 +14,7 @@ import zfs # XXX MCL backuplist=["a", "a/nfs", "a/local", "a/portbuild", "a/portbuild/amd64", "a/portbuild/arm", "a/portbuild/i386", - "a/portbuild/ia64", "a/portbuild/powerpc", + "a/portbuild/ia64", "a/portbuild/mips", "a/portbuild/powerpc", "a/portbuild/sparc64"] # Directory to store backups Modified: projects/portbuild/scripts/zexpire ============================================================================== --- projects/portbuild/scripts/zexpire Thu Jun 28 07:01:48 2012 (r237689) +++ projects/portbuild/scripts/zexpire Thu Jun 28 07:02:15 2012 (r237690) @@ -18,6 +18,7 @@ expirelist=(("a", 14), ("a/portbuild/arm", 14), ("a/portbuild/i386", 14), ("a/portbuild/ia64", 14), + ("a/portbuild/mips", 14), ("a/portbuild/powerpc", 14), ("a/portbuild/sparc64", 14), ("a/portbuild/sun4v", 14), From owner-svn-src-projects@FreeBSD.ORG Thu Jun 28 13:47:08 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 063311065677; Thu, 28 Jun 2012 13:47:08 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E5E118FC14; Thu, 28 Jun 2012 13:47:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5SDl74H079427; Thu, 28 Jun 2012 13:47:07 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5SDl79x079424; Thu, 28 Jun 2012 13:47:07 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201206281347.q5SDl79x079424@svn.freebsd.org> From: "Cherry G. Mathew" Date: Thu, 28 Jun 2012 13:47:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237711 - in projects/amd64_xen_pv/sys: amd64/xen dev/xen/control X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2012 13:47:08 -0000 Author: cherry Date: Thu Jun 28 13:47:07 2012 New Revision: 237711 URL: http://svn.freebsd.org/changeset/base/237711 Log: Allow non-SMP builds for amd64/xen Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/mm.c projects/amd64_xen_pv/sys/dev/xen/control/control.c Modified: projects/amd64_xen_pv/sys/amd64/xen/mm.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/mm.c Thu Jun 28 13:12:34 2012 (r237710) +++ projects/amd64_xen_pv/sys/amd64/xen/mm.c Thu Jun 28 13:47:07 2012 (r237711) @@ -52,9 +52,11 @@ static mmu_update_t xpq_queue[MAX_VIRT_C #define XPQ_IDX xpq_idx[vcpu] #define SET_VCPU() int vcpu = smp_processor_id() #else - -static mmu_update_t xpq_queue[XPQUEUE_SIZE]; +#ifdef INVARIANTS static struct mmu_log xpq_queue_log[XPQUEUE_SIZE]; +#endif + +static mmu_update_t xpq_queue[XPQUEUE_SIZE]; static int xpq_idx = 0; #define XPQ_QUEUE_LOG xpq_queue_log Modified: projects/amd64_xen_pv/sys/dev/xen/control/control.c ============================================================================== --- projects/amd64_xen_pv/sys/dev/xen/control/control.c Thu Jun 28 13:12:34 2012 (r237710) +++ projects/amd64_xen_pv/sys/dev/xen/control/control.c Thu Jun 28 13:47:07 2012 (r237711) @@ -201,13 +201,13 @@ extern void xencons_resume(void); static void xctrl_suspend() { - u_int cpuid; int i, j, k, fpp; unsigned long max_pfn, start_info_mfn; EVENTHANDLER_INVOKE(power_suspend); #ifdef SMP + u_int cpuid; struct thread *td; cpuset_t map; /* From owner-svn-src-projects@FreeBSD.ORG Thu Jun 28 19:19:38 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EEF3F1065670; Thu, 28 Jun 2012 19:19:38 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C08518FC08; Thu, 28 Jun 2012 19:19:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5SJJcsY093936; Thu, 28 Jun 2012 19:19:38 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5SJJcEP093934; Thu, 28 Jun 2012 19:19:38 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201206281919.q5SJJcEP093934@svn.freebsd.org> From: "Cherry G. Mathew" Date: Thu, 28 Jun 2012 19:19:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237723 - projects/amd64_xen_pv/sys/amd64/xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2012 19:19:39 -0000 Author: cherry Date: Thu Jun 28 19:19:38 2012 New Revision: 237723 URL: http://svn.freebsd.org/changeset/base/237723 Log: Initialise kernel and process0 pmaps. Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Thu Jun 28 18:52:40 2012 (r237722) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Thu Jun 28 19:19:38 2012 (r237723) @@ -119,6 +119,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -615,14 +616,51 @@ pmap_init(void) void pmap_pinit0(pmap_t pmap) { - KASSERT(0, ("XXX: TODO\n")); + PMAP_LOCK_INIT(pmap); + pmap->pm_pml4 = (void *) KPML4phys; + pmap->pm_root = NULL; + CPU_ZERO(&pmap->pm_active); + PCPU_SET(curpmap, pmap); + TAILQ_INIT(&pmap->pm_pvchunk); + bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } int pmap_pinit(pmap_t pmap) { - KASSERT(0, ("XXX: TODO\n")); - return -1; + + KASSERT(pmap != kernel_pmap, + ("kernel map re-initialised!")); + + PMAP_LOCK_INIT(pmap); + + /* + * allocate the page directory page + */ + pmap->pm_pml4 = (void *) kmem_alloc(kernel_map, PAGE_SIZE); + bzero(pmap->pm_pml4, PAGE_SIZE); + + /* + * We do not wire in kernel space, or the self-referencial + * entry in userspace pmaps for two reasons: + * i) both kernel and userland run in ring3 (same CPU + * privilege level). This means that userland that has kernel + * address space mapped in, can access kernel memory! + * Instead, we make the kernel pmap is exclusive and + * unshared, and we switch to it on *every* kernel + * entry. This is facilitated by the hypervisor. + * ii) we access the user pmap from within kernel VA. The + * self-referencing entry is useful if we access the pmap + * from the *user* VA. + * XXX: review this when userland is up. + */ + + pmap->pm_root = NULL; + CPU_ZERO(&pmap->pm_active); + TAILQ_INIT(&pmap->pm_pvchunk); + bzero(&pmap->pm_stats, sizeof pmap->pm_stats); + + return 1; } void @@ -737,6 +775,7 @@ void * pmap_kenter_temporary(vm_paddr_t pa, int i) { KASSERT(0, ("XXX: TODO\n")); + return NULL; } void From owner-svn-src-projects@FreeBSD.ORG Thu Jun 28 19:27:55 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F701106566B; Thu, 28 Jun 2012 19:27:55 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A00E8FC0C; Thu, 28 Jun 2012 19:27:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5SJRscM094296; Thu, 28 Jun 2012 19:27:54 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5SJRsUH094294; Thu, 28 Jun 2012 19:27:54 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201206281927.q5SJRsUH094294@svn.freebsd.org> From: "Cherry G. Mathew" Date: Thu, 28 Jun 2012 19:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237724 - projects/amd64_xen_pv/sys/amd64/xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2012 19:27:55 -0000 Author: cherry Date: Thu Jun 28 19:27:54 2012 New Revision: 237724 URL: http://svn.freebsd.org/changeset/base/237724 Log: later initialisation code for the bootstrap vcpu, that depends on uma(9) and malloc(9) initialisation routines having been run. This happens during mi_startup() after SI_SUB_VM init hooks are run. Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/machdep.c Thu Jun 28 19:19:38 2012 (r237723) +++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c Thu Jun 28 19:27:54 2012 (r237724) @@ -56,10 +56,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -74,8 +76,13 @@ #include #include +#include +#include +#include +#include #include +#include #include #include #include @@ -110,6 +117,8 @@ vm_offset_t pa_index = 0; vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; +struct kva_md_info kmi; + struct pcpu __pcpu[MAXCPU]; struct user_segment_descriptor gdt[512] @@ -124,11 +133,14 @@ void failsafe_callback(void); vm_paddr_t initxen(struct start_info *); -extern void identify_cpu(void); +extern void printcpuinfo(void); /* XXX header file */ +extern void identify_cpu(void); /* XXX header file */ +extern void panicifcpuunsupported(void); /* XXX header file */ static void get_fpcontext(struct thread *td, mcontext_t *mcp); static int set_fpcontext(struct thread *td, const mcontext_t *mcp, char *xfpustate, size_t xfpustate_len); + /* Expects a zero-ed page aligned page */ static void setup_gdt(struct user_segment_descriptor *thisgdt) @@ -577,6 +589,73 @@ cpu_idle_wakeup(int cpu) return (1); } +static void +cpu_startup(void *dummy) +{ + uintmax_t memsize; + + /* + * Good {morning,afternoon,evening,night}. + */ + startrtclock(); + + //printcpuinfo(); + //panicifcpuunsupported(); + +#ifdef PERFMON + perfmon_init(); +#endif + realmem = Maxmem; + + /* + * Display physical memory if SMBIOS reports reasonable amount. + */ + memsize = 0; + if (memsize < ptoa((uintmax_t)cnt.v_free_count)) + memsize = ptoa((uintmax_t)Maxmem); + printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20); + + /* + * Display any holes after the first chunk of extended memory. + */ + if (bootverbose) { + int indx; + + printf("Physical memory chunk(s):\n"); + for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) { + vm_paddr_t size; + + size = phys_avail[indx + 1] - phys_avail[indx]; + printf( + "0x%016jx - 0x%016jx, %ju bytes (%ju pages)\n", + (uintmax_t)phys_avail[indx], + (uintmax_t)phys_avail[indx + 1] - 1, + (uintmax_t)size, (uintmax_t)size / PAGE_SIZE); + } + } + + vm_ksubmap_init(&kmi); + + printf("avail memory = %ju (%ju MB)\n", + ptoa((uintmax_t)cnt.v_free_count), + ptoa((uintmax_t)cnt.v_free_count) / 1048576); + + /* + * Set up buffers, so they can be used to read disk labels. + */ + bufinit(); + vm_pager_bufferinit(); + + cpu_setregs(); + + /* + * Add BSP as an interrupt target. + */ + intr_add_cpu(0); +} + +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); + /* XXX: Unify with "native" machdep.c */ /* * Reset registers to default values on exec. @@ -588,6 +667,12 @@ exec_setregs(struct thread *td, struct i } void +cpu_setregs(void) +{ + /* XXX: */ +} + +void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) { @@ -1427,3 +1512,4 @@ freebsd4_sigreturn(struct thread *td, st return sys_sigreturn(td, (struct sigreturn_args *)uap); } #endif + From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 09:03:48 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89B0A1065674; Fri, 29 Jun 2012 09:03:48 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7444E8FC16; Fri, 29 Jun 2012 09:03:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5T93mxq030024; Fri, 29 Jun 2012 09:03:48 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5T93mtH030022; Fri, 29 Jun 2012 09:03:48 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206290903.q5T93mtH030022@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 29 Jun 2012 09:03:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237751 - projects/pf/head/sys/modules/pf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 09:03:48 -0000 Author: glebius Date: Fri Jun 29 09:03:47 2012 New Revision: 237751 URL: http://svn.freebsd.org/changeset/base/237751 Log: Fix module build. Modified: projects/pf/head/sys/modules/pf/Makefile Modified: projects/pf/head/sys/modules/pf/Makefile ============================================================================== --- projects/pf/head/sys/modules/pf/Makefile Fri Jun 29 08:41:13 2012 (r237750) +++ projects/pf/head/sys/modules/pf/Makefile Fri Jun 29 09:03:47 2012 (r237751) @@ -7,8 +7,8 @@ KMOD= pf SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ - pf_ruleset.c \ - in4_cksum.c \ + pf_ruleset.c in4_cksum.c \ + bus_if.h device_if.h \ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h CFLAGS+= -I${.CURDIR}/../../contrib/pf From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 14:15:55 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C6301065673; Fri, 29 Jun 2012 14:15:55 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E78F8FC0C; Fri, 29 Jun 2012 14:15:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TEFtEo050200; Fri, 29 Jun 2012 14:15:55 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TEFtTo050198; Fri, 29 Jun 2012 14:15:55 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201206291415.q5TEFtTo050198@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Jun 2012 14:15:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237781 - projects/amd64_xen_pv/sys/amd64/xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 14:15:55 -0000 Author: attilio Date: Fri Jun 29 14:15:54 2012 New Revision: 237781 URL: http://svn.freebsd.org/changeset/base/237781 Log: Introduce a new allocator backed by numa to replace mmu_alloc() as long as it is safe to go with it. Please note that the interface needs to be cleaned up in order to just allow page size allocation and not pass an arbitrary length. Reviewed by: cherry Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Jun 29 14:14:49 2012 (r237780) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Jun 29 14:15:54 2012 (r237781) @@ -10,6 +10,8 @@ * All rights reserved. * Copyright (c) 2012 Spectra Logic Corporation * All rights reserved. + * Copyright (c) 2012 Citrix Systems + * All rights reserved. * * This code is derived from software contributed to Berkeley by * the Systems Programming Group of the University of Utah Computer @@ -120,6 +122,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -136,6 +139,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -179,6 +183,7 @@ static vm_paddr_t boot_ptendphys; /* phy * bootstrap page tables */ +static uma_zone_t xen_pagezone; static size_t tsz; /* mmu_map.h opaque cookie size */ static vm_offset_t (*ptmb_mappedalloc)(size_t) = NULL; static void (*ptmb_mappedfree)(size_t) = NULL; @@ -1160,3 +1165,51 @@ pmap_change_attr(vm_offset_t va, vm_size KASSERT(0, ("XXX: TODO\n")); return -1; } + +static vm_offset_t +xen_pagezone_alloc(size_t size) +{ + vm_offset_t ret; + + KASSERT(size == PAGE_SIZE, ("%s: invalid size", __func__)); + + ret = (vm_offset_t)uma_zalloc(xen_pagezone, M_NOWAIT | M_ZERO); + if (ret == 0) + panic("%s: failed allocation\n", __func__); + return (ret); +} + +static void +xen_pagezone_free(vm_offset_t page) +{ + + uma_zfree(xen_pagezone, (void *)page); +} + +static int +xen_pagezone_init(void *mem, int size, int flags) +{ + vm_offset_t va; + + va = (vm_offset_t)mem; + + /* Xen requires the page table hierarchy to be R/O. */ + pmap_xen_setpages_ro(va, atop(size)); + return (0); +} + +/* + * Replace the custom mmu_alloc(), backed by vallocpages(), with an + * uma backed allocator, as soon as it is possible. + */ +static void +setup_xen_pagezone(void *dummy __unused) +{ + + xen_pagezone = uma_zcreate("XEN PAGEZONE", PAGE_SIZE, NULL, NULL, + xen_pagezone_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); + ptmb_mappedalloc = xen_pagezone_alloc; + ptmb_mappedfree = xen_pagezone_free; +} +SYSINIT(setup_xen_pagezone, SI_SUB_VM_CONF, SI_ORDER_ANY, setup_xen_pagezone, + NULL); From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 14:33:01 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 570791065672; Fri, 29 Jun 2012 14:33:01 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 410328FC0C; Fri, 29 Jun 2012 14:33:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TEX1xV050950; Fri, 29 Jun 2012 14:33:01 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TEX17o050947; Fri, 29 Jun 2012 14:33:01 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201206291433.q5TEX17o050947@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Jun 2012 14:33:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237782 - projects/amd64_xen_pv/sys/amd64/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 14:33:01 -0000 Author: attilio Date: Fri Jun 29 14:33:00 2012 New Revision: 237782 URL: http://svn.freebsd.org/changeset/base/237782 Log: For the time being, untile single-user doesn't boot and work, disable SMP option for XEN. Approved by: cherry Modified: projects/amd64_xen_pv/sys/amd64/conf/XEN Modified: projects/amd64_xen_pv/sys/amd64/conf/XEN ============================================================================== --- projects/amd64_xen_pv/sys/amd64/conf/XEN Fri Jun 29 14:15:54 2012 (r237781) +++ projects/amd64_xen_pv/sys/amd64/conf/XEN Fri Jun 29 14:33:00 2012 (r237782) @@ -62,7 +62,7 @@ nodevice isa options MCLSHIFT=12 # To make an SMP kernel, the next line is needed -options SMP # Symmetric MultiProcessor Kernel +nooptions SMP # Symmetric MultiProcessor Kernel #device atkbdc # AT keyboard controller #device atkbd # AT keyboard From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 14:39:04 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0B7C106564A; Fri, 29 Jun 2012 14:39:04 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9AF778FC16; Fri, 29 Jun 2012 14:39:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TEd4cA051276; Fri, 29 Jun 2012 14:39:04 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TEd48q051273; Fri, 29 Jun 2012 14:39:04 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206291439.q5TEd48q051273@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 29 Jun 2012 14:39:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237783 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 14:39:04 -0000 Author: glebius Date: Fri Jun 29 14:39:04 2012 New Revision: 237783 URL: http://svn.freebsd.org/changeset/base/237783 Log: - Make hash sizes configurable via loader tunables. - Reduce default size to a more conservative value of 32768. Modified: projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pfvar.h Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Fri Jun 29 14:33:00 2012 (r237782) +++ projects/pf/head/sys/contrib/pf/net/pf.c Fri Jun 29 14:39:04 2012 (r237783) @@ -375,13 +375,24 @@ VNET_DEFINE(struct pf_limit, pf_limits[P } while (0) static MALLOC_DEFINE(M_PFHASH, "pf_hash", "pf(4) hash header structures"); -/* XXXGL: make static? */ VNET_DEFINE(struct pf_keyhash *, pf_keyhash); VNET_DEFINE(struct pf_idhash *, pf_idhash); VNET_DEFINE(u_long, pf_hashmask); VNET_DEFINE(struct pf_srchash *, pf_srchash); VNET_DEFINE(u_long, pf_srchashmask); +SYSCTL_NODE(_net, OID_AUTO, pf, CTLFLAG_RW, 0, "pf(4)"); + +VNET_DEFINE(u_long, pf_hashsize); +#define V_pf_hashsize VNET(pf_hashsize) +SYSCTL_VNET_UINT(_net_pf, OID_AUTO, states_hashsize, CTLFLAG_RDTUN, + &VNET_NAME(pf_hashsize), 0, "Size of pf(4) states hashtable"); + +VNET_DEFINE(u_long, pf_srchashsize); +#define V_pf_srchashsize VNET(pf_srchashsize) +SYSCTL_VNET_UINT(_net_pf, OID_AUTO, source_nodes_hashsize, CTLFLAG_RDTUN, + &VNET_NAME(pf_srchashsize), 0, "Size of pf(4) source nodes hashtable"); + VNET_DEFINE(void *, pf_swi_cookie); /* @@ -715,6 +726,13 @@ pf_initialize() struct pf_srchash *sh; u_int i; + TUNABLE_ULONG_FETCH("net.pf.states_hashsize", &V_pf_hashsize); + if (V_pf_hashsize == 0 || !powerof2(V_pf_hashsize)) + V_pf_hashsize = PF_HASHSIZ; + TUNABLE_ULONG_FETCH("net.pf.source_nodes_hashsize", &V_pf_srchashsize); + if (V_pf_srchashsize == 0 || !powerof2(V_pf_srchashsize)) + V_pf_srchashsize = PF_HASHSIZ / 4; + /* States and state keys storage. */ V_pf_state_z = uma_zcreate("pf states", sizeof(struct pf_state), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); @@ -724,11 +742,11 @@ pf_initialize() V_pf_state_key_z = uma_zcreate("pf state keys", sizeof(struct pf_state_key), NULL, NULL, pf_state_key_ini, NULL, UMA_ALIGN_PTR, 0); - V_pf_keyhash = malloc(PF_HASHSIZ * sizeof(struct pf_keyhash), M_PFHASH, - M_WAITOK|M_ZERO); - V_pf_idhash = malloc(PF_HASHSIZ * sizeof(struct pf_idhash), M_PFHASH, - M_WAITOK|M_ZERO); - V_pf_hashmask = PF_HASHSIZ - 1; + V_pf_keyhash = malloc(V_pf_hashsize * sizeof(struct pf_keyhash), + M_PFHASH, M_WAITOK | M_ZERO); + V_pf_idhash = malloc(V_pf_hashsize * sizeof(struct pf_idhash), + M_PFHASH, M_WAITOK | M_ZERO); + V_pf_hashmask = V_pf_hashsize - 1; for (i = 0, kh = V_pf_keyhash, ih = V_pf_idhash; i <= V_pf_hashmask; i++, kh++, ih++) { mtx_init(&kh->lock, "pf_keyhash", NULL, MTX_DEF); @@ -741,9 +759,9 @@ pf_initialize() 0); V_pf_limits[PF_LIMIT_SRC_NODES].zone = V_pf_sources_z; uma_zone_set_max(V_pf_sources_z, PFSNODE_HIWAT); - V_pf_srchash = malloc((PF_HASHSIZ / 4) * sizeof(struct pf_srchash), + V_pf_srchash = malloc(V_pf_srchashsize * sizeof(struct pf_srchash), M_PFHASH, M_WAITOK|M_ZERO); - V_pf_srchashmask = (PF_HASHSIZ / 4) - 1; + V_pf_srchashmask = V_pf_srchashsize - 1; for (i = 0, sh = V_pf_srchash; i <= V_pf_srchashmask; i++, sh++) mtx_init(&sh->lock, "pf_srchash", NULL, MTX_DEF); Modified: projects/pf/head/sys/contrib/pf/net/pfvar.h ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pfvar.h Fri Jun 29 14:33:00 2012 (r237782) +++ projects/pf/head/sys/contrib/pf/net/pfvar.h Fri Jun 29 14:39:04 2012 (r237783) @@ -1672,7 +1672,7 @@ struct pf_idhash { struct mtx lock; }; -#define PF_HASHSIZ (262144) /* now 2^18 XXXGL: grow? */ +#define PF_HASHSIZ (32768) VNET_DECLARE(struct pf_keyhash *, pf_keyhash); VNET_DECLARE(struct pf_idhash *, pf_idhash); VNET_DECLARE(u_long, pf_hashmask); From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 14:55:58 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CA0D106567B; Fri, 29 Jun 2012 14:55:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E36358FC1B; Fri, 29 Jun 2012 14:55:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TEtv8x052009; Fri, 29 Jun 2012 14:55:57 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TEtvuY052007; Fri, 29 Jun 2012 14:55:57 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206291455.q5TEtvuY052007@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 29 Jun 2012 14:55:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237784 - projects/pf/head/contrib/pf/man X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 14:55:58 -0000 Author: glebius Date: Fri Jun 29 14:55:57 2012 New Revision: 237784 URL: http://svn.freebsd.org/changeset/base/237784 Log: Document loader tunables of pf(4). Modified: projects/pf/head/contrib/pf/man/pf.4 Modified: projects/pf/head/contrib/pf/man/pf.4 ============================================================================== --- projects/pf/head/contrib/pf/man/pf.4 Fri Jun 29 14:39:04 2012 (r237783) +++ projects/pf/head/contrib/pf/man/pf.4 Fri Jun 29 14:55:57 2012 (r237784) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 4 2012 +.Dd June 29 2012 .Dt PF 4 .Os .Sh NAME @@ -75,6 +75,25 @@ separated by characters, similar to how file system hierarchies are laid out. The final component of the anchor path is the anchor under which operations will be performed. +.Sh SYSCTL VARIABLES AND LOADER TUNABLES +The following +.Xr loader 8 +tunables are available. +.Bl -tag -width indent +.It Va net.pf.states_hashsize +Size of hash tables that store states. +Should be power of 2. +Default value is 32768. +.It Va net.pf.source_nodes_hashsize +Size of hash table that store source nodes. +Should be power of 2. +Default value is 8192. +.El +.Pp +Read only +.Xr sysctl 8 +variables with matching names are provided to obtain current values +at runtime. .Sh IOCTL INTERFACE .Nm supports the following From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 15:09:39 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FC68106566B; Fri, 29 Jun 2012 15:09:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AD318FC16; Fri, 29 Jun 2012 15:09:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TF9cYJ052673; Fri, 29 Jun 2012 15:09:38 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TF9cWf052670; Fri, 29 Jun 2012 15:09:38 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206291509.q5TF9cWf052670@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 29 Jun 2012 15:09:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237785 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 15:09:39 -0000 Author: glebius Date: Fri Jun 29 15:09:38 2012 New Revision: 237785 URL: http://svn.freebsd.org/changeset/base/237785 Log: Remove a couple of meaningless XXX from me. Modified: projects/pf/head/sys/contrib/pf/net/pf_if.c projects/pf/head/sys/contrib/pf/net/pf_norm.c Modified: projects/pf/head/sys/contrib/pf/net/pf_if.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_if.c Fri Jun 29 14:55:57 2012 (r237784) +++ projects/pf/head/sys/contrib/pf/net/pf_if.c Fri Jun 29 15:09:38 2012 (r237785) @@ -69,7 +69,6 @@ static VNET_DEFINE(long, pfi_update); #define V_pfi_update VNET(pfi_update) #define PFI_BUFFER_MAX 0x10000 -/* XXXGL */ static VNET_DEFINE(struct pfr_addr *, pfi_buffer); static VNET_DEFINE(int, pfi_buffer_cnt); static VNET_DEFINE(int, pfi_buffer_max); Modified: projects/pf/head/sys/contrib/pf/net/pf_norm.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_norm.c Fri Jun 29 14:55:57 2012 (r237784) +++ projects/pf/head/sys/contrib/pf/net/pf_norm.c Fri Jun 29 15:09:38 2012 (r237785) @@ -1517,10 +1517,8 @@ pf_normalize_tcp_stateful(struct mbuf *m int copyback = 0; int got_ts = 0; - /* XXXGL: lock */ - KASSERT((src->scrub || dst->scrub), - ("pf_normalize_tcp_statefull: src->scrub && dst->scrub!")); + ("%s: src->scrub && dst->scrub!", __func__)); /* * Enforce the minimum TTL seen for this connection. Negate a common From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 15:10:57 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C586106566B; Fri, 29 Jun 2012 15:10:57 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 501818FC0A; Fri, 29 Jun 2012 15:10:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TFAvV1052775; Fri, 29 Jun 2012 15:10:57 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TFAv9q052764; Fri, 29 Jun 2012 15:10:57 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201206291510.q5TFAv9q052764@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Jun 2012 15:10:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237786 - in projects/amd64_xen_pv: . bin/rcp bin/rm cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zhack c... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 15:10:57 -0000 Author: attilio Date: Fri Jun 29 15:10:54 2012 New Revision: 237786 URL: http://svn.freebsd.org/changeset/base/237786 Log: MFC @ r237782 Added: projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/ - copied from r237782, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zhack/ - copied from r237782, head/cddl/contrib/opensolaris/cmd/zhack/ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 - copied unchanged from r237782, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 projects/amd64_xen_pv/cddl/lib/libdtrace/io.d - copied unchanged from r237782, head/cddl/lib/libdtrace/io.d projects/amd64_xen_pv/cddl/usr.sbin/zhack/ - copied from r237782, head/cddl/usr.sbin/zhack/ projects/amd64_xen_pv/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c - copied unchanged from r237782, head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c projects/amd64_xen_pv/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h - copied unchanged from r237782, head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h projects/amd64_xen_pv/lib/libc/amd64/sys/__vdso_gettc.c - copied unchanged from r237782, head/lib/libc/amd64/sys/__vdso_gettc.c projects/amd64_xen_pv/lib/libc/i386/sys/__vdso_gettc.c - copied unchanged from r237782, head/lib/libc/i386/sys/__vdso_gettc.c projects/amd64_xen_pv/lib/libc/sys/__vdso_gettimeofday.c - copied unchanged from r237782, head/lib/libc/sys/__vdso_gettimeofday.c projects/amd64_xen_pv/lib/libc/sys/clock_gettime.c - copied unchanged from r237782, head/lib/libc/sys/clock_gettime.c projects/amd64_xen_pv/lib/libc/sys/gettimeofday.c - copied unchanged from r237782, head/lib/libc/sys/gettimeofday.c projects/amd64_xen_pv/lib/libz/test/ - copied from r237782, head/lib/libz/test/ projects/amd64_xen_pv/sbin/camcontrol/progress.c - copied unchanged from r237782, head/sbin/camcontrol/progress.c projects/amd64_xen_pv/sbin/camcontrol/progress.h - copied unchanged from r237782, head/sbin/camcontrol/progress.h projects/amd64_xen_pv/share/man/man4/bxe.4 - copied unchanged from r237782, head/share/man/man4/bxe.4 projects/amd64_xen_pv/share/man/man4/est.4 - copied unchanged from r237782, head/share/man/man4/est.4 projects/amd64_xen_pv/share/man/man4/filemon.4 - copied unchanged from r237782, head/share/man/man4/filemon.4 projects/amd64_xen_pv/sys/amd64/include/vdso.h - copied unchanged from r237782, head/sys/amd64/include/vdso.h projects/amd64_xen_pv/sys/arm/at91/at91sam9x25.c - copied unchanged from r237782, head/sys/arm/at91/at91sam9x25.c projects/amd64_xen_pv/sys/arm/at91/at91sam9x25reg.h - copied unchanged from r237782, head/sys/arm/at91/at91sam9x25reg.h projects/amd64_xen_pv/sys/arm/at91/board_sam9x25ek.c - copied unchanged from r237782, head/sys/arm/at91/board_sam9x25ek.c projects/amd64_xen_pv/sys/arm/at91/std.sam9x25ek - copied unchanged from r237782, head/sys/arm/at91/std.sam9x25ek projects/amd64_xen_pv/sys/arm/conf/SAM9X25EK - copied unchanged from r237782, head/sys/arm/conf/SAM9X25EK projects/amd64_xen_pv/sys/arm/conf/SAM9X25EK.hints - copied unchanged from r237782, head/sys/arm/conf/SAM9X25EK.hints projects/amd64_xen_pv/sys/arm/include/atags.h - copied unchanged from r237782, head/sys/arm/include/atags.h projects/amd64_xen_pv/sys/arm/include/vdso.h - copied unchanged from r237782, head/sys/arm/include/vdso.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c - copied unchanged from r237782, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c projects/amd64_xen_pv/sys/contrib/dev/acpica/common/ahpredef.c - copied unchanged from r237782, head/sys/contrib/dev/acpica/common/ahpredef.c projects/amd64_xen_pv/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu - copied unchanged from r237782, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu projects/amd64_xen_pv/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu - copied unchanged from r237782, head/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c - copied unchanged from r237782, head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h - copied unchanged from r237782, head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c - copied unchanged from r237782, head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h - copied unchanged from r237782, head/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h - copied unchanged from r237782, head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h projects/amd64_xen_pv/sys/dev/cxgbe/tom/ - copied from r237782, head/sys/dev/cxgbe/tom/ projects/amd64_xen_pv/sys/dev/filemon/ - copied from r237782, head/sys/dev/filemon/ projects/amd64_xen_pv/sys/i386/include/vdso.h - copied unchanged from r237782, head/sys/i386/include/vdso.h projects/amd64_xen_pv/sys/ia64/include/vdso.h - copied unchanged from r237782, head/sys/ia64/include/vdso.h projects/amd64_xen_pv/sys/kern/kern_rangelock.c - copied unchanged from r237782, head/sys/kern/kern_rangelock.c projects/amd64_xen_pv/sys/kern/kern_sharedpage.c - copied unchanged from r237782, head/sys/kern/kern_sharedpage.c projects/amd64_xen_pv/sys/kern/subr_dummy_vdso_tc.c - copied unchanged from r237782, head/sys/kern/subr_dummy_vdso_tc.c projects/amd64_xen_pv/sys/mips/include/vdso.h - copied unchanged from r237782, head/sys/mips/include/vdso.h projects/amd64_xen_pv/sys/modules/cxgbe/tom/ - copied from r237782, head/sys/modules/cxgbe/tom/ projects/amd64_xen_pv/sys/modules/filemon/ - copied from r237782, head/sys/modules/filemon/ projects/amd64_xen_pv/sys/modules/nand/ - copied from r237782, head/sys/modules/nand/ projects/amd64_xen_pv/sys/modules/netmap/ - copied from r237782, head/sys/modules/netmap/ projects/amd64_xen_pv/sys/modules/toecore/ - copied from r237782, head/sys/modules/toecore/ projects/amd64_xen_pv/sys/netinet/toecore.c - copied unchanged from r237782, head/sys/netinet/toecore.c projects/amd64_xen_pv/sys/netinet/toecore.h - copied unchanged from r237782, head/sys/netinet/toecore.h projects/amd64_xen_pv/sys/pc98/include/vdso.h - copied unchanged from r237782, head/sys/pc98/include/vdso.h projects/amd64_xen_pv/sys/powerpc/booke/machdep_e500.c - copied unchanged from r237782, head/sys/powerpc/booke/machdep_e500.c projects/amd64_xen_pv/sys/powerpc/booke/machdep_ppc4xx.c - copied unchanged from r237782, head/sys/powerpc/booke/machdep_ppc4xx.c projects/amd64_xen_pv/sys/powerpc/include/machdep.h - copied unchanged from r237782, head/sys/powerpc/include/machdep.h projects/amd64_xen_pv/sys/powerpc/include/vdso.h - copied unchanged from r237782, head/sys/powerpc/include/vdso.h projects/amd64_xen_pv/sys/sparc64/include/vdso.h - copied unchanged from r237782, head/sys/sparc64/include/vdso.h projects/amd64_xen_pv/sys/sys/rangelock.h - copied unchanged from r237782, head/sys/sys/rangelock.h projects/amd64_xen_pv/sys/sys/vdso.h - copied unchanged from r237782, head/sys/sys/vdso.h projects/amd64_xen_pv/sys/x86/acpica/acpi_wakeup.c - copied unchanged from r237782, head/sys/x86/acpica/acpi_wakeup.c projects/amd64_xen_pv/sys/x86/include/vdso.h - copied unchanged from r237782, head/sys/x86/include/vdso.h projects/amd64_xen_pv/tools/build/make_check/check.mk - copied unchanged from r237782, head/tools/build/make_check/check.mk projects/amd64_xen_pv/tools/build/options/WITH_GNU_SORT - copied unchanged from r237782, head/tools/build/options/WITH_GNU_SORT projects/amd64_xen_pv/tools/regression/filemon/ - copied from r237782, head/tools/regression/filemon/ projects/amd64_xen_pv/tools/regression/usr.bin/make/test-new.mk - copied unchanged from r237782, head/tools/regression/usr.bin/make/test-new.mk projects/amd64_xen_pv/tools/regression/usr.bin/make/variables/modifier_t/ - copied from r237782, head/tools/regression/usr.bin/make/variables/modifier_t/ projects/amd64_xen_pv/tools/regression/usr.bin/make/variables/opt_V/ - copied from r237782, head/tools/regression/usr.bin/make/variables/opt_V/ projects/amd64_xen_pv/tools/tools/ath/athaggrstats/ - copied from r237782, head/tools/tools/ath/athaggrstats/ projects/amd64_xen_pv/tools/tools/ifpifa/ - copied from r237782, head/tools/tools/ifpifa/ projects/amd64_xen_pv/usr.sbin/pciconf/err.c - copied unchanged from r237782, head/usr.sbin/pciconf/err.c Deleted: projects/amd64_xen_pv/etc/auth.conf projects/amd64_xen_pv/etc/pam.d/kde projects/amd64_xen_pv/lib/libutil/auth.3 projects/amd64_xen_pv/lib/libutil/auth.conf.5 projects/amd64_xen_pv/lib/libz/example.c projects/amd64_xen_pv/lib/libz/minigzip.c projects/amd64_xen_pv/sys/amd64/acpica/acpi_switch.S projects/amd64_xen_pv/sys/amd64/acpica/acpi_wakeup.c projects/amd64_xen_pv/sys/arm/at91/files.at91sam9 projects/amd64_xen_pv/sys/dev/cxgb/cxgb_offload.c projects/amd64_xen_pv/sys/dev/cxgb/t3cdev.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/toecore/ projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_ddp.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_defs.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_tcp.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c projects/amd64_xen_pv/sys/i386/acpica/acpi_wakeup.c projects/amd64_xen_pv/sys/modules/cxgb/toecore/ projects/amd64_xen_pv/sys/netinet/toedev.h projects/amd64_xen_pv/tools/build/options/WITH_BSD_SORT Modified: projects/amd64_xen_pv/Makefile.inc1 projects/amd64_xen_pv/ObsoleteFiles.inc projects/amd64_xen_pv/UPDATING projects/amd64_xen_pv/bin/rcp/rcp.1 projects/amd64_xen_pv/bin/rm/rm.c projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c projects/amd64_xen_pv/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/amd64_xen_pv/cddl/lib/libnvpair/Makefile projects/amd64_xen_pv/cddl/lib/libzfs/Makefile projects/amd64_xen_pv/cddl/sbin/zpool/Makefile projects/amd64_xen_pv/cddl/usr.bin/ztest/Makefile projects/amd64_xen_pv/cddl/usr.sbin/Makefile projects/amd64_xen_pv/contrib/bind9/CHANGES projects/amd64_xen_pv/contrib/bind9/README projects/amd64_xen_pv/contrib/bind9/bin/named/builtin.c projects/amd64_xen_pv/contrib/bind9/bin/named/query.c projects/amd64_xen_pv/contrib/bind9/bin/named/server.c projects/amd64_xen_pv/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c projects/amd64_xen_pv/contrib/bind9/lib/bind9/api projects/amd64_xen_pv/contrib/bind9/lib/bind9/check.c projects/amd64_xen_pv/contrib/bind9/lib/dns/api projects/amd64_xen_pv/contrib/bind9/lib/dns/dnssec.c projects/amd64_xen_pv/contrib/bind9/lib/dns/include/dns/ecdb.h projects/amd64_xen_pv/contrib/bind9/lib/dns/include/dns/rpz.h projects/amd64_xen_pv/contrib/bind9/lib/dns/include/dns/sdb.h projects/amd64_xen_pv/contrib/bind9/lib/dns/include/dns/stats.h projects/amd64_xen_pv/contrib/bind9/lib/dns/include/dns/tsec.h projects/amd64_xen_pv/contrib/bind9/lib/dns/include/dns/view.h projects/amd64_xen_pv/contrib/bind9/lib/dns/rbtdb.c projects/amd64_xen_pv/contrib/bind9/lib/dns/rdata.c projects/amd64_xen_pv/contrib/bind9/lib/dns/rdataslab.c projects/amd64_xen_pv/contrib/bind9/lib/dns/resolver.c projects/amd64_xen_pv/contrib/bind9/lib/dns/sdb.c projects/amd64_xen_pv/contrib/bind9/lib/dns/tkey.c projects/amd64_xen_pv/contrib/bind9/lib/dns/zone.c projects/amd64_xen_pv/contrib/bind9/lib/isc/pthreads/mutex.c projects/amd64_xen_pv/contrib/bind9/lib/isccfg/api projects/amd64_xen_pv/contrib/bind9/lib/isccfg/parser.c projects/amd64_xen_pv/contrib/bind9/version projects/amd64_xen_pv/contrib/bsnmp/lib/bsnmpclient.3 projects/amd64_xen_pv/contrib/bsnmp/lib/bsnmplib.3 projects/amd64_xen_pv/contrib/bsnmp/snmp_mibII/mibII_tcp.c projects/amd64_xen_pv/contrib/bsnmp/snmp_target/snmp_target.3 projects/amd64_xen_pv/contrib/bsnmp/snmp_usm/snmp_usm.3 projects/amd64_xen_pv/contrib/bsnmp/snmp_vacm/snmp_vacm.3 projects/amd64_xen_pv/contrib/gcc/ChangeLog.gcc43 projects/amd64_xen_pv/contrib/gcc/config/arm/freebsd.h projects/amd64_xen_pv/contrib/gcc/config/sparc/freebsd.h projects/amd64_xen_pv/contrib/gcc/fold-const.c projects/amd64_xen_pv/contrib/gcc/gimplify.c projects/amd64_xen_pv/contrib/gcc/tree-ssa-ccp.c projects/amd64_xen_pv/contrib/gcc/tree-ssa-pre.c projects/amd64_xen_pv/contrib/groff/tmac/doc-common projects/amd64_xen_pv/contrib/less/LICENSE projects/amd64_xen_pv/contrib/less/Makefile.aut projects/amd64_xen_pv/contrib/less/NEWS projects/amd64_xen_pv/contrib/less/README projects/amd64_xen_pv/contrib/less/brac.c projects/amd64_xen_pv/contrib/less/ch.c projects/amd64_xen_pv/contrib/less/charset.c projects/amd64_xen_pv/contrib/less/charset.h projects/amd64_xen_pv/contrib/less/cmd.h projects/amd64_xen_pv/contrib/less/cmdbuf.c projects/amd64_xen_pv/contrib/less/command.c projects/amd64_xen_pv/contrib/less/configure projects/amd64_xen_pv/contrib/less/configure.ac projects/amd64_xen_pv/contrib/less/cvt.c projects/amd64_xen_pv/contrib/less/decode.c projects/amd64_xen_pv/contrib/less/defines.ds projects/amd64_xen_pv/contrib/less/defines.h.in projects/amd64_xen_pv/contrib/less/defines.o2 projects/amd64_xen_pv/contrib/less/defines.o9 projects/amd64_xen_pv/contrib/less/defines.wn projects/amd64_xen_pv/contrib/less/edit.c projects/amd64_xen_pv/contrib/less/filename.c projects/amd64_xen_pv/contrib/less/forwback.c projects/amd64_xen_pv/contrib/less/help.c projects/amd64_xen_pv/contrib/less/ifile.c projects/amd64_xen_pv/contrib/less/input.c projects/amd64_xen_pv/contrib/less/jump.c projects/amd64_xen_pv/contrib/less/less.h projects/amd64_xen_pv/contrib/less/less.hlp projects/amd64_xen_pv/contrib/less/less.man projects/amd64_xen_pv/contrib/less/less.nro projects/amd64_xen_pv/contrib/less/lessecho.c projects/amd64_xen_pv/contrib/less/lessecho.man projects/amd64_xen_pv/contrib/less/lessecho.nro projects/amd64_xen_pv/contrib/less/lesskey.c projects/amd64_xen_pv/contrib/less/lesskey.h projects/amd64_xen_pv/contrib/less/lesskey.man projects/amd64_xen_pv/contrib/less/lesskey.nro projects/amd64_xen_pv/contrib/less/lglob.h projects/amd64_xen_pv/contrib/less/line.c projects/amd64_xen_pv/contrib/less/linenum.c projects/amd64_xen_pv/contrib/less/lsystem.c projects/amd64_xen_pv/contrib/less/main.c projects/amd64_xen_pv/contrib/less/mark.c projects/amd64_xen_pv/contrib/less/mkhelp.c projects/amd64_xen_pv/contrib/less/optfunc.c projects/amd64_xen_pv/contrib/less/option.c projects/amd64_xen_pv/contrib/less/option.h projects/amd64_xen_pv/contrib/less/opttbl.c projects/amd64_xen_pv/contrib/less/os.c projects/amd64_xen_pv/contrib/less/output.c projects/amd64_xen_pv/contrib/less/pattern.c projects/amd64_xen_pv/contrib/less/pattern.h projects/amd64_xen_pv/contrib/less/pckeys.h projects/amd64_xen_pv/contrib/less/position.c projects/amd64_xen_pv/contrib/less/position.h projects/amd64_xen_pv/contrib/less/prompt.c projects/amd64_xen_pv/contrib/less/screen.c projects/amd64_xen_pv/contrib/less/scrsize.c projects/amd64_xen_pv/contrib/less/search.c projects/amd64_xen_pv/contrib/less/signal.c projects/amd64_xen_pv/contrib/less/tags.c projects/amd64_xen_pv/contrib/less/ttyin.c projects/amd64_xen_pv/contrib/less/version.c projects/amd64_xen_pv/contrib/libc++/include/__bit_reference projects/amd64_xen_pv/contrib/libstdc++/include/bits/locale_facets.tcc projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_bvector.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_deque.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_list.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_map.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_multimap.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_multiset.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_set.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_tree.h projects/amd64_xen_pv/contrib/libstdc++/include/bits/stl_vector.h projects/amd64_xen_pv/contrib/llvm/include/llvm/Support/FileSystem.h projects/amd64_xen_pv/contrib/llvm/lib/Support/Unix/PathV2.inc projects/amd64_xen_pv/contrib/llvm/lib/Support/Windows/PathV2.inc projects/amd64_xen_pv/contrib/llvm/tools/bugpoint/ToolRunner.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp projects/amd64_xen_pv/contrib/telnet/telnet/telnet.1 projects/amd64_xen_pv/contrib/top/display.c projects/amd64_xen_pv/contrib/top/layout.h projects/amd64_xen_pv/contrib/top/machine.h projects/amd64_xen_pv/contrib/top/top.c projects/amd64_xen_pv/contrib/traceroute/traceroute.8 projects/amd64_xen_pv/crypto/openssh/ssh-keyscan.1 projects/amd64_xen_pv/crypto/openssh/ssh-keyscan.c projects/amd64_xen_pv/crypto/openssl/CHANGES projects/amd64_xen_pv/crypto/openssl/Configure projects/amd64_xen_pv/crypto/openssl/FAQ projects/amd64_xen_pv/crypto/openssl/LICENSE projects/amd64_xen_pv/crypto/openssl/Makefile projects/amd64_xen_pv/crypto/openssl/NEWS projects/amd64_xen_pv/crypto/openssl/README projects/amd64_xen_pv/crypto/openssl/apps/Makefile projects/amd64_xen_pv/crypto/openssl/apps/asn1pars.c projects/amd64_xen_pv/crypto/openssl/apps/cms.c projects/amd64_xen_pv/crypto/openssl/apps/openssl.cnf projects/amd64_xen_pv/crypto/openssl/apps/pkcs12.c projects/amd64_xen_pv/crypto/openssl/apps/s_client.c projects/amd64_xen_pv/crypto/openssl/apps/s_server.c projects/amd64_xen_pv/crypto/openssl/apps/x509.c projects/amd64_xen_pv/crypto/openssl/config projects/amd64_xen_pv/crypto/openssl/crypto/asn1/a_object.c projects/amd64_xen_pv/crypto/openssl/crypto/asn1/a_strex.c projects/amd64_xen_pv/crypto/openssl/crypto/asn1/a_strnid.c projects/amd64_xen_pv/crypto/openssl/crypto/asn1/asn1.h projects/amd64_xen_pv/crypto/openssl/crypto/asn1/asn_mime.c projects/amd64_xen_pv/crypto/openssl/crypto/asn1/x_name.c projects/amd64_xen_pv/crypto/openssl/crypto/asn1/x_pubkey.c projects/amd64_xen_pv/crypto/openssl/crypto/bio/bf_buff.c projects/amd64_xen_pv/crypto/openssl/crypto/bio/bio.h projects/amd64_xen_pv/crypto/openssl/crypto/bio/bss_dgram.c projects/amd64_xen_pv/crypto/openssl/crypto/bn/asm/mo-586.pl projects/amd64_xen_pv/crypto/openssl/crypto/bn/asm/ppc.pl projects/amd64_xen_pv/crypto/openssl/crypto/bn/bn_blind.c projects/amd64_xen_pv/crypto/openssl/crypto/bn/bn_gf2m.c projects/amd64_xen_pv/crypto/openssl/crypto/buffer/buffer.c projects/amd64_xen_pv/crypto/openssl/crypto/cms/cms.h projects/amd64_xen_pv/crypto/openssl/crypto/cms/cms_enc.c projects/amd64_xen_pv/crypto/openssl/crypto/cms/cms_env.c projects/amd64_xen_pv/crypto/openssl/crypto/cms/cms_io.c projects/amd64_xen_pv/crypto/openssl/crypto/cms/cms_lcl.h projects/amd64_xen_pv/crypto/openssl/crypto/cms/cms_smime.c projects/amd64_xen_pv/crypto/openssl/crypto/comp/c_rle.c projects/amd64_xen_pv/crypto/openssl/crypto/conf/conf_api.c projects/amd64_xen_pv/crypto/openssl/crypto/cryptlib.c projects/amd64_xen_pv/crypto/openssl/crypto/crypto.h projects/amd64_xen_pv/crypto/openssl/crypto/ec/ec2_smpl.c projects/amd64_xen_pv/crypto/openssl/crypto/ec/ec_key.c projects/amd64_xen_pv/crypto/openssl/crypto/ec/ecp_smpl.c projects/amd64_xen_pv/crypto/openssl/crypto/ecdsa/ecdsatest.c projects/amd64_xen_pv/crypto/openssl/crypto/ecdsa/ecs_ossl.c projects/amd64_xen_pv/crypto/openssl/crypto/evp/evp_test.c projects/amd64_xen_pv/crypto/openssl/crypto/ocsp/ocsp_lib.c projects/amd64_xen_pv/crypto/openssl/crypto/opensslv.h projects/amd64_xen_pv/crypto/openssl/crypto/perlasm/cbc.pl projects/amd64_xen_pv/crypto/openssl/crypto/pkcs7/pk7_smime.c projects/amd64_xen_pv/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl projects/amd64_xen_pv/crypto/openssl/crypto/rc4/rc4_skey.c projects/amd64_xen_pv/crypto/openssl/crypto/rsa/rsa_eay.c projects/amd64_xen_pv/crypto/openssl/crypto/x509/x509_vfy.c projects/amd64_xen_pv/crypto/openssl/crypto/x509v3/v3_addr.c projects/amd64_xen_pv/crypto/openssl/crypto/x509v3/v3_asid.c projects/amd64_xen_pv/crypto/openssl/doc/HOWTO/proxy_certificates.txt projects/amd64_xen_pv/crypto/openssl/doc/apps/ca.pod projects/amd64_xen_pv/crypto/openssl/doc/apps/dgst.pod projects/amd64_xen_pv/crypto/openssl/doc/crypto/engine.pod projects/amd64_xen_pv/crypto/openssl/doc/ssl/SSL_clear.pod projects/amd64_xen_pv/crypto/openssl/engines/e_capi.c projects/amd64_xen_pv/crypto/openssl/engines/e_capi_err.h projects/amd64_xen_pv/crypto/openssl/fips/fips_canister.c projects/amd64_xen_pv/crypto/openssl/openssl.spec projects/amd64_xen_pv/crypto/openssl/ssl/bio_ssl.c projects/amd64_xen_pv/crypto/openssl/ssl/d1_both.c projects/amd64_xen_pv/crypto/openssl/ssl/d1_clnt.c projects/amd64_xen_pv/crypto/openssl/ssl/d1_enc.c projects/amd64_xen_pv/crypto/openssl/ssl/d1_lib.c projects/amd64_xen_pv/crypto/openssl/ssl/d1_pkt.c projects/amd64_xen_pv/crypto/openssl/ssl/d1_srvr.c projects/amd64_xen_pv/crypto/openssl/ssl/s2_srvr.c projects/amd64_xen_pv/crypto/openssl/ssl/s3_clnt.c projects/amd64_xen_pv/crypto/openssl/ssl/s3_lib.c projects/amd64_xen_pv/crypto/openssl/ssl/s3_srvr.c projects/amd64_xen_pv/crypto/openssl/ssl/ssl.h projects/amd64_xen_pv/crypto/openssl/ssl/ssl_ciph.c projects/amd64_xen_pv/crypto/openssl/ssl/ssl_err.c projects/amd64_xen_pv/crypto/openssl/ssl/ssl_lib.c projects/amd64_xen_pv/crypto/openssl/ssl/ssl_locl.h projects/amd64_xen_pv/crypto/openssl/ssl/t1_lib.c projects/amd64_xen_pv/crypto/openssl/util/fipslink.pl projects/amd64_xen_pv/crypto/openssl/util/mkerr.pl projects/amd64_xen_pv/crypto/openssl/util/pl/VC-32.pl projects/amd64_xen_pv/etc/Makefile projects/amd64_xen_pv/etc/defaults/periodic.conf projects/amd64_xen_pv/etc/login.conf projects/amd64_xen_pv/etc/mtree/BSD.include.dist projects/amd64_xen_pv/etc/pam.d/Makefile projects/amd64_xen_pv/etc/periodic/daily/400.status-disks projects/amd64_xen_pv/gnu/lib/libgomp/config.h projects/amd64_xen_pv/gnu/lib/libstdc++/config.h projects/amd64_xen_pv/gnu/lib/libsupc++/Version.map projects/amd64_xen_pv/gnu/usr.bin/sort/Makefile projects/amd64_xen_pv/include/Makefile projects/amd64_xen_pv/include/fmtmsg.h projects/amd64_xen_pv/include/paths.h projects/amd64_xen_pv/include/wchar.h projects/amd64_xen_pv/kerberos5/Makefile.inc projects/amd64_xen_pv/kerberos5/lib/libasn1/Makefile projects/amd64_xen_pv/kerberos5/lib/libgssapi_krb5/Makefile projects/amd64_xen_pv/kerberos5/lib/libgssapi_ntlm/Makefile projects/amd64_xen_pv/kerberos5/lib/libgssapi_spnego/Makefile projects/amd64_xen_pv/kerberos5/lib/libhdb/Makefile projects/amd64_xen_pv/kerberos5/lib/libheimbase/Makefile projects/amd64_xen_pv/kerberos5/lib/libheimipcc/Makefile projects/amd64_xen_pv/kerberos5/lib/libheimipcs/Makefile projects/amd64_xen_pv/kerberos5/lib/libhx509/Makefile projects/amd64_xen_pv/kerberos5/lib/libkadm5clnt/Makefile projects/amd64_xen_pv/kerberos5/lib/libkadm5srv/Makefile projects/amd64_xen_pv/kerberos5/lib/libkafs5/Makefile projects/amd64_xen_pv/kerberos5/lib/libkdc/Makefile projects/amd64_xen_pv/kerberos5/lib/libkrb5/Makefile projects/amd64_xen_pv/kerberos5/lib/libroken/Makefile projects/amd64_xen_pv/kerberos5/lib/libvers/Makefile projects/amd64_xen_pv/kerberos5/libexec/hprop/Makefile projects/amd64_xen_pv/kerberos5/libexec/kadmind/Makefile projects/amd64_xen_pv/kerberos5/libexec/kcm/Makefile projects/amd64_xen_pv/kerberos5/libexec/kdigest/Makefile projects/amd64_xen_pv/kerberos5/libexec/kfd/Makefile projects/amd64_xen_pv/kerberos5/tools/asn1_compile/Makefile projects/amd64_xen_pv/kerberos5/tools/slc/Makefile projects/amd64_xen_pv/kerberos5/usr.bin/hxtool/Makefile projects/amd64_xen_pv/kerberos5/usr.bin/kadmin/Makefile projects/amd64_xen_pv/kerberos5/usr.bin/kcc/Makefile projects/amd64_xen_pv/kerberos5/usr.bin/kf/Makefile projects/amd64_xen_pv/kerberos5/usr.bin/string2key/Makefile projects/amd64_xen_pv/kerberos5/usr.sbin/iprop-log/Makefile projects/amd64_xen_pv/kerberos5/usr.sbin/ktutil/Makefile projects/amd64_xen_pv/lib/bind/dns/code.h projects/amd64_xen_pv/lib/bind/dns/dns/enumtype.h projects/amd64_xen_pv/lib/bind/dns/dns/rdatastruct.h projects/amd64_xen_pv/lib/libc++/Makefile projects/amd64_xen_pv/lib/libc/amd64/sys/Makefile.inc projects/amd64_xen_pv/lib/libc/arm/Symbol.map projects/amd64_xen_pv/lib/libc/gen/aux.c projects/amd64_xen_pv/lib/libc/gen/fstab.c projects/amd64_xen_pv/lib/libc/gen/getnetgrent.c projects/amd64_xen_pv/lib/libc/gen/posix_spawnattr_getflags.3 projects/amd64_xen_pv/lib/libc/gen/signal.3 projects/amd64_xen_pv/lib/libc/gen/sysconf.c projects/amd64_xen_pv/lib/libc/gen/syslog.c projects/amd64_xen_pv/lib/libc/i386/sys/Makefile.inc projects/amd64_xen_pv/lib/libc/include/libc_private.h projects/amd64_xen_pv/lib/libc/include/port_before.h projects/amd64_xen_pv/lib/libc/locale/setrunelocale.c projects/amd64_xen_pv/lib/libc/net/Makefile.inc projects/amd64_xen_pv/lib/libc/net/getaddrinfo.c projects/amd64_xen_pv/lib/libc/stdio/fpurge.c projects/amd64_xen_pv/lib/libc/stdlib/Makefile.inc projects/amd64_xen_pv/lib/libc/stdlib/getopt_long.c projects/amd64_xen_pv/lib/libc/stdlib/realpath.c projects/amd64_xen_pv/lib/libc/stdlib/strfmon.3 projects/amd64_xen_pv/lib/libc/stdtime/Makefile.inc projects/amd64_xen_pv/lib/libc/stdtime/strftime.3 projects/amd64_xen_pv/lib/libc/stdtime/strftime.c projects/amd64_xen_pv/lib/libc/stdtime/strptime.3 projects/amd64_xen_pv/lib/libc/string/Makefile.inc projects/amd64_xen_pv/lib/libc/string/strcasecmp.3 projects/amd64_xen_pv/lib/libc/string/strcoll.3 projects/amd64_xen_pv/lib/libc/string/strstr.3 projects/amd64_xen_pv/lib/libc/string/strxfrm.3 projects/amd64_xen_pv/lib/libc/sys/Makefile.inc projects/amd64_xen_pv/lib/libc/sys/posix_fadvise.2 projects/amd64_xen_pv/lib/libc/sys/stat.2 projects/amd64_xen_pv/lib/libcrypt/Makefile projects/amd64_xen_pv/lib/libcrypt/crypt.3 projects/amd64_xen_pv/lib/libcrypt/crypt.c projects/amd64_xen_pv/lib/libcxxrt/Makefile projects/amd64_xen_pv/lib/libcxxrt/Version.map projects/amd64_xen_pv/lib/libedit/common.c projects/amd64_xen_pv/lib/libedit/editline.3 projects/amd64_xen_pv/lib/libedit/editrc.5 projects/amd64_xen_pv/lib/libedit/el.c projects/amd64_xen_pv/lib/libedit/el.h projects/amd64_xen_pv/lib/libedit/histedit.h projects/amd64_xen_pv/lib/libedit/history.c projects/amd64_xen_pv/lib/libedit/key.c projects/amd64_xen_pv/lib/libedit/key.h projects/amd64_xen_pv/lib/libedit/prompt.c projects/amd64_xen_pv/lib/libedit/prompt.h projects/amd64_xen_pv/lib/libedit/read.c projects/amd64_xen_pv/lib/libedit/refresh.c projects/amd64_xen_pv/lib/libedit/search.c projects/amd64_xen_pv/lib/libedit/sig.c projects/amd64_xen_pv/lib/libedit/sig.h projects/amd64_xen_pv/lib/libedit/term.c projects/amd64_xen_pv/lib/libedit/term.h projects/amd64_xen_pv/lib/libedit/tty.c projects/amd64_xen_pv/lib/libedit/vi.c projects/amd64_xen_pv/lib/libelf/Makefile projects/amd64_xen_pv/lib/libelf/elf.3 projects/amd64_xen_pv/lib/libelf/elf_begin.3 projects/amd64_xen_pv/lib/libelf/gelf.3 projects/amd64_xen_pv/lib/libfetch/common.c projects/amd64_xen_pv/lib/libgpib/gpib.3 projects/amd64_xen_pv/lib/libgssapi/gss_accept_sec_context.3 projects/amd64_xen_pv/lib/libgssapi/gss_acquire_cred.3 projects/amd64_xen_pv/lib/libgssapi/gss_add_cred.3 projects/amd64_xen_pv/lib/libgssapi/gss_add_oid_set_member.3 projects/amd64_xen_pv/lib/libgssapi/gss_canonicalize_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_compare_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_context_time.3 projects/amd64_xen_pv/lib/libgssapi/gss_create_empty_oid_set.3 projects/amd64_xen_pv/lib/libgssapi/gss_delete_sec_context.3 projects/amd64_xen_pv/lib/libgssapi/gss_display_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_display_status.3 projects/amd64_xen_pv/lib/libgssapi/gss_duplicate_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_export_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_export_sec_context.3 projects/amd64_xen_pv/lib/libgssapi/gss_get_mic.3 projects/amd64_xen_pv/lib/libgssapi/gss_import_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_import_sec_context.3 projects/amd64_xen_pv/lib/libgssapi/gss_indicate_mechs.3 projects/amd64_xen_pv/lib/libgssapi/gss_init_sec_context.3 projects/amd64_xen_pv/lib/libgssapi/gss_inquire_context.3 projects/amd64_xen_pv/lib/libgssapi/gss_inquire_cred.3 projects/amd64_xen_pv/lib/libgssapi/gss_inquire_cred_by_mech.3 projects/amd64_xen_pv/lib/libgssapi/gss_inquire_mechs_for_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_inquire_names_for_mech.3 projects/amd64_xen_pv/lib/libgssapi/gss_process_context_token.3 projects/amd64_xen_pv/lib/libgssapi/gss_release_buffer.3 projects/amd64_xen_pv/lib/libgssapi/gss_release_cred.3 projects/amd64_xen_pv/lib/libgssapi/gss_release_name.3 projects/amd64_xen_pv/lib/libgssapi/gss_release_oid_set.3 projects/amd64_xen_pv/lib/libgssapi/gss_test_oid_set_member.3 projects/amd64_xen_pv/lib/libgssapi/gss_unwrap.3 projects/amd64_xen_pv/lib/libgssapi/gss_verify_mic.3 projects/amd64_xen_pv/lib/libgssapi/gss_wrap.3 projects/amd64_xen_pv/lib/libgssapi/gss_wrap_size_limit.3 projects/amd64_xen_pv/lib/libgssapi/gssapi.3 projects/amd64_xen_pv/lib/libgssapi/mech.5 projects/amd64_xen_pv/lib/libkiconv/Makefile projects/amd64_xen_pv/lib/libncp/ncpl_nls.c projects/amd64_xen_pv/lib/libpmc/pmc.3 projects/amd64_xen_pv/lib/libprocstat/libprocstat.c projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_get_error.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_get_mech_info.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_get_principal_name.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_get_versions.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_getcred.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_is_installed.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_max_data_length.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_qop_to_num.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_seccreate.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_set_callback.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_set_defaults.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_set_svc_name.3 projects/amd64_xen_pv/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 projects/amd64_xen_pv/lib/libstand/Makefile projects/amd64_xen_pv/lib/libusb/Makefile projects/amd64_xen_pv/lib/libusb/libusb10.c projects/amd64_xen_pv/lib/libusb/libusb10_io.c projects/amd64_xen_pv/lib/libusb/libusb20.3 projects/amd64_xen_pv/lib/libutil/Makefile projects/amd64_xen_pv/lib/libutil/auth.c projects/amd64_xen_pv/lib/libutil/login.conf.5 projects/amd64_xen_pv/lib/libutil/property.3 projects/amd64_xen_pv/lib/libutil/pw_util.c projects/amd64_xen_pv/lib/libz/ChangeLog projects/amd64_xen_pv/lib/libz/FAQ projects/amd64_xen_pv/lib/libz/FREEBSD-upgrade (contents, props changed) projects/amd64_xen_pv/lib/libz/Makefile (contents, props changed) projects/amd64_xen_pv/lib/libz/README projects/amd64_xen_pv/lib/libz/Symbol.map (contents, props changed) projects/amd64_xen_pv/lib/libz/Versions.def (contents, props changed) projects/amd64_xen_pv/lib/libz/adler32.c projects/amd64_xen_pv/lib/libz/contrib/asm686/match.S (contents, props changed) projects/amd64_xen_pv/lib/libz/crc32.c projects/amd64_xen_pv/lib/libz/crc32.h projects/amd64_xen_pv/lib/libz/deflate.c projects/amd64_xen_pv/lib/libz/deflate.h projects/amd64_xen_pv/lib/libz/doc/algorithm.txt (contents, props changed) projects/amd64_xen_pv/lib/libz/gzguts.h (contents, props changed) projects/amd64_xen_pv/lib/libz/gzlib.c projects/amd64_xen_pv/lib/libz/gzread.c projects/amd64_xen_pv/lib/libz/gzwrite.c projects/amd64_xen_pv/lib/libz/infback.c projects/amd64_xen_pv/lib/libz/inffixed.h projects/amd64_xen_pv/lib/libz/inflate.c projects/amd64_xen_pv/lib/libz/inftrees.c projects/amd64_xen_pv/lib/libz/trees.c projects/amd64_xen_pv/lib/libz/zconf.h projects/amd64_xen_pv/lib/libz/zlib.3 projects/amd64_xen_pv/lib/libz/zlib.h projects/amd64_xen_pv/lib/libz/zopen.c (contents, props changed) projects/amd64_xen_pv/lib/libz/zutil.c projects/amd64_xen_pv/lib/libz/zutil.h projects/amd64_xen_pv/libexec/rshd/rshd.8 projects/amd64_xen_pv/libexec/rtld-elf/map_object.c projects/amd64_xen_pv/libexec/rtld-elf/rtld.c projects/amd64_xen_pv/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/amd64_xen_pv/release/doc/share/misc/dev.archlist.txt projects/amd64_xen_pv/release/picobsd/tinyware/passwd/passwd.c projects/amd64_xen_pv/sbin/camcontrol/Makefile projects/amd64_xen_pv/sbin/camcontrol/camcontrol.8 projects/amd64_xen_pv/sbin/camcontrol/camcontrol.c projects/amd64_xen_pv/sbin/camcontrol/camcontrol.h projects/amd64_xen_pv/sbin/camcontrol/fwdownload.c projects/amd64_xen_pv/sbin/devd/devd.cc projects/amd64_xen_pv/sbin/devfs/devfs.8 projects/amd64_xen_pv/sbin/fsck_ffs/suj.c projects/amd64_xen_pv/sbin/fsck_msdosfs/main.c projects/amd64_xen_pv/sbin/geom/class/raid/graid.8 projects/amd64_xen_pv/sbin/hastd/primary.c projects/amd64_xen_pv/sbin/hastd/synch.h projects/amd64_xen_pv/sbin/ifconfig/ifconfig.8 projects/amd64_xen_pv/sbin/ifconfig/ifconfig.c projects/amd64_xen_pv/sbin/ifconfig/iflagg.c projects/amd64_xen_pv/sbin/ipfw/ipfw.8 projects/amd64_xen_pv/sbin/mca/Makefile projects/amd64_xen_pv/sbin/mca/mca.c projects/amd64_xen_pv/sbin/mdconfig/mdconfig.8 projects/amd64_xen_pv/sbin/natd/natd.8 projects/amd64_xen_pv/sbin/restore/utilities.c projects/amd64_xen_pv/sbin/setkey/setkey.8 projects/amd64_xen_pv/secure/lib/libcrypt/crypt-des.c projects/amd64_xen_pv/secure/lib/libcrypto/Makefile.inc projects/amd64_xen_pv/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_ctrl.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_f_base64.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_f_md.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_f_null.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_find_type.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_push.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_read.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_accept.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_bio.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_connect.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_fd.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_file.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_mem.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_null.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_s_socket.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_set_callback.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BIO_should_retry.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_CTX_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_CTX_start.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_add.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_add_word.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_bn2bin.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_cmp.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_copy.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_generate_prime.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_num_bytes.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_rand.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_set_bit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_swap.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/BN_zero.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/CONF_modules_free.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DH_generate_key.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DH_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DH_set_method.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DH_size.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_do_sign.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_generate_key.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_set_method.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_sign.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/DSA_size.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_clear_error.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_error_string.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_get_error.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_load_strings.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_print_errors.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_put_error.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_remove_state.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ERR_set_mark.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_SealInit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_SignInit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OPENSSL_config.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/PKCS12_create.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/PKCS12_parse.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/PKCS7_sign.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/PKCS7_verify.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RAND_add.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RAND_bytes.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RAND_cleanup.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RAND_egd.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RAND_load_file.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_check_key.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_generate_key.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_print.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_set_method.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_sign.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/RSA_size.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/X509_new.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/bio.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/blowfish.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/bn.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/bn_internal.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/buffer.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/crypto.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_DHparams.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_X509.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/des.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/dh.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/dsa.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ecdsa.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/engine.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/err.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/evp.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/hmac.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/lh_stats.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/lhash.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/md5.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/mdc2.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/pem.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/rand.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/rc4.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ripemd.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/rsa.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/sha.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/threads.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ui.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/ui_compat.3 projects/amd64_xen_pv/secure/lib/libcrypto/man/x509.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_free.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_new.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_SESSION_free.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_accept.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_alert_type_string.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_clear.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_connect.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_do_handshake.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_free.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_ciphers.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_error.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_fd.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_rbio.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_session.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_verify_result.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_get_version.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_library_init.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_new.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_pending.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_read.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_rstate_string.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_session_reused.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_set_bio.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_set_connect_state.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_set_fd.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_set_session.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_set_shutdown.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_set_verify_result.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_shutdown.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_state_string.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_want.3 projects/amd64_xen_pv/secure/lib/libssl/man/SSL_write.3 projects/amd64_xen_pv/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/amd64_xen_pv/secure/lib/libssl/man/ssl.3 projects/amd64_xen_pv/secure/usr.bin/openssl/man/CA.pl.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/asn1parse.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/ca.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/ciphers.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/crl.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/dgst.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/dhparam.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/dsa.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/dsaparam.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/ec.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/ecparam.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/enc.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/errstr.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/gendsa.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/genrsa.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/nseq.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/ocsp.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/openssl.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/passwd.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/pkcs12.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/pkcs7.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/pkcs8.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/rand.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/req.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/rsa.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/rsautl.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/s_client.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/s_server.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/s_time.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/sess_id.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/smime.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/speed.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/spkac.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/verify.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/version.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/x509.1 projects/amd64_xen_pv/secure/usr.bin/openssl/man/x509v3_config.1 projects/amd64_xen_pv/share/examples/csh/dot.cshrc projects/amd64_xen_pv/share/examples/etc/README.examples projects/amd64_xen_pv/share/examples/mdoc/example.4 projects/amd64_xen_pv/share/examples/pf/faq-example1 projects/amd64_xen_pv/share/examples/pf/pf.conf projects/amd64_xen_pv/share/examples/scsi_target/scsi_target.c projects/amd64_xen_pv/share/man/man4/Makefile projects/amd64_xen_pv/share/man/man4/acpi_ibm.4 projects/amd64_xen_pv/share/man/man4/acpi_panasonic.4 projects/amd64_xen_pv/share/man/man4/ahci.4 projects/amd64_xen_pv/share/man/man4/ata.4 projects/amd64_xen_pv/share/man/man4/bce.4 projects/amd64_xen_pv/share/man/man4/carp.4 projects/amd64_xen_pv/share/man/man4/cpufreq.4 projects/amd64_xen_pv/share/man/man4/firewire.4 projects/amd64_xen_pv/share/man/man4/hptrr.4 projects/amd64_xen_pv/share/man/man4/io.4 projects/amd64_xen_pv/share/man/man4/ip.4 projects/amd64_xen_pv/share/man/man4/mac_lomac.4 projects/amd64_xen_pv/share/man/man4/man4.i386/sbni.4 projects/amd64_xen_pv/share/man/man4/mps.4 projects/amd64_xen_pv/share/man/man4/mpt.4 projects/amd64_xen_pv/share/man/man4/mvs.4 projects/amd64_xen_pv/share/man/man4/ng_ksocket.4 projects/amd64_xen_pv/share/man/man4/ng_netflow.4 projects/amd64_xen_pv/share/man/man4/run.4 projects/amd64_xen_pv/share/man/man4/scsi.4 projects/amd64_xen_pv/share/man/man4/siis.4 projects/amd64_xen_pv/share/man/man4/snd_hda.4 projects/amd64_xen_pv/share/man/man4/usb.4 projects/amd64_xen_pv/share/man/man4/vlan.4 projects/amd64_xen_pv/share/man/man4/witness.4 projects/amd64_xen_pv/share/man/man5/devfs.conf.5 projects/amd64_xen_pv/share/man/man5/devfs.rules.5 projects/amd64_xen_pv/share/man/man5/make.conf.5 projects/amd64_xen_pv/share/man/man5/passwd.5 projects/amd64_xen_pv/share/man/man5/periodic.conf.5 projects/amd64_xen_pv/share/man/man5/rc.conf.5 projects/amd64_xen_pv/share/man/man5/src.conf.5 projects/amd64_xen_pv/share/man/man7/build.7 projects/amd64_xen_pv/share/man/man7/development.7 projects/amd64_xen_pv/share/man/man7/release.7 projects/amd64_xen_pv/share/man/man9/disk.9 projects/amd64_xen_pv/share/man/man9/locking.9 projects/amd64_xen_pv/share/man/man9/rmlock.9 projects/amd64_xen_pv/share/man/man9/rwlock.9 projects/amd64_xen_pv/share/misc/committers-ports.dot projects/amd64_xen_pv/share/misc/committers-src.dot projects/amd64_xen_pv/share/misc/organization.dot projects/amd64_xen_pv/share/mk/bsd.crunchgen.mk projects/amd64_xen_pv/share/mk/bsd.lib.mk projects/amd64_xen_pv/share/mk/bsd.own.mk projects/amd64_xen_pv/share/mk/bsd.sys.mk projects/amd64_xen_pv/sys/amd64/acpica/acpi_wakecode.S projects/amd64_xen_pv/sys/amd64/amd64/cpu_switch.S projects/amd64_xen_pv/sys/amd64/amd64/genassym.c projects/amd64_xen_pv/sys/amd64/amd64/minidump_machdep.c projects/amd64_xen_pv/sys/amd64/amd64/mp_machdep.c projects/amd64_xen_pv/sys/amd64/amd64/pmap.c projects/amd64_xen_pv/sys/amd64/amd64/trap.c projects/amd64_xen_pv/sys/amd64/conf/GENERIC projects/amd64_xen_pv/sys/amd64/include/atomic.h projects/amd64_xen_pv/sys/amd64/include/elf.h projects/amd64_xen_pv/sys/amd64/include/pcb.h projects/amd64_xen_pv/sys/amd64/include/pmap.h projects/amd64_xen_pv/sys/amd64/include/smp.h projects/amd64_xen_pv/sys/arm/arm/bcopyinout_xscale.S projects/amd64_xen_pv/sys/arm/arm/bootconfig.c projects/amd64_xen_pv/sys/arm/arm/busdma_machdep.c projects/amd64_xen_pv/sys/arm/arm/cpufunc.c projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_arm10.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_arm11.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_arm7tdmi.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_arm8.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_arm9.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_armv4.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_armv5.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_sa1.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_xscale.S projects/amd64_xen_pv/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/amd64_xen_pv/sys/arm/arm/db_disasm.c projects/amd64_xen_pv/sys/arm/arm/db_interface.c projects/amd64_xen_pv/sys/arm/arm/db_trace.c projects/amd64_xen_pv/sys/arm/arm/disassem.c projects/amd64_xen_pv/sys/arm/arm/dump_machdep.c projects/amd64_xen_pv/sys/arm/arm/elf_trampoline.c projects/amd64_xen_pv/sys/arm/arm/exception.S projects/amd64_xen_pv/sys/arm/arm/gdb_machdep.c projects/amd64_xen_pv/sys/arm/arm/in_cksum.c projects/amd64_xen_pv/sys/arm/arm/intr.c projects/amd64_xen_pv/sys/arm/arm/irq_dispatch.S projects/amd64_xen_pv/sys/arm/arm/locore.S projects/amd64_xen_pv/sys/arm/arm/machdep.c projects/amd64_xen_pv/sys/arm/arm/mem.c projects/amd64_xen_pv/sys/arm/arm/nexus.c projects/amd64_xen_pv/sys/arm/arm/pmap.c projects/amd64_xen_pv/sys/arm/arm/support.S projects/amd64_xen_pv/sys/arm/arm/swtch.S projects/amd64_xen_pv/sys/arm/arm/sys_machdep.c projects/amd64_xen_pv/sys/arm/arm/trap.c projects/amd64_xen_pv/sys/arm/arm/undefined.c projects/amd64_xen_pv/sys/arm/arm/vectors.S projects/amd64_xen_pv/sys/arm/arm/vm_machdep.c projects/amd64_xen_pv/sys/arm/at91/at91.c projects/amd64_xen_pv/sys/arm/at91/at91_machdep.c projects/amd64_xen_pv/sys/arm/at91/at91_mci.c projects/amd64_xen_pv/sys/arm/at91/at91_pio.c projects/amd64_xen_pv/sys/arm/at91/at91_pio_rm9200.h projects/amd64_xen_pv/sys/arm/at91/at91_pit.c projects/amd64_xen_pv/sys/arm/at91/at91_pitreg.h projects/amd64_xen_pv/sys/arm/at91/at91_pmc.c projects/amd64_xen_pv/sys/arm/at91/at91_pmcvar.h projects/amd64_xen_pv/sys/arm/at91/at91_reset.S projects/amd64_xen_pv/sys/arm/at91/at91_rst.c projects/amd64_xen_pv/sys/arm/at91/at91_spi.c projects/amd64_xen_pv/sys/arm/at91/at91_spireg.h projects/amd64_xen_pv/sys/arm/at91/at91_ssc.c projects/amd64_xen_pv/sys/arm/at91/at91_st.c projects/amd64_xen_pv/sys/arm/at91/at91_twi.c projects/amd64_xen_pv/sys/arm/at91/at91_wdtreg.h projects/amd64_xen_pv/sys/arm/at91/at91reg.h projects/amd64_xen_pv/sys/arm/at91/at91rm9200.c projects/amd64_xen_pv/sys/arm/at91/at91rm92reg.h projects/amd64_xen_pv/sys/arm/at91/at91sam9260.c projects/amd64_xen_pv/sys/arm/at91/at91sam9260reg.h projects/amd64_xen_pv/sys/arm/at91/at91sam9g20.c projects/amd64_xen_pv/sys/arm/at91/at91sam9g20reg.h projects/amd64_xen_pv/sys/arm/at91/at91var.h projects/amd64_xen_pv/sys/arm/at91/board_qila9g20.c projects/amd64_xen_pv/sys/arm/at91/board_sam9g20ek.c projects/amd64_xen_pv/sys/arm/at91/files.at91 projects/amd64_xen_pv/sys/arm/at91/if_macb.c projects/amd64_xen_pv/sys/arm/at91/std.at91 projects/amd64_xen_pv/sys/arm/at91/std.at91sam9 projects/amd64_xen_pv/sys/arm/at91/std.ethernut5 projects/amd64_xen_pv/sys/arm/at91/std.hl200 projects/amd64_xen_pv/sys/arm/at91/std.hl201 projects/amd64_xen_pv/sys/arm/at91/std.kb920x projects/amd64_xen_pv/sys/arm/at91/std.qila9g20 projects/amd64_xen_pv/sys/arm/at91/std.sam9g20ek projects/amd64_xen_pv/sys/arm/at91/uart_cpu_at91rm9200usart.c projects/amd64_xen_pv/sys/arm/conf/AVILA projects/amd64_xen_pv/sys/arm/conf/BWCT projects/amd64_xen_pv/sys/arm/conf/CAMBRIA projects/amd64_xen_pv/sys/arm/conf/CNS11XXNAS projects/amd64_xen_pv/sys/arm/conf/CRB projects/amd64_xen_pv/sys/arm/conf/EP80219 projects/amd64_xen_pv/sys/arm/conf/ETHERNUT5 projects/amd64_xen_pv/sys/arm/conf/ETHERNUT5.hints projects/amd64_xen_pv/sys/arm/conf/GUMSTIX projects/amd64_xen_pv/sys/arm/conf/GUMSTIX-QEMU projects/amd64_xen_pv/sys/arm/conf/HL200 projects/amd64_xen_pv/sys/arm/conf/HL201 projects/amd64_xen_pv/sys/arm/conf/IQ31244 projects/amd64_xen_pv/sys/arm/conf/KB920X projects/amd64_xen_pv/sys/arm/conf/LN2410SBC projects/amd64_xen_pv/sys/arm/conf/NSLU projects/amd64_xen_pv/sys/arm/conf/QILA9G20 projects/amd64_xen_pv/sys/arm/conf/QILA9G20.hints projects/amd64_xen_pv/sys/arm/conf/SAM9G20EK projects/amd64_xen_pv/sys/arm/conf/SAM9G20EK.hints projects/amd64_xen_pv/sys/arm/conf/SIMICS projects/amd64_xen_pv/sys/arm/econa/econa_machdep.c projects/amd64_xen_pv/sys/arm/include/_stdint.h projects/amd64_xen_pv/sys/arm/include/_types.h projects/amd64_xen_pv/sys/arm/include/armreg.h projects/amd64_xen_pv/sys/arm/include/asmacros.h projects/amd64_xen_pv/sys/arm/include/atomic.h projects/amd64_xen_pv/sys/arm/include/blockio.h projects/amd64_xen_pv/sys/arm/include/cpu.h projects/amd64_xen_pv/sys/arm/include/cpufunc.h projects/amd64_xen_pv/sys/arm/include/elf.h projects/amd64_xen_pv/sys/arm/include/endian.h projects/amd64_xen_pv/sys/arm/include/fdt.h projects/amd64_xen_pv/sys/arm/include/fp.h projects/amd64_xen_pv/sys/arm/include/frame.h projects/amd64_xen_pv/sys/arm/include/ieee.h projects/amd64_xen_pv/sys/arm/include/in_cksum.h projects/amd64_xen_pv/sys/arm/include/intr.h projects/amd64_xen_pv/sys/arm/include/katelib.h projects/amd64_xen_pv/sys/arm/include/kdb.h projects/amd64_xen_pv/sys/arm/include/machdep.h projects/amd64_xen_pv/sys/arm/include/param.h projects/amd64_xen_pv/sys/arm/include/pmap.h projects/amd64_xen_pv/sys/arm/include/pmc_mdep.h projects/amd64_xen_pv/sys/arm/include/profile.h projects/amd64_xen_pv/sys/arm/include/pte.h projects/amd64_xen_pv/sys/arm/include/resource.h projects/amd64_xen_pv/sys/arm/include/stack.h projects/amd64_xen_pv/sys/arm/include/vmparam.h projects/amd64_xen_pv/sys/arm/mv/mv_machdep.c projects/amd64_xen_pv/sys/arm/mv/mvwin.h projects/amd64_xen_pv/sys/arm/mv/std.mv projects/amd64_xen_pv/sys/arm/s3c2xx0/s3c2410reg.h projects/amd64_xen_pv/sys/arm/s3c2xx0/s3c2440reg.h projects/amd64_xen_pv/sys/arm/s3c2xx0/s3c24x0.c projects/amd64_xen_pv/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/amd64_xen_pv/sys/arm/s3c2xx0/s3c24x0reg.h projects/amd64_xen_pv/sys/arm/sa11x0/assabet_machdep.c projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0.c projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0_gpioreg.h projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0_io_asm.S projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0_irq.S projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0_ost.c projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0_ostreg.h projects/amd64_xen_pv/sys/arm/sa11x0/sa11x0_var.h projects/amd64_xen_pv/sys/arm/sa11x0/uart_dev_sa1110.c projects/amd64_xen_pv/sys/arm/xscale/i80321/ep80219_machdep.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321_aau.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321_dma.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321_intr.h projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321_pci.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321_space.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321_timer.c projects/amd64_xen_pv/sys/arm/xscale/i80321/i80321reg.h projects/amd64_xen_pv/sys/arm/xscale/i80321/iq31244_7seg.c projects/amd64_xen_pv/sys/arm/xscale/i80321/iq31244_machdep.c projects/amd64_xen_pv/sys/arm/xscale/i80321/iq80321.c projects/amd64_xen_pv/sys/arm/xscale/i80321/obio.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/crb_machdep.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/i81342.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/i81342_mcu.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/i81342_pci.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/i81342_space.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/i81342reg.h projects/amd64_xen_pv/sys/arm/xscale/i8134x/iq81342_7seg.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/obio.c projects/amd64_xen_pv/sys/arm/xscale/i8134x/uart_cpu_i81342.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/avila_ata.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/avila_gpio.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/avila_machdep.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/cambria_exp_space.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/if_npe.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/if_npereg.h projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_iic.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_npe.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_npereg.h projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_pci.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_pci_space.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_qmgr.c projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425_qmgr.h projects/amd64_xen_pv/sys/arm/xscale/ixp425/ixp425reg.h projects/amd64_xen_pv/sys/arm/xscale/pxa/if_smc_smi.c projects/amd64_xen_pv/sys/arm/xscale/pxa/pxa_machdep.c projects/amd64_xen_pv/sys/arm/xscale/pxa/pxareg.h projects/amd64_xen_pv/sys/arm/xscale/std.xscale projects/amd64_xen_pv/sys/boot/common/load_elf.c projects/amd64_xen_pv/sys/boot/common/load_elf_obj.c projects/amd64_xen_pv/sys/boot/i386/boot2/boot2.c projects/amd64_xen_pv/sys/boot/i386/libi386/biospnp.c projects/amd64_xen_pv/sys/boot/ofw/libofw/ofw_disk.c projects/amd64_xen_pv/sys/boot/sparc64/loader/main.c projects/amd64_xen_pv/sys/boot/userboot/libstand/Makefile projects/amd64_xen_pv/sys/boot/zfs/zfsimpl.c projects/amd64_xen_pv/sys/cam/ata/ata_da.c projects/amd64_xen_pv/sys/cam/ata/ata_pmp.c projects/amd64_xen_pv/sys/cam/ata/ata_xpt.c projects/amd64_xen_pv/sys/cam/cam.h projects/amd64_xen_pv/sys/cam/cam_ccb.h projects/amd64_xen_pv/sys/cam/cam_debug.h projects/amd64_xen_pv/sys/cam/cam_periph.c projects/amd64_xen_pv/sys/cam/cam_periph.h projects/amd64_xen_pv/sys/cam/cam_xpt.c projects/amd64_xen_pv/sys/cam/cam_xpt.h projects/amd64_xen_pv/sys/cam/cam_xpt_periph.h projects/amd64_xen_pv/sys/cam/ctl/ctl.c projects/amd64_xen_pv/sys/cam/ctl/ctl_backend.c projects/amd64_xen_pv/sys/cam/ctl/ctl_frontend_cam_sim.c projects/amd64_xen_pv/sys/cam/ctl/ctl_frontend_internal.c projects/amd64_xen_pv/sys/cam/ctl/scsi_ctl.c projects/amd64_xen_pv/sys/cam/scsi/scsi_all.c projects/amd64_xen_pv/sys/cam/scsi/scsi_all.h projects/amd64_xen_pv/sys/cam/scsi/scsi_cd.c projects/amd64_xen_pv/sys/cam/scsi/scsi_da.c projects/amd64_xen_pv/sys/cam/scsi/scsi_da.h projects/amd64_xen_pv/sys/cam/scsi/scsi_enc.c projects/amd64_xen_pv/sys/cam/scsi/scsi_pass.c projects/amd64_xen_pv/sys/cam/scsi/scsi_pt.c projects/amd64_xen_pv/sys/cam/scsi/scsi_sa.c projects/amd64_xen_pv/sys/cam/scsi/scsi_target.c projects/amd64_xen_pv/sys/cam/scsi/scsi_xpt.c projects/amd64_xen_pv/sys/cddl/boot/zfs/zfsimpl.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/Makefile.files projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h projects/amd64_xen_pv/sys/cddl/dev/dtrace/amd64/dis_tables.c projects/amd64_xen_pv/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/amd64_xen_pv/sys/cddl/dev/dtrace/i386/dis_tables.c projects/amd64_xen_pv/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/amd64_xen_pv/sys/compat/ndis/subr_ntoskrnl.c projects/amd64_xen_pv/sys/conf/NOTES projects/amd64_xen_pv/sys/conf/files projects/amd64_xen_pv/sys/conf/files.amd64 projects/amd64_xen_pv/sys/conf/files.arm projects/amd64_xen_pv/sys/conf/files.i386 projects/amd64_xen_pv/sys/conf/files.ia64 projects/amd64_xen_pv/sys/conf/files.mips projects/amd64_xen_pv/sys/conf/files.powerpc projects/amd64_xen_pv/sys/conf/files.sparc64 projects/amd64_xen_pv/sys/conf/kern.post.mk projects/amd64_xen_pv/sys/conf/options projects/amd64_xen_pv/sys/conf/options.arm projects/amd64_xen_pv/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/common/dmextern.c projects/amd64_xen_pv/sys/contrib/dev/acpica/common/dmrestag.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/aslcompile.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/aslerror.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/aslfiles.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/asllookup.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/aslmain.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/aslsupport.l projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/aslutils.c projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/dttemplate.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/events/evgpe.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/executer/exconfig.c projects/amd64_xen_pv/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/amd64_xen_pv/sys/contrib/dev/acpica/include/acdebug.h projects/amd64_xen_pv/sys/contrib/dev/acpica/include/acdisasm.h projects/amd64_xen_pv/sys/contrib/dev/acpica/include/acglobal.h projects/amd64_xen_pv/sys/contrib/dev/acpica/include/aclocal.h projects/amd64_xen_pv/sys/contrib/dev/acpica/include/acpixf.h projects/amd64_xen_pv/sys/contrib/dev/acpica/include/acpredef.h projects/amd64_xen_pv/sys/contrib/dev/acpica/include/acutils.h projects/amd64_xen_pv/sys/contrib/pf/net/pf.c projects/amd64_xen_pv/sys/contrib/pf/net/pf_ioctl.c projects/amd64_xen_pv/sys/contrib/pf/net/pf_table.c projects/amd64_xen_pv/sys/contrib/pf/net/pfvar.h projects/amd64_xen_pv/sys/contrib/rdma/krping/krping.c projects/amd64_xen_pv/sys/contrib/rdma/krping/krping.h projects/amd64_xen_pv/sys/contrib/rdma/krping/krping_dev.c projects/amd64_xen_pv/sys/contrib/rdma/rdma_addr.c projects/amd64_xen_pv/sys/contrib/rdma/rdma_cache.c projects/amd64_xen_pv/sys/dev/acpi_support/acpi_ibm.c projects/amd64_xen_pv/sys/dev/acpica/Osd/OsdSynch.c projects/amd64_xen_pv/sys/dev/acpica/acpi.c projects/amd64_xen_pv/sys/dev/acpica/acpi_ec.c projects/amd64_xen_pv/sys/dev/acpica/acpi_video.c projects/amd64_xen_pv/sys/dev/acpica/acpivar.h projects/amd64_xen_pv/sys/dev/adb/adb_kbd.c projects/amd64_xen_pv/sys/dev/ae/if_ae.c projects/amd64_xen_pv/sys/dev/agp/agp_i810.c projects/amd64_xen_pv/sys/dev/ahci/ahci.c projects/amd64_xen_pv/sys/dev/aic7xxx/aic79xx.c projects/amd64_xen_pv/sys/dev/aic7xxx/aic79xx_osm.c projects/amd64_xen_pv/sys/dev/aic7xxx/aic7xxx.c projects/amd64_xen_pv/sys/dev/aic7xxx/aic7xxx_osm.c projects/amd64_xen_pv/sys/dev/aic7xxx/aicasm/Makefile projects/amd64_xen_pv/sys/dev/aic7xxx/aicasm/aicasm.c projects/amd64_xen_pv/sys/dev/ata/ata-all.c projects/amd64_xen_pv/sys/dev/ata/chipsets/ata-ite.c projects/amd64_xen_pv/sys/dev/ath/ath_dfs/null/dfs_null.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ah.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ah_desc.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ah_internal.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar9002/ar9285.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c projects/amd64_xen_pv/sys/dev/ath/ath_rate/amrr/amrr.c projects/amd64_xen_pv/sys/dev/ath/ath_rate/onoe/onoe.c projects/amd64_xen_pv/sys/dev/ath/ath_rate/sample/sample.c projects/amd64_xen_pv/sys/dev/ath/if_ath.c projects/amd64_xen_pv/sys/dev/ath/if_ath_ahb.c projects/amd64_xen_pv/sys/dev/ath/if_ath_debug.c projects/amd64_xen_pv/sys/dev/ath/if_ath_led.c projects/amd64_xen_pv/sys/dev/ath/if_ath_misc.h projects/amd64_xen_pv/sys/dev/ath/if_ath_rx.c projects/amd64_xen_pv/sys/dev/ath/if_ath_sysctl.c projects/amd64_xen_pv/sys/dev/ath/if_ath_tx.c projects/amd64_xen_pv/sys/dev/ath/if_ath_tx.h projects/amd64_xen_pv/sys/dev/ath/if_ath_tx_ht.c projects/amd64_xen_pv/sys/dev/ath/if_athdfs.h projects/amd64_xen_pv/sys/dev/ath/if_athioctl.h projects/amd64_xen_pv/sys/dev/ath/if_athvar.h projects/amd64_xen_pv/sys/dev/bge/if_bge.c projects/amd64_xen_pv/sys/dev/bge/if_bgereg.h projects/amd64_xen_pv/sys/dev/cxgb/common/cxgb_ctl_defs.h projects/amd64_xen_pv/sys/dev/cxgb/cxgb_adapter.h projects/amd64_xen_pv/sys/dev/cxgb/cxgb_main.c projects/amd64_xen_pv/sys/dev/cxgb/cxgb_offload.h projects/amd64_xen_pv/sys/dev/cxgb/cxgb_osdep.h projects/amd64_xen_pv/sys/dev/cxgb/cxgb_sge.c projects/amd64_xen_pv/sys/dev/cxgb/sys/mvec.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_l2t.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_l2t.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_listen.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_tom.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/tom/cxgb_tom.h projects/amd64_xen_pv/sys/dev/cxgbe/adapter.h projects/amd64_xen_pv/sys/dev/cxgbe/common/common.h projects/amd64_xen_pv/sys/dev/cxgbe/common/t4_hw.c projects/amd64_xen_pv/sys/dev/cxgbe/common/t4_msg.h projects/amd64_xen_pv/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/amd64_xen_pv/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/amd64_xen_pv/sys/dev/cxgbe/firmware/t4fw_interface.h projects/amd64_xen_pv/sys/dev/cxgbe/offload.h projects/amd64_xen_pv/sys/dev/cxgbe/osdep.h projects/amd64_xen_pv/sys/dev/cxgbe/t4_l2t.c projects/amd64_xen_pv/sys/dev/cxgbe/t4_l2t.h projects/amd64_xen_pv/sys/dev/cxgbe/t4_main.c projects/amd64_xen_pv/sys/dev/cxgbe/t4_sge.c projects/amd64_xen_pv/sys/dev/drm2/drmP.h projects/amd64_xen_pv/sys/dev/drm2/drm_pciids.h projects/amd64_xen_pv/sys/dev/drm2/i915/i915_gem.c projects/amd64_xen_pv/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/amd64_xen_pv/sys/dev/e1000/if_igb.c projects/amd64_xen_pv/sys/dev/fb/fbreg.h projects/amd64_xen_pv/sys/dev/firewire/sbp_targ.c projects/amd64_xen_pv/sys/dev/flash/at45d.c projects/amd64_xen_pv/sys/dev/hptiop/hptiop.c projects/amd64_xen_pv/sys/dev/hptmv/entry.c projects/amd64_xen_pv/sys/dev/hptrr/hptrr_osm_bsd.c projects/amd64_xen_pv/sys/dev/hwpmc/hwpmc_arm.c projects/amd64_xen_pv/sys/dev/hwpmc/hwpmc_intel.c projects/amd64_xen_pv/sys/dev/isp/isp.c projects/amd64_xen_pv/sys/dev/isp/isp_freebsd.c projects/amd64_xen_pv/sys/dev/isp/isp_freebsd.h projects/amd64_xen_pv/sys/dev/isp/isp_pci.c projects/amd64_xen_pv/sys/dev/isp/isp_sbus.c projects/amd64_xen_pv/sys/dev/isp/ispmbox.h projects/amd64_xen_pv/sys/dev/isp/ispreg.h projects/amd64_xen_pv/sys/dev/isp/ispvar.h projects/amd64_xen_pv/sys/dev/ispfw/asm_2400.h projects/amd64_xen_pv/sys/dev/ispfw/asm_2500.h projects/amd64_xen_pv/sys/dev/iwn/if_iwn.c projects/amd64_xen_pv/sys/dev/ixgbe/ixgbe.c projects/amd64_xen_pv/sys/dev/jme/if_jme.c projects/amd64_xen_pv/sys/dev/mfi/mfi_disk.c projects/amd64_xen_pv/sys/dev/mfi/mfi_tbolt.c projects/amd64_xen_pv/sys/dev/mmc/mmc.c projects/amd64_xen_pv/sys/dev/mmc/mmcsd.c projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_cnfg.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_hbd.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_history.txt projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_init.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_ioc.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_ra.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_raid.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_sas.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_targ.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_tool.h projects/amd64_xen_pv/sys/dev/mps/mpi/mpi2_type.h projects/amd64_xen_pv/sys/dev/mps/mps.c projects/amd64_xen_pv/sys/dev/mps/mps_config.c projects/amd64_xen_pv/sys/dev/mps/mps_ioctl.h projects/amd64_xen_pv/sys/dev/mps/mps_mapping.c projects/amd64_xen_pv/sys/dev/mps/mps_mapping.h projects/amd64_xen_pv/sys/dev/mps/mps_sas.c projects/amd64_xen_pv/sys/dev/mps/mps_sas.h projects/amd64_xen_pv/sys/dev/mps/mps_sas_lsi.c projects/amd64_xen_pv/sys/dev/mps/mps_user.c projects/amd64_xen_pv/sys/dev/mps/mpsvar.h projects/amd64_xen_pv/sys/dev/mpt/mpt_cam.c projects/amd64_xen_pv/sys/dev/mvs/mvs.c projects/amd64_xen_pv/sys/dev/mvs/mvs.h projects/amd64_xen_pv/sys/dev/mvs/mvs_soc.c projects/amd64_xen_pv/sys/dev/mxge/eth_z8e.h projects/amd64_xen_pv/sys/dev/mxge/ethp_z8e.h projects/amd64_xen_pv/sys/dev/mxge/rss_eth_z8e.h projects/amd64_xen_pv/sys/dev/mxge/rss_ethp_z8e.h projects/amd64_xen_pv/sys/dev/nand/nand.c projects/amd64_xen_pv/sys/dev/nand/nandsim.c projects/amd64_xen_pv/sys/dev/pccard/pccard.c projects/amd64_xen_pv/sys/dev/pccard/pccardvarp.h projects/amd64_xen_pv/sys/dev/pci/pci_pci.c projects/amd64_xen_pv/sys/dev/puc/puc_cfg.h projects/amd64_xen_pv/sys/dev/puc/pucdata.c projects/amd64_xen_pv/sys/dev/re/if_re.c projects/amd64_xen_pv/sys/dev/siis/siis.c projects/amd64_xen_pv/sys/dev/sio/sio.c projects/amd64_xen_pv/sys/dev/sym/sym_conf.h projects/amd64_xen_pv/sys/dev/sym/sym_hipd.c projects/amd64_xen_pv/sys/dev/twa/tw_osl_cam.c projects/amd64_xen_pv/sys/dev/usb/quirk/usb_quirk.c projects/amd64_xen_pv/sys/dev/usb/serial/uftdi.c projects/amd64_xen_pv/sys/dev/usb/serial/uftdi_reg.h projects/amd64_xen_pv/sys/dev/usb/usb_device.c projects/amd64_xen_pv/sys/dev/usb/usb_generic.c projects/amd64_xen_pv/sys/dev/usb/usbdevs projects/amd64_xen_pv/sys/dev/usb/wlan/if_rum.c projects/amd64_xen_pv/sys/dev/usb/wlan/if_run.c projects/amd64_xen_pv/sys/dev/usb/wlan/if_ural.c projects/amd64_xen_pv/sys/dev/viawd/viawd.c projects/amd64_xen_pv/sys/dev/vxge/vxgehal/vxgehal-channel.h projects/amd64_xen_pv/sys/dev/wbwd/wbwd.c projects/amd64_xen_pv/sys/dev/wpi/if_wpi.c projects/amd64_xen_pv/sys/dev/xen/balloon/balloon.c projects/amd64_xen_pv/sys/dev/xen/blkfront/blkfront.c projects/amd64_xen_pv/sys/fs/nandfs/nandfs_cleaner.c projects/amd64_xen_pv/sys/fs/nfsclient/nfs_clbio.c projects/amd64_xen_pv/sys/fs/nfsclient/nfs_clnode.c projects/amd64_xen_pv/sys/fs/nfsclient/nfs_clvfsops.c projects/amd64_xen_pv/sys/geom/geom.h projects/amd64_xen_pv/sys/geom/geom_disk.c projects/amd64_xen_pv/sys/geom/geom_disk.h projects/amd64_xen_pv/sys/geom/geom_subr.c projects/amd64_xen_pv/sys/geom/multipath/g_multipath.c projects/amd64_xen_pv/sys/geom/part/g_part_gpt.c projects/amd64_xen_pv/sys/i386/acpica/acpi_wakecode.S projects/amd64_xen_pv/sys/i386/conf/GENERIC projects/amd64_xen_pv/sys/i386/conf/XEN projects/amd64_xen_pv/sys/i386/i386/bios.c projects/amd64_xen_pv/sys/i386/i386/elf_machdep.c projects/amd64_xen_pv/sys/i386/i386/machdep.c projects/amd64_xen_pv/sys/i386/i386/minidump_machdep.c projects/amd64_xen_pv/sys/i386/i386/mp_machdep.c projects/amd64_xen_pv/sys/i386/i386/pmap.c projects/amd64_xen_pv/sys/i386/i386/swtch.s projects/amd64_xen_pv/sys/i386/include/atomic.h projects/amd64_xen_pv/sys/i386/include/elf.h projects/amd64_xen_pv/sys/i386/include/pcb.h projects/amd64_xen_pv/sys/i386/include/pmap.h projects/amd64_xen_pv/sys/i386/include/smp.h projects/amd64_xen_pv/sys/i386/include/vmparam.h projects/amd64_xen_pv/sys/i386/xen/pmap.c projects/amd64_xen_pv/sys/ia64/acpica/acpi_wakeup.c projects/amd64_xen_pv/sys/ia64/ia64/pmap.c projects/amd64_xen_pv/sys/ia64/include/_stdint.h projects/amd64_xen_pv/sys/ia64/include/_types.h projects/amd64_xen_pv/sys/ia64/include/elf.h projects/amd64_xen_pv/sys/ia64/include/pmap.h projects/amd64_xen_pv/sys/kern/capabilities.conf projects/amd64_xen_pv/sys/kern/imgact_aout.c projects/amd64_xen_pv/sys/kern/imgact_elf.c projects/amd64_xen_pv/sys/kern/imgact_gzip.c projects/amd64_xen_pv/sys/kern/init_main.c projects/amd64_xen_pv/sys/kern/init_sysent.c projects/amd64_xen_pv/sys/kern/kern_descrip.c projects/amd64_xen_pv/sys/kern/kern_event.c projects/amd64_xen_pv/sys/kern/kern_exec.c projects/amd64_xen_pv/sys/kern/kern_fork.c projects/amd64_xen_pv/sys/kern/kern_shutdown.c projects/amd64_xen_pv/sys/kern/kern_tc.c projects/amd64_xen_pv/sys/kern/kern_thread.c projects/amd64_xen_pv/sys/kern/subr_firmware.c projects/amd64_xen_pv/sys/kern/subr_rman.c projects/amd64_xen_pv/sys/kern/subr_smp.c projects/amd64_xen_pv/sys/kern/subr_syscall.c projects/amd64_xen_pv/sys/kern/subr_trap.c projects/amd64_xen_pv/sys/kern/subr_witness.c projects/amd64_xen_pv/sys/kern/sys_capability.c projects/amd64_xen_pv/sys/kern/sys_generic.c projects/amd64_xen_pv/sys/kern/sys_procdesc.c projects/amd64_xen_pv/sys/kern/tty.c projects/amd64_xen_pv/sys/kern/uipc_syscalls.c projects/amd64_xen_pv/sys/kern/uipc_usrreq.c projects/amd64_xen_pv/sys/kern/vfs_bio.c projects/amd64_xen_pv/sys/kern/vfs_default.c projects/amd64_xen_pv/sys/kern/vfs_subr.c projects/amd64_xen_pv/sys/kern/vfs_syscalls.c projects/amd64_xen_pv/sys/kern/vfs_vnops.c projects/amd64_xen_pv/sys/libkern/iconv.c projects/amd64_xen_pv/sys/mips/cavium/uart_bus_octeonusart.c projects/amd64_xen_pv/sys/mips/include/_stdint.h projects/amd64_xen_pv/sys/mips/include/_types.h projects/amd64_xen_pv/sys/mips/include/elf.h projects/amd64_xen_pv/sys/mips/include/pmap.h projects/amd64_xen_pv/sys/mips/mips/pmap.c projects/amd64_xen_pv/sys/mips/rmi/rootfs_list.txt projects/amd64_xen_pv/sys/modules/Makefile projects/amd64_xen_pv/sys/modules/cxgb/Makefile projects/amd64_xen_pv/sys/modules/cxgb/cxgb/Makefile projects/amd64_xen_pv/sys/modules/cxgb/iw_cxgb/Makefile projects/amd64_xen_pv/sys/modules/cxgb/tom/Makefile projects/amd64_xen_pv/sys/modules/cxgbe/Makefile projects/amd64_xen_pv/sys/modules/ixgbe/Makefile projects/amd64_xen_pv/sys/modules/rdma/krping/Makefile projects/amd64_xen_pv/sys/modules/wpi/Makefile projects/amd64_xen_pv/sys/modules/zfs/Makefile projects/amd64_xen_pv/sys/net/bpf.c projects/amd64_xen_pv/sys/net/if.h projects/amd64_xen_pv/sys/net/if_bridge.c projects/amd64_xen_pv/sys/net/if_gif.c projects/amd64_xen_pv/sys/net/if_lagg.c projects/amd64_xen_pv/sys/net/if_loop.c projects/amd64_xen_pv/sys/net/if_tap.c projects/amd64_xen_pv/sys/net/if_var.h projects/amd64_xen_pv/sys/net/if_vlan.c projects/amd64_xen_pv/sys/net80211/ieee80211_output.c projects/amd64_xen_pv/sys/net80211/ieee80211_radiotap.c projects/amd64_xen_pv/sys/net80211/ieee80211_var.h projects/amd64_xen_pv/sys/netgraph/netflow/netflow.c projects/amd64_xen_pv/sys/netgraph/netflow/netflow_v9.c projects/amd64_xen_pv/sys/netgraph/netflow/ng_netflow.c projects/amd64_xen_pv/sys/netgraph/netflow/ng_netflow.h projects/amd64_xen_pv/sys/netinet/icmp_var.h projects/amd64_xen_pv/sys/netinet/if_ether.c projects/amd64_xen_pv/sys/netinet/if_ether.h projects/amd64_xen_pv/sys/netinet/in.c projects/amd64_xen_pv/sys/netinet/in.h projects/amd64_xen_pv/sys/netinet/in_pcb.c projects/amd64_xen_pv/sys/netinet/in_pcb.h projects/amd64_xen_pv/sys/netinet/ip_carp.c projects/amd64_xen_pv/sys/netinet/ip_icmp.c projects/amd64_xen_pv/sys/netinet/ip_input.c projects/amd64_xen_pv/sys/netinet/ip_output.c projects/amd64_xen_pv/sys/netinet/ipfw/ip_fw_table.c projects/amd64_xen_pv/sys/netinet/libalias/libalias.3 projects/amd64_xen_pv/sys/netinet/sctp_asconf.c projects/amd64_xen_pv/sys/netinet/sctp_asconf.h projects/amd64_xen_pv/sys/netinet/sctp_bsd_addr.c projects/amd64_xen_pv/sys/netinet/sctp_bsd_addr.h projects/amd64_xen_pv/sys/netinet/sctp_indata.c projects/amd64_xen_pv/sys/netinet/sctp_indata.h projects/amd64_xen_pv/sys/netinet/sctp_input.c projects/amd64_xen_pv/sys/netinet/sctp_input.h projects/amd64_xen_pv/sys/netinet/sctp_os_bsd.h projects/amd64_xen_pv/sys/netinet/sctp_output.c projects/amd64_xen_pv/sys/netinet/sctp_output.h projects/amd64_xen_pv/sys/netinet/sctp_pcb.c projects/amd64_xen_pv/sys/netinet/sctp_pcb.h projects/amd64_xen_pv/sys/netinet/sctp_sysctl.c projects/amd64_xen_pv/sys/netinet/sctp_sysctl.h projects/amd64_xen_pv/sys/netinet/sctp_usrreq.c projects/amd64_xen_pv/sys/netinet/sctputil.c projects/amd64_xen_pv/sys/netinet/sctputil.h projects/amd64_xen_pv/sys/netinet/tcp_input.c projects/amd64_xen_pv/sys/netinet/tcp_lro.c projects/amd64_xen_pv/sys/netinet/tcp_offload.c projects/amd64_xen_pv/sys/netinet/tcp_offload.h projects/amd64_xen_pv/sys/netinet/tcp_output.c projects/amd64_xen_pv/sys/netinet/tcp_subr.c projects/amd64_xen_pv/sys/netinet/tcp_syncache.c projects/amd64_xen_pv/sys/netinet/tcp_syncache.h projects/amd64_xen_pv/sys/netinet/tcp_timer.c projects/amd64_xen_pv/sys/netinet/tcp_timewait.c projects/amd64_xen_pv/sys/netinet/tcp_usrreq.c projects/amd64_xen_pv/sys/netinet/tcp_var.h projects/amd64_xen_pv/sys/netinet/udp_usrreq.c projects/amd64_xen_pv/sys/netinet6/in6.c projects/amd64_xen_pv/sys/netinet6/in6_src.c projects/amd64_xen_pv/sys/netinet6/ip6_forward.c projects/amd64_xen_pv/sys/netinet6/ip6_input.c projects/amd64_xen_pv/sys/netinet6/ip6_ipsec.c projects/amd64_xen_pv/sys/netinet6/ip6_output.c projects/amd64_xen_pv/sys/netinet6/mld6.c projects/amd64_xen_pv/sys/netinet6/sctp6_usrreq.c projects/amd64_xen_pv/sys/netinet6/udp6_usrreq.c projects/amd64_xen_pv/sys/netncp/ncp_nls.h projects/amd64_xen_pv/sys/netsmb/smb_dev.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/cma.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/iwcm.c projects/amd64_xen_pv/sys/ofed/include/linux/net.h projects/amd64_xen_pv/sys/ofed/include/linux/workqueue.h projects/amd64_xen_pv/sys/ofed/include/net/netevent.h projects/amd64_xen_pv/sys/ofed/include/rdma/iw_cm.h projects/amd64_xen_pv/sys/powerpc/aim/locore32.S projects/amd64_xen_pv/sys/powerpc/aim/locore64.S projects/amd64_xen_pv/sys/powerpc/booke/machdep.c projects/amd64_xen_pv/sys/powerpc/booke/platform_bare.c projects/amd64_xen_pv/sys/powerpc/conf/GENERIC64 projects/amd64_xen_pv/sys/powerpc/include/_stdint.h projects/amd64_xen_pv/sys/powerpc/include/_types.h projects/amd64_xen_pv/sys/powerpc/include/elf.h projects/amd64_xen_pv/sys/powerpc/include/pmap.h projects/amd64_xen_pv/sys/sparc64/conf/GENERIC projects/amd64_xen_pv/sys/sparc64/include/_stdint.h projects/amd64_xen_pv/sys/sparc64/include/_types.h projects/amd64_xen_pv/sys/sparc64/include/elf.h projects/amd64_xen_pv/sys/sparc64/include/pmap.h projects/amd64_xen_pv/sys/sparc64/sparc64/pmap.c projects/amd64_xen_pv/sys/sparc64/sparc64/tsb.c projects/amd64_xen_pv/sys/sys/_types.h projects/amd64_xen_pv/sys/sys/buf.h projects/amd64_xen_pv/sys/sys/cdefs.h projects/amd64_xen_pv/sys/sys/file.h projects/amd64_xen_pv/sys/sys/filedesc.h projects/amd64_xen_pv/sys/sys/imgact_aout.h projects/amd64_xen_pv/sys/sys/kernel.h projects/amd64_xen_pv/sys/sys/mbuf.h projects/amd64_xen_pv/sys/sys/mount.h projects/amd64_xen_pv/sys/sys/param.h projects/amd64_xen_pv/sys/sys/proc.h projects/amd64_xen_pv/sys/sys/smp.h projects/amd64_xen_pv/sys/sys/stdint.h projects/amd64_xen_pv/sys/sys/sysent.h projects/amd64_xen_pv/sys/sys/vnode.h projects/amd64_xen_pv/sys/ufs/ffs/ffs_softdep.c projects/amd64_xen_pv/sys/ufs/ffs/ffs_vfsops.c projects/amd64_xen_pv/sys/ufs/ffs/ffs_vnops.c projects/amd64_xen_pv/sys/vm/pmap.h projects/amd64_xen_pv/sys/vm/swap_pager.c projects/amd64_xen_pv/sys/vm/vm_map.c projects/amd64_xen_pv/sys/vm/vm_object.h projects/amd64_xen_pv/sys/vm/vm_page.c projects/amd64_xen_pv/sys/vm/vm_page.h projects/amd64_xen_pv/sys/vm/vm_pageout.c projects/amd64_xen_pv/sys/vm/vnode_pager.c projects/amd64_xen_pv/sys/x86/include/_stdint.h projects/amd64_xen_pv/sys/x86/include/_types.h projects/amd64_xen_pv/sys/x86/x86/dump_machdep.c projects/amd64_xen_pv/sys/x86/x86/tsc.c projects/amd64_xen_pv/tools/build/options/makeman projects/amd64_xen_pv/tools/regression/bin/sh/builtins/wait3.0 projects/amd64_xen_pv/tools/regression/usr.bin/make/common.sh projects/amd64_xen_pv/tools/test/auxinfo/auxinfo.c projects/amd64_xen_pv/tools/tools/ath/Makefile projects/amd64_xen_pv/tools/tools/ath/athdebug/athdebug.c projects/amd64_xen_pv/tools/tools/net80211/w00t/redir/buddy.c projects/amd64_xen_pv/tools/tools/net80211/wesside/dics/dics.c projects/amd64_xen_pv/tools/tools/net80211/wlanstats/main.c projects/amd64_xen_pv/tools/tools/netmap/bridge.c projects/amd64_xen_pv/tools/tools/netmap/pcap.c projects/amd64_xen_pv/tools/tools/syscall_timing/syscall_timing.c projects/amd64_xen_pv/tools/tools/tinybsd/README projects/amd64_xen_pv/usr.bin/calendar/calendars/calendar.freebsd projects/amd64_xen_pv/usr.bin/chat/chat.c projects/amd64_xen_pv/usr.bin/cut/cut.1 projects/amd64_xen_pv/usr.bin/cut/cut.c projects/amd64_xen_pv/usr.bin/find/find.1 projects/amd64_xen_pv/usr.bin/gzip/zmore.1 projects/amd64_xen_pv/usr.bin/kdump/kdump.1 projects/amd64_xen_pv/usr.bin/kdump/kdump.c projects/amd64_xen_pv/usr.bin/killall/killall.1 projects/amd64_xen_pv/usr.bin/killall/killall.c projects/amd64_xen_pv/usr.bin/ktrace/ktrace.1 projects/amd64_xen_pv/usr.bin/ktrace/ktrace.h projects/amd64_xen_pv/usr.bin/less/defines.h projects/amd64_xen_pv/usr.bin/login/login.1 projects/amd64_xen_pv/usr.bin/mail/popen.c projects/amd64_xen_pv/usr.bin/make/Makefile projects/amd64_xen_pv/usr.bin/make/make.1 projects/amd64_xen_pv/usr.bin/make/var.c projects/amd64_xen_pv/usr.bin/makewhatis/makewhatis.c projects/amd64_xen_pv/usr.bin/man/man.conf.5 projects/amd64_xen_pv/usr.bin/minigzip/Makefile projects/amd64_xen_pv/usr.bin/netstat/inet.c projects/amd64_xen_pv/usr.bin/passwd/passwd.1 projects/amd64_xen_pv/usr.bin/rlogin/rlogin.1 projects/amd64_xen_pv/usr.bin/rsh/rsh.1 projects/amd64_xen_pv/usr.bin/sockstat/sockstat.c projects/amd64_xen_pv/usr.bin/sort/Makefile projects/amd64_xen_pv/usr.bin/sort/coll.c projects/amd64_xen_pv/usr.bin/sort/sort.h projects/amd64_xen_pv/usr.bin/top/machine.c projects/amd64_xen_pv/usr.bin/top/top.local.1 projects/amd64_xen_pv/usr.bin/touch/touch.1 projects/amd64_xen_pv/usr.bin/touch/touch.c projects/amd64_xen_pv/usr.bin/unzip/unzip.c projects/amd64_xen_pv/usr.bin/usbhidctl/usbhidctl.1 projects/amd64_xen_pv/usr.sbin/acpi/iasl/Makefile projects/amd64_xen_pv/usr.sbin/adduser/rmuser.8 projects/amd64_xen_pv/usr.sbin/apmd/apmd.8 projects/amd64_xen_pv/usr.sbin/arp/arp.4 projects/amd64_xen_pv/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 projects/amd64_xen_pv/usr.sbin/bluetooth/btpand/btpand.8 projects/amd64_xen_pv/usr.sbin/bluetooth/hccontrol/hccontrol.8 projects/amd64_xen_pv/usr.sbin/bluetooth/l2control/l2control.8 projects/amd64_xen_pv/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 projects/amd64_xen_pv/usr.sbin/bsdinstall/partedit/diskeditor.c projects/amd64_xen_pv/usr.sbin/bsdinstall/partedit/part_wizard.c projects/amd64_xen_pv/usr.sbin/cpucontrol/amd.c projects/amd64_xen_pv/usr.sbin/crunch/crunchgen/crunched_main.c projects/amd64_xen_pv/usr.sbin/crunch/crunchgen/crunchgen.c projects/amd64_xen_pv/usr.sbin/crunch/crunchide/crunchide.c projects/amd64_xen_pv/usr.sbin/crunch/crunchide/exec_elf32.c projects/amd64_xen_pv/usr.sbin/ctladm/ctladm.8 projects/amd64_xen_pv/usr.sbin/ctladm/ctladm.c projects/amd64_xen_pv/usr.sbin/daemon/daemon.8 projects/amd64_xen_pv/usr.sbin/daemon/daemon.c projects/amd64_xen_pv/usr.sbin/digictl/digictl.8 projects/amd64_xen_pv/usr.sbin/flowctl/flowctl.8 projects/amd64_xen_pv/usr.sbin/flowctl/flowctl.c projects/amd64_xen_pv/usr.sbin/fwcontrol/fwcontrol.8 projects/amd64_xen_pv/usr.sbin/gssd/gssd.8 projects/amd64_xen_pv/usr.sbin/ifmcstat/ifmcstat.c projects/amd64_xen_pv/usr.sbin/inetd/inetd.c projects/amd64_xen_pv/usr.sbin/inetd/inetd.h projects/amd64_xen_pv/usr.sbin/jail/command.c projects/amd64_xen_pv/usr.sbin/jail/jail.8 projects/amd64_xen_pv/usr.sbin/jail/jail.c projects/amd64_xen_pv/usr.sbin/jail/jail.conf.5 projects/amd64_xen_pv/usr.sbin/jail/jailp.h projects/amd64_xen_pv/usr.sbin/kbdmap/kbdmap.c projects/amd64_xen_pv/usr.sbin/kldxref/ef.c projects/amd64_xen_pv/usr.sbin/lpr/lpr/lpr.c projects/amd64_xen_pv/usr.sbin/mfiutil/Makefile projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_cmd.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_config.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_drive.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_evt.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_flash.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_patrol.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_show.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfi_volume.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfiutil.c projects/amd64_xen_pv/usr.sbin/mfiutil/mfiutil.h projects/amd64_xen_pv/usr.sbin/mptutil/mpt_show.c projects/amd64_xen_pv/usr.sbin/ndiscvt/ndiscvt.8 projects/amd64_xen_pv/usr.sbin/newsyslog/newsyslog.8 projects/amd64_xen_pv/usr.sbin/newsyslog/newsyslog.conf.5 projects/amd64_xen_pv/usr.sbin/pc-sysinstall/backend/functions-localize.sh projects/amd64_xen_pv/usr.sbin/pc-sysinstall/backend/functions.sh projects/amd64_xen_pv/usr.sbin/pciconf/Makefile projects/amd64_xen_pv/usr.sbin/pciconf/cap.c projects/amd64_xen_pv/usr.sbin/pciconf/pciconf.8 projects/amd64_xen_pv/usr.sbin/pciconf/pciconf.c projects/amd64_xen_pv/usr.sbin/pciconf/pciconf.h projects/amd64_xen_pv/usr.sbin/pkg_install/add/main.c projects/amd64_xen_pv/usr.sbin/pkg_install/add/perform.c projects/amd64_xen_pv/usr.sbin/pkg_install/add/pkg_add.1 projects/amd64_xen_pv/usr.sbin/pkg_install/lib/exec.c projects/amd64_xen_pv/usr.sbin/pkg_install/lib/file.c projects/amd64_xen_pv/usr.sbin/pkg_install/lib/lib.h projects/amd64_xen_pv/usr.sbin/pkg_install/lib/msg.c projects/amd64_xen_pv/usr.sbin/pkg_install/lib/url.c projects/amd64_xen_pv/usr.sbin/pmcstat/pmcstat.8 projects/amd64_xen_pv/usr.sbin/pmcstat/pmcstat_log.c projects/amd64_xen_pv/usr.sbin/setfib/setfib.1 projects/amd64_xen_pv/usr.sbin/syslogd/syslogd.8 projects/amd64_xen_pv/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/amd64_xen_pv/ (props changed) projects/amd64_xen_pv/cddl/contrib/opensolaris/ (props changed) projects/amd64_xen_pv/contrib/bind9/ (props changed) projects/amd64_xen_pv/contrib/gcc/ (props changed) projects/amd64_xen_pv/contrib/groff/ (props changed) projects/amd64_xen_pv/contrib/less/ (props changed) projects/amd64_xen_pv/contrib/libc++/ (props changed) projects/amd64_xen_pv/contrib/libstdc++/ (props changed) projects/amd64_xen_pv/contrib/llvm/ (props changed) projects/amd64_xen_pv/contrib/llvm/tools/clang/ (props changed) projects/amd64_xen_pv/contrib/top/ (props changed) projects/amd64_xen_pv/crypto/openssh/ (props changed) projects/amd64_xen_pv/crypto/openssl/ (props changed) projects/amd64_xen_pv/gnu/lib/ (props changed) projects/amd64_xen_pv/lib/libc/ (props changed) projects/amd64_xen_pv/lib/libc/stdtime/ (props changed) projects/amd64_xen_pv/lib/libutil/ (props changed) projects/amd64_xen_pv/lib/libz/ (props changed) projects/amd64_xen_pv/lib/libz/contrib/ (props changed) projects/amd64_xen_pv/lib/libz/contrib/README.contrib (props changed) projects/amd64_xen_pv/lib/libz/contrib/asm686/ (props changed) projects/amd64_xen_pv/lib/libz/contrib/asm686/README.686 (props changed) projects/amd64_xen_pv/lib/libz/contrib/gcc_gvmat64/ (props changed) projects/amd64_xen_pv/lib/libz/contrib/gcc_gvmat64/gvmat64.S (props changed) projects/amd64_xen_pv/lib/libz/doc/ (props changed) projects/amd64_xen_pv/lib/libz/doc/rfc1950.txt (props changed) projects/amd64_xen_pv/lib/libz/doc/rfc1951.txt (props changed) projects/amd64_xen_pv/lib/libz/doc/rfc1952.txt (props changed) projects/amd64_xen_pv/lib/libz/doc/txtvsbin.txt (props changed) projects/amd64_xen_pv/lib/libz/gzclose.c (props changed) projects/amd64_xen_pv/sbin/ (props changed) projects/amd64_xen_pv/sbin/ipfw/ (props changed) projects/amd64_xen_pv/share/man/man4/ (props changed) projects/amd64_xen_pv/sys/ (props changed) projects/amd64_xen_pv/sys/boot/ (props changed) projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/ (props changed) projects/amd64_xen_pv/sys/conf/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/common/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/compiler/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/components/events/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/components/executer/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/amd64_xen_pv/sys/contrib/dev/acpica/include/ (props changed) projects/amd64_xen_pv/sys/contrib/pf/ (props changed) projects/amd64_xen_pv/tools/regression/usr.bin/make/all.sh (props changed) projects/amd64_xen_pv/usr.bin/calendar/ (props changed) projects/amd64_xen_pv/usr.sbin/jail/ (props changed) projects/amd64_xen_pv/usr.sbin/ndiscvt/ (props changed) Modified: projects/amd64_xen_pv/Makefile.inc1 ============================================================================== --- projects/amd64_xen_pv/Makefile.inc1 Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/Makefile.inc1 Fri Jun 29 15:10:54 2012 (r237786) @@ -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 @@ SUBDIR+=etc # 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 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ 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 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ 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 @@ build32: .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 @@ buildkernel: 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 @@ buildkernel: 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) @@ -1272,6 +1274,11 @@ _ofed_lib= contrib/ofed/usr.lib/ .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 Modified: projects/amd64_xen_pv/ObsoleteFiles.inc ============================================================================== --- projects/amd64_xen_pv/ObsoleteFiles.inc Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/ObsoleteFiles.inc Fri Jun 29 15:10:54 2012 (r237786) @@ -38,6 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 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 Modified: projects/amd64_xen_pv/UPDATING ============================================================================== --- projects/amd64_xen_pv/UPDATING Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/UPDATING Fri Jun 29 15:10:54 2012 (r237786) @@ -24,6 +24,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +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: projects/amd64_xen_pv/bin/rcp/rcp.1 ============================================================================== --- projects/amd64_xen_pv/bin/rcp/rcp.1 Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/bin/rcp/rcp.1 Fri Jun 29 15:10:54 2012 (r237786) @@ -116,17 +116,11 @@ The .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: projects/amd64_xen_pv/bin/rm/rm.c ============================================================================== --- projects/amd64_xen_pv/bin/rm/rm.c Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/bin/rm/rm.c Fri Jun 29 15:10:54 2012 (r237786) @@ -301,10 +301,16 @@ rm_tree(char **argv) 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 @@ rm_file(char **argv) 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 @@ rm_overwrite(char *file, struct stat *sb 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: projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Jun 29 15:10:54 2012 (r237786) @@ -18,8 +18,10 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ #include @@ -54,6 +56,7 @@ #include #include #include +#include #undef ZFS_MAXNAMELEN #undef verify #include @@ -63,7 +66,8 @@ #define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ zio_checksum_table[(idx)].ci_name : "UNKNOWN") #define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ - dmu_ot[(idx)].ot_name : "UNKNOWN") + dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \ + dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN") #define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES) #ifndef lint @@ -1088,7 +1092,7 @@ dump_dsl_dataset(objset_t *os, uint64_t ASSERT(size == sizeof (*ds)); crtime = ds->ds_creation_time; - zdb_nicenum(ds->ds_used_bytes, used); + zdb_nicenum(ds->ds_referenced_bytes, used); zdb_nicenum(ds->ds_compressed_bytes, compressed); zdb_nicenum(ds->ds_uncompressed_bytes, uncompressed); zdb_nicenum(ds->ds_unique_bytes, unique); @@ -1132,6 +1136,44 @@ dump_dsl_dataset(objset_t *os, uint64_t /* ARGSUSED */ static int +dump_bptree_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx) +{ + char blkbuf[BP_SPRINTF_LEN]; + + if (bp->blk_birth != 0) { + sprintf_blkptr(blkbuf, bp); + (void) printf("\t%s\n", blkbuf); + } + return (0); +} + +static void +dump_bptree(objset_t *os, uint64_t obj, char *name) +{ + char bytes[32]; + bptree_phys_t *bt; + dmu_buf_t *db; + + if (dump_opt['d'] < 3) + return; + + VERIFY3U(0, ==, dmu_bonus_hold(os, obj, FTAG, &db)); + bt = db->db_data; + zdb_nicenum(bt->bt_bytes, bytes); + (void) printf("\n %s: %llu datasets, %s\n", + name, (unsigned long long)(bt->bt_end - bt->bt_begin), bytes); + dmu_buf_rele(db, FTAG); + + if (dump_opt['d'] < 5) + return; + + (void) printf("\n"); + + (void) bptree_iterate(os, obj, B_FALSE, dump_bptree_cb, NULL, NULL); +} + +/* ARGSUSED */ +static int dump_bpobj_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx) { char blkbuf[BP_SPRINTF_LEN]; @@ -1883,11 +1925,13 @@ typedef struct zdb_blkstats { */ #define ZDB_OT_DEFERRED (DMU_OT_NUMTYPES + 0) #define ZDB_OT_DITTO (DMU_OT_NUMTYPES + 1) -#define ZDB_OT_TOTAL (DMU_OT_NUMTYPES + 2) +#define ZDB_OT_OTHER (DMU_OT_NUMTYPES + 2) +#define ZDB_OT_TOTAL (DMU_OT_NUMTYPES + 3) static char *zdb_ot_extname[] = { "deferred free", "dedup ditto", + "other", "Total", }; @@ -1968,9 +2012,10 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog type = BP_GET_TYPE(bp); - zdb_count_block(zcb, zilog, bp, type); + zdb_count_block(zcb, zilog, bp, + (type & DMU_OT_NEWTYPE) ? ZDB_OT_OTHER : type); - is_metadata = (BP_GET_LEVEL(bp) != 0 || dmu_ot[type].ot_metadata); + is_metadata = (BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type)); if (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata)) { int ioerr; @@ -2197,6 +2242,12 @@ dump_block_stats(spa_t *spa) (void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj, count_block_cb, &zcb, NULL); } + if (spa_feature_is_active(spa, + &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset, + spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb, + &zcb, NULL)); + } if (dump_opt['c'] > 1) flags |= TRAVERSE_PREFETCH_DATA; @@ -2373,7 +2424,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilo } if (BP_IS_HOLE(bp) || BP_GET_CHECKSUM(bp) == ZIO_CHECKSUM_OFF || - BP_GET_LEVEL(bp) > 0 || dmu_ot[BP_GET_TYPE(bp)].ot_metadata) + BP_GET_LEVEL(bp) > 0 || DMU_OT_IS_METADATA(BP_GET_TYPE(bp))) return (0); ddt_key_fill(&zdde_search.zdde_key, bp); @@ -2478,7 +2529,14 @@ dump_zpool(spa_t *spa) dump_bpobj(&spa->spa_deferred_bpobj, "Deferred frees"); if (spa_version(spa) >= SPA_VERSION_DEADLISTS) { dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj, - "Pool frees"); + "Pool snapshot frees"); + } + + if (spa_feature_is_active(spa, + &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + dump_bptree(spa->spa_meta_objset, + spa->spa_dsl_pool->dp_bptree_obj, + "Pool dataset frees"); } dump_dtl(spa->spa_root_vdev, 0); } Copied: projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 (from r237782, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 Fri Jun 29 15:10:54 2012 (r237786, copy of r237782, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5) @@ -0,0 +1,174 @@ +'\" te +.\" Copyright (c) 2012, Martin Matuska . +.\" All Rights Reserved. +.\" +.\" The contents of this file are subject to the terms of the +.\" Common Development and Distribution License (the "License"). +.\" You may not use this file except in compliance with the License. +.\" +.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +.\" or http://www.opensolaris.org/os/licensing. +.\" See the License for the specific language governing permissions +.\" and limitations under the License. +.\" +.\" When distributing Covered Code, include this CDDL HEADER in each +.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE. +.\" If applicable, add the following below this CDDL HEADER, with the +.\" fields enclosed by brackets "[]" replaced with your own identifying +.\" information: Portions Copyright [yyyy] [name of copyright owner] +.\" +.\" Copyright (c) 2012 by Delphix. All rights reserved. +.\" +.\" $FreeBSD$ +.\" +.Dd May 28, 2012 +.Dt ZPOOL-FEATURES 8 +.Os +.Sh NAME +.Nm zpool-features +.Nd ZFS pool feature descriptions +.Sh DESCRIPTION +ZFS pool on\-disk format versions are specified via "features" which replace +the old on\-disk format numbers (the last supported on\-disk format number is +28). +To enable a feature on a pool use the +.Xr zpool 8 +command to set the +.Sy feature@feature_name +property to +.Ar enabled . +.Pp +The pool format does not affect file system version compatibility or the ability +to send file systems between pools. +.Pp +Since most features can be enabled independently of each other the on\-disk +format of the pool is specified by the set of all features marked as +.Sy active +on the pool. If the pool was created by another software version this set may +include unsupported features. +.Ss Identifying features +Every feature has a guid of the form +.Sy com.example:feature_name . +The reverse DNS name ensures that the feature's guid is unique across all ZFS +implementations. When unsupported features are encountered on a pool they will +be identified by their guids. +Refer to the documentation for the ZFS implementation that created the pool +for information about those features. +.Pp +Each supported feature also has a short name. +By convention a feature's short name is the portion of its guid which follows +the ':' (e.g. +.Sy com.example:feature_name +would have the short name +.Sy feature_name ), +however a feature's short name may differ across ZFS implementations if +following the convention would result in name conflicts. +.Ss Feature states +Features can be in one of three states: +.Bl -tag +.It Sy active +This feature's on\-disk format changes are in effect on the pool. +Support for this feature is required to import the pool in read\-write mode. +If this feature is not read-only compatible, support is also required to +import the pool in read\-only mode (see "Read\-only compatibility"). +.It Sy enabled +An administrator has marked this feature as enabled on the pool, but the +feature's on\-disk format changes have not been made yet. +The pool can still be imported by software that does not support this feature, +but changes may be made to the on\-disk format at any time which will move +the feature to the +.Sy active +state. +Some features may support returning to the +.Sy enabled +state after becoming +.Sy active . +See feature\-specific documentation for details. +.It Sy disabled +This feature's on\-disk format changes have not been made and will not be made +unless an administrator moves the feature to the +.Sy enabled +state. +Features cannot be disabled once they have been enabled. +.El +The state of supported features is exposed through pool properties of the form +.Sy feature@short_name . +.Ss Read\-only compatibility +Some features may make on\-disk format changes that do not interfere with other +software's ability to read from the pool. +These features are referred to as "read\-only compatible". +If all unsupported features on a pool are read\-only compatible, the pool can +be imported in read\-only mode by setting the +.Sy readonly +property during import (see +.Xr zpool 8 +for details on importing pools). +.Ss Unsupported features +For each unsupported feature enabled on an imported pool a pool property +named +.Sy unsupported@feature_guid +will indicate why the import was allowed despite the unsupported feature. +Possible values for this property are: +.Bl -tag +.It Sy inactive +The feature is in the +.Sy enabled +state and therefore the pool's on\-disk format is still compatible with +software that does not support this feature. +.It Sy readonly +The feature is read\-only compatible and the pool has been imported in +read\-only mode. +.El +.Ss Feature dependencies +Some features depend on other features being enabled in order to function +properly. +Enabling a feature will automatically enable any features it depends on. +.Sh FEATURES +The following features are supported on this system: +.Bl -tag +.It Sy async_destroy +.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:async_destroy" +.It GUID Ta com.delphix:async_destroy +.It READ\-ONLY COMPATIBLE Ta yes +.It DEPENDENCIES Ta none +.El +.Pp +Destroying a file system requires traversing all of its data in order to +return its used space to the pool. +Without +.Sy async_destroy +the file system is not fully removed until all space has been reclaimed. +If the destroy operation is interrupted by a reboot or power outage the next +attempt to open the pool will need to complete the destroy operation +synchronously. +.Pp +When +.Sy async_destroy +is enabled the file system's data will be reclaimed by a background process, +allowing the destroy operation to complete without traversing the entire file +system. +The background process is able to resume interrupted destroys after the pool +has been opened, eliminating the need to finish interrupted destroys as part +of the open operation. +The amount of space remaining to be reclaimed by the background process is +available through the +.Sy freeing +property. +.Sh SEE ALSO +.Xr zpool 8 +.Sh AUTHORS +This manual page is a +.Xr mdoc 7 +reimplementation of the +.Tn illumos +manual page +.Em zpool-features(5) , +modified and customized for +.Fx +and licensed under the Common Development and Distribution License +.Pq Tn CDDL . +.Pp +The +.Xr mdoc 7 +implementation of this manual page was initially written by +.An Martin Matuska Aq mm@FreeBSD.org . Modified: projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Jun 29 15:10:54 2012 (r237786) @@ -1,5 +1,5 @@ '\" te -.\" Copyright (c) 2011, Martin Matuska . +.\" Copyright (c) 2012, Martin Matuska . .\" All Rights Reserved. .\" .\" The contents of this file are subject to the terms of the @@ -20,6 +20,7 @@ .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2011, Justin T. Gibbs +.\" Copyright (c) 2012 by Delphix. All Rights Reserved. .\" .\" $FreeBSD$ .\" @@ -47,7 +48,7 @@ .Op Ar device .Nm .Cm create -.Op Fl fn +.Op Fl fnd .Op Fl o Ar property Ns = Ns Ar value .Ar ... .Op Fl O Ar file-system-property Ns = Ns Ar value @@ -189,7 +190,7 @@ for information on managing datasets. A .Qq virtual device .Pq No vdev -describes a single device or a collection of devices organized according to +describes a single device or a collection of devices organized according to certain performance and fault characteristics. The following virtual devices are supported: .Bl -tag @@ -237,7 +238,7 @@ A group can have single-, double- , or triple parity, meaning that the .No raidz group can sustain one, two, or three failures, respectively, without -losing any data. The +losing any data. The .Sy raidz1 No vdev type specifies a single-parity .No raidz @@ -287,7 +288,7 @@ writes are load-balanced between devices .No raidz .No vdev types are not supported for the intent log. For more information, -see the +see the .Qq Sx Intent Log section. .It Sy cache @@ -309,13 +310,13 @@ A pool can have any number of virtual de (known as .Qq root .No vdev Ns s). -Data is dynamically distributed across all top-level devices to balance data +Data is dynamically distributed across all top-level devices to balance data among devices. As new virtual devices are added, .Tn ZFS automatically places data on the newly available devices. .Pp Virtual devices are specified one at a time on the command line, separated by -whitespace. The keywords +whitespace. The keywords .Qq mirror and .Qq raidz @@ -428,7 +429,7 @@ allows devices to be associated with poo .Qq hot spares . These devices are not actively used in the pool, but when an active device fails, it is automatically replaced by a hot spare. To create a pool with hot -spares, specify a +spares, specify a .Qq spare .No vdev with any number of devices. For example, @@ -458,7 +459,7 @@ pools. .Pp Spares cannot replace log devices. .Ss Intent Log -The +The .Tn ZFS Intent Log .Pq Tn ZIL @@ -537,6 +538,16 @@ value of 1.76 indicates that 1.76 units for a description of the deduplication feature. .It Sy free Number of blocks within the pool that are not allocated. +.It Sy freeing +After a file system or snapshot is destroyed, the space it was using is +returned to the pool asynchronously. +.Sy freeing +is the amount of space remaining to be reclaimed. +Over time +.Sy freeing +will decrease while +.Sy free +increases. .It Sy expandsize This property has currently no value on FreeBSD. .It Sy guid @@ -552,11 +563,16 @@ or .Qq Sy UNAVAIL . .It Sy size Total size of the storage pool. +.It Sy unsupported@ Ns Ar feature_guid +Information about unsupported features that are enabled on the pool. +See +.Xr zpool-features 5 +for details. .It Sy used Amount of storage space used within the pool. .El .Pp -These space usage properties report actual physical space available to the +The space usage properties report actual physical space available to the storage pool. The physical space can be different from the total amount of space that any contained datasets can actually use. The amount of space used in a @@ -582,7 +598,7 @@ the typical paths are not valid. .Sy altroot is not a persistent property. It is valid only while the system is up. Setting -.Sy altroot +.Sy altroot defaults to using .Cm cachefile=none , though this may be overridden using an explicit setting. @@ -627,9 +643,9 @@ This property can also be referred to by .It Sy autoreplace Ns = Ns Cm on No | Cm off Controls automatic device replacement. If set to .Qq Cm off , -device replacement must be initiated by the administrator by using the +device replacement must be initiated by the administrator by using the .Qq Nm Cm replace -command. If set to +command. If set to .Qq Cm on , any new device, found in the same physical location as a device that previously belonged to the pool, is @@ -650,13 +666,18 @@ pool configuration in a different locati .Qq Nm Cm import Fl c . Setting it to the special value .Qq Cm none -creates a temporary pool that is never cached, and the special value +creates a temporary pool that is never cached, and the special value .Cm '' (empty string) uses the default location. +.It Sy comment Ns = Ns Ar text +A text string consisting of printable ASCII characters that will be stored +such that it is available even if the pool becomes faulted. +An administrator can provide additional information about a pool using this +property. .It Sy dedupditto Ns = Ns Ar number Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block -is automatically stored. Deafult setting is +is automatically stored. Default setting is .Cm 0 . .It Sy delegation Ns = Ns Cm on No | Cm off Controls whether a non-privileged user is granted access based on the dataset @@ -686,6 +707,17 @@ requests that have yet to be committed t .It Sy panic Prints out a message to the console and generates a system crash dump. .El +.It Sy feature@ Ns Ar feature_name Ns = Ns Sy enabled +The value of this property is the current state of +.Ar feature_name . +The only valid value when setting this property is +.Sy enabled +which moves +.Ar feature_name +to the enabled state. +See +.Xr zpool-features 5 +for details on feature states. .It Sy listsnaps Ns = Ns Cm on No | Cm off Controls whether information about snapshots associated with this pool is output when @@ -699,9 +731,9 @@ The current on-disk version of the pool. decreased. The preferred method of updating pools is with the .Qq Nm Cm upgrade command, though this property can be used when a specific version is needed -for backwards compatibility. This property can be any number between 1 and the -current version reported by -.Qo Ic zpool upgrade -v Qc . +for backwards compatibility. +Once feature flags is enabled on a pool this property will no longer have a +value. .El .Sh SUBCOMMANDS All subcommands that modify state are logged persistently to the pool in their @@ -810,7 +842,7 @@ do not actually discard any transactions .It Xo .Nm .Cm create -.Op Fl fn +.Op Fl fnd .Op Fl o Ar property Ns = Ns Ar value .Ar ... .Op Fl O Ar file-system-property Ns = Ns Ar value @@ -859,9 +891,13 @@ The mount point must not exist or must b root dataset cannot be mounted. This can be overridden with the .Fl m option. +.Pp +By default all supported features are enabled on the new pool unless the +.Fl d +option is specified. .Bl -tag -width indent .It Fl f -Forces use of +Forces use of .Ar vdev Ns s, even if they appear in use or specify a conflicting replication level. Not all devices can be overridden in this manner. @@ -869,6 +905,17 @@ Not all devices can be overridden in thi Displays the configuration that would be used without actually creating the pool. The actual pool creation can still fail due to insufficient privileges or device sharing. +.It Fl d +Do not enable any features on the new pool. +Individual features can be enabled by setting their corresponding properties +to +.Sy enabled +with the +.Fl o +option. +See +.Xr zpool-features 5 +for details about feature properties. .It Xo .Fl o Ar property Ns = Ns Ar value .Op Fl o Ar property Ns = Ns Ar value @@ -897,7 +944,7 @@ or .Qq Cm altroot Ns Pa /pool if .Sy altroot -is specified. The mount point must be an absolute path, +is specified. The mount point must be an absolute path, .Qq Cm legacy , or .Qq Cm none . @@ -1234,7 +1281,7 @@ seconds until .Sy Ctrl-C is pressed. If no .Ar pools -are specified, statistics for every pool in the system is shown. If +are specified, statistics for every pool in the system is shown. If .Ar count is specified, the command exits after .Ar count @@ -1292,7 +1339,7 @@ When given an interval, the output is pr .Ar interval seconds until .Sy Ctrl-C -is pressed. If +is pressed. If .Ar count is specified, the command exits after .Ar count @@ -1301,6 +1348,8 @@ reports are printed. .It Fl H Scripted mode. Do not display headers, and separate fields by a single tab instead of arbitrary space. +.It Fl v +Show more detailed information. .It Fl o Ar property Ns Op , Ns Ar ... Comma-separated list of properties to display. See the .Qq Sx Properties @@ -1396,7 +1445,7 @@ This is equivalent to attaching waiting for it to resilver, and then detaching .Ar old_device . .Pp -The size of +The size of .Ar new_device must be greater than or equal to the minimum size of all the devices in a mirror or @@ -1407,7 +1456,7 @@ configuration. is required if the pool is not redundant. If .Ar new_device is not specified, it defaults to -.Ar old_device . +.Ar old_device . This form of replacement is useful after an existing disk has failed and has been physically replaced. In this case, the new disk may have the same .Pa /dev @@ -1494,12 +1543,12 @@ unless overridden by a device specificat .Pp When using a .Ar device -argument, +argument, .Cm split -includes the specified device(s) in a new pool and, should any devices remain +includes the specified device(s) in a new pool and, should any devices remain unspecified, assigns the last device in each mirror .No vdev -to that pool, as it does normally. If you are uncertain about the outcome of a +to that pool, as it does normally. If you are uncertain about the outcome of a .Cm split command, use the .Fl n @@ -1552,7 +1601,7 @@ When given an interval, the output is pr .Ar interval seconds until .Sy Ctrl-C -is pressed. If +is pressed. If .Ar count is specified, the command exits after .Ar count @@ -1873,6 +1922,7 @@ Invalid command line options were specif .El .Sh SEE ALSO .Xr zfs 8 +.Xr zpool-features 5 .Sh AUTHORS This manual page is a .Xr mdoc 7 Modified: projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jun 29 15:09:38 2012 (r237785) +++ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jun 29 15:10:54 2012 (r237786) @@ -54,6 +54,7 @@ #include "zpool_util.h" #include "zfs_comutil.h" +#include "zfeature_common.h" #include "statcommon.h" @@ -207,7 +208,7 @@ get_usage(zpool_help_t idx) { case HELP_CLEAR: return (gettext("\tclear [-nF] [device]\n")); case HELP_CREATE: - return (gettext("\tcreate [-fn] [-o property=value] ... \n" + return (gettext("\tcreate [-fnd] [-o property=value] ... \n" "\t [-O file-system-property=value] ... \n" "\t [-m mountpoint] [-R root] ...\n")); case HELP_DESTROY: @@ -234,7 +235,7 @@ get_usage(zpool_help_t idx) { case HELP_LABELCLEAR: return (gettext("\tlabelclear [-f] \n")); case HELP_LIST: - return (gettext("\tlist [-H] [-o property[,...]] " + return (gettext("\tlist [-Hv] [-o property[,...]] " "[-T d|u] [pool] ... [interval [count]]\n")); case HELP_OFFLINE: return (gettext("\toffline [-t] ...\n")); @@ -339,6 +340,12 @@ usage(boolean_t requested) /* Iterate over all properties */ (void) zprop_iter(print_prop_cb, fp, B_FALSE, B_TRUE, ZFS_TYPE_POOL); + + (void) fprintf(fp, "\t%-15s ", "feature@..."); + (void) fprintf(fp, "YES disabled | enabled | active\n"); + + (void) fprintf(fp, gettext("\nThe feature@ properties must be " + "appended with a feature name.\nSee zpool-features(5).\n")); } /* @@ -405,12 +412,16 @@ add_prop_list(const char *propname, char proplist = *props; if (poolprop) { - if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL) { + if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL && + !zpool_prop_feature(propname)) { (void) fprintf(stderr, gettext("property '%s' is " "not a valid pool property\n"), propname); return (2); } - normnm = zpool_prop_to_name(prop); + if (zpool_prop_feature(propname)) + normnm = propname; + else + normnm = zpool_prop_to_name(prop); } else { if ((fprop = zfs_name_to_prop(propname)) != ZPROP_INVAL) { normnm = zfs_prop_to_name(fprop); @@ -701,7 +712,7 @@ errout: } /* - * zpool create [-fn] [-o property=value] ... + * zpool create [-fnd] [-o property=value] ... * [-O file-system-property=value] ... * [-R root] [-m mountpoint] ... * @@ -710,8 +721,10 @@ errout: * were to be created. * -R Create a pool under an alternate root * -m Set default mountpoint for the root dataset. By default it's - * '/' + * '/' * -o Set property=value. + * -d Don't automatically enable all supported pool features + * (individual features can be enabled with -o). * -O Set fsproperty=value in the pool's root file system * * Creates the named pool according to the given vdev specification. The @@ -724,6 +737,7 @@ zpool_do_create(int argc, char **argv) { boolean_t force = B_FALSE; boolean_t dryrun = B_FALSE; + boolean_t enable_all_pool_feat = B_TRUE; int c; nvlist_t *nvroot = NULL; char *poolname; @@ -735,7 +749,7 @@ zpool_do_create(int argc, char **argv) char *propval; /* check options */ - while ((c = getopt(argc, argv, ":fnR:m:o:O:")) != -1) { + while ((c = getopt(argc, argv, ":fndR:m:o:O:")) != -1) { switch (c) { case 'f': force = B_TRUE; @@ -743,6 +757,9 @@ zpool_do_create(int argc, char **argv) case 'n': dryrun = B_TRUE; break; + case 'd': + enable_all_pool_feat = B_FALSE; + break; case 'R': altroot = optarg; if (add_prop_list(zpool_prop_to_name( @@ -770,6 +787,21 @@ zpool_do_create(int argc, char **argv) if (add_prop_list(optarg, propval, &props, B_TRUE)) goto errout; + + /* + * If the user is creating a pool that doesn't support + * feature flags, don't enable any features. + */ + if (zpool_name_to_prop(optarg) == ZPOOL_PROP_VERSION) { + char *end; + u_longlong_t ver; + + ver = strtoull(propval, &end, 10); + if (*end == '\0' && + ver < SPA_VERSION_FEATURES) { + enable_all_pool_feat = B_FALSE; + } + } break; case 'O': if ((propval = strchr(optarg, '=')) == NULL) { @@ -835,7 +867,6 @@ zpool_do_create(int argc, char **argv) goto errout; } - if (altroot != NULL && altroot[0] != '/') { (void) fprintf(stderr, gettext("invalid alternate root '%s': " "must be an absolute path\n"), altroot); @@ -917,6 +948,27 @@ zpool_do_create(int argc, char **argv) /* * Hand off to libzfs. */ + if (enable_all_pool_feat) { + int i; + for (i = 0; i < SPA_FEATURES; i++) { + char propname[MAXPATHLEN]; + zfeature_info_t *feat = &spa_feature_table[i]; + + (void) snprintf(propname, sizeof (propname), + "feature@%s", feat->fi_uname); + + /* + * Skip feature if user specified it manually + * on the command line. + */ + if (nvlist_exists(props, propname)) + continue; + + if (add_prop_list(propname, ZFS_FEATURE_ENABLED, + &props, B_TRUE) != 0) + goto errout; + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 15:24:43 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3ADF1065670; Fri, 29 Jun 2012 15:24:43 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8E5008FC14; Fri, 29 Jun 2012 15:24:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TFOhBL053427; Fri, 29 Jun 2012 15:24:43 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TFOhHg053423; Fri, 29 Jun 2012 15:24:43 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206291524.q5TFOhHg053423@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 29 Jun 2012 15:24:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237788 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 15:24:43 -0000 Author: glebius Date: Fri Jun 29 15:24:42 2012 New Revision: 237788 URL: http://svn.freebsd.org/changeset/base/237788 Log: As Robert suggested provide mbuf to pf_socket_lookup() and utilize in_pcblookup_mbuf()/in6_pcblookup_mbuf(). Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.c projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pfvar.h Modified: projects/pf/head/sys/contrib/pf/net/if_pflog.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/if_pflog.c Fri Jun 29 15:21:34 2012 (r237787) +++ projects/pf/head/sys/contrib/pf/net/if_pflog.c Fri Jun 29 15:24:42 2012 (r237788) @@ -234,7 +234,7 @@ pflog_packet(struct pfi_kif *kif, struct * These conditions are very very rare, however. */ if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done && lookupsafe) - pd->lookup.done = pf_socket_lookup(dir, pd); + pd->lookup.done = pf_socket_lookup(dir, pd, m); if (pd->lookup.done > 0) hdr.uid = pd->lookup.uid; else Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Fri Jun 29 15:21:34 2012 (r237787) +++ projects/pf/head/sys/contrib/pf/net/pf.c Fri Jun 29 15:24:42 2012 (r237788) @@ -2644,7 +2644,7 @@ pf_addr_inc(struct pf_addr *addr, sa_fam #endif /* INET6 */ int -pf_socket_lookup(int direction, struct pf_pdesc *pd) +pf_socket_lookup(int direction, struct pf_pdesc *pd, struct mbuf *m) { struct pf_addr *saddr, *daddr; u_int16_t sport, dport; @@ -2687,16 +2687,12 @@ pf_socket_lookup(int direction, struct p switch (pd->af) { #ifdef INET case AF_INET: - /* - * XXXRW: would be nice if we had an mbuf here so that we - * could use in_pcblookup_mbuf(). - */ - inp = in_pcblookup(pi, saddr->v4, sport, daddr->v4, - dport, INPLOOKUP_RLOCKPCB, NULL); + inp = in_pcblookup_mbuf(pi, saddr->v4, sport, daddr->v4, + dport, INPLOOKUP_RLOCKPCB, NULL, m); if (inp == NULL) { - inp = in_pcblookup(pi, saddr->v4, sport, + inp = in_pcblookup_mbuf(pi, saddr->v4, sport, daddr->v4, dport, INPLOOKUP_WILDCARD | - INPLOOKUP_RLOCKPCB, NULL); + INPLOOKUP_RLOCKPCB, NULL, m); if (inp == NULL) return (-1); } @@ -2704,16 +2700,12 @@ pf_socket_lookup(int direction, struct p #endif /* INET */ #ifdef INET6 case AF_INET6: - /* - * XXXRW: would be nice if we had an mbuf here so that we - * could use in6_pcblookup_mbuf(). - */ - inp = in6_pcblookup(pi, &saddr->v6, sport, - &daddr->v6, dport, INPLOOKUP_RLOCKPCB, NULL); + inp = in6_pcblookup_mbuf(pi, &saddr->v6, sport, &daddr->v6, + dport, INPLOOKUP_RLOCKPCB, NULL, m); if (inp == NULL) { - inp = in6_pcblookup(pi, &saddr->v6, sport, + inp = in6_pcblookup_mbuf(pi, &saddr->v6, sport, &daddr->v6, dport, INPLOOKUP_WILDCARD | - INPLOOKUP_RLOCKPCB, NULL); + INPLOOKUP_RLOCKPCB, NULL, m); if (inp == NULL) return (-1); } @@ -3170,13 +3162,13 @@ pf_test_rule(struct pf_rule **rm, struct r = TAILQ_NEXT(r, entries); /* tcp/udp only. uid.op always 0 in other cases */ else if (r->uid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(direction, pd), 1)) && + pf_socket_lookup(direction, pd, m), 1)) && !pf_match_uid(r->uid.op, r->uid.uid[0], r->uid.uid[1], pd->lookup.uid)) r = TAILQ_NEXT(r, entries); /* tcp/udp only. gid.op always 0 in other cases */ else if (r->gid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(direction, pd), 1)) && + pf_socket_lookup(direction, pd, m), 1)) && !pf_match_gid(r->gid.op, r->gid.gid[0], r->gid.gid[1], pd->lookup.gid)) r = TAILQ_NEXT(r, entries); Modified: projects/pf/head/sys/contrib/pf/net/pfvar.h ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pfvar.h Fri Jun 29 15:21:34 2012 (r237787) +++ projects/pf/head/sys/contrib/pf/net/pfvar.h Fri Jun 29 15:24:42 2012 (r237788) @@ -1841,7 +1841,7 @@ u_int32_t void pf_purge_expired_fragments(void); int pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *, int); -int pf_socket_lookup(int, struct pf_pdesc *); +int pf_socket_lookup(int, struct pf_pdesc *, struct mbuf *); struct pf_state_key *pf_alloc_state_key(int); void pfr_initialize(void); void pfr_cleanup(void); From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 15:27:18 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E2951065674; Fri, 29 Jun 2012 15:27:18 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7965C8FC1A; Fri, 29 Jun 2012 15:27:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TFRIG4053658; Fri, 29 Jun 2012 15:27:18 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TFRIqD053656; Fri, 29 Jun 2012 15:27:18 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206291527.q5TFRIqD053656@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 29 Jun 2012 15:27:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237791 - projects/pf/head/contrib/pf/man X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 15:27:18 -0000 Author: glebius Date: Fri Jun 29 15:27:17 2012 New Revision: 237791 URL: http://svn.freebsd.org/changeset/base/237791 Log: The locking problem between pf and PCBs no longer exists. Modified: projects/pf/head/contrib/pf/man/pf.conf.5 Modified: projects/pf/head/contrib/pf/man/pf.conf.5 ============================================================================== --- projects/pf/head/contrib/pf/man/pf.conf.5 Fri Jun 29 15:24:55 2012 (r237790) +++ projects/pf/head/contrib/pf/man/pf.conf.5 Fri Jun 29 15:27:17 2012 (r237791) @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 28 2012 +.Dd June 29 2012 .Dt PF.CONF 5 .Os .Sh NAME @@ -1421,7 +1421,7 @@ has the socket open where the packet is (depending on which socket is local). This is in addition to the normal information logged. .Pp -Due to the problems described in the BUGS section only the first packet +Only the first packet logged via .Ar log (all, user) will have the user credentials logged when using stateful matching. @@ -3040,22 +3040,6 @@ Protocol name database. .It Pa /etc/services Service name database. .El -.Sh BUGS -Due to a lock order reversal (LOR) with the socket layer, the use of the -.Ar group -and -.Ar user -filter parameter in conjuction with a Giant-free netstack -can result in a deadlock. -A workaround is available under the -.Va debug.pfugidhack -sysctl which is automatically enabled when a -.Ar user -/ -.Ar group -rule is added or -.Ar log (user) -is specified. .Sh SEE ALSO .Xr altq 4 , .Xr carp 4 , From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 15:47:04 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F77C1065670; Fri, 29 Jun 2012 15:47:04 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A1458FC0C; Fri, 29 Jun 2012 15:47:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TFl4ZN054550; Fri, 29 Jun 2012 15:47:04 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TFl4bL054546; Fri, 29 Jun 2012 15:47:04 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201206291547.q5TFl4bL054546@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Jun 2012 15:47:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237793 - projects/amd64_xen_pv/sys/amd64/xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 15:47:04 -0000 Author: attilio Date: Fri Jun 29 15:47:03 2012 New Revision: 237793 URL: http://svn.freebsd.org/changeset/base/237793 Log: - Remove the possibility to pass an arbitrary size to the mmu_map_mbackend alloc structures. They will now allocate a single page size chunk of memory. - Fix the prototype for pmtb_mappedfree to match with the expected prototype. Approved by: cherry Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c Fri Jun 29 15:30:14 2012 (r237792) +++ projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c Fri Jun 29 15:47:03 2012 (r237793) @@ -328,7 +328,7 @@ mmu_map_hold_va(struct pmap *pm, void *a vm_paddr_t pml4tep_ma; pml4_entry_t pml4te; - pti->pdpt = (pdp_entry_t *)pti->ptmb.alloc(PAGE_SIZE); + pti->pdpt = (pdp_entry_t *)pti->ptmb.alloc(); pml4tep = &pti->pml4t[pml4t_index(va)]; pml4tep_ma = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pml4tep)); @@ -346,7 +346,7 @@ mmu_map_hold_va(struct pmap *pm, void *a vm_paddr_t pdptep_ma; pdp_entry_t pdpte; - pti->pdt = (pd_entry_t *)pti->ptmb.alloc(PAGE_SIZE); + pti->pdt = (pd_entry_t *)pti->ptmb.alloc(); pdptep = &pti->pdpt[pdpt_index(va)]; pdptep_ma = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pdptep)); @@ -364,7 +364,7 @@ mmu_map_hold_va(struct pmap *pm, void *a vm_paddr_t pdtep_ma; pd_entry_t pdte; - pti->pt = (pt_entry_t *) pti->ptmb.alloc(PAGE_SIZE); + pti->pt = (pt_entry_t *) pti->ptmb.alloc(); pdtep = &pti->pdt[pdt_index(va)]; pdtep_ma = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pdtep)); Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h Fri Jun 29 15:30:14 2012 (r237792) +++ projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h Fri Jun 29 15:47:03 2012 (r237793) @@ -90,7 +90,7 @@ typedef void * mmu_map_t; struct mmu_map_mbackend { /* Callbacks */ - vm_offset_t (*alloc)(size_t); + vm_offset_t (*alloc)(void); void (*free)(vm_offset_t); /* May be NULL */ /* Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Jun 29 15:30:14 2012 (r237792) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Jun 29 15:47:03 2012 (r237793) @@ -185,8 +185,8 @@ static vm_paddr_t boot_ptendphys; /* phy static uma_zone_t xen_pagezone; static size_t tsz; /* mmu_map.h opaque cookie size */ -static vm_offset_t (*ptmb_mappedalloc)(size_t) = NULL; -static void (*ptmb_mappedfree)(size_t) = NULL; +static vm_offset_t (*ptmb_mappedalloc)(void) = NULL; +static void (*ptmb_mappedfree)(vm_offset_t) = NULL; static vm_offset_t ptmb_ptov(vm_paddr_t p) { return PTOV(p); @@ -461,21 +461,18 @@ pmap_xen_bootpages(vm_paddr_t *firstaddr /* alloc from linear mapped boot time virtual address space */ static vm_offset_t -mmu_alloc(size_t size) +mmu_alloc(void) { - KASSERT(size != 0, ("mmu_alloc size must not be zero\n")); KASSERT(physfree != 0, ("physfree must have been set before using mmu_alloc")); - size = round_page(size); /* We can allocate only in page sizes */ - - vm_offset_t va = vallocpages(&physfree, atop(size)); + vm_offset_t va = vallocpages(&physfree, atop(PAGE_SIZE)); /* * Xen requires the page table hierarchy to be R/O. */ - pmap_xen_setpages_ro(va, atop(size)); + pmap_xen_setpages_ro(va, atop(PAGE_SIZE)); return va; } @@ -1167,12 +1164,10 @@ pmap_change_attr(vm_offset_t va, vm_size } static vm_offset_t -xen_pagezone_alloc(size_t size) +xen_pagezone_alloc(void) { vm_offset_t ret; - KASSERT(size == PAGE_SIZE, ("%s: invalid size", __func__)); - ret = (vm_offset_t)uma_zalloc(xen_pagezone, M_NOWAIT | M_ZERO); if (ret == 0) panic("%s: failed allocation\n", __func__); From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 16:06:06 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C800A1065673; Fri, 29 Jun 2012 16:06:06 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B39B98FC18; Fri, 29 Jun 2012 16:06:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TG66SV055465; Fri, 29 Jun 2012 16:06:06 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TG66nq055462; Fri, 29 Jun 2012 16:06:06 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206291606.q5TG66nq055462@svn.freebsd.org> From: Davide Italiano Date: Fri, 29 Jun 2012 16:06:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237796 - in projects/calloutng/sys: kern sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 16:06:06 -0000 Author: davide Date: Fri Jun 29 16:06:06 2012 New Revision: 237796 URL: http://svn.freebsd.org/changeset/base/237796 Log: Experiment a new approach used for low-precision events, try to align them to some time borders on insert. This approach can make system load more bursty, but it is very cheap to be implemented and may be quite effective. Moreover, it can easily coexist with the previously implemented "real-time aggregation". Discussed with: mav Modified: projects/calloutng/sys/kern/kern_timeout.c projects/calloutng/sys/sys/callout.h Modified: projects/calloutng/sys/kern/kern_timeout.c ============================================================================== --- projects/calloutng/sys/kern/kern_timeout.c Fri Jun 29 15:57:25 2012 (r237795) +++ projects/calloutng/sys/kern/kern_timeout.c Fri Jun 29 16:06:06 2012 (r237796) @@ -497,8 +497,7 @@ callout_cc_add(struct callout *c, struct struct bintime to_bintime, void (*func)(void *), void *arg, int cpu, int flags) { - struct timeval tv; - int bucket; + int bucket, r_shift, r_val; CC_LOCK_ASSERT(cc); if (bintime_cmp(&to_bintime, &cc->cc_lastscan, <)) { @@ -510,25 +509,38 @@ callout_cc_add(struct callout *c, struct c->c_flags |= CALLOUT_DIRECT; c->c_flags &= ~CALLOUT_PROCESSED; c->c_func = func; - c->c_time = to_bintime; - tv.tv_sec = 0; - if (flags & C_10US) { - tv.tv_usec = 10; - timeval2bintime(&tv, &c->c_precision); - } - else if (flags & C_100US) { - tv.tv_usec = 100; - timeval2bintime(&tv, &c->c_precision); - } - else if (flags & C_1MS) { - tv.tv_usec = 1000; - timeval2bintime(&tv, &c->c_precision); + c->c_time = to_bintime; + bintime_clear(&c->c_precision); + if (flags & 0x2) { + r_shift = ((flags >> 2) & PRECISION_RANGE); + r_val = (r_shift != 0) ? (uint64_t)1 << (64 - r_shift) : 0; + /* + * Round as far as precision specified is coarse (up to 8ms). + * In order to play safe, round to to half of the interval and + * set half precision. + */ + if (r_shift < 6) { + r_val = (r_shift != 0) ? r_val >> 2 : + ((uint64_t)1 << (64 - 1)) - 1; + /* + * Round only if c_time is not a multiple of the + * rounding factor. + */ + if ((c->c_time.frac & r_val) != r_val) { + c->c_time.frac |= r_val - 1; + c->c_time.frac += 1; + if (c->c_time.frac == 0) + c->c_time.sec += 1; + } + } + c->c_precision.frac = r_val; + CTR6(KTR_CALLOUT, "rounding %d.%u%u to %d.%u%u", + to_bintime.sec, (u_int) (to_bintime.frac >> 32), + (u_int) (to_bintime.frac & 0xffffffff), c->c_time.sec, + (u_int) (c->c_time.frac >> 32), + (u_int) (c->c_time.frac & 0xffffffff)); } - else { - c->c_precision.sec = 0; - c->c_precision.frac = 0; - } - bucket = get_bucket(&c->c_time); + bucket = get_bucket(&c->c_time); TAILQ_INSERT_TAIL(&cc->cc_callwheel[bucket & callwheelmask], c, c_links.tqe); /* @@ -536,10 +548,10 @@ callout_cc_add(struct callout *c, struct * that has been inserted. */ if (callout_new_inserted != NULL && - (bintime_cmp(&to_bintime, &cc->cc_firstevent, <) || + (bintime_cmp(&c->c_time, &cc->cc_firstevent, <) || (cc->cc_firstevent.sec == 0 && cc->cc_firstevent.frac == 0))) { - cc->cc_firstevent = to_bintime; - (*callout_new_inserted)(cpu, to_bintime); + cc->cc_firstevent = c->c_time; + (*callout_new_inserted)(cpu, c->c_time); } } Modified: projects/calloutng/sys/sys/callout.h ============================================================================== --- projects/calloutng/sys/sys/callout.h Fri Jun 29 15:57:25 2012 (r237795) +++ projects/calloutng/sys/sys/callout.h Fri Jun 29 16:06:06 2012 (r237796) @@ -51,9 +51,28 @@ #define CALLOUT_DIRECT 0x1000 /* allow exec from hw int context */ #define C_DIRECT_EXEC 0x0001 /* direct execution of callout */ -#define C_10US 0x0002 /* precision field */ -#define C_100US 0x0004 /* precision field */ -#define C_1MS 0x0008 /* precision field */ +#define C_P1S 0x0002 /* fields related to precision */ +#define C_P500MS 0x0006 +#define C_P250MS 0x000a +#define C_P125MS 0x000e +#define C_P64MS 0x0012 +#define C_P32MS 0x0016 +#define C_P16MS 0x001a +#define C_P8MS 0x001e +#define C_P4MS 0x0022 +#define C_P2MS 0x0026 +#define C_P1MS 0x002a +#define C_P500US 0x002e +#define C_P250US 0x0032 +#define C_P125US 0x0036 +#define C_P64US 0x003a +#define C_P32US 0x003e +#define C_P16US 0x0042 +#define C_P8US 0x0046 +#define C_P4US 0x004a +#define C_P2US 0x004e +#define PRECISION_BITS 7 +#define PRECISION_RANGE ((1 << PRECISION_BITS) - 1) struct callout_handle { struct callout *callout; From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 17:04:43 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 557361065676; Fri, 29 Jun 2012 17:04:43 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3F77D8FC18; Fri, 29 Jun 2012 17:04:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TH4hLS058082; Fri, 29 Jun 2012 17:04:43 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TH4hCT058078; Fri, 29 Jun 2012 17:04:43 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201206291704.q5TH4hCT058078@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Jun 2012 17:04:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237801 - projects/amd64_xen_pv/sys/amd64/xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 17:04:43 -0000 Author: attilio Date: Fri Jun 29 17:04:42 2012 New Revision: 237801 URL: http://svn.freebsd.org/changeset/base/237801 Log: PMTB addresses are tought to be mostly opaque, so they are not turned at all in void ptrs. However, vm_offset_t is not a correct choice because it doesn't express at all the concept. Simply handle the virutal addresses involved as uintptr_t. Reviewed by: cherry Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c Fri Jun 29 17:00:52 2012 (r237800) +++ projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c Fri Jun 29 17:04:42 2012 (r237801) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include static int -pml4t_index(vm_offset_t va) +pml4t_index(uintptr_t va) { /* amd64 sign extends 48th bit and upwards */ const uint64_t SIGNMASK = (1UL << 48) - 1; @@ -69,7 +69,7 @@ pml4t_index(vm_offset_t va) } static int -pdpt_index(vm_offset_t va) +pdpt_index(uintptr_t va) { /* amd64 sign extends 48th bit and upwards */ const uint64_t SIGNMASK = (1UL << 48) - 1; @@ -79,7 +79,7 @@ pdpt_index(vm_offset_t va) } static int -pdt_index(vm_offset_t va) +pdt_index(uintptr_t va) { /* amd64 sign extends 48th bit and upwards */ const uint64_t SIGNMASK = (1UL << 48) - 1; @@ -108,7 +108,7 @@ pmap_get_pml4t(struct pmap *pm) /* Returns physical address */ static vm_paddr_t -pmap_get_pdpt(vm_offset_t va, pml4_entry_t *pml4t) +pmap_get_pdpt(uintptr_t va, pml4_entry_t *pml4t) { pml4_entry_t pml4e; @@ -127,7 +127,7 @@ pmap_get_pdpt(vm_offset_t va, pml4_entry /* Returns physical address */ static vm_paddr_t -pmap_get_pdt(vm_offset_t va, pdp_entry_t *pdpt) +pmap_get_pdt(uintptr_t va, pdp_entry_t *pdpt) { pdp_entry_t pdpe; @@ -146,7 +146,7 @@ pmap_get_pdt(vm_offset_t va, pdp_entry_t /* Returns physical address */ static vm_paddr_t -pmap_get_pt(vm_offset_t va, pd_entry_t *pdt) +pmap_get_pt(uintptr_t va, pd_entry_t *pdt) { pd_entry_t pdte; @@ -271,7 +271,7 @@ mmu_map_pt(void *addr) } bool -mmu_map_inspect_va(struct pmap *pm, void *addr, vm_offset_t va) +mmu_map_inspect_va(struct pmap *pm, void *addr, uintptr_t va) { KASSERT(addr != NULL && pm != NULL, ("NULL arg(s) given")); @@ -310,7 +310,7 @@ mmu_map_inspect_va(struct pmap *pm, void } extern uint64_t xenstack; /* The stack Xen gives us at boot */ void -mmu_map_hold_va(struct pmap *pm, void *addr, vm_offset_t va) +mmu_map_hold_va(struct pmap *pm, void *addr, uintptr_t va) { KASSERT(addr != NULL && pm != NULL, ("NULL arg(s) given")); @@ -331,8 +331,8 @@ mmu_map_hold_va(struct pmap *pm, void *a pti->pdpt = (pdp_entry_t *)pti->ptmb.alloc(); pml4tep = &pti->pml4t[pml4t_index(va)]; - pml4tep_ma = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pml4tep)); - pml4te = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pti->pdpt)) | PG_RW | PG_V | PG_U; /* XXX: revisit flags */ + pml4tep_ma = xpmap_ptom(pti->ptmb.vtop((uintptr_t)pml4tep)); + pml4te = xpmap_ptom(pti->ptmb.vtop((uintptr_t)pti->pdpt)) | PG_RW | PG_V | PG_U; /* XXX: revisit flags */ xen_queue_pt_update(pml4tep_ma, pml4te); } else { @@ -349,8 +349,8 @@ mmu_map_hold_va(struct pmap *pm, void *a pti->pdt = (pd_entry_t *)pti->ptmb.alloc(); pdptep = &pti->pdpt[pdpt_index(va)]; - pdptep_ma = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pdptep)); - pdpte = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pti->pdt)) | PG_RW | PG_V | PG_U; /* XXX: revisit flags */ + pdptep_ma = xpmap_ptom(pti->ptmb.vtop((uintptr_t)pdptep)); + pdpte = xpmap_ptom(pti->ptmb.vtop((uintptr_t)pti->pdt)) | PG_RW | PG_V | PG_U; /* XXX: revisit flags */ xen_queue_pt_update(pdptep_ma, pdpte); } else { @@ -367,8 +367,8 @@ mmu_map_hold_va(struct pmap *pm, void *a pti->pt = (pt_entry_t *) pti->ptmb.alloc(); pdtep = &pti->pdt[pdt_index(va)]; - pdtep_ma = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pdtep)); - pdte = xpmap_ptom(pti->ptmb.vtop((vm_offset_t)pti->pt)) | PG_RW | PG_V | PG_U; /* XXX: revisit flags */ + pdtep_ma = xpmap_ptom(pti->ptmb.vtop((uintptr_t)pdtep)); + pdte = xpmap_ptom(pti->ptmb.vtop((uintptr_t)pti->pt)) | PG_RW | PG_V | PG_U; /* XXX: revisit flags */ xen_queue_pt_update(pdtep_ma, pdte); } else { @@ -377,7 +377,7 @@ mmu_map_hold_va(struct pmap *pm, void *a } void -mmu_map_release_va(struct pmap *pm, void *addr, vm_offset_t va) +mmu_map_release_va(struct pmap *pm, void *addr, uintptr_t va) { KASSERT(addr != NULL && pm != NULL, ("NULL arg(s) given")); Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h Fri Jun 29 17:00:52 2012 (r237800) +++ projects/amd64_xen_pv/sys/amd64/xen/mmu_map.h Fri Jun 29 17:04:42 2012 (r237801) @@ -90,8 +90,8 @@ typedef void * mmu_map_t; struct mmu_map_mbackend { /* Callbacks */ - vm_offset_t (*alloc)(void); - void (*free)(vm_offset_t); /* May be NULL */ + uintptr_t (*alloc)(void); + void (*free)(uintptr_t); /* May be NULL */ /* * vtop()/ptov() conversion functions: @@ -101,8 +101,8 @@ struct mmu_map_mbackend { /* Callbacks * * multiple instances of use; ie; mappings may persist across * one pair of mmu_map_t_init()/.._finit() calls. */ - vm_offset_t (*ptov)(vm_paddr_t); - vm_paddr_t (*vtop)(vm_offset_t); + uintptr_t (*ptov)(vm_paddr_t); + vm_paddr_t (*vtop)(uintptr_t); }; /* Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Jun 29 17:00:52 2012 (r237800) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Jun 29 17:04:42 2012 (r237801) @@ -153,15 +153,15 @@ extern unsigned long physfree; /* from m struct pmap kernel_pmap_store; -vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ -vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ +uintptr_t virtual_avail; /* VA of first avail page (after kernel bss) */ +uintptr_t virtual_end; /* VA of last avail page (end of kernel AS) */ #ifdef SUPERPAGESUPPORT static int ndmpdp; static vm_paddr_t dmaplimit; #endif /* SUPERPAGESUPPORT */ -vm_offset_t kernel_vm_end = VM_MIN_KERNEL_ADDRESS; +uintptr_t kernel_vm_end = VM_MIN_KERNEL_ADDRESS; pt_entry_t pg_nx; /* XXX: do we need this ? */ struct msgbuf *msgbufp = 0; @@ -185,13 +185,13 @@ static vm_paddr_t boot_ptendphys; /* phy static uma_zone_t xen_pagezone; static size_t tsz; /* mmu_map.h opaque cookie size */ -static vm_offset_t (*ptmb_mappedalloc)(void) = NULL; -static void (*ptmb_mappedfree)(vm_offset_t) = NULL; -static vm_offset_t ptmb_ptov(vm_paddr_t p) +static uintptr_t (*ptmb_mappedalloc)(void) = NULL; +static void (*ptmb_mappedfree)(uintptr_t) = NULL; +static uintptr_t ptmb_ptov(vm_paddr_t p) { return PTOV(p); } -static vm_paddr_t ptmb_vtop(vm_offset_t v) +static vm_paddr_t ptmb_vtop(uintptr_t v) { return VTOP(v); } @@ -200,10 +200,10 @@ extern uint64_t xenstack; /* The stack X extern char *console_page; /* The shared ring for console i/o */ /* return kernel virtual address of 'n' claimed physical pages at boot. */ -static vm_offset_t +static uintptr_t vallocpages(vm_paddr_t *firstaddr, int n) { - u_int64_t ret = *firstaddr + KERNBASE; + uintptr_t ret = *firstaddr + KERNBASE; bzero((void *)ret, n * PAGE_SIZE); *firstaddr += n * PAGE_SIZE; @@ -224,7 +224,7 @@ vallocpages(vm_paddr_t *firstaddr, int n /* Set page addressed by va to r/o */ static void -pmap_xen_setpages_ro(vm_offset_t va, vm_size_t npages) +pmap_xen_setpages_ro(uintptr_t va, vm_size_t npages) { vm_size_t i; for (i = 0; i < npages; i++) { @@ -235,7 +235,7 @@ pmap_xen_setpages_ro(vm_offset_t va, vm_ /* Set page addressed by va to r/w */ static void -pmap_xen_setpages_rw(vm_offset_t va, vm_size_t npages) +pmap_xen_setpages_rw(uintptr_t va, vm_size_t npages) { vm_size_t i; for (i = 0; i < npages; i++) { @@ -248,12 +248,12 @@ extern int etext; /* End of kernel text extern int end; /* End of kernel binary (virtual address) */ /* Return pte flags according to kernel va access restrictions */ static pt_entry_t -pmap_xen_kernel_vaflags(vm_offset_t va) +pmap_xen_kernel_vaflags(uintptr_t va) { - if ((va > (vm_offset_t) &etext && /* .data, .bss et. al */ - (va < (vm_offset_t) &end)) + if ((va > (uintptr_t) &etext && /* .data, .bss et. al */ + (va < (uintptr_t) &end)) || - ((va > (vm_offset_t)(xen_start_info->pt_base + + ((va > (uintptr_t)(xen_start_info->pt_base + xen_start_info->nr_pt_frames * PAGE_SIZE)) && va < PTOV(boot_ptphys)) || @@ -430,7 +430,7 @@ create_boot_pagetables(vm_paddr_t *first static void pmap_xen_bootpages(vm_paddr_t *firstaddr) { - vm_offset_t va; + uintptr_t va; vm_paddr_t ma; /* Share info */ @@ -460,13 +460,15 @@ pmap_xen_bootpages(vm_paddr_t *firstaddr } /* alloc from linear mapped boot time virtual address space */ -static vm_offset_t +static uintptr_t mmu_alloc(void) { + uintptr_t va; + KASSERT(physfree != 0, ("physfree must have been set before using mmu_alloc")); - vm_offset_t va = vallocpages(&physfree, atop(PAGE_SIZE)); + va = vallocpages(&physfree, atop(PAGE_SIZE)); /* * Xen requires the page table hierarchy to be R/O. @@ -525,7 +527,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) * is available. */ - virtual_avail = (vm_offset_t) xenstack + 512 * 1024; + virtual_avail = (uintptr_t) xenstack + 512 * 1024; /* XXX: Check we don't overlap xen pgdir entries. */ virtual_end = VM_MAX_KERNEL_ADDRESS; @@ -560,7 +562,7 @@ pmap_page_init(vm_page_t m) * and update kernel_vm_end. */ void -pmap_growkernel(vm_offset_t addr) +pmap_growkernel(uintptr_t addr) { KASSERT(kernel_vm_end < addr, ("trying to shrink kernel VA!")); @@ -600,6 +602,8 @@ pmap_growkernel(vm_offset_t addr) void pmap_init(void) { + uintptr_t va; + /* XXX: review the use of gdtset for the purpose below */ gdtset = 1; /* xpq may assert for locking sanity from this point onwards */ @@ -608,7 +612,7 @@ pmap_init(void) /* Get a va for console and map the console mfn into it */ vm_paddr_t console_ma = xen_start_info->console.domU.mfn << PAGE_SHIFT; - vm_offset_t va = kmem_alloc_nofault(kernel_map, PAGE_SIZE); + va = kmem_alloc_nofault(kernel_map, PAGE_SIZE); KASSERT(va != 0, ("Could not allocate KVA for console page!\n")); pmap_kenter(va, xpmap_mtop(console_ma)); @@ -672,7 +676,7 @@ pmap_release(pmap_t pmap) } __inline pt_entry_t * -vtopte(vm_offset_t va) +vtopte(uintptr_t va) { KASSERT(0, ("XXX: REVIEW\n")); u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); @@ -1163,12 +1167,12 @@ pmap_change_attr(vm_offset_t va, vm_size return -1; } -static vm_offset_t +static uintptr_t xen_pagezone_alloc(void) { - vm_offset_t ret; + uintptr_t ret; - ret = (vm_offset_t)uma_zalloc(xen_pagezone, M_NOWAIT | M_ZERO); + ret = (uintptr_t)uma_zalloc(xen_pagezone, M_NOWAIT | M_ZERO); if (ret == 0) panic("%s: failed allocation\n", __func__); return (ret); @@ -1184,9 +1188,9 @@ xen_pagezone_free(vm_offset_t page) static int xen_pagezone_init(void *mem, int size, int flags) { - vm_offset_t va; + uintptr_t va; - va = (vm_offset_t)mem; + va = (uintptr_t)mem; /* Xen requires the page table hierarchy to be R/O. */ pmap_xen_setpages_ro(va, atop(size)); From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 17:05:14 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 617DF1065680; Fri, 29 Jun 2012 17:05:14 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 018888FC15; Fri, 29 Jun 2012 17:05:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TH5D02058141; Fri, 29 Jun 2012 17:05:13 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TH5Dxt058139; Fri, 29 Jun 2012 17:05:13 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206291705.q5TH5Dxt058139@svn.freebsd.org> From: Davide Italiano Date: Fri, 29 Jun 2012 17:05:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237802 - projects/calloutng/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 17:05:14 -0000 Author: davide Date: Fri Jun 29 17:05:13 2012 New Revision: 237802 URL: http://svn.freebsd.org/changeset/base/237802 Log: Introduce the delta_bintime_in_msecs() as suggested by Bruce Evans. While here, make an attempt to fix some style bugs. Reported by: bde Modified: projects/calloutng/sys/netinet/tcp_timer.c Modified: projects/calloutng/sys/netinet/tcp_timer.c ============================================================================== --- projects/calloutng/sys/netinet/tcp_timer.c Fri Jun 29 17:04:42 2012 (r237801) +++ projects/calloutng/sys/netinet/tcp_timer.c Fri Jun 29 17:05:13 2012 (r237802) @@ -662,52 +662,39 @@ tcp_timer_active(struct tcpcb *tp, int t #define ticks_to_msecs(t) (1000*(t) / hz) -#define bintime_to_msecs(bt) \ - (((uint64_t)1000 * \ - (uint32_t) (bt.frac >> 32)) >> 32) + (bt.sec * 1000); +static int +delta_bintime_in_msecs(struct bintime bt, struct bintime now) +{ + bintime_sub(&bt, &now); + return (((uint64_t) 1000 * (uint64_t) (bt.frac >> 32)) >> 32) + + (bt.sec * 1000); +} void -tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer, struct xtcp_timer *xtimer) +tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer, + struct xtcp_timer *xtimer) { - struct bintime now; - struct bintime bt; + struct bintime bt, now; - bzero(xtimer, sizeof(struct xtcp_timer)); + bzero(xtimer, sizeof(xtimer)); if (timer == NULL) return; + bintime_clear(&bt); getbinuptime(&now); - bt.sec = 0; - bt.frac = 0; - - if (callout_active(&timer->tt_delack)) { - bt = timer->tt_delack.c_time; - bintime_sub(&bt,&now); - xtimer->tt_delack = bintime_to_msecs(bt); - } - - if (callout_active(&timer->tt_rexmt)) { - bt = timer->tt_rexmt.c_time; - bintime_sub(&bt,&now); - xtimer->tt_rexmt = bintime_to_msecs(bt); - } - - if (callout_active(&timer->tt_persist)) { - bt = timer->tt_persist.c_time; - bintime_sub(&bt,&now); - xtimer->tt_persist = bintime_to_msecs(bt); - } - - if (callout_active(&timer->tt_keep)) { - bt = timer->tt_keep.c_time; - bintime_sub(&bt,&now); - xtimer->tt_keep = bintime_to_msecs(bt); - } - - if (callout_active(&timer->tt_2msl)) { - bt = timer->tt_2msl.c_time; - bintime_sub(&bt,&now); - xtimer->tt_2msl = bintime_to_msecs(bt); - } - + if (callout_active(&timer->tt_delack)) + xtimer->tt_delack = delta_bintime_in_msecs( + timer->tt_delack.c_time, now); + if (callout_active(&timer->tt_rexmt)) + xtimer->tt_rexmt = delta_bintime_in_msecs( + timer->tt_rexmt.c_time, now); + if (callout_active(&timer->tt_persist)) + xtimer->tt_persist = delta_bintime_in_msecs( + timer->tt_persist.c_time, now); + if (callout_active(&timer->tt_keep)) + xtimer->tt_keep = delta_bintime_in_msecs( + timer->tt_keep.c_time, now); + if (callout_active(&timer->tt_2msl)) + xtimer->tt_2msl = delta_bintime_in_msecs( + timer->tt_2msl.c_time, now); xtimer->t_rcvtime = ticks_to_msecs(ticks - tp->t_rcvtime); } From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 17:26:38 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 95FA4106566C; Fri, 29 Jun 2012 17:26:38 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 815818FC14; Fri, 29 Jun 2012 17:26:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5THQcpK059259; Fri, 29 Jun 2012 17:26:38 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5THQcdP059257; Fri, 29 Jun 2012 17:26:38 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206291726.q5THQcdP059257@svn.freebsd.org> From: Davide Italiano Date: Fri, 29 Jun 2012 17:26:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237807 - projects/calloutng/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 17:26:38 -0000 Author: davide Date: Fri Jun 29 17:26:37 2012 New Revision: 237807 URL: http://svn.freebsd.org/changeset/base/237807 Log: Take in account that time_t is not 64 bits long on all the architectures supported. Remove an unneeded check. Reported by: bde [1], mav [2] Reviewed by: mav Modified: projects/calloutng/sys/kern/kern_timeout.c Modified: projects/calloutng/sys/kern/kern_timeout.c ============================================================================== --- projects/calloutng/sys/kern/kern_timeout.c Fri Jun 29 17:21:46 2012 (r237806) +++ projects/calloutng/sys/kern/kern_timeout.c Fri Jun 29 17:26:37 2012 (r237807) @@ -144,6 +144,9 @@ struct callout_cpu cc_cpu; (bt)->frac = ((uint64_t)0x8000000000000000 / (freq)) << 1; \ } +#define TIME_T_MAX \ + (sizeof(time_t) == (sizeof(int64_t)) ? INT64_MAX : INT32_MAX) + static int timeout_cpu; void (*callout_new_inserted)(int cpu, struct bintime bt) = NULL; @@ -394,8 +397,8 @@ callout_process(void) first = (first + 1) & callwheelmask; } future = ((last + hz/4) & callwheelmask); - max.sec = max.frac = INT_MAX; - min.sec = min.frac = INT_MAX; + max.sec = min.sec = TIME_T_MAX; + max.frac = min.frac = UINT64_MAX; limit.sec = 0; limit.frac = (uint64_t)1 << (64 - 2); bintime_add(&limit, &now); @@ -432,12 +435,11 @@ callout_process(void) min = (bintime_cmp(&tmp_min, &min, >)) ? tmp_min : min; max = (bintime_cmp(&tmp_max, &max, >)) ? tmp_max : max; } - if (last == future || - (max.sec != INT_MAX && min.sec != INT_MAX)) + if (last == future || max.sec != TIME_T_MAX) break; last = (last + 1) & callwheelmask; } - if (max.sec == INT_MAX && min.sec == INT_MAX) { + if (max.sec == TIME_T_MAX) { next.sec = 0; next.frac = (uint64_t)1 << (64 - 2); bintime_add(&next, &now); From owner-svn-src-projects@FreeBSD.ORG Fri Jun 29 17:39:42 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60DC1106566B; Fri, 29 Jun 2012 17:39:42 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 469D28FC14; Fri, 29 Jun 2012 17:39:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5THdgON060051; Fri, 29 Jun 2012 17:39:42 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5THdfar060024; Fri, 29 Jun 2012 17:39:41 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206291739.q5THdfar060024@svn.freebsd.org> From: Davide Italiano Date: Fri, 29 Jun 2012 17:39:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237811 - in projects/calloutng: . bin/rm cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/lib/libdtrace/common contrib/gcc contrib/less contrib/t... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 17:39:42 -0000 Author: davide Date: Fri Jun 29 17:39:40 2012 New Revision: 237811 URL: http://svn.freebsd.org/changeset/base/237811 Log: MFC as per r237808. Added: projects/calloutng/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/ - copied from r237808, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/ projects/calloutng/lib/libc/amd64/sys/__vdso_gettc.c - copied unchanged from r237808, head/lib/libc/amd64/sys/__vdso_gettc.c projects/calloutng/lib/libc/i386/sys/__vdso_gettc.c - copied unchanged from r237808, head/lib/libc/i386/sys/__vdso_gettc.c projects/calloutng/lib/libc/sys/__vdso_gettimeofday.c - copied unchanged from r237808, head/lib/libc/sys/__vdso_gettimeofday.c projects/calloutng/lib/libc/sys/clock_gettime.c - copied unchanged from r237808, head/lib/libc/sys/clock_gettime.c projects/calloutng/lib/libc/sys/gettimeofday.c - copied unchanged from r237808, head/lib/libc/sys/gettimeofday.c projects/calloutng/lib/libz/test/ - copied from r237808, head/lib/libz/test/ projects/calloutng/sbin/camcontrol/progress.c - copied unchanged from r237808, head/sbin/camcontrol/progress.c projects/calloutng/sbin/camcontrol/progress.h - copied unchanged from r237808, head/sbin/camcontrol/progress.h projects/calloutng/share/man/man4/bxe.4 - copied unchanged from r237808, head/share/man/man4/bxe.4 projects/calloutng/share/man/man4/est.4 - copied unchanged from r237808, head/share/man/man4/est.4 projects/calloutng/sys/amd64/include/vdso.h - copied unchanged from r237808, head/sys/amd64/include/vdso.h projects/calloutng/sys/arm/at91/at91sam9x25.c - copied unchanged from r237808, head/sys/arm/at91/at91sam9x25.c projects/calloutng/sys/arm/at91/at91sam9x25reg.h - copied unchanged from r237808, head/sys/arm/at91/at91sam9x25reg.h projects/calloutng/sys/arm/at91/board_sam9x25ek.c - copied unchanged from r237808, head/sys/arm/at91/board_sam9x25ek.c projects/calloutng/sys/arm/at91/std.sam9x25ek - copied unchanged from r237808, head/sys/arm/at91/std.sam9x25ek projects/calloutng/sys/arm/conf/SAM9X25EK - copied unchanged from r237808, head/sys/arm/conf/SAM9X25EK projects/calloutng/sys/arm/conf/SAM9X25EK.hints - copied unchanged from r237808, head/sys/arm/conf/SAM9X25EK.hints projects/calloutng/sys/arm/include/vdso.h - copied unchanged from r237808, head/sys/arm/include/vdso.h projects/calloutng/sys/contrib/dev/acpica/common/ahpredef.c - copied unchanged from r237808, head/sys/contrib/dev/acpica/common/ahpredef.c projects/calloutng/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu - copied unchanged from r237808, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu projects/calloutng/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu - copied unchanged from r237808, head/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c - copied unchanged from r237808, head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h - copied unchanged from r237808, head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h projects/calloutng/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c - copied unchanged from r237808, head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c projects/calloutng/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h - copied unchanged from r237808, head/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h - copied unchanged from r237808, head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ib_intfc.h projects/calloutng/sys/dev/cxgbe/tom/ - copied from r237808, head/sys/dev/cxgbe/tom/ projects/calloutng/sys/i386/include/vdso.h - copied unchanged from r237808, head/sys/i386/include/vdso.h projects/calloutng/sys/ia64/include/vdso.h - copied unchanged from r237808, head/sys/ia64/include/vdso.h projects/calloutng/sys/kern/kern_sharedpage.c - copied unchanged from r237808, head/sys/kern/kern_sharedpage.c projects/calloutng/sys/kern/subr_dummy_vdso_tc.c - copied unchanged from r237808, head/sys/kern/subr_dummy_vdso_tc.c projects/calloutng/sys/mips/include/vdso.h - copied unchanged from r237808, head/sys/mips/include/vdso.h projects/calloutng/sys/modules/cxgbe/tom/ - copied from r237808, head/sys/modules/cxgbe/tom/ projects/calloutng/sys/modules/nand/ - copied from r237808, head/sys/modules/nand/ projects/calloutng/sys/modules/toecore/ - copied from r237808, head/sys/modules/toecore/ projects/calloutng/sys/netinet/toecore.c - copied unchanged from r237808, head/sys/netinet/toecore.c projects/calloutng/sys/netinet/toecore.h - copied unchanged from r237808, head/sys/netinet/toecore.h projects/calloutng/sys/pc98/include/vdso.h - copied unchanged from r237808, head/sys/pc98/include/vdso.h projects/calloutng/sys/powerpc/include/vdso.h - copied unchanged from r237808, head/sys/powerpc/include/vdso.h projects/calloutng/sys/sparc64/include/vdso.h - copied unchanged from r237808, head/sys/sparc64/include/vdso.h projects/calloutng/sys/sys/vdso.h - copied unchanged from r237808, head/sys/sys/vdso.h projects/calloutng/sys/x86/include/vdso.h - copied unchanged from r237808, head/sys/x86/include/vdso.h projects/calloutng/tools/build/options/WITH_GNU_SORT - copied unchanged from r237808, head/tools/build/options/WITH_GNU_SORT Deleted: projects/calloutng/lib/libz/example.c projects/calloutng/lib/libz/minigzip.c projects/calloutng/sys/dev/cxgb/cxgb_offload.c projects/calloutng/sys/dev/cxgb/t3cdev.h projects/calloutng/sys/dev/cxgb/ulp/toecore/ projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_ddp.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_defs.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_tcp.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c projects/calloutng/sys/modules/cxgb/toecore/ projects/calloutng/sys/netinet/toedev.h projects/calloutng/tools/build/options/WITH_BSD_SORT Modified: projects/calloutng/UPDATING projects/calloutng/bin/rm/rm.c projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h projects/calloutng/contrib/gcc/ChangeLog.gcc43 projects/calloutng/contrib/gcc/fold-const.c projects/calloutng/contrib/gcc/gimplify.c projects/calloutng/contrib/gcc/tree-ssa-ccp.c projects/calloutng/contrib/gcc/tree-ssa-pre.c projects/calloutng/contrib/less/LICENSE projects/calloutng/contrib/less/Makefile.aut projects/calloutng/contrib/less/NEWS projects/calloutng/contrib/less/README projects/calloutng/contrib/less/brac.c projects/calloutng/contrib/less/ch.c projects/calloutng/contrib/less/charset.c projects/calloutng/contrib/less/charset.h projects/calloutng/contrib/less/cmd.h projects/calloutng/contrib/less/cmdbuf.c projects/calloutng/contrib/less/command.c projects/calloutng/contrib/less/configure projects/calloutng/contrib/less/configure.ac projects/calloutng/contrib/less/cvt.c projects/calloutng/contrib/less/decode.c projects/calloutng/contrib/less/defines.ds projects/calloutng/contrib/less/defines.h.in projects/calloutng/contrib/less/defines.o2 projects/calloutng/contrib/less/defines.o9 projects/calloutng/contrib/less/defines.wn projects/calloutng/contrib/less/edit.c projects/calloutng/contrib/less/filename.c projects/calloutng/contrib/less/forwback.c projects/calloutng/contrib/less/help.c projects/calloutng/contrib/less/ifile.c projects/calloutng/contrib/less/input.c projects/calloutng/contrib/less/jump.c projects/calloutng/contrib/less/less.h projects/calloutng/contrib/less/less.hlp projects/calloutng/contrib/less/less.man projects/calloutng/contrib/less/less.nro projects/calloutng/contrib/less/lessecho.c projects/calloutng/contrib/less/lessecho.man projects/calloutng/contrib/less/lessecho.nro projects/calloutng/contrib/less/lesskey.c projects/calloutng/contrib/less/lesskey.h projects/calloutng/contrib/less/lesskey.man projects/calloutng/contrib/less/lesskey.nro projects/calloutng/contrib/less/lglob.h projects/calloutng/contrib/less/line.c projects/calloutng/contrib/less/linenum.c projects/calloutng/contrib/less/lsystem.c projects/calloutng/contrib/less/main.c projects/calloutng/contrib/less/mark.c projects/calloutng/contrib/less/mkhelp.c projects/calloutng/contrib/less/optfunc.c projects/calloutng/contrib/less/option.c projects/calloutng/contrib/less/option.h projects/calloutng/contrib/less/opttbl.c projects/calloutng/contrib/less/os.c projects/calloutng/contrib/less/output.c projects/calloutng/contrib/less/pattern.c projects/calloutng/contrib/less/pattern.h projects/calloutng/contrib/less/pckeys.h projects/calloutng/contrib/less/position.c projects/calloutng/contrib/less/position.h projects/calloutng/contrib/less/prompt.c projects/calloutng/contrib/less/screen.c projects/calloutng/contrib/less/scrsize.c projects/calloutng/contrib/less/search.c projects/calloutng/contrib/less/signal.c projects/calloutng/contrib/less/tags.c projects/calloutng/contrib/less/ttyin.c projects/calloutng/contrib/less/version.c projects/calloutng/contrib/top/display.c projects/calloutng/contrib/top/layout.h projects/calloutng/contrib/top/machine.h projects/calloutng/contrib/top/top.c projects/calloutng/contrib/traceroute/traceroute.8 projects/calloutng/crypto/openssh/ssh-keyscan.1 projects/calloutng/crypto/openssh/ssh-keyscan.c projects/calloutng/crypto/openssl/CHANGES projects/calloutng/crypto/openssl/Configure projects/calloutng/crypto/openssl/FAQ projects/calloutng/crypto/openssl/LICENSE projects/calloutng/crypto/openssl/Makefile projects/calloutng/crypto/openssl/NEWS projects/calloutng/crypto/openssl/README projects/calloutng/crypto/openssl/apps/Makefile projects/calloutng/crypto/openssl/apps/asn1pars.c projects/calloutng/crypto/openssl/apps/cms.c projects/calloutng/crypto/openssl/apps/openssl.cnf projects/calloutng/crypto/openssl/apps/pkcs12.c projects/calloutng/crypto/openssl/apps/s_client.c projects/calloutng/crypto/openssl/apps/s_server.c projects/calloutng/crypto/openssl/apps/x509.c projects/calloutng/crypto/openssl/config projects/calloutng/crypto/openssl/crypto/asn1/a_object.c projects/calloutng/crypto/openssl/crypto/asn1/a_strex.c projects/calloutng/crypto/openssl/crypto/asn1/a_strnid.c projects/calloutng/crypto/openssl/crypto/asn1/asn1.h projects/calloutng/crypto/openssl/crypto/asn1/asn_mime.c projects/calloutng/crypto/openssl/crypto/asn1/x_name.c projects/calloutng/crypto/openssl/crypto/asn1/x_pubkey.c projects/calloutng/crypto/openssl/crypto/bio/bf_buff.c projects/calloutng/crypto/openssl/crypto/bio/bio.h projects/calloutng/crypto/openssl/crypto/bio/bss_dgram.c projects/calloutng/crypto/openssl/crypto/bn/asm/mo-586.pl projects/calloutng/crypto/openssl/crypto/bn/asm/ppc.pl projects/calloutng/crypto/openssl/crypto/bn/bn_blind.c projects/calloutng/crypto/openssl/crypto/bn/bn_gf2m.c projects/calloutng/crypto/openssl/crypto/cms/cms.h projects/calloutng/crypto/openssl/crypto/cms/cms_enc.c projects/calloutng/crypto/openssl/crypto/cms/cms_env.c projects/calloutng/crypto/openssl/crypto/cms/cms_io.c projects/calloutng/crypto/openssl/crypto/cms/cms_lcl.h projects/calloutng/crypto/openssl/crypto/cms/cms_smime.c projects/calloutng/crypto/openssl/crypto/comp/c_rle.c projects/calloutng/crypto/openssl/crypto/conf/conf_api.c projects/calloutng/crypto/openssl/crypto/cryptlib.c projects/calloutng/crypto/openssl/crypto/crypto.h projects/calloutng/crypto/openssl/crypto/ec/ec2_smpl.c projects/calloutng/crypto/openssl/crypto/ec/ec_key.c projects/calloutng/crypto/openssl/crypto/ec/ecp_smpl.c projects/calloutng/crypto/openssl/crypto/ecdsa/ecdsatest.c projects/calloutng/crypto/openssl/crypto/ecdsa/ecs_ossl.c projects/calloutng/crypto/openssl/crypto/evp/evp_test.c projects/calloutng/crypto/openssl/crypto/ocsp/ocsp_lib.c projects/calloutng/crypto/openssl/crypto/opensslv.h projects/calloutng/crypto/openssl/crypto/perlasm/cbc.pl projects/calloutng/crypto/openssl/crypto/pkcs7/pk7_smime.c projects/calloutng/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl projects/calloutng/crypto/openssl/crypto/rc4/rc4_skey.c projects/calloutng/crypto/openssl/crypto/rsa/rsa_eay.c projects/calloutng/crypto/openssl/crypto/x509/x509_vfy.c projects/calloutng/crypto/openssl/crypto/x509v3/v3_addr.c projects/calloutng/crypto/openssl/crypto/x509v3/v3_asid.c projects/calloutng/crypto/openssl/doc/HOWTO/proxy_certificates.txt projects/calloutng/crypto/openssl/doc/apps/ca.pod projects/calloutng/crypto/openssl/doc/apps/dgst.pod projects/calloutng/crypto/openssl/doc/crypto/engine.pod projects/calloutng/crypto/openssl/doc/ssl/SSL_clear.pod projects/calloutng/crypto/openssl/engines/e_capi.c projects/calloutng/crypto/openssl/engines/e_capi_err.h projects/calloutng/crypto/openssl/fips/fips_canister.c projects/calloutng/crypto/openssl/openssl.spec projects/calloutng/crypto/openssl/ssl/bio_ssl.c projects/calloutng/crypto/openssl/ssl/d1_both.c projects/calloutng/crypto/openssl/ssl/d1_clnt.c projects/calloutng/crypto/openssl/ssl/d1_enc.c projects/calloutng/crypto/openssl/ssl/d1_lib.c projects/calloutng/crypto/openssl/ssl/d1_pkt.c projects/calloutng/crypto/openssl/ssl/d1_srvr.c projects/calloutng/crypto/openssl/ssl/s2_srvr.c projects/calloutng/crypto/openssl/ssl/s3_clnt.c projects/calloutng/crypto/openssl/ssl/s3_lib.c projects/calloutng/crypto/openssl/ssl/s3_srvr.c projects/calloutng/crypto/openssl/ssl/ssl.h projects/calloutng/crypto/openssl/ssl/ssl_ciph.c projects/calloutng/crypto/openssl/ssl/ssl_err.c projects/calloutng/crypto/openssl/ssl/ssl_lib.c projects/calloutng/crypto/openssl/ssl/ssl_locl.h projects/calloutng/crypto/openssl/ssl/t1_lib.c projects/calloutng/crypto/openssl/util/fipslink.pl projects/calloutng/crypto/openssl/util/mkerr.pl projects/calloutng/crypto/openssl/util/pl/VC-32.pl projects/calloutng/etc/login.conf projects/calloutng/etc/mtree/BSD.include.dist projects/calloutng/etc/periodic/daily/400.status-disks projects/calloutng/gnu/usr.bin/sort/Makefile projects/calloutng/include/Makefile projects/calloutng/include/wchar.h projects/calloutng/lib/libc/amd64/sys/Makefile.inc projects/calloutng/lib/libc/gen/aux.c projects/calloutng/lib/libc/gen/sysconf.c projects/calloutng/lib/libc/gen/syslog.c projects/calloutng/lib/libc/i386/sys/Makefile.inc projects/calloutng/lib/libc/include/libc_private.h projects/calloutng/lib/libc/net/Makefile.inc projects/calloutng/lib/libc/stdlib/Makefile.inc projects/calloutng/lib/libc/stdlib/strfmon.3 projects/calloutng/lib/libc/stdtime/Makefile.inc projects/calloutng/lib/libc/stdtime/strftime.3 projects/calloutng/lib/libc/stdtime/strftime.c projects/calloutng/lib/libc/stdtime/strptime.3 projects/calloutng/lib/libc/string/Makefile.inc projects/calloutng/lib/libc/string/strcasecmp.3 projects/calloutng/lib/libc/string/strcoll.3 projects/calloutng/lib/libc/string/strstr.3 projects/calloutng/lib/libc/string/strxfrm.3 projects/calloutng/lib/libc/sys/Makefile.inc projects/calloutng/lib/libc/sys/posix_fadvise.2 projects/calloutng/lib/libedit/common.c projects/calloutng/lib/libedit/editline.3 projects/calloutng/lib/libedit/editrc.5 projects/calloutng/lib/libedit/el.c projects/calloutng/lib/libedit/el.h projects/calloutng/lib/libedit/histedit.h projects/calloutng/lib/libedit/history.c projects/calloutng/lib/libedit/key.c projects/calloutng/lib/libedit/key.h projects/calloutng/lib/libedit/prompt.c projects/calloutng/lib/libedit/prompt.h projects/calloutng/lib/libedit/read.c projects/calloutng/lib/libedit/refresh.c projects/calloutng/lib/libedit/search.c projects/calloutng/lib/libedit/sig.c projects/calloutng/lib/libedit/sig.h projects/calloutng/lib/libedit/term.c projects/calloutng/lib/libedit/term.h projects/calloutng/lib/libedit/tty.c projects/calloutng/lib/libedit/vi.c projects/calloutng/lib/libelf/Makefile projects/calloutng/lib/libstand/Makefile projects/calloutng/lib/libutil/login.conf.5 projects/calloutng/lib/libutil/pw_util.c projects/calloutng/lib/libz/ChangeLog projects/calloutng/lib/libz/FAQ projects/calloutng/lib/libz/FREEBSD-upgrade (contents, props changed) projects/calloutng/lib/libz/Makefile (contents, props changed) projects/calloutng/lib/libz/README projects/calloutng/lib/libz/Symbol.map (contents, props changed) projects/calloutng/lib/libz/Versions.def (contents, props changed) projects/calloutng/lib/libz/adler32.c projects/calloutng/lib/libz/contrib/asm686/match.S (contents, props changed) projects/calloutng/lib/libz/crc32.c projects/calloutng/lib/libz/crc32.h projects/calloutng/lib/libz/deflate.c projects/calloutng/lib/libz/deflate.h projects/calloutng/lib/libz/doc/algorithm.txt (contents, props changed) projects/calloutng/lib/libz/gzguts.h (contents, props changed) projects/calloutng/lib/libz/gzlib.c projects/calloutng/lib/libz/gzread.c projects/calloutng/lib/libz/gzwrite.c projects/calloutng/lib/libz/infback.c projects/calloutng/lib/libz/inffixed.h projects/calloutng/lib/libz/inflate.c projects/calloutng/lib/libz/inftrees.c projects/calloutng/lib/libz/trees.c projects/calloutng/lib/libz/zconf.h projects/calloutng/lib/libz/zlib.3 projects/calloutng/lib/libz/zlib.h projects/calloutng/lib/libz/zopen.c (contents, props changed) projects/calloutng/lib/libz/zutil.c projects/calloutng/lib/libz/zutil.h projects/calloutng/libexec/rtld-elf/rtld.c projects/calloutng/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/calloutng/release/doc/share/misc/dev.archlist.txt projects/calloutng/sbin/camcontrol/Makefile projects/calloutng/sbin/camcontrol/camcontrol.8 projects/calloutng/sbin/camcontrol/camcontrol.c projects/calloutng/sbin/camcontrol/camcontrol.h projects/calloutng/sbin/camcontrol/fwdownload.c projects/calloutng/sbin/geom/class/raid/graid.8 projects/calloutng/sbin/ifconfig/ifconfig.c projects/calloutng/sbin/mdconfig/mdconfig.8 projects/calloutng/secure/lib/libcrypto/Makefile.inc projects/calloutng/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/calloutng/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/calloutng/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/calloutng/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/calloutng/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/calloutng/secure/lib/libcrypto/man/BIO_ctrl.3 projects/calloutng/secure/lib/libcrypto/man/BIO_f_base64.3 projects/calloutng/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/calloutng/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/calloutng/secure/lib/libcrypto/man/BIO_f_md.3 projects/calloutng/secure/lib/libcrypto/man/BIO_f_null.3 projects/calloutng/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/calloutng/secure/lib/libcrypto/man/BIO_find_type.3 projects/calloutng/secure/lib/libcrypto/man/BIO_new.3 projects/calloutng/secure/lib/libcrypto/man/BIO_push.3 projects/calloutng/secure/lib/libcrypto/man/BIO_read.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_accept.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_bio.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_connect.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_fd.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_file.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_mem.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_null.3 projects/calloutng/secure/lib/libcrypto/man/BIO_s_socket.3 projects/calloutng/secure/lib/libcrypto/man/BIO_set_callback.3 projects/calloutng/secure/lib/libcrypto/man/BIO_should_retry.3 projects/calloutng/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/calloutng/secure/lib/libcrypto/man/BN_CTX_new.3 projects/calloutng/secure/lib/libcrypto/man/BN_CTX_start.3 projects/calloutng/secure/lib/libcrypto/man/BN_add.3 projects/calloutng/secure/lib/libcrypto/man/BN_add_word.3 projects/calloutng/secure/lib/libcrypto/man/BN_bn2bin.3 projects/calloutng/secure/lib/libcrypto/man/BN_cmp.3 projects/calloutng/secure/lib/libcrypto/man/BN_copy.3 projects/calloutng/secure/lib/libcrypto/man/BN_generate_prime.3 projects/calloutng/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/calloutng/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/calloutng/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/calloutng/secure/lib/libcrypto/man/BN_new.3 projects/calloutng/secure/lib/libcrypto/man/BN_num_bytes.3 projects/calloutng/secure/lib/libcrypto/man/BN_rand.3 projects/calloutng/secure/lib/libcrypto/man/BN_set_bit.3 projects/calloutng/secure/lib/libcrypto/man/BN_swap.3 projects/calloutng/secure/lib/libcrypto/man/BN_zero.3 projects/calloutng/secure/lib/libcrypto/man/CONF_modules_free.3 projects/calloutng/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/calloutng/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/calloutng/secure/lib/libcrypto/man/DH_generate_key.3 projects/calloutng/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/calloutng/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/calloutng/secure/lib/libcrypto/man/DH_new.3 projects/calloutng/secure/lib/libcrypto/man/DH_set_method.3 projects/calloutng/secure/lib/libcrypto/man/DH_size.3 projects/calloutng/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/calloutng/secure/lib/libcrypto/man/DSA_do_sign.3 projects/calloutng/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/calloutng/secure/lib/libcrypto/man/DSA_generate_key.3 projects/calloutng/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/calloutng/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/calloutng/secure/lib/libcrypto/man/DSA_new.3 projects/calloutng/secure/lib/libcrypto/man/DSA_set_method.3 projects/calloutng/secure/lib/libcrypto/man/DSA_sign.3 projects/calloutng/secure/lib/libcrypto/man/DSA_size.3 projects/calloutng/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/calloutng/secure/lib/libcrypto/man/ERR_clear_error.3 projects/calloutng/secure/lib/libcrypto/man/ERR_error_string.3 projects/calloutng/secure/lib/libcrypto/man/ERR_get_error.3 projects/calloutng/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/calloutng/secure/lib/libcrypto/man/ERR_load_strings.3 projects/calloutng/secure/lib/libcrypto/man/ERR_print_errors.3 projects/calloutng/secure/lib/libcrypto/man/ERR_put_error.3 projects/calloutng/secure/lib/libcrypto/man/ERR_remove_state.3 projects/calloutng/secure/lib/libcrypto/man/ERR_set_mark.3 projects/calloutng/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/calloutng/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/calloutng/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/calloutng/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/calloutng/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/calloutng/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/calloutng/secure/lib/libcrypto/man/EVP_SealInit.3 projects/calloutng/secure/lib/libcrypto/man/EVP_SignInit.3 projects/calloutng/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/calloutng/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/calloutng/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/calloutng/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/calloutng/secure/lib/libcrypto/man/OPENSSL_config.3 projects/calloutng/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/calloutng/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/calloutng/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/calloutng/secure/lib/libcrypto/man/PKCS12_create.3 projects/calloutng/secure/lib/libcrypto/man/PKCS12_parse.3 projects/calloutng/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/calloutng/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/calloutng/secure/lib/libcrypto/man/PKCS7_sign.3 projects/calloutng/secure/lib/libcrypto/man/PKCS7_verify.3 projects/calloutng/secure/lib/libcrypto/man/RAND_add.3 projects/calloutng/secure/lib/libcrypto/man/RAND_bytes.3 projects/calloutng/secure/lib/libcrypto/man/RAND_cleanup.3 projects/calloutng/secure/lib/libcrypto/man/RAND_egd.3 projects/calloutng/secure/lib/libcrypto/man/RAND_load_file.3 projects/calloutng/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/calloutng/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/calloutng/secure/lib/libcrypto/man/RSA_check_key.3 projects/calloutng/secure/lib/libcrypto/man/RSA_generate_key.3 projects/calloutng/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/calloutng/secure/lib/libcrypto/man/RSA_new.3 projects/calloutng/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/calloutng/secure/lib/libcrypto/man/RSA_print.3 projects/calloutng/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/calloutng/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/calloutng/secure/lib/libcrypto/man/RSA_set_method.3 projects/calloutng/secure/lib/libcrypto/man/RSA_sign.3 projects/calloutng/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/calloutng/secure/lib/libcrypto/man/RSA_size.3 projects/calloutng/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/calloutng/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/calloutng/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/calloutng/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/calloutng/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/calloutng/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/calloutng/secure/lib/libcrypto/man/X509_new.3 projects/calloutng/secure/lib/libcrypto/man/bio.3 projects/calloutng/secure/lib/libcrypto/man/blowfish.3 projects/calloutng/secure/lib/libcrypto/man/bn.3 projects/calloutng/secure/lib/libcrypto/man/bn_internal.3 projects/calloutng/secure/lib/libcrypto/man/buffer.3 projects/calloutng/secure/lib/libcrypto/man/crypto.3 projects/calloutng/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/calloutng/secure/lib/libcrypto/man/d2i_DHparams.3 projects/calloutng/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/calloutng/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/calloutng/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/calloutng/secure/lib/libcrypto/man/d2i_X509.3 projects/calloutng/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/calloutng/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/calloutng/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/calloutng/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/calloutng/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/calloutng/secure/lib/libcrypto/man/des.3 projects/calloutng/secure/lib/libcrypto/man/dh.3 projects/calloutng/secure/lib/libcrypto/man/dsa.3 projects/calloutng/secure/lib/libcrypto/man/ecdsa.3 projects/calloutng/secure/lib/libcrypto/man/engine.3 projects/calloutng/secure/lib/libcrypto/man/err.3 projects/calloutng/secure/lib/libcrypto/man/evp.3 projects/calloutng/secure/lib/libcrypto/man/hmac.3 projects/calloutng/secure/lib/libcrypto/man/lh_stats.3 projects/calloutng/secure/lib/libcrypto/man/lhash.3 projects/calloutng/secure/lib/libcrypto/man/md5.3 projects/calloutng/secure/lib/libcrypto/man/mdc2.3 projects/calloutng/secure/lib/libcrypto/man/pem.3 projects/calloutng/secure/lib/libcrypto/man/rand.3 projects/calloutng/secure/lib/libcrypto/man/rc4.3 projects/calloutng/secure/lib/libcrypto/man/ripemd.3 projects/calloutng/secure/lib/libcrypto/man/rsa.3 projects/calloutng/secure/lib/libcrypto/man/sha.3 projects/calloutng/secure/lib/libcrypto/man/threads.3 projects/calloutng/secure/lib/libcrypto/man/ui.3 projects/calloutng/secure/lib/libcrypto/man/ui_compat.3 projects/calloutng/secure/lib/libcrypto/man/x509.3 projects/calloutng/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/calloutng/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_free.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_new.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/calloutng/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/calloutng/secure/lib/libssl/man/SSL_SESSION_free.3 projects/calloutng/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/calloutng/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/calloutng/secure/lib/libssl/man/SSL_accept.3 projects/calloutng/secure/lib/libssl/man/SSL_alert_type_string.3 projects/calloutng/secure/lib/libssl/man/SSL_clear.3 projects/calloutng/secure/lib/libssl/man/SSL_connect.3 projects/calloutng/secure/lib/libssl/man/SSL_do_handshake.3 projects/calloutng/secure/lib/libssl/man/SSL_free.3 projects/calloutng/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/calloutng/secure/lib/libssl/man/SSL_get_ciphers.3 projects/calloutng/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/calloutng/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/calloutng/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/calloutng/secure/lib/libssl/man/SSL_get_error.3 projects/calloutng/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/calloutng/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/calloutng/secure/lib/libssl/man/SSL_get_fd.3 projects/calloutng/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/calloutng/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/calloutng/secure/lib/libssl/man/SSL_get_rbio.3 projects/calloutng/secure/lib/libssl/man/SSL_get_session.3 projects/calloutng/secure/lib/libssl/man/SSL_get_verify_result.3 projects/calloutng/secure/lib/libssl/man/SSL_get_version.3 projects/calloutng/secure/lib/libssl/man/SSL_library_init.3 projects/calloutng/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/calloutng/secure/lib/libssl/man/SSL_new.3 projects/calloutng/secure/lib/libssl/man/SSL_pending.3 projects/calloutng/secure/lib/libssl/man/SSL_read.3 projects/calloutng/secure/lib/libssl/man/SSL_rstate_string.3 projects/calloutng/secure/lib/libssl/man/SSL_session_reused.3 projects/calloutng/secure/lib/libssl/man/SSL_set_bio.3 projects/calloutng/secure/lib/libssl/man/SSL_set_connect_state.3 projects/calloutng/secure/lib/libssl/man/SSL_set_fd.3 projects/calloutng/secure/lib/libssl/man/SSL_set_session.3 projects/calloutng/secure/lib/libssl/man/SSL_set_shutdown.3 projects/calloutng/secure/lib/libssl/man/SSL_set_verify_result.3 projects/calloutng/secure/lib/libssl/man/SSL_shutdown.3 projects/calloutng/secure/lib/libssl/man/SSL_state_string.3 projects/calloutng/secure/lib/libssl/man/SSL_want.3 projects/calloutng/secure/lib/libssl/man/SSL_write.3 projects/calloutng/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/calloutng/secure/lib/libssl/man/ssl.3 projects/calloutng/secure/usr.bin/openssl/man/CA.pl.1 projects/calloutng/secure/usr.bin/openssl/man/asn1parse.1 projects/calloutng/secure/usr.bin/openssl/man/ca.1 projects/calloutng/secure/usr.bin/openssl/man/ciphers.1 projects/calloutng/secure/usr.bin/openssl/man/crl.1 projects/calloutng/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/calloutng/secure/usr.bin/openssl/man/dgst.1 projects/calloutng/secure/usr.bin/openssl/man/dhparam.1 projects/calloutng/secure/usr.bin/openssl/man/dsa.1 projects/calloutng/secure/usr.bin/openssl/man/dsaparam.1 projects/calloutng/secure/usr.bin/openssl/man/ec.1 projects/calloutng/secure/usr.bin/openssl/man/ecparam.1 projects/calloutng/secure/usr.bin/openssl/man/enc.1 projects/calloutng/secure/usr.bin/openssl/man/errstr.1 projects/calloutng/secure/usr.bin/openssl/man/gendsa.1 projects/calloutng/secure/usr.bin/openssl/man/genrsa.1 projects/calloutng/secure/usr.bin/openssl/man/nseq.1 projects/calloutng/secure/usr.bin/openssl/man/ocsp.1 projects/calloutng/secure/usr.bin/openssl/man/openssl.1 projects/calloutng/secure/usr.bin/openssl/man/passwd.1 projects/calloutng/secure/usr.bin/openssl/man/pkcs12.1 projects/calloutng/secure/usr.bin/openssl/man/pkcs7.1 projects/calloutng/secure/usr.bin/openssl/man/pkcs8.1 projects/calloutng/secure/usr.bin/openssl/man/rand.1 projects/calloutng/secure/usr.bin/openssl/man/req.1 projects/calloutng/secure/usr.bin/openssl/man/rsa.1 projects/calloutng/secure/usr.bin/openssl/man/rsautl.1 projects/calloutng/secure/usr.bin/openssl/man/s_client.1 projects/calloutng/secure/usr.bin/openssl/man/s_server.1 projects/calloutng/secure/usr.bin/openssl/man/s_time.1 projects/calloutng/secure/usr.bin/openssl/man/sess_id.1 projects/calloutng/secure/usr.bin/openssl/man/smime.1 projects/calloutng/secure/usr.bin/openssl/man/speed.1 projects/calloutng/secure/usr.bin/openssl/man/spkac.1 projects/calloutng/secure/usr.bin/openssl/man/verify.1 projects/calloutng/secure/usr.bin/openssl/man/version.1 projects/calloutng/secure/usr.bin/openssl/man/x509.1 projects/calloutng/secure/usr.bin/openssl/man/x509v3_config.1 projects/calloutng/share/examples/pf/faq-example1 projects/calloutng/share/examples/pf/pf.conf projects/calloutng/share/examples/scsi_target/scsi_target.c projects/calloutng/share/man/man4/Makefile projects/calloutng/share/man/man4/acpi_ibm.4 projects/calloutng/share/man/man4/ahci.4 projects/calloutng/share/man/man4/ata.4 projects/calloutng/share/man/man4/cpufreq.4 projects/calloutng/share/man/man4/ng_netflow.4 projects/calloutng/share/man/man5/passwd.5 projects/calloutng/share/man/man5/src.conf.5 projects/calloutng/share/man/man7/build.7 projects/calloutng/share/man/man9/disk.9 projects/calloutng/share/man/man9/locking.9 projects/calloutng/share/misc/committers-ports.dot projects/calloutng/share/misc/organization.dot projects/calloutng/share/mk/bsd.crunchgen.mk projects/calloutng/share/mk/bsd.own.mk projects/calloutng/sys/amd64/amd64/pmap.c projects/calloutng/sys/amd64/amd64/trap.c projects/calloutng/sys/amd64/conf/GENERIC projects/calloutng/sys/amd64/include/elf.h projects/calloutng/sys/arm/at91/at91_machdep.c projects/calloutng/sys/arm/at91/at91_pmcvar.h projects/calloutng/sys/arm/at91/at91_spi.c projects/calloutng/sys/arm/at91/at91_twi.c projects/calloutng/sys/arm/at91/at91reg.h projects/calloutng/sys/arm/at91/at91sam9260.c projects/calloutng/sys/arm/at91/std.at91sam9 projects/calloutng/sys/arm/include/_stdint.h projects/calloutng/sys/arm/include/_types.h projects/calloutng/sys/arm/include/elf.h projects/calloutng/sys/arm/xscale/std.xscale projects/calloutng/sys/boot/common/load_elf.c projects/calloutng/sys/boot/common/load_elf_obj.c projects/calloutng/sys/boot/userboot/libstand/Makefile projects/calloutng/sys/cam/cam_periph.c projects/calloutng/sys/cam/cam_xpt.c projects/calloutng/sys/cam/cam_xpt_periph.h projects/calloutng/sys/cam/ctl/ctl.c projects/calloutng/sys/cam/ctl/ctl_backend.c projects/calloutng/sys/cam/ctl/ctl_frontend_cam_sim.c projects/calloutng/sys/cam/ctl/ctl_frontend_internal.c projects/calloutng/sys/cam/ctl/scsi_ctl.c projects/calloutng/sys/cam/scsi/scsi_all.c projects/calloutng/sys/cam/scsi/scsi_all.h projects/calloutng/sys/cam/scsi/scsi_cd.c projects/calloutng/sys/cam/scsi/scsi_da.c projects/calloutng/sys/cam/scsi/scsi_da.h projects/calloutng/sys/cam/scsi/scsi_enc.c projects/calloutng/sys/cam/scsi/scsi_pass.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/calloutng/sys/cddl/dev/dtrace/amd64/dis_tables.c projects/calloutng/sys/cddl/dev/dtrace/i386/dis_tables.c projects/calloutng/sys/conf/NOTES projects/calloutng/sys/conf/files projects/calloutng/sys/conf/files.arm projects/calloutng/sys/conf/files.ia64 projects/calloutng/sys/conf/files.mips projects/calloutng/sys/conf/files.powerpc projects/calloutng/sys/conf/files.sparc64 projects/calloutng/sys/conf/options projects/calloutng/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/calloutng/sys/contrib/dev/acpica/common/dmextern.c projects/calloutng/sys/contrib/dev/acpica/common/dmrestag.c projects/calloutng/sys/contrib/dev/acpica/compiler/aslcompile.c projects/calloutng/sys/contrib/dev/acpica/compiler/aslerror.c projects/calloutng/sys/contrib/dev/acpica/compiler/aslfiles.c projects/calloutng/sys/contrib/dev/acpica/compiler/asllookup.c projects/calloutng/sys/contrib/dev/acpica/compiler/aslmain.c projects/calloutng/sys/contrib/dev/acpica/compiler/aslsupport.l projects/calloutng/sys/contrib/dev/acpica/compiler/aslutils.c projects/calloutng/sys/contrib/dev/acpica/compiler/dttemplate.c projects/calloutng/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/calloutng/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/calloutng/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/calloutng/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/calloutng/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/calloutng/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/calloutng/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/calloutng/sys/contrib/dev/acpica/components/events/evgpe.c projects/calloutng/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/calloutng/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/calloutng/sys/contrib/dev/acpica/components/executer/exconfig.c projects/calloutng/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/calloutng/sys/contrib/dev/acpica/include/acdebug.h projects/calloutng/sys/contrib/dev/acpica/include/acdisasm.h projects/calloutng/sys/contrib/dev/acpica/include/acglobal.h projects/calloutng/sys/contrib/dev/acpica/include/aclocal.h projects/calloutng/sys/contrib/dev/acpica/include/acpixf.h projects/calloutng/sys/contrib/dev/acpica/include/acpredef.h projects/calloutng/sys/contrib/dev/acpica/include/acutils.h projects/calloutng/sys/contrib/rdma/krping/krping.c projects/calloutng/sys/contrib/rdma/krping/krping.h projects/calloutng/sys/contrib/rdma/krping/krping_dev.c projects/calloutng/sys/contrib/rdma/rdma_addr.c projects/calloutng/sys/contrib/rdma/rdma_cache.c projects/calloutng/sys/dev/acpi_support/acpi_ibm.c projects/calloutng/sys/dev/adb/adb_kbd.c projects/calloutng/sys/dev/agp/agp_i810.c projects/calloutng/sys/dev/aic7xxx/aic79xx.c projects/calloutng/sys/dev/aic7xxx/aic79xx_osm.c projects/calloutng/sys/dev/aic7xxx/aic7xxx.c projects/calloutng/sys/dev/aic7xxx/aic7xxx_osm.c projects/calloutng/sys/dev/ath/ath_dfs/null/dfs_null.c projects/calloutng/sys/dev/ath/ath_hal/ah.h projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c projects/calloutng/sys/dev/ath/ath_hal/ar9002/ar9285.h projects/calloutng/sys/dev/ath/ath_rate/amrr/amrr.c projects/calloutng/sys/dev/ath/ath_rate/onoe/onoe.c projects/calloutng/sys/dev/ath/ath_rate/sample/sample.c projects/calloutng/sys/dev/ath/if_ath.c projects/calloutng/sys/dev/ath/if_ath_ahb.c projects/calloutng/sys/dev/ath/if_ath_led.c projects/calloutng/sys/dev/ath/if_ath_rx.c projects/calloutng/sys/dev/ath/if_ath_tx.c projects/calloutng/sys/dev/ath/if_athdfs.h projects/calloutng/sys/dev/ath/if_athioctl.h projects/calloutng/sys/dev/cxgb/common/cxgb_ctl_defs.h projects/calloutng/sys/dev/cxgb/cxgb_adapter.h projects/calloutng/sys/dev/cxgb/cxgb_main.c projects/calloutng/sys/dev/cxgb/cxgb_offload.h projects/calloutng/sys/dev/cxgb/cxgb_osdep.h projects/calloutng/sys/dev/cxgb/cxgb_sge.c projects/calloutng/sys/dev/cxgb/sys/mvec.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h projects/calloutng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_l2t.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_l2t.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_listen.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_tom.c projects/calloutng/sys/dev/cxgb/ulp/tom/cxgb_tom.h projects/calloutng/sys/dev/cxgbe/adapter.h projects/calloutng/sys/dev/cxgbe/common/common.h projects/calloutng/sys/dev/cxgbe/common/t4_hw.c projects/calloutng/sys/dev/cxgbe/common/t4_msg.h projects/calloutng/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/calloutng/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/calloutng/sys/dev/cxgbe/firmware/t4fw_interface.h projects/calloutng/sys/dev/cxgbe/offload.h projects/calloutng/sys/dev/cxgbe/osdep.h projects/calloutng/sys/dev/cxgbe/t4_l2t.c projects/calloutng/sys/dev/cxgbe/t4_l2t.h projects/calloutng/sys/dev/cxgbe/t4_main.c projects/calloutng/sys/dev/cxgbe/t4_sge.c projects/calloutng/sys/dev/drm2/drmP.h projects/calloutng/sys/dev/drm2/drm_pciids.h projects/calloutng/sys/dev/fb/fbreg.h projects/calloutng/sys/dev/firewire/sbp_targ.c projects/calloutng/sys/dev/flash/at45d.c projects/calloutng/sys/dev/isp/isp.c projects/calloutng/sys/dev/isp/isp_freebsd.c projects/calloutng/sys/dev/isp/isp_freebsd.h projects/calloutng/sys/dev/isp/isp_pci.c projects/calloutng/sys/dev/isp/ispmbox.h projects/calloutng/sys/dev/isp/ispreg.h projects/calloutng/sys/dev/isp/ispvar.h projects/calloutng/sys/dev/ispfw/asm_2400.h projects/calloutng/sys/dev/ispfw/asm_2500.h projects/calloutng/sys/dev/iwn/if_iwn.c projects/calloutng/sys/dev/mfi/mfi_tbolt.c projects/calloutng/sys/dev/mps/mpi/mpi2.h projects/calloutng/sys/dev/mps/mpi/mpi2_cnfg.h projects/calloutng/sys/dev/mps/mpi/mpi2_hbd.h projects/calloutng/sys/dev/mps/mpi/mpi2_history.txt projects/calloutng/sys/dev/mps/mpi/mpi2_init.h projects/calloutng/sys/dev/mps/mpi/mpi2_ioc.h projects/calloutng/sys/dev/mps/mpi/mpi2_ra.h projects/calloutng/sys/dev/mps/mpi/mpi2_raid.h projects/calloutng/sys/dev/mps/mpi/mpi2_sas.h projects/calloutng/sys/dev/mps/mpi/mpi2_targ.h projects/calloutng/sys/dev/mps/mpi/mpi2_tool.h projects/calloutng/sys/dev/mps/mpi/mpi2_type.h projects/calloutng/sys/dev/mps/mps.c projects/calloutng/sys/dev/mps/mps_config.c projects/calloutng/sys/dev/mps/mps_ioctl.h projects/calloutng/sys/dev/mps/mps_mapping.c projects/calloutng/sys/dev/mps/mps_mapping.h projects/calloutng/sys/dev/mps/mps_sas.c projects/calloutng/sys/dev/mps/mps_sas.h projects/calloutng/sys/dev/mps/mps_sas_lsi.c projects/calloutng/sys/dev/mps/mps_user.c projects/calloutng/sys/dev/mps/mpsvar.h projects/calloutng/sys/dev/mpt/mpt_cam.c projects/calloutng/sys/dev/nand/nand.c projects/calloutng/sys/dev/nand/nandsim.c projects/calloutng/sys/dev/pccard/pccard.c projects/calloutng/sys/dev/pccard/pccardvarp.h projects/calloutng/sys/dev/pci/pci_pci.c projects/calloutng/sys/dev/puc/puc_cfg.h projects/calloutng/sys/dev/puc/pucdata.c projects/calloutng/sys/dev/re/if_re.c projects/calloutng/sys/dev/sio/sio.c projects/calloutng/sys/dev/twa/tw_osl_cam.c projects/calloutng/sys/dev/usb/serial/uftdi.c projects/calloutng/sys/dev/usb/serial/uftdi_reg.h projects/calloutng/sys/dev/viawd/viawd.c projects/calloutng/sys/dev/xen/balloon/balloon.c projects/calloutng/sys/dev/xen/blkfront/blkfront.c projects/calloutng/sys/fs/nfsclient/nfs_clbio.c projects/calloutng/sys/fs/nfsclient/nfs_clnode.c projects/calloutng/sys/fs/nfsclient/nfs_clvfsops.c projects/calloutng/sys/geom/geom.h projects/calloutng/sys/geom/geom_disk.c projects/calloutng/sys/geom/geom_disk.h projects/calloutng/sys/geom/geom_subr.c projects/calloutng/sys/i386/conf/GENERIC projects/calloutng/sys/i386/conf/XEN projects/calloutng/sys/i386/i386/elf_machdep.c projects/calloutng/sys/i386/i386/machdep.c projects/calloutng/sys/i386/i386/pmap.c projects/calloutng/sys/i386/include/elf.h projects/calloutng/sys/i386/include/vmparam.h projects/calloutng/sys/ia64/include/_stdint.h projects/calloutng/sys/ia64/include/_types.h projects/calloutng/sys/ia64/include/elf.h projects/calloutng/sys/kern/imgact_aout.c projects/calloutng/sys/kern/imgact_elf.c projects/calloutng/sys/kern/imgact_gzip.c projects/calloutng/sys/kern/kern_descrip.c projects/calloutng/sys/kern/kern_exec.c projects/calloutng/sys/kern/kern_fork.c projects/calloutng/sys/kern/kern_tc.c projects/calloutng/sys/kern/subr_firmware.c projects/calloutng/sys/kern/subr_witness.c projects/calloutng/sys/kern/sys_procdesc.c projects/calloutng/sys/kern/tty.c projects/calloutng/sys/kern/vfs_syscalls.c projects/calloutng/sys/kern/vfs_vnops.c projects/calloutng/sys/mips/cavium/uart_bus_octeonusart.c projects/calloutng/sys/mips/include/_stdint.h projects/calloutng/sys/mips/include/_types.h projects/calloutng/sys/mips/include/elf.h projects/calloutng/sys/mips/mips/pmap.c projects/calloutng/sys/modules/Makefile projects/calloutng/sys/modules/cxgb/Makefile projects/calloutng/sys/modules/cxgb/cxgb/Makefile projects/calloutng/sys/modules/cxgb/iw_cxgb/Makefile projects/calloutng/sys/modules/cxgb/tom/Makefile projects/calloutng/sys/modules/cxgbe/Makefile projects/calloutng/sys/modules/rdma/krping/Makefile projects/calloutng/sys/net/if.h projects/calloutng/sys/net/if_gif.c projects/calloutng/sys/net/if_var.h projects/calloutng/sys/net/if_vlan.c projects/calloutng/sys/net80211/ieee80211_output.c projects/calloutng/sys/net80211/ieee80211_radiotap.c projects/calloutng/sys/net80211/ieee80211_var.h projects/calloutng/sys/netgraph/netflow/netflow.c projects/calloutng/sys/netgraph/netflow/ng_netflow.c projects/calloutng/sys/netgraph/netflow/ng_netflow.h projects/calloutng/sys/netinet/icmp_var.h projects/calloutng/sys/netinet/if_ether.c projects/calloutng/sys/netinet/if_ether.h projects/calloutng/sys/netinet/in.c projects/calloutng/sys/netinet/ip_icmp.c projects/calloutng/sys/netinet/ipfw/ip_fw_table.c projects/calloutng/sys/netinet/sctp_asconf.c projects/calloutng/sys/netinet/sctp_asconf.h projects/calloutng/sys/netinet/sctp_bsd_addr.c projects/calloutng/sys/netinet/sctp_bsd_addr.h projects/calloutng/sys/netinet/sctp_indata.c projects/calloutng/sys/netinet/sctp_indata.h projects/calloutng/sys/netinet/sctp_input.c projects/calloutng/sys/netinet/sctp_input.h projects/calloutng/sys/netinet/sctp_os_bsd.h projects/calloutng/sys/netinet/sctp_output.c projects/calloutng/sys/netinet/sctp_output.h projects/calloutng/sys/netinet/sctp_pcb.c projects/calloutng/sys/netinet/sctp_pcb.h projects/calloutng/sys/netinet/sctp_sysctl.c projects/calloutng/sys/netinet/sctp_sysctl.h projects/calloutng/sys/netinet/sctp_usrreq.c projects/calloutng/sys/netinet/sctputil.c projects/calloutng/sys/netinet/sctputil.h projects/calloutng/sys/netinet/tcp_input.c projects/calloutng/sys/netinet/tcp_offload.c projects/calloutng/sys/netinet/tcp_offload.h projects/calloutng/sys/netinet/tcp_output.c projects/calloutng/sys/netinet/tcp_subr.c projects/calloutng/sys/netinet/tcp_syncache.c projects/calloutng/sys/netinet/tcp_syncache.h projects/calloutng/sys/netinet/tcp_timer.c projects/calloutng/sys/netinet/tcp_usrreq.c projects/calloutng/sys/netinet/tcp_var.h projects/calloutng/sys/netinet6/in6.c projects/calloutng/sys/netinet6/in6_src.c projects/calloutng/sys/netinet6/mld6.c projects/calloutng/sys/netinet6/sctp6_usrreq.c projects/calloutng/sys/ofed/drivers/infiniband/core/cma.c projects/calloutng/sys/ofed/drivers/infiniband/core/iwcm.c projects/calloutng/sys/ofed/include/linux/net.h projects/calloutng/sys/ofed/include/linux/workqueue.h projects/calloutng/sys/ofed/include/net/netevent.h projects/calloutng/sys/ofed/include/rdma/iw_cm.h projects/calloutng/sys/powerpc/aim/locore32.S projects/calloutng/sys/powerpc/aim/locore64.S projects/calloutng/sys/powerpc/conf/GENERIC64 projects/calloutng/sys/powerpc/include/_stdint.h projects/calloutng/sys/powerpc/include/_types.h projects/calloutng/sys/powerpc/include/elf.h projects/calloutng/sys/sparc64/conf/GENERIC projects/calloutng/sys/sparc64/include/_stdint.h projects/calloutng/sys/sparc64/include/_types.h projects/calloutng/sys/sparc64/include/elf.h projects/calloutng/sys/sparc64/sparc64/pmap.c projects/calloutng/sys/sys/_types.h projects/calloutng/sys/sys/file.h projects/calloutng/sys/sys/imgact_aout.h projects/calloutng/sys/sys/param.h projects/calloutng/sys/sys/stdint.h projects/calloutng/sys/sys/sysent.h projects/calloutng/sys/ufs/ffs/ffs_vnops.c projects/calloutng/sys/vm/vm_map.c projects/calloutng/sys/vm/vm_object.h projects/calloutng/sys/vm/vm_page.c projects/calloutng/sys/vm/vm_page.h projects/calloutng/sys/x86/include/_stdint.h projects/calloutng/sys/x86/include/_types.h projects/calloutng/sys/x86/x86/tsc.c projects/calloutng/tools/regression/filemon/Makefile projects/calloutng/tools/regression/usr.bin/make/common.sh projects/calloutng/tools/test/auxinfo/auxinfo.c projects/calloutng/tools/tools/net80211/w00t/redir/buddy.c projects/calloutng/tools/tools/net80211/wesside/dics/dics.c projects/calloutng/tools/tools/netmap/bridge.c projects/calloutng/tools/tools/netmap/pcap.c projects/calloutng/usr.bin/killall/killall.1 projects/calloutng/usr.bin/killall/killall.c projects/calloutng/usr.bin/less/defines.h projects/calloutng/usr.bin/make/Makefile projects/calloutng/usr.bin/makewhatis/makewhatis.c projects/calloutng/usr.bin/minigzip/Makefile projects/calloutng/usr.bin/netstat/inet.c projects/calloutng/usr.bin/sockstat/sockstat.c projects/calloutng/usr.bin/sort/Makefile projects/calloutng/usr.bin/top/machine.c projects/calloutng/usr.bin/top/top.local.1 projects/calloutng/usr.sbin/acpi/iasl/Makefile projects/calloutng/usr.sbin/bsdinstall/partedit/diskeditor.c projects/calloutng/usr.sbin/bsdinstall/partedit/part_wizard.c projects/calloutng/usr.sbin/crunch/crunchgen/crunched_main.c projects/calloutng/usr.sbin/crunch/crunchgen/crunchgen.c projects/calloutng/usr.sbin/crunch/crunchide/crunchide.c projects/calloutng/usr.sbin/crunch/crunchide/exec_elf32.c projects/calloutng/usr.sbin/ctladm/ctladm.c projects/calloutng/usr.sbin/ifmcstat/ifmcstat.c projects/calloutng/usr.sbin/jail/jail.c projects/calloutng/usr.sbin/kbdmap/kbdmap.c projects/calloutng/usr.sbin/kldxref/ef.c projects/calloutng/usr.sbin/mfiutil/Makefile projects/calloutng/usr.sbin/mfiutil/mfi_cmd.c projects/calloutng/usr.sbin/mfiutil/mfi_config.c projects/calloutng/usr.sbin/mfiutil/mfi_drive.c projects/calloutng/usr.sbin/mfiutil/mfi_evt.c projects/calloutng/usr.sbin/mfiutil/mfi_flash.c projects/calloutng/usr.sbin/mfiutil/mfi_patrol.c projects/calloutng/usr.sbin/mfiutil/mfi_show.c projects/calloutng/usr.sbin/mfiutil/mfi_volume.c projects/calloutng/usr.sbin/mfiutil/mfiutil.c projects/calloutng/usr.sbin/mfiutil/mfiutil.h projects/calloutng/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/calloutng/ (props changed) projects/calloutng/cddl/contrib/opensolaris/ (props changed) projects/calloutng/contrib/gcc/ (props changed) projects/calloutng/contrib/less/ (props changed) projects/calloutng/contrib/top/ (props changed) projects/calloutng/crypto/openssh/ (props changed) projects/calloutng/crypto/openssl/ (props changed) projects/calloutng/lib/libc/ (props changed) projects/calloutng/lib/libc/stdtime/ (props changed) projects/calloutng/lib/libutil/ (props changed) projects/calloutng/lib/libz/ (props changed) projects/calloutng/lib/libz/contrib/ (props changed) projects/calloutng/lib/libz/contrib/README.contrib (props changed) projects/calloutng/lib/libz/contrib/asm686/ (props changed) projects/calloutng/lib/libz/contrib/asm686/README.686 (props changed) projects/calloutng/lib/libz/contrib/gcc_gvmat64/ (props changed) projects/calloutng/lib/libz/contrib/gcc_gvmat64/gvmat64.S (props changed) projects/calloutng/lib/libz/doc/ (props changed) projects/calloutng/lib/libz/doc/rfc1950.txt (props changed) projects/calloutng/lib/libz/doc/rfc1951.txt (props changed) projects/calloutng/lib/libz/doc/rfc1952.txt (props changed) projects/calloutng/lib/libz/doc/txtvsbin.txt (props changed) projects/calloutng/lib/libz/gzclose.c (props changed) projects/calloutng/sbin/ (props changed) projects/calloutng/share/man/man4/ (props changed) projects/calloutng/sys/ (props changed) projects/calloutng/sys/boot/ (props changed) projects/calloutng/sys/cddl/contrib/opensolaris/ (props changed) projects/calloutng/sys/conf/ (props changed) projects/calloutng/sys/contrib/dev/acpica/ (props changed) projects/calloutng/sys/contrib/dev/acpica/common/ (props changed) projects/calloutng/sys/contrib/dev/acpica/compiler/ (props changed) projects/calloutng/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/calloutng/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/calloutng/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/calloutng/sys/contrib/dev/acpica/components/events/ (props changed) projects/calloutng/sys/contrib/dev/acpica/components/executer/ (props changed) projects/calloutng/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/calloutng/sys/contrib/dev/acpica/include/ (props changed) projects/calloutng/usr.sbin/jail/ (props changed) Modified: projects/calloutng/UPDATING ============================================================================== --- projects/calloutng/UPDATING Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/UPDATING Fri Jun 29 17:39:40 2012 (r237811) @@ -24,6 +24,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +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 Modified: projects/calloutng/bin/rm/rm.c ============================================================================== --- projects/calloutng/bin/rm/rm.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/bin/rm/rm.c Fri Jun 29 17:39:40 2012 (r237811) @@ -301,10 +301,16 @@ rm_tree(char **argv) 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 @@ rm_file(char **argv) 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 @@ rm_overwrite(char *file, struct stat *sb 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: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c Fri Jun 29 17:39:40 2012 (r237811) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ #include #include @@ -209,6 +211,83 @@ dt_aggregate_lquantizedcmp(int64_t *lhs, return (0); } +static void +dt_aggregate_llquantize(int64_t *existing, int64_t *new, size_t size) +{ + int i; + + for (i = 1; i < size / sizeof (int64_t); i++) + existing[i] = existing[i] + new[i]; +} + +static long double +dt_aggregate_llquantizedsum(int64_t *llquanta) +{ + int64_t arg = *llquanta++; + uint16_t factor = DTRACE_LLQUANTIZE_FACTOR(arg); + uint16_t low = DTRACE_LLQUANTIZE_LOW(arg); + uint16_t high = DTRACE_LLQUANTIZE_HIGH(arg); + uint16_t nsteps = DTRACE_LLQUANTIZE_NSTEP(arg); + int bin = 0, order; + int64_t value = 1, next, step; + long double total; + + assert(nsteps >= factor); + assert(nsteps % factor == 0); + + for (order = 0; order < low; order++) + value *= factor; + + total = (long double)llquanta[bin++] * (long double)(value - 1); + + next = value * factor; + step = next > nsteps ? next / nsteps : 1; + + while (order <= high) { + assert(value < next); + total += (long double)llquanta[bin++] * (long double)(value); + + if ((value += step) != next) + continue; + + next = value * factor; + step = next > nsteps ? next / nsteps : 1; + order++; + } + + return (total + (long double)llquanta[bin] * (long double)value); +} + +static int +dt_aggregate_llquantizedcmp(int64_t *lhs, int64_t *rhs) +{ + long double lsum = dt_aggregate_llquantizedsum(lhs); + long double rsum = dt_aggregate_llquantizedsum(rhs); + int64_t lzero, rzero; + + if (lsum < rsum) + return (DT_LESSTHAN); + + if (lsum > rsum) + return (DT_GREATERTHAN); + + /* + * If they're both equal, then we will compare based on the weights at + * zero. If the weights at zero are equal, then this will be judged a + * tie and will be resolved based on the key comparison. + */ + lzero = lhs[1]; + rzero = rhs[1]; + + if (lzero < rzero) + return (DT_LESSTHAN); + + if (lzero > rzero) + return (DT_GREATERTHAN); + + return (0); +} + static int dt_aggregate_quantizedcmp(int64_t *lhs, int64_t *rhs) { @@ -592,6 +671,10 @@ hashnext: h->dtahe_aggregate = dt_aggregate_lquantize; break; + case DTRACEAGG_LLQUANTIZE: + h->dtahe_aggregate = dt_aggregate_llquantize; + break; + case DTRACEAGG_COUNT: case DTRACEAGG_SUM: case DTRACEAGG_AVG: @@ -859,6 +942,10 @@ dt_aggregate_valcmp(const void *lhs, con rval = dt_aggregate_lquantizedcmp(laddr, raddr); break; + case DTRACEAGG_LLQUANTIZE: + rval = dt_aggregate_llquantizedcmp(laddr, raddr); + break; + case DTRACEAGG_COUNT: case DTRACEAGG_SUM: case DTRACEAGG_MIN: Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Jun 29 17:39:40 2012 (r237811) @@ -82,6 +82,7 @@ #include #include +#include #include #include @@ -1369,6 +1370,146 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_nod argmax = 5; } + if (fid->di_id == DTRACEAGG_LLQUANTIZE) { + /* + * For log/linear quantizations, we have between one and five + * arguments in addition to the expression: + * + * arg1 => Factor + * arg2 => Low magnitude + * arg3 => High magnitude + * arg4 => Number of steps per magnitude + * arg5 => Quantization increment value (defaults to 1) + */ + dt_node_t *llarg = dnp->dn_aggfun->dn_args->dn_list; + uint64_t oarg, order, v; + dt_idsig_t *isp; + int i; + + struct { + char *str; /* string identifier */ + int badtype; /* error on bad type */ + int badval; /* error on bad value */ + int mismatch; /* error on bad match */ + int shift; /* shift value */ + uint16_t value; /* value itself */ + } args[] = { + { "factor", D_LLQUANT_FACTORTYPE, + D_LLQUANT_FACTORVAL, D_LLQUANT_FACTORMATCH, + DTRACE_LLQUANTIZE_FACTORSHIFT }, + { "low magnitude", D_LLQUANT_LOWTYPE, + D_LLQUANT_LOWVAL, D_LLQUANT_LOWMATCH, + DTRACE_LLQUANTIZE_LOWSHIFT }, + { "high magnitude", D_LLQUANT_HIGHTYPE, + D_LLQUANT_HIGHVAL, D_LLQUANT_HIGHMATCH, + DTRACE_LLQUANTIZE_HIGHSHIFT }, + { "linear steps per magnitude", D_LLQUANT_NSTEPTYPE, + D_LLQUANT_NSTEPVAL, D_LLQUANT_NSTEPMATCH, + DTRACE_LLQUANTIZE_NSTEPSHIFT }, + { NULL } + }; + + assert(arg == 0); + + for (i = 0; args[i].str != NULL; i++) { + if (llarg->dn_kind != DT_NODE_INT) { + dnerror(llarg, args[i].badtype, "llquantize( ) " + "argument #%d (%s) must be an " + "integer constant\n", i + 1, args[i].str); + } + + if ((uint64_t)llarg->dn_value > UINT16_MAX) { + dnerror(llarg, args[i].badval, "llquantize( ) " + "argument #%d (%s) must be an unsigned " + "16-bit quantity\n", i + 1, args[i].str); + } + + args[i].value = (uint16_t)llarg->dn_value; + + assert(!(arg & ((uint64_t)UINT16_MAX << + args[i].shift))); + arg |= ((uint64_t)args[i].value << args[i].shift); + llarg = llarg->dn_list; + } + + assert(arg != 0); + + if (args[0].value < 2) { + dnerror(dnp, D_LLQUANT_FACTORSMALL, "llquantize( ) " + "factor (argument #1) must be two or more\n"); + } + + if (args[1].value >= args[2].value) { + dnerror(dnp, D_LLQUANT_MAGRANGE, "llquantize( ) " + "high magnitude (argument #3) must be greater " + "than low magnitude (argument #2)\n"); + } + + if (args[3].value < args[0].value) { + dnerror(dnp, D_LLQUANT_FACTORNSTEPS, "llquantize( ) " + "factor (argument #1) must be less than or " + "equal to the number of linear steps per " + "magnitude (argument #4)\n"); + } + + for (v = args[0].value; v < args[3].value; v *= args[0].value) + continue; + + if ((args[3].value % args[0].value) || (v % args[3].value)) { + dnerror(dnp, D_LLQUANT_FACTOREVEN, "llquantize( ) " + "factor (argument #1) must evenly divide the " + "number of steps per magnitude (argument #4), " + "and the number of steps per magnitude must evenly " + "divide a power of the factor\n"); + } + + for (i = 0, order = 1; i < args[2].value; i++) { + if (order * args[0].value > order) { + order *= args[0].value; + continue; + } + + dnerror(dnp, D_LLQUANT_MAGTOOBIG, "llquantize( ) " + "factor (%d) raised to power of high magnitude " + "(%d) overflows 64-bits\n", args[0].value, + args[2].value); + } + + isp = (dt_idsig_t *)aid->di_data; + + if (isp->dis_auxinfo == 0) { + /* + * This is the first time we've seen an llquantize() + * for this aggregation; we'll store our argument + * as the auxiliary signature information. + */ + isp->dis_auxinfo = arg; + } else if ((oarg = isp->dis_auxinfo) != arg) { + /* + * If we have seen this llquantize() before and the + * argument doesn't match the original argument, pick + * the original argument apart to concisely report the + * mismatch. + */ + int expected = 0, found = 0; + + for (i = 0; expected == found; i++) { + assert(args[i].str != NULL); + + expected = (oarg >> args[i].shift) & UINT16_MAX; + found = (arg >> args[i].shift) & UINT16_MAX; + } + + dnerror(dnp, args[i - 1].mismatch, "llquantize( ) " + "%s (argument #%d) doesn't match previous " + "declaration: expected %d, found %d\n", + args[i - 1].str, i, expected, found); + } + + incr = llarg; + argmax = 6; + } + if (fid->di_id == DTRACEAGG_QUANTIZE) { incr = dnp->dn_aggfun->dn_args->dn_list; argmax = 2; Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Fri Jun 29 17:39:40 2012 (r237811) @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + #include #include #include @@ -686,6 +690,121 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FI return (0); } +int +dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, + size_t size, uint64_t normal) +{ + int i, first_bin, last_bin, bin = 1, order, levels; + uint16_t factor, low, high, nsteps; + const int64_t *data = addr; + int64_t value = 1, next, step; + char positives = 0, negatives = 0; + long double total = 0; + uint64_t arg; + char c[32]; + + if (size < sizeof (uint64_t)) + return (dt_set_errno(dtp, EDT_DMISMATCH)); + + arg = *data++; + size -= sizeof (uint64_t); + + factor = DTRACE_LLQUANTIZE_FACTOR(arg); + low = DTRACE_LLQUANTIZE_LOW(arg); + high = DTRACE_LLQUANTIZE_HIGH(arg); + nsteps = DTRACE_LLQUANTIZE_NSTEP(arg); + + /* + * We don't expect to be handed invalid llquantize() parameters here, + * but sanity check them (to a degree) nonetheless. + */ + if (size > INT32_MAX || factor < 2 || low >= high || + nsteps == 0 || factor > nsteps) + return (dt_set_errno(dtp, EDT_DMISMATCH)); + + levels = (int)size / sizeof (uint64_t); + + first_bin = 0; + last_bin = levels - 1; + + while (first_bin < levels && data[first_bin] == 0) + first_bin++; + + if (first_bin == levels) { + first_bin = 0; + last_bin = 1; + } else { + if (first_bin > 0) + first_bin--; + + while (last_bin > 0 && data[last_bin] == 0) + last_bin--; + + if (last_bin < levels - 1) + last_bin++; + } + + for (i = first_bin; i <= last_bin; i++) { + positives |= (data[i] > 0); + negatives |= (data[i] < 0); + total += dt_fabsl((long double)data[i]); + } + + if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value", + "------------- Distribution -------------", "count") < 0) + return (-1); + + for (order = 0; order < low; order++) + value *= factor; + + next = value * factor; + step = next > nsteps ? next / nsteps : 1; + + if (first_bin == 0) { + (void) snprintf(c, sizeof (c), "< %lld", (long long)value); + + if (dt_printf(dtp, fp, "%16s ", c) < 0) + return (-1); + + if (dt_print_quantline(dtp, fp, data[0], normal, + total, positives, negatives) < 0) + return (-1); + } + + while (order <= high) { + if (bin >= first_bin && bin <= last_bin) { + if (dt_printf(dtp, fp, "%16lld ", (long long)value) < 0) + return (-1); + + if (dt_print_quantline(dtp, fp, data[bin], + normal, total, positives, negatives) < 0) + return (-1); + } + + assert(value < next); + bin++; + + if ((value += step) != next) + continue; + + next = value * factor; + step = next > nsteps ? next / nsteps : 1; + order++; + } + + if (last_bin < bin) + return (0); + + assert(last_bin == bin); + (void) snprintf(c, sizeof (c), ">= %lld", value); + + if (dt_printf(dtp, fp, "%16s ", c) < 0) + return (-1); + + return (dt_print_quantline(dtp, fp, data[bin], normal, + total, positives, negatives)); +} + /*ARGSUSED*/ static int dt_print_average(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr, @@ -1711,6 +1830,9 @@ dt_print_datum(dtrace_hdl_t *dtp, FILE * case DTRACEAGG_LQUANTIZE: return (dt_print_lquantize(dtp, fp, addr, size, normal)); + case DTRACEAGG_LLQUANTIZE: + return (dt_print_llquantize(dtp, fp, addr, size, normal)); + case DTRACEAGG_AVG: return (dt_print_average(dtp, fp, addr, size, normal)); Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h Fri Jun 29 17:39:40 2012 (r237811) @@ -236,6 +236,23 @@ typedef enum { D_LQUANT_MATCHBASE, /* lquantize() mismatch on base */ D_LQUANT_MATCHLIM, /* lquantize() mismatch on limit */ D_LQUANT_MATCHSTEP, /* lquantize() mismatch on step */ + D_LLQUANT_FACTORTYPE, /* llquantize() bad magnitude type */ + D_LLQUANT_FACTORVAL, /* llquantize() bad magnitude value */ + D_LLQUANT_FACTORMATCH, /* llquantize() mismatch on magnitude */ + D_LLQUANT_LOWTYPE, /* llquantize() bad low mag type */ + D_LLQUANT_LOWVAL, /* llquantize() bad low mag value */ + D_LLQUANT_LOWMATCH, /* llquantize() mismatch on low mag */ + D_LLQUANT_HIGHTYPE, /* llquantize() bad high mag type */ + D_LLQUANT_HIGHVAL, /* llquantize() bad high mag value */ + D_LLQUANT_HIGHMATCH, /* llquantize() mismatch on high mag */ + D_LLQUANT_NSTEPTYPE, /* llquantize() bad # steps type */ + D_LLQUANT_NSTEPVAL, /* llquantize() bad # steps value */ + D_LLQUANT_NSTEPMATCH, /* llquantize() mismatch on # steps */ + D_LLQUANT_MAGRANGE, /* llquantize() bad magnitude range */ + D_LLQUANT_FACTORNSTEPS, /* llquantize() # steps < factor */ + D_LLQUANT_FACTOREVEN, /* llquantize() bad # steps/factor */ + D_LLQUANT_FACTORSMALL, /* llquantize() magnitude too small */ + D_LLQUANT_MAGTOOBIG, /* llquantize() high mag too large */ D_PRINTM_ADDR, /* printm() memref bad type */ D_PRINTM_SIZE, /* printm() size bad type */ D_PRINTT_ADDR, /* printt() typeref bad type */ Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Fri Jun 29 17:39:40 2012 (r237811) @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + #ifndef _DT_IMPL_H #define _DT_IMPL_H @@ -641,6 +645,8 @@ extern int dt_print_quantize(dtrace_hdl_ const void *, size_t, uint64_t); extern int dt_print_lquantize(dtrace_hdl_t *, FILE *, const void *, size_t, uint64_t); +extern int dt_print_llquantize(dtrace_hdl_t *, FILE *, + const void *, size_t, uint64_t); extern int dt_print_agg(const dtrace_aggdata_t *, void *); extern int dt_handle(dtrace_hdl_t *, dtrace_probedata_t *); Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Jun 29 17:39:40 2012 (r237811) @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, Joyent, Inc. All rights reserved. */ #include @@ -114,8 +115,9 @@ #define DT_VERS_1_6_1 DT_VERSION_NUMBER(1, 6, 1) #define DT_VERS_1_6_2 DT_VERSION_NUMBER(1, 6, 2) #define DT_VERS_1_6_3 DT_VERSION_NUMBER(1, 6, 3) -#define DT_VERS_LATEST DT_VERS_1_6_3 -#define DT_VERS_STRING "Sun D 1.6.3" +#define DT_VERS_1_7 DT_VERSION_NUMBER(1, 7, 0) +#define DT_VERS_LATEST DT_VERS_1_7 +#define DT_VERS_STRING "Sun D 1.7" const dt_version_t _dtrace_versions[] = { DT_VERS_1_0, /* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */ @@ -131,6 +133,7 @@ const dt_version_t _dtrace_versions[] = DT_VERS_1_6_1, /* D API 1.6.1 */ DT_VERS_1_6_2, /* D API 1.6.2 */ DT_VERS_1_6_3, /* D API 1.6.3 */ + DT_VERS_1_7, /* D API 1.7 */ 0 }; @@ -287,6 +290,9 @@ static const dt_ident_t _dtrace_globals[ &dt_idops_func, "stack(...)" }, { "lltostr", DT_IDENT_FUNC, 0, DIF_SUBR_LLTOSTR, DT_ATTR_STABCMN, DT_VERS_1_0, &dt_idops_func, "string(int64_t)" }, +{ "llquantize", DT_IDENT_AGGFUNC, 0, DTRACEAGG_LLQUANTIZE, DT_ATTR_STABCMN, + DT_VERS_1_7, &dt_idops_func, + "void(@, int32_t, int32_t, int32_t, int32_t, ...)" }, { "lquantize", DT_IDENT_AGGFUNC, 0, DTRACEAGG_LQUANTIZE, DT_ATTR_STABCMN, DT_VERS_1_0, &dt_idops_func, "void(@, int32_t, int32_t, ...)" }, Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c Fri Jun 29 17:39:40 2012 (r237811) @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, Joyent, Inc. All rights reserved. */ #if defined(sun) @@ -1322,6 +1323,14 @@ pfprint_lquantize(dtrace_hdl_t *dtp, FIL return (dt_print_lquantize(dtp, fp, addr, size, normal)); } +/*ARGSUSED*/ +static int +pfprint_llquantize(dtrace_hdl_t *dtp, FILE *fp, const char *format, + const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal) +{ + return (dt_print_llquantize(dtp, fp, addr, size, normal)); +} + static int dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv, const dtrace_recdesc_t *recs, uint_t nrecs, const void *buf, @@ -1507,6 +1516,9 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE case DTRACEAGG_LQUANTIZE: func = pfprint_lquantize; break; + case DTRACEAGG_LLQUANTIZE: + func = pfprint_llquantize; + break; case DTRACEACT_MOD: func = pfprint_mod; break; Modified: projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h Fri Jun 29 17:39:40 2012 (r237811) @@ -24,11 +24,13 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + #ifndef _DTRACE_H #define _DTRACE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include Modified: projects/calloutng/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- projects/calloutng/contrib/gcc/ChangeLog.gcc43 Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/gcc/ChangeLog.gcc43 Fri Jun 29 17:39:40 2012 (r237811) @@ -5,6 +5,18 @@ with SSE3 instruction set support. * doc/invoke.texi: Likewise. +2007-04-12 Richard Guenther (r123736) + + PR tree-optimization/24689 + PR tree-optimization/31307 + * fold-const.c (operand_equal_p): Compare INTEGER_CST array + indices by value. + * gimplify.c (canonicalize_addr_expr): To be consistent with + gimplify_compound_lval only set operands two and three of + ARRAY_REFs if they are not gimple_min_invariant. This makes + it never at this place. + * tree-ssa-ccp.c (maybe_fold_offset_to_array_ref): Likewise. + 2007-04-07 H.J. Lu (r123639) * config/i386/i386.c (ix86_handle_option): Handle SSSE3. @@ -96,7 +108,7 @@ * doc/invoke.texi: Add entry about geode processor. -2006-10-24 Richard Guenther +2006-10-24 Richard Guenther (r118001) PR middle-end/28796 * builtins.c (fold_builtin_classify): Use HONOR_INFINITIES @@ -170,7 +182,13 @@ * doc/invoke.texi: Document -mssse3/-mno-ssse3 switches. -2006-10-21 Richard Guenther +2006-10-21 Richard Guenther (r117932) + + PR tree-optimization/3511 + * tree-ssa-pre.c (phi_translate): Fold CALL_EXPRs that + got new invariant arguments during PHI translation. + +2006-10-21 Richard Guenther (r117929) * builtins.c (fold_builtin_classify): Fix typo. Modified: projects/calloutng/contrib/gcc/fold-const.c ============================================================================== --- projects/calloutng/contrib/gcc/fold-const.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/gcc/fold-const.c Fri Jun 29 17:39:40 2012 (r237811) @@ -2802,9 +2802,13 @@ operand_equal_p (tree arg0, tree arg1, u case ARRAY_REF: case ARRAY_RANGE_REF: - /* Operands 2 and 3 may be null. */ + /* Operands 2 and 3 may be null. + Compare the array index by value if it is constant first as we + may have different types but same value here. */ return (OP_SAME (0) - && OP_SAME (1) + && (tree_int_cst_equal (TREE_OPERAND (arg0, 1), + TREE_OPERAND (arg1, 1)) + || OP_SAME (1)) && OP_SAME_WITH_NULL (2) && OP_SAME_WITH_NULL (3)); Modified: projects/calloutng/contrib/gcc/gimplify.c ============================================================================== --- projects/calloutng/contrib/gcc/gimplify.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/gcc/gimplify.c Fri Jun 29 17:39:40 2012 (r237811) @@ -1600,9 +1600,7 @@ canonicalize_addr_expr (tree *expr_p) /* All checks succeeded. Build a new node to merge the cast. */ *expr_p = build4 (ARRAY_REF, dctype, obj_expr, TYPE_MIN_VALUE (TYPE_DOMAIN (datype)), - TYPE_MIN_VALUE (TYPE_DOMAIN (datype)), - size_binop (EXACT_DIV_EXPR, TYPE_SIZE_UNIT (dctype), - size_int (TYPE_ALIGN_UNIT (dctype)))); + NULL_TREE, NULL_TREE); *expr_p = build1 (ADDR_EXPR, ctype, *expr_p); } Modified: projects/calloutng/contrib/gcc/tree-ssa-ccp.c ============================================================================== --- projects/calloutng/contrib/gcc/tree-ssa-ccp.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/gcc/tree-ssa-ccp.c Fri Jun 29 17:39:40 2012 (r237811) @@ -1621,9 +1621,7 @@ maybe_fold_offset_to_array_ref (tree bas if (!integer_zerop (elt_offset)) idx = int_const_binop (PLUS_EXPR, idx, elt_offset, 0); - return build4 (ARRAY_REF, orig_type, base, idx, min_idx, - size_int (tree_low_cst (elt_size, 1) - / (TYPE_ALIGN_UNIT (elt_type)))); + return build4 (ARRAY_REF, orig_type, base, idx, NULL_TREE, NULL_TREE); } Modified: projects/calloutng/contrib/gcc/tree-ssa-pre.c ============================================================================== --- projects/calloutng/contrib/gcc/tree-ssa-pre.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/gcc/tree-ssa-pre.c Fri Jun 29 17:39:40 2012 (r237811) @@ -1076,6 +1076,7 @@ phi_translate (tree expr, value_set_t se tree newexpr; tree vh = get_value_handle (expr); bool listchanged = false; + bool invariantarg = false; VEC (tree, gc) *vuses = VALUE_HANDLE_VUSES (vh); VEC (tree, gc) *tvuses; @@ -1134,10 +1135,26 @@ phi_translate (tree expr, value_set_t se if (newval != oldval) { listchanged = true; + invariantarg |= is_gimple_min_invariant (newval); TREE_VALUE (newwalker) = get_value_handle (newval); } } } + + /* In case of new invariant args we might try to fold the call + again. */ + if (invariantarg) + { + tree tmp = fold_ternary (CALL_EXPR, TREE_TYPE (expr), + newop0, newarglist, newop2); + if (tmp) + { + STRIP_TYPE_NOPS (tmp); + if (is_gimple_min_invariant (tmp)) + return tmp; + } + } + if (listchanged) vn_lookup_or_add (newarglist, NULL); Modified: projects/calloutng/contrib/less/LICENSE ============================================================================== --- projects/calloutng/contrib/less/LICENSE Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/LICENSE Fri Jun 29 17:39:40 2012 (r237811) @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2011 Mark Nudelman +Copyright (C) 1984-2012 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: projects/calloutng/contrib/less/Makefile.aut ============================================================================== --- projects/calloutng/contrib/less/Makefile.aut Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/Makefile.aut Fri Jun 29 17:39:40 2012 (r237811) @@ -1,6 +1,6 @@ # Makefile for authoring less. -EMAIL = markn@greenwoodsoftware.com +EMAIL = bug-less@gnu.org HOMEPAGE = http://www.greenwoodsoftware.com/less SHELL = /bin/sh RCS = rcs @@ -112,8 +112,7 @@ dist: ${DISTFILES} echo "Preparing $$REL"; \ rm -rf $$REL; mkdir $$REL; \ for file in ${DISTFILES}; do \ - cp -p $$file $$REL; \ - chmod -w $$REL/$$file; \ + ./add_copyright $$file $$REL; \ done; \ cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \ echo "Creating release/$$REL/$$REL.tar.gz"; \ Modified: projects/calloutng/contrib/less/NEWS ============================================================================== --- projects/calloutng/contrib/less/NEWS Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/NEWS Fri Jun 29 17:39:40 2012 (r237811) @@ -7,8 +7,34 @@ http://www.greenwoodsoftware.com/less You can also download the latest version of less from there. - To report bugs, suggestions or comments, send email to - bug-less@gnu.org or markn@greenwoodsoftware.com. + To report bugs, suggestions or comments, send email to bug-less@gnu.org. + +====================================================================== + + Major changes between "less" versions 444 and 449 + +* Add ESC-F command to keep reading data until a pattern is found. + +* Use exit code of LESSOPEN script if LESSOPEN starts with "||". + +* When up/down arrow is used on the command line immediately after + typing text, the next command starting with that text is found. + +* Add support for GNU regex. + +* Add configure option --with-regex=none and fix compile errors + when compiling with no regex library. + +* Fix bugs handling SGR sequences in Win32. + +* Fix possible crashes caused by malformed LESSOPEN or + LESSCLOSE variables. + +* Fix bug highlighting text which is discontiguous in the file + due to backspace processing. + +* Fix bug in displaying status column when scrolling backwards + with -J and -S in effect. ====================================================================== Modified: projects/calloutng/contrib/less/README ============================================================================== --- projects/calloutng/contrib/less/README Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/README Fri Jun 29 17:39:40 2012 (r237811) @@ -7,9 +7,9 @@ ************************************************************************** ************************************************************************** - Less, version 444 + Less, version 449 - This is the distribution of less, version 444, released 09 Jun 2011. + This is the distribution of less, version 449, released 26 Jun 2012. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or @@ -21,7 +21,7 @@ or 2. The Less License, in the file LICENSE. - Please report any problems to bug-less@gnu.org or markn@greenwoodsoftware.com. + Please report any problems to bug-less@gnu.org. See http://www.greenwoodsoftware.com/less for the latest info. ========================================================================= @@ -60,10 +60,11 @@ INSTALLATION (Unix systems only): regcomp Use the V8-compatible regcomp. regcomp-local Use Henry Spencer's V8-compatible regcomp (source is supplied with less). + none No regular expressions, only simple string matching. --with-secure Builds a "secure" version of less, with some features disabled - to prevent users from viewing other files, accessing shell - commands, etc. + to prevent users from viewing other files, accessing shell + commands, etc. 3. It is a good idea to look over the generated Makefile and defines.h @@ -96,7 +97,7 @@ INSTALLATION (Unix systems only): bindir and/or mandir to the appropriate directories. If you have any problems building or running "less", suggestions, -complaints, etc., you may mail to the author at markn@greenwoodsoftware.com. +complaints, etc., you may mail to bug-less@gnu.org. Note to hackers: comments noting possible improvements are enclosed in double curly brackets {{ like this }}. Modified: projects/calloutng/contrib/less/brac.c ============================================================================== --- projects/calloutng/contrib/less/brac.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/brac.c Fri Jun 29 17:39:40 2012 (r237811) @@ -1,12 +1,11 @@ -/* - * Copyright (C) 1984-2011 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information about less, or for information on how to - * contact the author, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ /* Modified: projects/calloutng/contrib/less/ch.c ============================================================================== --- projects/calloutng/contrib/less/ch.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/ch.c Fri Jun 29 17:39:40 2012 (r237811) @@ -1,12 +1,11 @@ -/* - * Copyright (C) 1984-2011 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information about less, or for information on how to - * contact the author, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ /* @@ -582,6 +581,8 @@ ch_length() return (NULL_POSITION); if (ch_flags & CH_HELPFILE) return (size_helpdata); + if (ch_flags & CH_NODATA) + return (0); return (ch_fsize); } Modified: projects/calloutng/contrib/less/charset.c ============================================================================== --- projects/calloutng/contrib/less/charset.c Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/charset.c Fri Jun 29 17:39:40 2012 (r237811) @@ -1,12 +1,11 @@ -/* - * Copyright (C) 1984-2011 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information about less, or for information on how to - * contact the author, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ /* Modified: projects/calloutng/contrib/less/charset.h ============================================================================== --- projects/calloutng/contrib/less/charset.h Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/charset.h Fri Jun 29 17:39:40 2012 (r237811) @@ -1,12 +1,11 @@ -/* - * Copyright (C) 2005-2011 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information about less, or for information on how to - * contact the author, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ #define IS_ASCII_OCTET(c) (((c) & 0x80) == 0) #define IS_UTF8_TRAIL(c) (((c) & 0xC0) == 0x80) Modified: projects/calloutng/contrib/less/cmd.h ============================================================================== --- projects/calloutng/contrib/less/cmd.h Fri Jun 29 17:28:58 2012 (r237810) +++ projects/calloutng/contrib/less/cmd.h Fri Jun 29 17:39:40 2012 (r237811) @@ -1,12 +1,11 @@ -/* - * Copyright (C) 1984-2011 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information about less, or for information on how to - * contact the author, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ #define MAX_USERCMD 500 @@ -66,6 +65,7 @@ #define A_NEXT_TAG 53 #define A_PREV_TAG 54 #define A_FILTER 55 +#define A_F_UNTIL_HILITE 56 #define A_INVALID 100 #define A_NOACTION 101 @@ -78,7 +78,7 @@ #define A_EXTRA 0200 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Jun 30 15:55:41 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 44CC11065670; Sat, 30 Jun 2012 15:55:41 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2FF358FC12; Sat, 30 Jun 2012 15:55:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5UFtfPt027841; Sat, 30 Jun 2012 15:55:41 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UFterU027839; Sat, 30 Jun 2012 15:55:40 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201206301555.q5UFterU027839@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 30 Jun 2012 15:55:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237843 - projects/altix2/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 15:55:41 -0000 Author: marcel Date: Sat Jun 30 15:55:40 2012 New Revision: 237843 URL: http://svn.freebsd.org/changeset/base/237843 Log: Add some section headers. I expect this file to grow fairly rapidly now that I can focus on the various load functions and with it the bounce buffering support. Having something to search for as a way to jump through this file seems like a good idea. Modified: projects/altix2/sys/kern/subr_busdma.c Modified: projects/altix2/sys/kern/subr_busdma.c ============================================================================== --- projects/altix2/sys/kern/subr_busdma.c Sat Jun 30 14:55:36 2012 (r237842) +++ projects/altix2/sys/kern/subr_busdma.c Sat Jun 30 15:55:40 2012 (r237843) @@ -41,6 +41,10 @@ __FBSDID("$FreeBSD$"); #include "busdma_if.h" +/* + * Section 1: Private types. + */ + struct busdma_tag { struct busdma_tag *dt_chain; struct busdma_tag *dt_child; @@ -76,6 +80,10 @@ struct busdma_md { #define BUSDMA_MD_FLAG_USED \ (BUSDMA_MD_FLAG_ALLOCATED | BUSDMA_MD_FLAG_LOADED) +/* + * Section 2: Private data. + */ + static struct busdma_tag busdma_root_tag = { .dt_maxaddr = ~0UL, .dt_align = 1, @@ -106,6 +114,10 @@ static struct busdma_tag busdma_root_tag static MALLOC_DEFINE(M_BUSDMA_MD, "busdma_md", "DMA memory descriptors"); static MALLOC_DEFINE(M_BUSDMA_TAG, "busdma_tag", "DMA tags"); +/* + * Section 3: Private functions. + */ + static void _busdma_mtag_dump(const char *func, device_t dev, struct busdma_mtag *mtag) { @@ -282,6 +294,10 @@ _busdma_iommu_map(device_t leaf, struct return (error); } +/* + * Section 4: Public interface. + */ + int busdma_tag_create(device_t dev, bus_addr_t align, bus_addr_t bndry, bus_addr_t maxaddr, bus_size_t maxsz, u_int nsegs, bus_size_t maxsegsz, From owner-svn-src-projects@FreeBSD.ORG Sat Jun 30 18:56:09 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CA63106566C; Sat, 30 Jun 2012 18:56:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 15B408FC12; Sat, 30 Jun 2012 18:56:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5UIu9ok035918; Sat, 30 Jun 2012 18:56:09 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UIu8Lb035916; Sat, 30 Jun 2012 18:56:08 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201206301856.q5UIu8Lb035916@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 30 Jun 2012 18:56:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237849 - projects/altix2/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 18:56:09 -0000 Author: marcel Date: Sat Jun 30 18:56:08 2012 New Revision: 237849 URL: http://svn.freebsd.org/changeset/base/237849 Log: Create zones for busdma_tag, busdma_md and busdma_md_seg structures. In particular, this is driven by not wanting to create a single blob comprising the busdma_md and all its busdma_md_seg structures: 1. the number of segments is an upper bound that is very rarely reached. Pre-allocating them means we're wasting a lot of memory. 2. The allocation size for these structures combined can vary per tag, which isn't always good. 3. During load operations we may need to keep track of more than the maximum number of segments. In particular this can happen before we've gone through I/O MMU mappings and/or bounce buffers. Now we can create segment structures when needed for busdma allocs and we can reserve some amount of segment structures and keep them in a pool when an unused busdma_md structure is allocated for use by the load functions later. For now, put the segment structures in a TAILQ and put the index in the structure. This probably changes over time when the whole logic of loading solidifies. Modified: projects/altix2/sys/kern/subr_busdma.c Modified: projects/altix2/sys/kern/subr_busdma.c ============================================================================== --- projects/altix2/sys/kern/subr_busdma.c Sat Jun 30 17:01:28 2012 (r237848) +++ projects/altix2/sys/kern/subr_busdma.c Sat Jun 30 18:56:08 2012 (r237849) @@ -32,8 +32,9 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include +#include #include #include #include @@ -60,6 +61,8 @@ struct busdma_tag { }; struct busdma_md_seg { + TAILQ_ENTRY(busdma_md_seg) mds_chain; + u_int mds_idx; bus_addr_t mds_busaddr; vm_paddr_t mds_paddr; vm_offset_t mds_vaddr; @@ -70,7 +73,7 @@ struct busdma_md { struct busdma_tag *md_tag; u_int md_flags; u_int md_nsegs; - struct busdma_md_seg md_seg[0]; + TAILQ_HEAD(, busdma_md_seg) md_seg; }; #define BUSDMA_MD_FLAG_ALLOCATED 0x1 /* busdma_mem_alloc() created @@ -84,57 +87,93 @@ struct busdma_md { * Section 2: Private data. */ -static struct busdma_tag busdma_root_tag = { - .dt_maxaddr = ~0UL, - .dt_align = 1, +static uma_zone_t busdma_tag_zone; +static uma_zone_t busdma_md_zone; +static uma_zone_t busdma_md_seg_zone; + +static struct busdma_tag *busdma_root_tag; + +/* + * Section 3: Private functions. + */ + +/* Section 3.1: Initialization. */ + +static void +busdma_init(void *arg) +{ /* - * Make dt_maxsz the largest power of 2. I don't like ~0 as the - * maximum size. 0 would be a good number to signal (virtually) - * unrestricted DMA sizes, but that creates an irregularity for - * merging restrictions. + * Create our zones. Note that the align argument is a bitmask that + * relays which bits of the address must be 0. Hence the decrement. */ - .dt_maxsz = (~0UL >> 1) + 1, + busdma_tag_zone = uma_zcreate("busdma_tags", + sizeof(struct busdma_tag), + NULL /*ctor*/, NULL /*dtor*/, + NULL /*init*/, NULL /*fini*/, + __alignof(struct busdma_tag) - 1 /*align*/, + 0); + + busdma_md_zone = uma_zcreate("busdma_mds", + sizeof(struct busdma_md), + NULL /*ctor*/, NULL /*dtor*/, + NULL /*init*/, NULL /*fini*/, + __alignof(struct busdma_md) - 1 /*align*/, + 0); + + busdma_md_seg_zone = uma_zcreate("busdma_md_segs", + sizeof(struct busdma_md_seg), + NULL /*ctor*/, NULL /*dtor*/, + NULL /*init*/, NULL /*fini*/, + __alignof(struct busdma_tag) - 1 /*align*/, + 0); /* - * Arbitrarily limit the number of scatter/gather segments to - * 1K. This to avoid that some driver actually tries to do - * DMA with unlimited segments and we try to allocate a memory - * descriptor for it. Why 1K? "It looked like a good idea at - * the time" (read: no particular reason). + * Allocate and initialize our root tag. */ - .dt_nsegs = 1024, + busdma_root_tag = uma_zalloc(busdma_tag_zone, M_WAITOK|M_ZERO); + + /* Make dt_maxaddr the largest possible address. */ + busdma_root_tag->dt_maxaddr = ~0UL; + + /* Make dt_align the least restrictive alignment. */ + busdma_root_tag->dt_align = 1; + + /* Make dt_maxsz the largest power of 2. */ + busdma_root_tag->dt_maxsz = (~0UL >> 1) + 1; /* - * Just like dt_maxsz, limit to the largest power of 2. + * Arbitrarily limit the number of scatter/gather segments to 1K + * so as to protect the kernel from bad drivers or bugs. Why 1K? + * "It looked like a good idea at the time". */ - .dt_maxsegsz = (~0UL >> 1) + 1, -}; + busdma_root_tag->dt_nsegs = 1024; -static MALLOC_DEFINE(M_BUSDMA_MD, "busdma_md", "DMA memory descriptors"); -static MALLOC_DEFINE(M_BUSDMA_TAG, "busdma_tag", "DMA tags"); + /* Just like dt_maxsz, limit to the largest power of 2. */ + busdma_root_tag->dt_maxsegsz = (~0UL >> 1) + 1; +} +SYSINIT(busdma_kmem, SI_SUB_KMEM, SI_ORDER_ANY, busdma_init, NULL); -/* - * Section 3: Private functions. - */ +/* Section 3.2: Debugging & tracing. */ static void _busdma_mtag_dump(const char *func, device_t dev, struct busdma_mtag *mtag) { - printf("[%s: %s: min=%#lx, max=%#lx, size=%#lx, align=%#lx, " - "bndry=%#lx]\n", __func__, + printf("[%s: %s: min=%#jx, max=%#jx, size=%#jx, align=%#jx, " + "bndry=%#jx]\n", __func__, (dev != NULL) ? device_get_nameunit(dev) : "*", - mtag->dmt_minaddr, mtag->dmt_maxaddr, mtag->dmt_maxsz, - mtag->dmt_align, mtag->dmt_bndry); + (uintmax_t)mtag->dmt_minaddr, (uintmax_t)mtag->dmt_maxaddr, + (uintmax_t)mtag->dmt_maxsz, (uintmax_t)mtag->dmt_align, + (uintmax_t)mtag->dmt_bndry); } static void _busdma_tag_dump(const char *func, device_t dev, struct busdma_tag *tag) { - printf("[%s: %s: tag=%p (minaddr=%jx, maxaddr=%jx, align=%jx, " - "bndry=%jx, maxsz=%jx, nsegs=%u, maxsegsz=%jx)]\n", + printf("[%s: %s: tag=%p (minaddr=%#jx, maxaddr=%#jx, align=%#jx, " + "bndry=%#jx, maxsz=%#jx, nsegs=%u, maxsegsz=%#jx)]\n", func, (dev != NULL) ? device_get_nameunit(dev) : "*", tag, (uintmax_t)tag->dt_minaddr, (uintmax_t)tag->dt_maxaddr, (uintmax_t)tag->dt_align, (uintmax_t)tag->dt_bndry, @@ -147,27 +186,50 @@ _busdma_md_dump(const char *func, device { struct busdma_tag *tag; struct busdma_md_seg *seg; - int idx; tag = md->md_tag; if (dev == NULL) dev = tag->dt_device; - printf("[%s: %s: md=%p (tag=%p, flags=%x, nsegs=%u)", func, + printf("[%s: %s: md=%p (tag=%p, flags=%#x, nsegs=%u)", func, device_get_nameunit(dev), md, tag, md->md_flags, md->md_nsegs); if (md->md_nsegs == 0) { printf(" -- UNUSED]\n"); return; } - for (idx = 0; idx < md->md_nsegs; idx++) { - seg = &md->md_seg[idx]; - printf(", %u={size=%jx, busaddr=%jx, paddr=%jx, vaddr=%jx}", - idx, seg->mds_size, seg->mds_busaddr, seg->mds_paddr, - seg->mds_vaddr); + TAILQ_FOREACH(seg, &md->md_seg, mds_chain) { + printf(", {idx=%u, size=%#jx, busaddr=%#jx, paddr=%#jx, " + "vaddr=%#jx}", seg->mds_idx, (uintmax_t)seg->mds_size, + (uintmax_t)seg->mds_busaddr, (uintmax_t)seg->mds_paddr, + (uintmax_t)seg->mds_vaddr); } printf("]\n"); } +/* Section 3.3: API support functions. */ + +static struct busdma_md_seg * +_busdma_md_get_seg(struct busdma_md *md, u_int idx) +{ + struct busdma_md_seg *seg; + + TAILQ_FOREACH(seg, &md->md_seg, mds_chain) { + if (seg->mds_idx == idx) + return (seg); + } + return (NULL); +} + +static void +_busdma_md_seg_reserve(struct busdma_tag *tag) +{ +} + +static void +_busdma_md_seg_unreserve(struct busdma_tag *tag) +{ +} + static struct busdma_tag * _busdma_tag_get_base(device_t dev) { @@ -182,7 +244,7 @@ _busdma_tag_get_base(device_t dev) parent = device_get_parent(parent); } if (base == NULL) { - base = &busdma_root_tag; + base = busdma_root_tag; parent = NULL; } _busdma_tag_dump(__func__, parent, base); @@ -204,7 +266,13 @@ _busdma_tag_make(device_t dev, struct bu if (maxsegsz > maxsz || nsegs == 1) maxsegsz = maxsz; - tag = malloc(sizeof(*tag), M_BUSDMA_TAG, M_NOWAIT | M_ZERO); + tag = uma_zalloc(busdma_tag_zone, M_NOWAIT); + if (tag == NULL) + return (ENOMEM); + + tag->dt_chain = NULL; + tag->dt_child = NULL; + tag->dt_parent = NULL; tag->dt_device = dev; tag->dt_minaddr = MAX(0, base->dt_minaddr); tag->dt_maxaddr = MIN(maxaddr, base->dt_maxaddr); @@ -222,14 +290,16 @@ static struct busdma_md * _busdma_md_create(struct busdma_tag *tag, u_int flags) { struct busdma_md *md; - size_t mdsz; - mdsz = sizeof(struct busdma_md) + - sizeof(struct busdma_md_seg) * tag->dt_nsegs; - md = malloc(mdsz, M_BUSDMA_MD, M_NOWAIT | M_ZERO); + md = uma_zalloc(busdma_md_zone, M_NOWAIT); if (md != NULL) { - md->md_tag = tag; + md->md_tag = tag; md->md_flags = flags; + md->md_nsegs = 0; + TAILQ_INIT(&md->md_seg); + + /* Reserve (pre-allocate) segments */ + _busdma_md_seg_reserve(tag); } return (md); } @@ -253,17 +323,24 @@ _busdma_iommu_xlate(device_t leaf, struc } static int -_busdma_iommu_map_r(device_t dev, struct busdma_md *md, u_int idx, - bus_addr_t *ba_p) +_busdma_iommu_map_r(device_t dev, struct busdma_md *md, + struct busdma_md_seg *seg) { int error; - if (dev == root_bus) + if (dev == root_bus) { + /* + * A bus address and a physical address are one and the same + * at this level. + */ + seg->mds_busaddr = seg->mds_paddr; return (0); + } - error = _busdma_iommu_map_r(device_get_parent(dev), md, idx, ba_p); + error = _busdma_iommu_map_r(device_get_parent(dev), md, seg); if (!error) - error = BUSDMA_IOMMU_MAP(dev, md, idx, ba_p); + error = BUSDMA_IOMMU_MAP(dev, md, seg->mds_idx, + &seg->mds_busaddr); return (error); } @@ -272,20 +349,13 @@ _busdma_iommu_map(device_t leaf, struct { struct busdma_md_seg *seg; device_t dev; - u_int idx; int error; _busdma_md_dump(__func__, root_bus, md); dev = device_get_parent(leaf); error = 0; - for (idx = 0; idx < md->md_nsegs; idx++) { - seg = &md->md_seg[idx]; - /* - * A bus address and a physical address are one and the same - * at this level. - */ - seg->mds_busaddr = seg->mds_paddr; - error = _busdma_iommu_map_r(dev, md, idx, &seg->mds_busaddr); + TAILQ_FOREACH(seg, &md->md_seg, mds_chain) { + error = _busdma_iommu_map_r(dev, md, seg); if (error) break; } @@ -374,18 +444,18 @@ busdma_md_destroy(struct busdma_md *md) if (md->md_nsegs > 0) return (EBUSY); - free(md, M_BUSDMA_MD); + _busdma_md_seg_unreserve(md->md_tag); + uma_zfree(busdma_md_zone, md); return (0); } bus_addr_t busdma_md_get_busaddr(struct busdma_md *md, u_int idx) { + struct busdma_md_seg *seg; - if (idx >= md->md_tag->dt_nsegs) - return (0); - - return (md->md_seg[idx].mds_busaddr); + seg = _busdma_md_get_seg(md, idx); + return ((seg != NULL) ? seg->mds_busaddr : ~0UL); } u_int @@ -398,31 +468,28 @@ busdma_md_get_nsegs(struct busdma_md *md vm_paddr_t busdma_md_get_paddr(struct busdma_md *md, u_int idx) { + struct busdma_md_seg *seg; - if (idx >= md->md_tag->dt_nsegs) - return (0); - - return (md->md_seg[idx].mds_paddr); + seg = _busdma_md_get_seg(md, idx); + return ((seg != NULL) ? seg->mds_paddr : ~0UL); } vm_size_t busdma_md_get_size(struct busdma_md *md, u_int idx) { + struct busdma_md_seg *seg; - if (idx >= md->md_tag->dt_nsegs) - return (0); - - return (md->md_seg[idx].mds_size); + seg = _busdma_md_get_seg(md, idx); + return ((seg != NULL) ? seg->mds_size : 0UL); } vm_offset_t busdma_md_get_vaddr(struct busdma_md *md, u_int idx) { + struct busdma_md_seg *seg; - if (idx >= md->md_tag->dt_nsegs) - return (0); - - return (md->md_seg[idx].mds_vaddr); + seg = _busdma_md_get_seg(md, idx); + return ((seg != NULL) ? seg->mds_vaddr : 0); } int @@ -494,7 +561,13 @@ busdma_mem_alloc(struct busdma_tag *tag, maxsz = tag->dt_maxsz; while (maxsz > 0 && idx < tag->dt_nsegs) { - seg = &md->md_seg[idx]; + seg = uma_zalloc(busdma_md_seg_zone, M_NOWAIT); + if (seg == NULL) + goto fail; + seg->mds_idx = idx; + TAILQ_INSERT_TAIL(&md->md_seg, seg, mds_chain); + seg->mds_busaddr = ~0UL; + seg->mds_paddr = ~0UL; seg->mds_size = MIN(maxsz, mtag.dmt_maxsz); seg->mds_vaddr = kmem_alloc_contig(kernel_map, seg->mds_size, 0, mtag.dmt_minaddr, mtag.dmt_maxaddr, mtag.dmt_align, @@ -517,20 +590,21 @@ busdma_mem_alloc(struct busdma_tag *tag, } fail: - seg = &md->md_seg[0]; - while (seg != &md->md_seg[idx]) { - kmem_free(kernel_map, seg->mds_vaddr, seg->mds_size); - seg++; + while ((seg = TAILQ_FIRST(&md->md_seg)) != NULL) { + if (seg->mds_paddr != ~0UL) + kmem_free(kernel_map, seg->mds_vaddr, seg->mds_size); + TAILQ_REMOVE(&md->md_seg, seg, mds_chain); + uma_zfree(busdma_md_seg_zone, seg); } - free(md, M_BUSDMA_MD); + uma_zfree(busdma_md_zone, md); return (ENOMEM); } int busdma_mem_free(struct busdma_md *md) { + struct busdma_md_seg *seg; device_t bus; - u_int idx; int error; if ((md->md_flags & BUSDMA_MD_FLAG_ALLOCATED) == 0) @@ -541,10 +615,12 @@ busdma_mem_free(struct busdma_md *md) if (error) printf("BUSDMA_IOMMU_UNMAP: error=%d\n", error); - for (idx = 0; idx < md->md_nsegs; idx++) - kmem_free(kernel_map, md->md_seg[idx].mds_vaddr, - md->md_seg[idx].mds_size); - free(md, M_BUSDMA_MD); + while ((seg = TAILQ_FIRST(&md->md_seg)) != NULL) { + kmem_free(kernel_map, seg->mds_vaddr, seg->mds_size); + TAILQ_REMOVE(&md->md_seg, seg, mds_chain); + uma_zfree(busdma_md_seg_zone, seg); + } + uma_zfree(busdma_md_zone, md); return (0); } From owner-svn-src-projects@FreeBSD.ORG Sat Jun 30 22:18:43 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C2D77106566B; Sat, 30 Jun 2012 22:18:43 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE5388FC12; Sat, 30 Jun 2012 22:18:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5UMIhim044912; Sat, 30 Jun 2012 22:18:43 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UMIhxf044910; Sat, 30 Jun 2012 22:18:43 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206302218.q5UMIhxf044910@svn.freebsd.org> From: Davide Italiano Date: Sat, 30 Jun 2012 22:18:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237857 - projects/calloutng/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 22:18:43 -0000 Author: davide Date: Sat Jun 30 22:18:43 2012 New Revision: 237857 URL: http://svn.freebsd.org/changeset/base/237857 Log: There's no need of extra indirection for cc_localexp, so we can replace struct callout_tailq* with struct callout_tailq. Rename cc_localexp to a more appropriate cc_expireq. Discussed with: mav Modified: projects/calloutng/sys/kern/kern_timeout.c Modified: projects/calloutng/sys/kern/kern_timeout.c ============================================================================== --- projects/calloutng/sys/kern/kern_timeout.c Sat Jun 30 20:25:50 2012 (r237856) +++ projects/calloutng/sys/kern/kern_timeout.c Sat Jun 30 22:18:43 2012 (r237857) @@ -108,7 +108,7 @@ struct callout_cpu { struct mtx cc_lock; struct callout *cc_callout; struct callout_tailq *cc_callwheel; - struct callout_tailq *cc_localexp; + struct callout_tailq cc_expireq; struct callout_list cc_callfree; struct callout *cc_next; struct callout *cc_curr; @@ -224,8 +224,6 @@ kern_timeout_callwheel_alloc(caddr_t v) v = (caddr_t)(cc->cc_callout + ncallout); cc->cc_callwheel = (struct callout_tailq *)v; v = (caddr_t)(cc->cc_callwheel + callwheelsize); - cc->cc_localexp = (struct callout_tailq *)v; - v = (caddr_t)(cc->cc_localexp + 1); return(v); } @@ -240,7 +238,7 @@ callout_cpu_init(struct callout_cpu *cc) for (i = 0; i < callwheelsize; i++) { TAILQ_INIT(&cc->cc_callwheel[i]); } - TAILQ_INIT(cc->cc_localexp); + TAILQ_INIT(&cc->cc_expireq); cc_cme_cleanup(cc); if (cc->cc_callout == NULL) return; @@ -322,8 +320,6 @@ start_softclock(void *dummy) cc->cc_callwheel = malloc( sizeof(struct callout_tailq) * callwheelsize, M_CALLOUT, M_WAITOK); - cc->cc_localexp = malloc( - sizeof(struct callout_tailq), M_CALLOUT, M_WAITOK); callout_cpu_init(cc); } #endif @@ -384,8 +380,8 @@ callout_process(void) tmp->c_flags &= ~CALLOUT_PENDING; } else { - TAILQ_INSERT_TAIL(cc->cc_localexp, - tmp,c_staiter); + TAILQ_INSERT_TAIL(&cc->cc_expireq, + tmp, c_staiter); TAILQ_REMOVE(sc, tmp, c_links.tqe); tmp->c_flags |= CALLOUT_PROCESSED; need_softclock = 1; @@ -770,7 +766,7 @@ softclock(void *arg) cc = (struct callout_cpu *)arg; CC_LOCK(cc); - c = TAILQ_FIRST(cc->cc_localexp); + c = TAILQ_FIRST(&cc->cc_expireq); while (c != NULL) { ++steps; if (steps >= MAX_SOFTCLOCK_STEPS) { @@ -781,9 +777,8 @@ softclock(void *arg) CC_LOCK(cc); c = cc->cc_next; steps = 0; - } - else { - TAILQ_REMOVE(cc->cc_localexp, c, c_staiter); + } else { + TAILQ_REMOVE(&cc->cc_expireq, c, c_staiter); c = softclock_call_cc(c, cc, &mpcalls, &lockcalls, &gcalls); steps = 0; @@ -933,12 +928,10 @@ _callout_reset_on(struct callout *c, str bucket = get_bucket(&c->c_time); TAILQ_REMOVE(&cc->cc_callwheel[bucket], c, c_links.tqe); - } - else { + } else { if (cc->cc_next == c) cc->cc_next = TAILQ_NEXT(c, c_staiter); - TAILQ_REMOVE(cc->cc_localexp, c, - c_staiter); + TAILQ_REMOVE(&cc->cc_expireq, c, c_staiter); } cancelled = 1; c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING); @@ -1153,10 +1146,8 @@ again: bucket = get_bucket(&c->c_time); TAILQ_REMOVE(&cc->cc_callwheel[bucket], c, c_links.tqe); - } - else - TAILQ_REMOVE(cc->cc_localexp, c, - c_staiter); + } else + TAILQ_REMOVE(&cc->cc_expireq, c, c_staiter); callout_cc_del(c, cc); CC_UNLOCK(cc); From owner-svn-src-projects@FreeBSD.ORG Sat Jun 30 23:29:35 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7773A106566B; Sat, 30 Jun 2012 23:29:35 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4A0D08FC14; Sat, 30 Jun 2012 23:29:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5UNTZ0L047734; Sat, 30 Jun 2012 23:29:35 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UNTZxh047732; Sat, 30 Jun 2012 23:29:35 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201206302329.q5UNTZxh047732@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 30 Jun 2012 23:29:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237858 - projects/altix2/sys/ia64/sgisn X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 23:29:35 -0000 Author: marcel Date: Sat Jun 30 23:29:34 2012 New Revision: 237858 URL: http://svn.freebsd.org/changeset/base/237858 Log: Register a timecounter based on the SHub's RTC. As it happens the mandatory ACPI PM Timer isn't there on the SGI Altix. Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sat Jun 30 22:18:43 2012 (r237857) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sat Jun 30 23:29:34 2012 (r237858) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -62,6 +63,7 @@ struct sgisn_shub_softc { bus_addr_t sc_mmraddr; bus_space_tag_t sc_tag; bus_space_handle_t sc_hndl; + struct timecounter sc_rtc; u_int sc_domain; u_int sc_hubtype; /* SHub type (0=SHub1, 1=SHub2) */ u_int sc_nasid_mask; @@ -130,6 +132,17 @@ static driver_t sgisn_shub_driver = { DRIVER_MODULE(shub, nexus, sgisn_shub_driver, sgisn_shub_devclass, 0, 0); +static u_int +sgisn_shub_get_rtc(struct timecounter *tc) +{ + struct sgisn_shub_softc *sc; + u_int rtc; + + sc = tc->tc_priv; + rtc = bus_space_read_8(sc->sc_tag, sc->sc_hndl, SHUB_MMR_RTC); + return (rtc); +} + static int sgisn_shub_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *res) @@ -429,6 +442,18 @@ sgisn_shub_attach(device_t dev) device_set_ivars(child, (void *)(uintptr_t)~0UL); } + /* Use the SHub's RTC as a time counter. */ + r = ia64_sal_entry(SAL_FREQ_BASE, 2, 0, 0, 0, 0, 0, 0); + if (r.sal_status == 0) { + sc->sc_rtc.tc_get_timecount = sgisn_shub_get_rtc; + sc->sc_rtc.tc_counter_mask = ~0U; + sc->sc_rtc.tc_frequency = r.sal_result[0]; + sc->sc_rtc.tc_name = "SHub RTC"; + sc->sc_rtc.tc_quality = (r.sal_result[0]) ? 1200 : 950; + sc->sc_rtc.tc_priv = sc; + tc_init(&sc->sc_rtc); + } + for (seg = 0; seg <= sc->sc_fwhub->hub_pci_maxseg; seg++) { for (bus = 0; bus <= sc->sc_fwhub->hub_pci_maxbus; bus++) { r = ia64_sal_entry(SAL_SGISN_IOBUS_INFO, seg, bus, From owner-svn-src-projects@FreeBSD.ORG Sat Jun 30 23:34:34 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 720821065670; Sat, 30 Jun 2012 23:34:34 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5CD988FC08; Sat, 30 Jun 2012 23:34:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5UNYYYf047984; Sat, 30 Jun 2012 23:34:34 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UNYYGN047979; Sat, 30 Jun 2012 23:34:34 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201206302334.q5UNYYGN047979@svn.freebsd.org> From: Davide Italiano Date: Sat, 30 Jun 2012 23:34:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237859 - in projects/calloutng/sys: conf kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 23:34:34 -0000 Author: davide Date: Sat Jun 30 23:34:33 2012 New Revision: 237859 URL: http://svn.freebsd.org/changeset/base/237859 Log: Add a new CALLOUT_PROFILING option so that SYSCTLs on the wheel may be selectively disabled/enabled. Reintroduce a SYSCTL that I wrongly removed in a previous commit. Selectively disabling this sort of rudimentary profiling may have a good effect on CPU caches because same variable is not accessed anymore by different CPUs. Discussed with: mav Modified: projects/calloutng/sys/conf/NOTES projects/calloutng/sys/conf/options projects/calloutng/sys/kern/kern_timeout.c Modified: projects/calloutng/sys/conf/NOTES ============================================================================== --- projects/calloutng/sys/conf/NOTES Sat Jun 30 23:29:34 2012 (r237858) +++ projects/calloutng/sys/conf/NOTES Sat Jun 30 23:34:33 2012 (r237859) @@ -1,4 +1,4 @@ -# $FreeBSD$ + # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -259,6 +259,8 @@ options SX_NOINLINE # SMP Debugging Options: # +# CALLOUT_PROFILING enables rudimentary profiling of the callwheel data +# structure used as backend in callout(9). # PREEMPTION allows the threads that are in the kernel to be preempted by # higher priority [interrupt] threads. It helps with interactivity # and allows interrupt threads to run sooner rather than waiting. @@ -297,6 +299,9 @@ options LOCK_PROFILING options MPROF_BUFFERS="1536" options MPROF_HASH_SIZE="1543" +# Profiling for the callout(9) backend. +options CALLOUT_PROFILING + # Profiling for internal hash tables. options SLEEPQUEUE_PROFILING options TURNSTILE_PROFILING Modified: projects/calloutng/sys/conf/options ============================================================================== --- projects/calloutng/sys/conf/options Sat Jun 30 23:29:34 2012 (r237858) +++ projects/calloutng/sys/conf/options Sat Jun 30 23:34:33 2012 (r237859) @@ -66,6 +66,7 @@ SYSCTL_DEBUG opt_sysctl.h ADAPTIVE_LOCKMGRS ALQ AUDIT opt_global.h +CALLOUT_PROFILING CAPABILITIES opt_capsicum.h CAPABILITY_MODE opt_capsicum.h CODA_COMPAT_5 opt_coda.h Modified: projects/calloutng/sys/kern/kern_timeout.c ============================================================================== --- projects/calloutng/sys/kern/kern_timeout.c Sat Jun 30 23:29:34 2012 (r237858) +++ projects/calloutng/sys/kern/kern_timeout.c Sat Jun 30 23:34:33 2012 (r237859) @@ -37,6 +37,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_callout_profiling.h" #include "opt_kdtrace.h" #include @@ -69,6 +70,10 @@ SDT_PROBE_DEFINE(callout_execute, kernel SDT_PROBE_ARGTYPE(callout_execute, kernel, , callout_end, 0, "struct callout *"); +#ifdef CALLOUT_PROFILING +static int avg_depth; +SYSCTL_INT(_debug, OID_AUTO, to_avg_depth, CTLFLAG_RD, &avg_depth, 0, + "Average number of items examined per softclock call. Units = 1/1000"); static int avg_gcalls; SYSCTL_INT(_debug, OID_AUTO, to_avg_gcalls, CTLFLAG_RD, &avg_gcalls, 0, "Average number of Giant callouts made per softclock call. Units = 1/1000"); @@ -78,6 +83,7 @@ SYSCTL_INT(_debug, OID_AUTO, to_avg_lock static int avg_mpcalls; SYSCTL_INT(_debug, OID_AUTO, to_avg_mpcalls, CTLFLAG_RD, &avg_mpcalls, 0, "Average number of MP callouts made per softclock call. Units = 1/1000"); +#endif /* * TODO: * allocate more timeout table slots when table overflows. @@ -784,10 +790,12 @@ softclock(void *arg) steps = 0; } } - +#ifdef CALLOUT_PROFILING + avg_depth += (depth * 1000 - avg_depth) >> 8; avg_mpcalls += (mpcalls * 1000 - avg_mpcalls) >> 8; avg_lockcalls += (lockcalls * 1000 - avg_lockcalls) >> 8; avg_gcalls += (gcalls * 1000 - avg_gcalls) >> 8; +#endif cc->cc_next = NULL; CC_UNLOCK(cc); }