Date: Mon, 22 Dec 2014 09:21:42 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276057 - in projects/sendfile: . bin/sh contrib/gcc/config/arm contrib/netbsd-tests/lib/libc/stdlib lib/libc/gen lib/libc/net lib/libc/posix1e lib/libc/stdlib lib/libc/string lib/libc/... Message-ID: <201412220921.sBM9LgmH022581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon Dec 22 09:21:41 2014 New Revision: 276057 URL: https://svnweb.freebsd.org/changeset/base/276057 Log: Merge head r258543 through r276056. Modified: projects/sendfile/Makefile.inc1 projects/sendfile/bin/sh/error.c projects/sendfile/bin/sh/error.h projects/sendfile/bin/sh/eval.c projects/sendfile/bin/sh/expand.c projects/sendfile/bin/sh/expand.h projects/sendfile/bin/sh/trap.c projects/sendfile/bin/sh/trap.h projects/sendfile/contrib/gcc/config/arm/arm.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c projects/sendfile/lib/libc/gen/cap_rights_get.3 projects/sendfile/lib/libc/gen/ftok.3 projects/sendfile/lib/libc/gen/ftw.3 projects/sendfile/lib/libc/gen/getcap.3 projects/sendfile/lib/libc/gen/posix_spawn.3 projects/sendfile/lib/libc/gen/scandir.3 projects/sendfile/lib/libc/net/getaddrinfo.3 projects/sendfile/lib/libc/net/sctp_recvmsg.3 projects/sendfile/lib/libc/net/sctp_send.3 projects/sendfile/lib/libc/posix1e/acl_set_flagset_np.3 projects/sendfile/lib/libc/stdlib/atexit.3 projects/sendfile/lib/libc/stdlib/exit.3 projects/sendfile/lib/libc/string/strspn.3 projects/sendfile/lib/libc/sys/access.2 projects/sendfile/lib/libc/sys/getdirentries.2 projects/sendfile/lib/libc/sys/getrlimit.2 projects/sendfile/lib/libc/sys/poll.2 projects/sendfile/lib/libc/sys/posix_openpt.2 projects/sendfile/lib/libc/sys/procctl.2 projects/sendfile/lib/libc/sys/revoke.2 projects/sendfile/lib/libc/sys/sched_setscheduler.2 projects/sendfile/lib/libc/sys/sigwaitinfo.2 projects/sendfile/lib/libc/sys/vfork.2 projects/sendfile/share/man/man4/altera_atse.4 projects/sendfile/share/man/man4/aout.4 projects/sendfile/share/man/man4/ath_ahb.4 projects/sendfile/share/man/man4/ath_pci.4 projects/sendfile/share/man/man4/carp.4 projects/sendfile/share/man/man4/crypto.4 projects/sendfile/share/man/man4/gpioled.4 projects/sendfile/share/man/man4/iicbus.4 projects/sendfile/share/man/man4/ip.4 projects/sendfile/share/man/man4/ipheth.4 projects/sendfile/share/man/man4/iscsi_initiator.4 projects/sendfile/share/man/man4/isp.4 projects/sendfile/share/man/man4/ispfw.4 projects/sendfile/share/man/man4/iwi.4 projects/sendfile/share/man/man4/mpr.4 projects/sendfile/share/man/man4/mrsas.4 projects/sendfile/share/man/man4/multicast.4 projects/sendfile/share/man/man4/net80211.4 projects/sendfile/share/man/man4/netmap.4 projects/sendfile/share/man/man4/nfe.4 projects/sendfile/share/man/man4/ng_ether_echo.4 projects/sendfile/share/man/man4/ng_netflow.4 projects/sendfile/share/man/man4/nvram2env.4 projects/sendfile/share/man/man4/pass.4 projects/sendfile/share/man/man4/pccbb.4 projects/sendfile/share/man/man4/pflog.4 projects/sendfile/share/man/man4/pfsync.4 projects/sendfile/share/man/man4/pts.4 projects/sendfile/share/man/man4/sa.4 projects/sendfile/share/man/man4/send.4 projects/sendfile/share/man/man4/sfxge.4 projects/sendfile/share/man/man4/snd_hda.4 projects/sendfile/share/man/man4/snd_ich.4 projects/sendfile/share/man/man4/tap.4 projects/sendfile/share/man/man4/tun.4 projects/sendfile/share/man/man4/umass.4 projects/sendfile/share/man/man4/ural.4 projects/sendfile/share/man/man4/usfs.4 projects/sendfile/share/man/man4/virtio_console.4 projects/sendfile/share/man/man4/virtio_random.4 projects/sendfile/share/man/man4/vxlan.4 projects/sendfile/share/man/man4/wpi.4 projects/sendfile/share/man/man4/wsp.4 projects/sendfile/share/man/man5/periodic.conf.5 projects/sendfile/share/man/man5/pf.conf.5 projects/sendfile/share/man/man5/pf.os.5 projects/sendfile/share/man/man5/rc.conf.5 projects/sendfile/share/man/man5/services.5 projects/sendfile/share/man/man9/BUF_ISLOCKED.9 projects/sendfile/share/man/man9/BUS_BIND_INTR.9 projects/sendfile/share/man/man9/BUS_DESCRIBE_INTR.9 projects/sendfile/share/man/man9/DB_COMMAND.9 projects/sendfile/share/man/man9/EVENTHANDLER.9 projects/sendfile/share/man/man9/VFS.9 projects/sendfile/share/man/man9/VFS_CHECKEXP.9 projects/sendfile/share/man/man9/VFS_FHTOVP.9 projects/sendfile/share/man/man9/VFS_SET.9 projects/sendfile/share/man/man9/VOP_LOCK.9 projects/sendfile/share/man/man9/VOP_VPTOCNP.9 projects/sendfile/share/man/man9/accf_data.9 projects/sendfile/share/man/man9/accf_dns.9 projects/sendfile/share/man/man9/acl.9 projects/sendfile/share/man/man9/alq.9 projects/sendfile/share/man/man9/devfs_set_cdevpriv.9 projects/sendfile/share/man/man9/eventtimers.9 projects/sendfile/share/man/man9/ieee80211_crypto.9 projects/sendfile/share/man/man9/ifnet.9 projects/sendfile/share/man/man9/kqueue.9 projects/sendfile/share/man/man9/lock.9 projects/sendfile/share/man/man9/locking.9 projects/sendfile/share/man/man9/mbuf.9 projects/sendfile/share/man/man9/refcount.9 projects/sendfile/share/man/man9/usbdi.9 projects/sendfile/share/man/man9/vm_page_busy.9 projects/sendfile/share/man/man9/vnet.9 projects/sendfile/share/man/man9/vnode.9 projects/sendfile/share/man/man9/zone.9 projects/sendfile/sys/arm/allwinner/a20/std.a20 projects/sendfile/sys/arm/allwinner/std.a10 projects/sendfile/sys/arm/altera/socfpga/std.socfpga projects/sendfile/sys/arm/arm/db_trace.c projects/sendfile/sys/arm/arm/gic.c projects/sendfile/sys/arm/arm/intr.c projects/sendfile/sys/arm/arm/nexus.c projects/sendfile/sys/arm/at91/at91_machdep.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/sendfile/sys/arm/broadcom/bcm2835/std.bcm2835 projects/sendfile/sys/arm/conf/APALIS-IMX6 projects/sendfile/sys/arm/conf/ARMADAXP projects/sendfile/sys/arm/conf/BEAGLEBONE projects/sendfile/sys/arm/conf/CHROMEBOOK-PEACH-PIT projects/sendfile/sys/arm/conf/CNS11XXNAS projects/sendfile/sys/arm/conf/CUBIEBOARD projects/sendfile/sys/arm/conf/CUBIEBOARD2 projects/sendfile/sys/arm/conf/DIGI-CCWMX53 projects/sendfile/sys/arm/conf/DOCKSTAR projects/sendfile/sys/arm/conf/DREAMPLUG-1001 projects/sendfile/sys/arm/conf/EFIKA_MX projects/sendfile/sys/arm/conf/EXYNOS5.common projects/sendfile/sys/arm/conf/HL201 projects/sendfile/sys/arm/conf/IMX53 projects/sendfile/sys/arm/conf/IMX53-QSB projects/sendfile/sys/arm/conf/IMX6 projects/sendfile/sys/arm/conf/PANDABOARD projects/sendfile/sys/arm/conf/RK3188 projects/sendfile/sys/arm/conf/RPI-B projects/sendfile/sys/arm/conf/SAM9260EK projects/sendfile/sys/arm/conf/SOCKIT projects/sendfile/sys/arm/conf/SOCKIT-BERI projects/sendfile/sys/arm/conf/VERSATILEPB projects/sendfile/sys/arm/conf/VYBRID projects/sendfile/sys/arm/conf/WANDBOARD-DUAL projects/sendfile/sys/arm/conf/WANDBOARD-QUAD projects/sendfile/sys/arm/conf/WANDBOARD-SOLO projects/sendfile/sys/arm/conf/ZEDBOARD projects/sendfile/sys/arm/freescale/imx/std.imx51 projects/sendfile/sys/arm/freescale/imx/std.imx53 projects/sendfile/sys/arm/freescale/imx/std.imx6 projects/sendfile/sys/arm/freescale/vybrid/std.vybrid projects/sendfile/sys/arm/include/intr.h projects/sendfile/sys/arm/lpc/lpc_intc.c projects/sendfile/sys/arm/mv/std-pj4b.mv projects/sendfile/sys/arm/rockchip/std.rk30xx projects/sendfile/sys/arm/samsung/exynos/std.exynos5250 projects/sendfile/sys/arm/samsung/exynos/std.exynos5420 projects/sendfile/sys/arm/ti/aintc.c projects/sendfile/sys/arm/ti/std.ti projects/sendfile/sys/arm/ti/ti_i2c.c projects/sendfile/sys/arm/ti/ti_wdt.c projects/sendfile/sys/arm/xilinx/std.zynq7 projects/sendfile/sys/boot/uboot/common/main.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sendfile/sys/dev/ahci/ahci.c projects/sendfile/sys/dev/ahci/ahci.h projects/sendfile/sys/dev/beri/virtio/virtio.c projects/sendfile/sys/fs/ext2fs/ext2_vnops.c projects/sendfile/sys/fs/msdosfs/msdosfs_vnops.c projects/sendfile/sys/fs/nandfs/nandfs_vnops.c projects/sendfile/sys/fs/tmpfs/tmpfs_vnops.c projects/sendfile/sys/kern/kern_sig.c projects/sendfile/sys/kern/vfs_vnops.c projects/sendfile/sys/netinet/sctputil.c projects/sendfile/sys/sys/vnode.h projects/sendfile/sys/ufs/ufs/ufs_vnops.c projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/vm/vm_page.h projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/gcc/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/Makefile.inc1 Mon Dec 22 09:21:41 2014 (r276057) @@ -1367,6 +1367,11 @@ _share= share/syscons/scrnmaps _gcc_tools= gnu/usr.bin/cc/cc_tools .endif +.if ${MK_INFO} != "no" +_texinfo= gnu/usr.bin/texinfo/libtxi \ + gnu/usr.bin/texinfo/makeinfo +.endif + .if ${MK_RESCUE} != "no" _rescue= rescue/rescue .endif @@ -1398,6 +1403,16 @@ build-tools: .MAKE ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor +.for _tool in \ + ${_texinfo} + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ + ${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP} +.endfor + # # kernel-tools: Build kernel-building tools Modified: projects/sendfile/bin/sh/error.c ============================================================================== --- projects/sendfile/bin/sh/error.c Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/error.c Mon Dec 22 09:21:41 2014 (r276057) @@ -90,13 +90,14 @@ exraise(int e) /* - * Called from trap.c when a SIGINT is received. (If the user specifies - * that SIGINT is to be trapped or ignored using the trap builtin, then - * this routine is not called.) Suppressint is nonzero when interrupts - * are held using the INTOFF macro. If SIGINTs are not suppressed and - * the shell is not a root shell, then we want to be terminated if we - * get here, as if we were terminated directly by a SIGINT. Arrange for - * this here. + * Called from trap.c when a SIGINT is received and not suppressed, or when + * an interrupt is pending and interrupts are re-enabled using INTON. + * (If the user specifies that SIGINT is to be trapped or ignored using the + * trap builtin, then this routine is not called.) Suppressint is nonzero + * when interrupts are held using the INTOFF macro. If SIGINTs are not + * suppressed and the shell is not a root shell, then we want to be + * terminated if we get here, as if we were terminated directly by a SIGINT. + * Arrange for this here. */ void @@ -104,16 +105,6 @@ onint(void) { sigset_t sigs; - /* - * The !in_dotrap here is safe. The only way we can arrive here - * with in_dotrap set is that a trap handler set SIGINT to SIG_DFL - * and killed itself. - */ - - if (suppressint && !in_dotrap) { - intpending++; - return; - } intpending = 0; sigemptyset(&sigs); sigprocmask(SIG_SETMASK, &sigs, NULL); @@ -130,6 +121,7 @@ onint(void) else { signal(SIGINT, SIG_DFL); kill(getpid(), SIGINT); + _exit(128 + SIGINT); } } Modified: projects/sendfile/bin/sh/error.h ============================================================================== --- projects/sendfile/bin/sh/error.h Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/error.h Mon Dec 22 09:21:41 2014 (r276057) @@ -75,11 +75,12 @@ extern volatile sig_atomic_t intpending; #define is_int_on() suppressint #define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} +#define SET_PENDING_INT intpending = 1 #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending void exraise(int) __dead2; -void onint(void); +void onint(void) __dead2; void warning(const char *, ...) __printflike(1, 2); void error(const char *, ...) __printf0like(1, 2) __dead2; void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; Modified: projects/sendfile/bin/sh/eval.c ============================================================================== --- projects/sendfile/bin/sh/eval.c Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/eval.c Mon Dec 22 09:21:41 2014 (r276057) @@ -539,13 +539,13 @@ expredir(union node *n) case NFROMTO: case NAPPEND: case NCLOBBER: - expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR); + expandarg(redir->nfile.fname, &fn, EXP_TILDE); redir->nfile.expfname = fn.list->text; break; case NFROMFD: case NTOFD: if (redir->ndup.vname) { - expandarg(redir->ndup.vname, &fn, EXP_TILDE | EXP_REDIR); + expandarg(redir->ndup.vname, &fn, EXP_TILDE); fixredir(redir, fn.list->text, 1); } break; Modified: projects/sendfile/bin/sh/expand.c ============================================================================== --- projects/sendfile/bin/sh/expand.c Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/expand.c Mon Dec 22 09:21:41 2014 (r276057) @@ -171,17 +171,12 @@ expandarg(union node *arg, struct arglis STPUTC('\0', expdest); p = grabstackstr(expdest); exparg.lastp = &exparg.list; - /* - * TODO - EXP_REDIR - */ if (flag & EXP_FULL) { ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; expandmeta(exparg.list, flag); } else { - if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */ - rmescapes(p); sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; *exparg.lastp = sp; @@ -209,7 +204,7 @@ expandarg(union node *arg, struct arglis * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. * Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'. * This is used to expand word in ${var+word} etc. - * If EXP_FULL, EXP_CASE or EXP_REDIR are set, keep and/or generate CTLESC + * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC * characters to allow for further processing. * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. */ @@ -217,7 +212,7 @@ static char * argstr(char *p, int flag) { char c; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */ + int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */ int firsteq = 1; int split_lit; int lit_quoted; @@ -303,7 +298,7 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int quotes = flag & (EXP_FULL | EXP_CASE); while ((c = *p) != '\0') { switch(c) { @@ -437,7 +432,7 @@ expbackq(union node *cmd, int quoted, in char lastc; int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int quotes = flag & (EXP_FULL | EXP_CASE); size_t nnl; INTOFF; @@ -637,7 +632,7 @@ evalvar(char *p, int flag) int varlen; int varlenb; int easy; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int quotes = flag & (EXP_FULL | EXP_CASE); varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -862,7 +857,7 @@ varisset(const char *name, int nulok) static void strtodest(const char *p, int flag, int subtype, int quoted) { - if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH) + if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); @@ -1104,7 +1099,6 @@ expandmeta(struct strlist *str, int flag struct strlist **savelastp; struct strlist *sp; char c; - /* TODO - EXP_REDIR */ while (str) { savelastp = exparg.lastp; Modified: projects/sendfile/bin/sh/expand.h ============================================================================== --- projects/sendfile/bin/sh/expand.h Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/expand.h Mon Dec 22 09:21:41 2014 (r276057) @@ -50,7 +50,6 @@ struct arglist { #define EXP_FULL 0x1 /* perform word splitting & file globbing */ #define EXP_TILDE 0x2 /* do normal tilde expansion */ #define EXP_VARTILDE 0x4 /* expand tildes in an assignment */ -#define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */ #define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */ #define EXP_SPLIT_LIT 0x20 /* IFS split literal text ${v+-a b c} */ #define EXP_LIT_QUOTED 0x40 /* for EXP_SPLIT_LIT, start off quoted */ Modified: projects/sendfile/bin/sh/trap.c ============================================================================== --- projects/sendfile/bin/sh/trap.c Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/trap.c Mon Dec 22 09:21:41 2014 (r276057) @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); static char sigmode[NSIG]; /* current value of signal */ volatile sig_atomic_t pendingsig; /* indicates some signal received */ volatile sig_atomic_t pendingsig_waitcmd; /* indicates SIGINT/SIGQUIT received */ -int in_dotrap; /* do we execute in a trap handler? */ +static int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ static volatile sig_atomic_t gotsig[NSIG]; /* indicates specified signal received */ @@ -380,7 +380,15 @@ onsig(int signo) { if (signo == SIGINT && trap[SIGINT] == NULL) { - onint(); + /* + * The !in_dotrap here is safe. The only way we can arrive + * here with in_dotrap set is that a trap handler set SIGINT to + * SIG_DFL and killed itself. + */ + if (suppressint && !in_dotrap) + SET_PENDING_INT; + else + onint(); return; } Modified: projects/sendfile/bin/sh/trap.h ============================================================================== --- projects/sendfile/bin/sh/trap.h Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/bin/sh/trap.h Mon Dec 22 09:21:41 2014 (r276057) @@ -35,7 +35,6 @@ extern volatile sig_atomic_t pendingsig; extern volatile sig_atomic_t pendingsig_waitcmd; -extern int in_dotrap; void clear_traps(void); int have_traps(void); Modified: projects/sendfile/contrib/gcc/config/arm/arm.c ============================================================================== --- projects/sendfile/contrib/gcc/config/arm/arm.c Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/contrib/gcc/config/arm/arm.c Mon Dec 22 09:21:41 2014 (r276057) @@ -604,6 +604,8 @@ static const struct processors all_archi {"armv6k", mpcore, "6K", FL_CO_PROC | FL_FOR_ARCH6K, NULL}, {"armv6z", arm1176jzs, "6Z", FL_CO_PROC | FL_FOR_ARCH6Z, NULL}, {"armv6zk", arm1176jzs, "6ZK", FL_CO_PROC | FL_FOR_ARCH6ZK, NULL}, + /* Clang compatibility... define __ARM_ARCH_7A__, but codegen is still 6ZK. */ + {"armv7a", arm1176jzs, "7A", FL_CO_PROC | FL_FOR_ARCH6ZK, NULL}, {"ep9312", ep9312, "4T", FL_LDSCHED | FL_CIRRUS | FL_FOR_ARCH4, NULL}, {"iwmmxt", iwmmxt, "5TE", FL_LDSCHED | FL_STRONG | FL_FOR_ARCH5TE | FL_XSCALE | FL_IWMMXT , NULL}, {NULL, arm_none, NULL, 0 , NULL} Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Mon Dec 22 09:21:41 2014 (r276057) @@ -231,6 +231,7 @@ ATF_TC_BODY(hsearch_two, tc) hdestroy(); } +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version #ifdef __NetBSD__ ATF_TC(hsearch_r_basic); ATF_TC_HEAD(hsearch_r_basic, tc) @@ -385,6 +386,7 @@ ATF_TC_BODY(hsearch_r_two, tc) hdestroy_r(&t); } +#endif ATF_TP_ADD_TCS(tp) { @@ -395,13 +397,15 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, hsearch_duplicate); ATF_TP_ADD_TC(tp, hsearch_nonexistent); ATF_TP_ADD_TC(tp, hsearch_two); - + +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version #ifdef __NetBSD__ ATF_TP_ADD_TC(tp, hsearch_r_basic); #endif ATF_TP_ADD_TC(tp, hsearch_r_duplicate); ATF_TP_ADD_TC(tp, hsearch_r_nonexistent); ATF_TP_ADD_TC(tp, hsearch_r_two); +#endif return atf_no_error(); } Modified: projects/sendfile/lib/libc/gen/cap_rights_get.3 ============================================================================== --- projects/sendfile/lib/libc/gen/cap_rights_get.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/gen/cap_rights_get.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -100,10 +100,10 @@ argument points at an invalid address. .El .Sh SEE ALSO .Xr cap_rights_limit 2 , -.Xr cap_rights_init 3 , .Xr errno 2 , .Xr open 2 , .Xr assert 3 , +.Xr cap_rights_init 3 , .Xr err 3 , .Xr memcmp 3 , .Xr memset 3 , Modified: projects/sendfile/lib/libc/gen/ftok.3 ============================================================================== --- projects/sendfile/lib/libc/gen/ftok.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/gen/ftok.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -64,9 +64,9 @@ function will return -1 if .Fa path does not exist or if it cannot be accessed by the calling process. .Sh SEE ALSO +.Xr msgget 2 , .Xr semget 2 , -.Xr shmget 2 , -.Xr msgget 2 +.Xr shmget 2 .Sh HISTORY The .Fn ftok Modified: projects/sendfile/lib/libc/gen/ftw.3 ============================================================================== --- projects/sendfile/lib/libc/gen/ftw.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/gen/ftw.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -87,8 +87,9 @@ A directory which cannot be read. The directory will not be descended into. .It Dv FTW_DP A directory being visited in post-order -.Fn ( nftw -only). +.Po Fn nftw +only +.Pc . .It Dv FTW_NS A file for which no .Xr stat 2 @@ -100,8 +101,9 @@ structure are undefined. A symbolic link. .It Dv FTW_SLN A symbolic link with a non-existent target -.Fn ( nftw -only). +.Po Fn nftw +only +.Pc . .El .Pp The Modified: projects/sendfile/lib/libc/gen/getcap.3 ============================================================================== --- projects/sendfile/lib/libc/gen/getcap.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/gen/getcap.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -137,9 +137,10 @@ It must be called before the call. If a sequential access is being performed (see below), it must be called before the first sequential access call -.Fn ( cgetfirst +.Po Fn cgetfirst or -.Fn cgetnext ) , +.Fn cgetnext +.Pc , or be directly preceded by a .Fn cgetclose call. Modified: projects/sendfile/lib/libc/gen/posix_spawn.3 ============================================================================== --- projects/sendfile/lib/libc/gen/posix_spawn.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/gen/posix_spawn.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -413,6 +413,10 @@ including trying to close a descriptor t .Xr execve 2 , .Xr fcntl 2 , .Xr open 2 , +.Xr sched_setparam 2 , +.Xr sched_setscheduler 2 , +.Xr setpgid 2 , +.Xr vfork 2 , .Xr posix_spawn_file_actions_addclose 3 , .Xr posix_spawn_file_actions_adddup2 3 , .Xr posix_spawn_file_actions_addopen 3 , @@ -431,11 +435,7 @@ including trying to close a descriptor t .Xr posix_spawnattr_setschedparam 3 , .Xr posix_spawnattr_setschedpolicy 3 , .Xr posix_spawnattr_setsigdefault 3 , -.Xr posix_spawnattr_setsigmask 3 , -.Xr sched_setparam 2 , -.Xr sched_setscheduler 2 , -.Xr setpgid 2 , -.Xr vfork 2 +.Xr posix_spawnattr_setsigmask 3 .Sh STANDARDS The .Fn posix_spawn Modified: projects/sendfile/lib/libc/gen/scandir.3 ============================================================================== --- projects/sendfile/lib/libc/gen/scandir.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/gen/scandir.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -92,7 +92,7 @@ by freeing each pointer in the array and .Pp The .Fn scandir_b -function behaves in the same way as +function behaves in the same way as .Fn scandir , but takes blocks as arguments instead of function pointers and calls .Fn qsort_b @@ -106,8 +106,8 @@ cannot allocate enough memory to hold al .Xr directory 3 , .Xr malloc 3 , .Xr qsort 3 , -.Xr dir 5 , -.Xr strcoll 3 +.Xr strcoll 3 , +.Xr dir 5 .Sh HISTORY The .Fn scandir Modified: projects/sendfile/lib/libc/net/getaddrinfo.3 ============================================================================== --- projects/sendfile/lib/libc/net/getaddrinfo.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/net/getaddrinfo.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -237,8 +237,8 @@ pointer in each .Li addrinfo structure until a null pointer is encountered. The three members -.Fa ai_family, -.Fa ai_socktype, +.Fa ai_family , +.Fa ai_socktype , and .Fa ai_protocol in each returned Modified: projects/sendfile/lib/libc/net/sctp_recvmsg.3 ============================================================================== --- projects/sendfile/lib/libc/net/sctp_recvmsg.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/net/sctp_recvmsg.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -282,12 +282,12 @@ This typically means that the socket is not connected and is a one-to-one style socket. .El .Sh SEE ALSO +.Xr getsockopt 2 , .Xr recv 2 , .Xr select 2 , +.Xr setsockopt 2 , .Xr socket 2 , .Xr write 2 , -.Xr getsockopt 2 , -.Xr setsockopt 2 , .Xr sctp_send 3 , .Xr sctp_sendmsg 3 , .Xr sendmsg 3 , Modified: projects/sendfile/lib/libc/net/sctp_send.3 ============================================================================== --- projects/sendfile/lib/libc/net/sctp_send.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/net/sctp_send.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -337,7 +337,7 @@ is not connected and is a one-to-one sty .Xr select 2 , .Xr sendmsg 2 , .Xr socket 2 , -.Xr write 2 +.Xr write 2 , .Xr sctp_connectx 3 , .Xr sctp_recvmsg 3 , .Xr sctp_sendmsg 3 , Modified: projects/sendfile/lib/libc/posix1e/acl_set_flagset_np.3 ============================================================================== --- projects/sendfile/lib/libc/posix1e/acl_set_flagset_np.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/posix1e/acl_set_flagset_np.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -64,9 +64,9 @@ ACL is already branded as POSIX.1e. .Sh SEE ALSO .Xr acl 3 , .Xr acl_add_flag_np 3 , -.Xr acl_get_brand_np 3 , .Xr acl_clear_flags_np 3 , .Xr acl_delete_flag_np 3 , +.Xr acl_get_brand_np 3 , .Xr acl_get_flagset_np 3 , .Xr posix1e 3 .Sh STANDARDS Modified: projects/sendfile/lib/libc/stdlib/atexit.3 ============================================================================== --- projects/sendfile/lib/libc/stdlib/atexit.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/stdlib/atexit.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -88,12 +88,12 @@ The existing list of functions is unmodi .It Bq Er ENOSYS The .Fn atexit_b -function was called by a program that did not supply a +function was called by a program that did not supply a .Fn _Block_copy implementation. .El .Sh SEE ALSO -.Xr at_quick_exit 3 +.Xr at_quick_exit 3 , .Xr exit 3 .Sh STANDARDS The Modified: projects/sendfile/lib/libc/stdlib/exit.3 ============================================================================== --- projects/sendfile/lib/libc/stdlib/exit.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/stdlib/exit.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -117,8 +117,8 @@ never return. .Sh SEE ALSO .Xr _exit 2 , .Xr wait 2 , -.Xr atexit 3 , .Xr at_quick_exit 3 , +.Xr atexit 3 , .Xr intro 3 , .Xr quick_exit 3 , .Xr sysexits 3 , Modified: projects/sendfile/lib/libc/string/strspn.3 ============================================================================== --- projects/sendfile/lib/libc/string/strspn.3 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/string/strspn.3 Mon Dec 22 09:21:41 2014 (r276057) @@ -71,7 +71,7 @@ spans the initial part of the null-termi .Fa s as long as the characters from .Fa s -.Sy do not +.Sy do not occur in the null-terminated string .Fa charset .Po it spans the Modified: projects/sendfile/lib/libc/sys/access.2 ============================================================================== --- projects/sendfile/lib/libc/sys/access.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/access.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -136,7 +136,7 @@ and .Fn access , .Fn eaccess , or -.Fn faccessat +.Fn faccessat will fail if: .Bl -tag -width Er .It Bq Er EINVAL Modified: projects/sendfile/lib/libc/sys/getdirentries.2 ============================================================================== --- projects/sendfile/lib/libc/sys/getdirentries.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/getdirentries.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -134,8 +134,9 @@ The current position pointer should only .Xr lseek 2 , a value returned in the location pointed to by .Fa basep -.Fn ( getdirentries -only) +.Po Fn getdirentries +only +.Pc or zero. .Sh RETURN VALUES If successful, the number of bytes actually transferred is returned. Modified: projects/sendfile/lib/libc/sys/getrlimit.2 ============================================================================== --- projects/sendfile/lib/libc/sys/getrlimit.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/getrlimit.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -194,8 +194,8 @@ raised the maximum limit value, and the .Xr csh 1 , .Xr quota 1 , .Xr quotactl 2 , -.Xr sigaltstack 2 , .Xr sigaction 2 , +.Xr sigaltstack 2 , .Xr sysctl 3 , .Xr ulimit 3 .Sh HISTORY Modified: projects/sendfile/lib/libc/sys/poll.2 ============================================================================== --- projects/sendfile/lib/libc/sys/poll.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/poll.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -148,8 +148,8 @@ is zero, then will return without blocking. .Pp The -.Fn ppoll -system call, unlike +.Fn ppoll +system call, unlike .Fn poll , is used to safely wait until either a set of file descriptors becomes ready or until a signal is caught. @@ -174,10 +174,10 @@ used by A null pointer may be passed to indicate that .Fn ppoll should wait indefinitely. -Finally, +Finally, .Fa newsigmask specifies a signal mask which is set while waiting for input. -When +When .Fn ppoll returns, the original signal mask is restored. .Bd -literal @@ -246,11 +246,11 @@ The specified time limit is invalid. One .Xr write 2 .Sh STANDARDS The -.Fn poll +.Fn poll function conforms to .St -p1003.1-2001 . The -.Fn ppoll +.Fn ppoll is not specified by POSIX. .Sh HISTORY The @@ -261,8 +261,8 @@ This manual page and the core of the imp .Nx . The .Fn ppoll -function first appeared in -.Fx 11.0 +function first appeared in +.Fx 11.0 .Sh BUGS The distinction between some of the fields in the .Fa events Modified: projects/sendfile/lib/libc/sys/posix_openpt.2 ============================================================================== --- projects/sendfile/lib/libc/sys/posix_openpt.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/posix_openpt.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -110,8 +110,8 @@ is not valid. Out of pseudo-terminal resources. .El .Sh SEE ALSO -.Xr pts 4 , .Xr ptsname 3 , +.Xr pts 4 , .Xr tty 4 .Sh STANDARDS The Modified: projects/sendfile/lib/libc/sys/procctl.2 ============================================================================== --- projects/sendfile/lib/libc/sys/procctl.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/procctl.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -107,7 +107,6 @@ reaper. After the system initialization, .Xr init 8 is the default reaper. -.Pp .It Dv PROC_REAP_RELEASE Releases the reaper state for the current process. The reaper of the current process becomes the new reaper of the @@ -146,6 +145,7 @@ for the specified process id. The specified process is the root of the reaper tree, i.e. .Xr init 8 . .El +.Pp The .Fa rs_children field returns the number of children of the reaper. Modified: projects/sendfile/lib/libc/sys/revoke.2 ============================================================================== --- projects/sendfile/lib/libc/sys/revoke.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/revoke.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -97,8 +97,8 @@ operation on the named file. The caller is neither the owner of the file nor the super user. .El .Sh SEE ALSO -.Xr close 2 , -.Xr revoke 1 +.Xr revoke 1 , +.Xr close 2 .Sh HISTORY The .Fn revoke Modified: projects/sendfile/lib/libc/sys/sched_setscheduler.2 ============================================================================== --- projects/sendfile/lib/libc/sys/sched_setscheduler.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/sched_setscheduler.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -151,9 +151,9 @@ argument is invalid, or one or more of t is outside the valid range for the specified scheduling policy. .El .Sh SEE ALSO -.Xr sched_getparam 2 , .Xr sched_get_priority_max 2 , .Xr sched_get_priority_min 2 , +.Xr sched_getparam 2 , .Xr sched_rr_get_interval 2 , .Xr sched_setparam 2 , .Xr sched_yield 2 Modified: projects/sendfile/lib/libc/sys/sigwaitinfo.2 ============================================================================== --- projects/sendfile/lib/libc/sys/sigwaitinfo.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/sigwaitinfo.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -172,8 +172,8 @@ system calls fail if: .Bl -tag -width Er .It Bq Er EINTR The wait was interrupted by an unblocked, caught signal. -.Pp .El +.Pp The .Fn sigtimedwait system call may also fail if: Modified: projects/sendfile/lib/libc/sys/vfork.2 ============================================================================== --- projects/sendfile/lib/libc/sys/vfork.2 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/lib/libc/sys/vfork.2 Mon Dec 22 09:21:41 2014 (r276057) @@ -100,8 +100,8 @@ since buffered data would then be flushe Same as for .Xr fork 2 . .Sh SEE ALSO -.Xr execve 2 , .Xr _exit 2 , +.Xr execve 2 , .Xr fork 2 , .Xr rfork 2 , .Xr sigaction 2 , Modified: projects/sendfile/share/man/man4/altera_atse.4 ============================================================================== --- projects/sendfile/share/man/man4/altera_atse.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/altera_atse.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -80,7 +80,7 @@ Only a single MAC address may be stored If the address begins with the Altera prefix 00:07:ed and ends in 00 then up to 16 addresses will be derived from it by adding the unit number of the interface to the stored address. -For other prefixes, the address will be assigned to atse0 and random +For other prefixes, the address will be assigned to atse0 and random addresses will be used for other interfaces. If the stored address is invalid, for example all zero's, multicast, or the default address shipped on all DE4 boards (00:07:ed:ff:ed:15) then a random Modified: projects/sendfile/share/man/man4/aout.4 ============================================================================== --- projects/sendfile/share/man/man4/aout.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/aout.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -123,7 +123,7 @@ non-executable mappings. .Xr execve 2 , .Xr a.out 5 , .Xr elf 5 , -.Xr sysctl 8 . +.Xr sysctl 8 .Sh HISTORY The .Xr a.out 5 Modified: projects/sendfile/share/man/man4/ath_ahb.4 ============================================================================== --- projects/sendfile/share/man/man4/ath_ahb.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/ath_ahb.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -47,7 +47,7 @@ drivers. This is only relevant for embedded System-on-Chip (SoC) devices such as the Atheros AR913x series, which include an Atheros wireless MAC on-die. .Sh SEE ALSO -.Xr ath 4 +.Xr ath 4 , .Xr ath_hal 4 .Sh HISTORY The Modified: projects/sendfile/share/man/man4/ath_pci.4 ============================================================================== --- projects/sendfile/share/man/man4/ath_pci.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/ath_pci.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -44,7 +44,7 @@ and .Xr ath_hal 4 drivers. .Sh SEE ALSO -.Xr ath 4 +.Xr ath 4 , .Xr ath_hal 4 .Sh HISTORY The Modified: projects/sendfile/share/man/man4/carp.4 ============================================================================== --- projects/sendfile/share/man/man4/carp.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/carp.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -306,7 +306,7 @@ tcpdump -npi vlan0 -T carp .Xr rc.conf 5 , .Xr devd.conf 5 , .Xr ifconfig 8 , -.Xr sysctl 8 +.Xr sysctl 8 , .Xr tcpdump 8 .Sh HISTORY The Modified: projects/sendfile/share/man/man4/crypto.4 ============================================================================== --- projects/sendfile/share/man/man4/crypto.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/crypto.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -114,7 +114,6 @@ The two modes are described separately b .Sh THEORY OF OPERATION Regardless of whether symmetric-key or asymmetric-key operations are to be performed, use of the device requires a basic series of steps: -.Pp .Bl -enum .It Open a file descriptor for the device. Modified: projects/sendfile/share/man/man4/gpioled.4 ============================================================================== --- projects/sendfile/share/man/man4/gpioled.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/gpioled.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -52,8 +52,8 @@ The GPIO pin can then be controlled by w in .Xr led 4 . .Pp -On a -.Xr device.hints 5 +On a +.Xr device.hints 5 based system, like .Li MIPS , these values are configurable for Modified: projects/sendfile/share/man/man4/iicbus.4 ============================================================================== --- projects/sendfile/share/man/man4/iicbus.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/iicbus.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -106,11 +106,11 @@ Some I2C interfaces are available: .Sh BUS FREQUENCY CONFIGURATION The operating frequency of an I2C bus may be fixed or configurable. The bus may be used as part of some larger standard interface, and that -interface specification may require a fixed frequency. -The driver for that hardware would not honor an attempt to configure a +interface specification may require a fixed frequency. +The driver for that hardware would not honor an attempt to configure a different speed. A general purpose I2C bus, such as those found in many embedded systems, -will often support multiple bus frequencies. +will often support multiple bus frequencies. .Pp When a system supports multiple I2C busses, a different frequency can be configured for each bus by number, represented by the @@ -145,7 +145,7 @@ The same variable can be changed at any Reset the bus using .Xr i2c 8 or the -.Xr iic 4 +.Xr iic 4 .Va I2CRSTCARD ioctl to make the change take effect. .Sh SEE ALSO Modified: projects/sendfile/share/man/man4/ip.4 ============================================================================== --- projects/sendfile/share/man/man4/ip.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/ip.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -857,12 +857,12 @@ field was not equal to the length of the .Xr recv 2 , .Xr send 2 , .Xr byteorder 3 , +.Xr sourcefilter 3 , .Xr icmp 4 , .Xr igmp 4 , .Xr inet 4 , .Xr intro 4 , -.Xr multicast 4 , -.Xr sourcefilter 3 +.Xr multicast 4 .Rs .%A D. Thaler .%A B. Fenner Modified: projects/sendfile/share/man/man4/ipheth.4 ============================================================================== --- projects/sendfile/share/man/man4/ipheth.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/ipheth.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -80,7 +80,7 @@ Apple iPad tethering (all models) .Xr netintro 4 , .Xr urndis 4 , .Xr usb 4 , -.Xr ifconfig 8 +.Xr ifconfig 8 , .Xr usbconfig 8 .Sh HISTORY The Modified: projects/sendfile/share/man/man4/iscsi_initiator.4 ============================================================================== --- projects/sendfile/share/man/man4/iscsi_initiator.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/iscsi_initiator.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -47,7 +47,7 @@ iscsi_initiator_load="YES" .Sh DESCRIPTION .Bf -symbolic This driver, along with its userspace counterpart -.Xr iscontrol 8 , +.Xr iscontrol 8 , is obsolete. Users are advised to use .Xr iscsi 4 @@ -112,6 +112,7 @@ for each new session. iSCSI RFC 3720 .\" .Sh HISTORY .Sh AUTHORS -This software was written by Daniel Braniss <danny@cs.huji.ac.il> +This software was written by +.An Daniel Braniss Aq Mt danny@cs.huji.ac.il .Sh BUGS The lun discovery method is old-fashioned. Modified: projects/sendfile/share/man/man4/isp.4 ============================================================================== --- projects/sendfile/share/man/man4/isp.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/isp.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -230,7 +230,9 @@ This is the readonly World Wide Port Nam .Sh AUTHORS The .Nm -driver was written by Matthew Jacob originally for NetBSD at +driver was written by +.An Matthew Jacob +originally for NetBSD at NASA/Ames Research Center. .Sh BUGS The driver currently ignores some NVRAM settings. Modified: projects/sendfile/share/man/man4/ispfw.4 ============================================================================== --- projects/sendfile/share/man/man4/ispfw.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/ispfw.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -56,4 +56,5 @@ This will kick the f/w into getting unst .Sh SEE ALSO .Xr isp 4 .Sh AUTHORS -This driver was written by Matthew Jacob. +This driver was written by +.An Matthew Jacob . Modified: projects/sendfile/share/man/man4/iwi.4 ============================================================================== --- projects/sendfile/share/man/man4/iwi.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/iwi.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -152,7 +152,7 @@ This should not happen. .Xr wlan_tkip 4 , .Xr wlan_wep 4 , .Xr ifconfig 8 , -.Xr wpa_supplicant 8 . +.Xr wpa_supplicant 8 .Sh AUTHORS The original .Nm Modified: projects/sendfile/share/man/man4/mpr.4 ============================================================================== --- projects/sendfile/share/man/man4/mpr.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/mpr.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -59,7 +59,7 @@ mpr_load="YES" .Ed .Sh DESCRIPTION The -.Nm +.Nm driver provides support for LSI Fusion-MPT 3 IT/IR .Tn SAS controllers. Modified: projects/sendfile/share/man/man4/mrsas.4 ============================================================================== --- projects/sendfile/share/man/man4/mrsas.4 Mon Dec 22 09:02:21 2014 (r276056) +++ projects/sendfile/share/man/man4/mrsas.4 Mon Dec 22 09:21:41 2014 (r276057) @@ -27,7 +27,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" The views and conclusions contained in the software and documentation .\" are those of the authors and should not be interpreted as representing .\" official policies, either expressed or implied, of the FreeBSD Project. @@ -57,15 +57,15 @@ mrsas_load="YES" .Ed .Sh DESCRIPTION The -.Nm +.Nm driver will detect LSI's next generation (6Gb/s and 12Gb/s) PCI Express SAS/SATA RAID controllers. See the .Nm HARDWARE section for the supported devices list. -A disk (virtual disk/physical disk) attached to the +A disk (virtual disk/physical disk) attached to the .Nm -driver will be visible to the user through +driver will be visible to the user through .Xr camcontrol 8 as .Pa /dev/da? @@ -79,11 +79,11 @@ The name is derived from the phrase "MegaRAID SAS HBA", which is substantially different than the old "MegaRAID" Driver .Xr mfi 4 -which does not connect targets -to the +which does not connect targets +to the +.Xr cam 4 +layer and thus requires a new driver which attaches targets to the .Xr cam 4 -layer and thus requires a new driver which attaches targets to the -.Xr cam 4 layer. Older MegaRAID controllers are supported by .Xr mfi 4 @@ -91,7 +91,7 @@ and will not work with .Nm , but both the .Xr mfi 4 -and +and .Nm drivers can detect and manage the LSI MegaRAID SAS 2208/2308/3008/3108 series of controllers. @@ -104,8 +104,8 @@ driver's behavior for LSI MegaRAID SAS 2 By default, the .Xr mfi 4 driver will detect these controllers. -See the -.Nm PRIORITY +See the +.Nm PRIORITY section to know more about driver priority for MR-Fusion devices. .Pp .Nm @@ -164,16 +164,16 @@ DELL PERC H330 .Sh CONFIGURATION To disable Online Controller Reset(OCR) for a specific .Nm -driver instance, set the +driver instance, set the following tunable value in .Xr loader.conf 5 : .Bd -literal -offset indent -dev.mrsas.X.disable_ocr=1 +dev.mrsas.X.disable_ocr=1 .Ed .Pp where X is the adapter number. .Pp -To change the I/O timeout value for a specific +To change the I/O timeout value for a specific .Nm driver instance, set the following tunable value in .Xr loader.conf 5 : @@ -230,12 +230,12 @@ and .Dv BUS_PROBE_LOW_PRIORITY ) . MR-Fusion Controllers include all cards with the Device IDs - -0x005B, +0x005B, 0x005D, 0x005F. .Pp The -.Xr mfi 4 +.Xr mfi 4 driver will set a priority of either .Dv BUS_PROBE_DEFAULT or @@ -254,13 +254,13 @@ for the .Nm driver to detect a MR-Fusion card instead of the .Xr mfi 4 -driver. +driver. .Bd -ragged -offset indent .Cd hw.mfi.mrsas_enable="1" .Ed .Pp At boot time, the -.Xr mfi 4 +.Xr mfi 4 driver will get priority to detect MR-Fusion controllers by default. Before changing this default driver selection policy, LSI advises users to understand @@ -273,9 +273,9 @@ driver to detect MR-Fusion cards, but al driver to detect MR-Fusion cards. .Pp LSI recommends setting hw.mfi.mrsas_enable="0" for customers who are using the -older -.Xr mfi 4 -driver and do not want to switch to +older +.Xr mfi 4 +driver and do not want to switch to .Nm . For those customers who are using a MR-Fusion controller for the first time, LSI recommends using the @@ -286,8 +286,8 @@ Changing the default behavior is well te unexpected behavior may pop up if more complex and unrealistic operations are executed by switching between the .Xr mfi 4 -and *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412220921.sBM9LgmH022581>