From owner-svn-src-stable-7@FreeBSD.ORG Sun May 24 20:49:23 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A3CA10656F5; Sun, 24 May 2009 20:49:22 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AF62F8FC1F; Sun, 24 May 2009 20:49:22 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OKnMLQ000837; Sun, 24 May 2009 20:49:22 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4OKnMlg000827; Sun, 24 May 2009 20:49:22 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905242049.n4OKnMlg000827@svn.freebsd.org> From: Kip Macy Date: Sun, 24 May 2009 20:49:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192697 - stable/7/usr.sbin/btxld X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 May 2009 20:49:24 -0000 Author: kmacy Date: Sun May 24 20:49:22 2009 New Revision: 192697 URL: http://svn.freebsd.org/changeset/base/192697 Log: merge 177933 Allow for a zero length 'loader'. Modified: stable/7/usr.sbin/btxld/btxld.c Modified: stable/7/usr.sbin/btxld/btxld.c ============================================================================== --- stable/7/usr.sbin/btxld/btxld.c Sun May 24 20:34:29 2009 (r192696) +++ stable/7/usr.sbin/btxld/btxld.c Sun May 24 20:49:22 2009 (r192697) @@ -336,6 +336,8 @@ gethdr(int fd, struct hdr *hdr) if (sb.st_size > MAXU32) errx(1, "%s: Too big", fname); hdr->size = sb.st_size; + if (!hdr->size) + return; if ((p = mmap(NULL, hdr->size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) err(2, "%s", fname); From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 02:59:55 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42D5A106564A; Mon, 25 May 2009 02:59:55 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 260B88FC0A; Mon, 25 May 2009 02:59:55 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P2xtdL008511; Mon, 25 May 2009 02:59:55 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4P2xtY4008509; Mon, 25 May 2009 02:59:55 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905250259.n4P2xtY4008509@svn.freebsd.org> From: Kip Macy Date: Mon, 25 May 2009 02:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192714 - in stable/7/sys/boot/i386: . gptzfsboot X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 02:59:56 -0000 Author: kmacy Date: Mon May 25 02:59:54 2009 New Revision: 192714 URL: http://svn.freebsd.org/changeset/base/192714 Log: import gptzfsboot Added: stable/7/sys/boot/i386/gptzfsboot/ stable/7/sys/boot/i386/gptzfsboot/Makefile (contents, props changed) Modified: stable/7/sys/boot/i386/Makefile Modified: stable/7/sys/boot/i386/Makefile ============================================================================== --- stable/7/sys/boot/i386/Makefile Mon May 25 02:36:29 2009 (r192713) +++ stable/7/sys/boot/i386/Makefile Mon May 25 02:59:54 2009 (r192714) @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - kgzldr libi386 libfirewire loader + gptzfsboot kgzldr libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr Added: stable/7/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/sys/boot/i386/gptzfsboot/Makefile Mon May 25 02:59:54 2009 (r192714) @@ -0,0 +1,74 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot ${.CURDIR}/../zfsboot + +FILES= gptzfsboot + +NM?= nm + +BOOT_COMCONSOLE_PORT?= 0x3f8 +BOOT_COMCONSOLE_SPEED?= 9600 +B2SIOFMT?= 0x3 + +REL1= 0x700 +ORG1= 0x7c00 +ORG2= 0x0 + +CFLAGS= -Os \ + -fno-guess-branch-probability \ + -fomit-frame-pointer \ + -fno-unit-at-a-time \ + -mno-align-long-strings \ + -mrtd \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ + -DGPT -DBOOT2 \ + -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ + -DSIOFMT=${B2SIOFMT} \ + -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ + -I${.CURDIR}/../../common \ + -I${.CURDIR}/../../zfs \ + -I${.CURDIR}/../../../cddl/boot/zfs \ + -I${.CURDIR}/../btx/lib -I. \ + -I${.CURDIR}/../boot2 \ + -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 + +LDFLAGS=-static -N --gc-sections + +# Pick up ../Makefile.inc early. +.include + +CLEANFILES= gptzfsboot + +gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN} + btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \ + -o ${.TARGET} gptzfsboot.bin + +CLEANFILES+= gptldr.bin gptldr.out gptldr.o + +gptldr.bin: gptldr.out + objcopy -S -O binary gptldr.out ${.TARGET} + +gptldr.out: gptldr.o + ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + +CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o + +gptzfsboot.bin: gptzfsboot.out + objcopy -S -O binary gptzfsboot.out ${.TARGET} + +gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o + ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + +zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c + +.if ${MACHINE_ARCH} == "amd64" +beforedepend zfsboot.o: machine +CLEANFILES+= machine +machine: + ln -sf ${.CURDIR}/../../../i386/include machine +.endif + +.include From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 03:06:27 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A569106566C; Mon, 25 May 2009 03:06:27 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 77B1D8FC14; Mon, 25 May 2009 03:06:27 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P36Ra1008816; Mon, 25 May 2009 03:06:27 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4P36RxQ008815; Mon, 25 May 2009 03:06:27 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905250306.n4P36RxQ008815@svn.freebsd.org> From: Kip Macy Date: Mon, 25 May 2009 03:06:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192715 - stable/7/sys/boot/i386 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 03:06:28 -0000 Author: kmacy Date: Mon May 25 03:06:26 2009 New Revision: 192715 URL: http://svn.freebsd.org/changeset/base/192715 Log: don't try building zfsboot and gptzfsboot if zfs loader is not enabled Modified: stable/7/sys/boot/i386/Makefile Modified: stable/7/sys/boot/i386/Makefile ============================================================================== --- stable/7/sys/boot/i386/Makefile Mon May 25 02:59:54 2009 (r192714) +++ stable/7/sys/boot/i386/Makefile Mon May 25 03:06:26 2009 (r192715) @@ -1,7 +1,11 @@ # $FreeBSD$ -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - gptzfsboot kgzldr libi386 libfirewire loader +SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ + kgzldr libi386 libfirewire loader + +.if defined(LOADER_ZFS_SUPPORT) +SUBDIR+= zfsboot gptzfsboot +.endif # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 04:11:31 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EA531065673; Mon, 25 May 2009 04:11:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1020B8FC15; Mon, 25 May 2009 04:11:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P4BUtW010410; Mon, 25 May 2009 04:11:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4P4BU23010409; Mon, 25 May 2009 04:11:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200905250411.n4P4BU23010409@svn.freebsd.org> From: Doug Barton Date: Mon, 25 May 2009 04:11:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192721 - stable/7/usr.sbin/mergemaster X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 04:11:32 -0000 Author: dougb Date: Mon May 25 04:11:30 2009 New Revision: 192721 URL: http://svn.freebsd.org/changeset/base/192721 Log: MFC 192219: Add -L to the mtree invocation to chase symbolic links that are present in "Service jails." MFC 192230: Enhance the safety and efficiency of the -U option, fix indentation on one line. Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/7/usr.sbin/mergemaster/mergemaster.sh Mon May 25 03:53:12 2009 (r192720) +++ stable/7/usr.sbin/mergemaster/mergemaster.sh Mon May 25 04:11:30 2009 (r192721) @@ -115,8 +115,10 @@ diff_loop () { while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \ "${HANDLE_COMPFILE}" = "NOT V" ]; do if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then - if [ -n "${AUTO_UPGRADE}" ]; then - if echo "${CHANGED}" | grep -qsv ${DESTDIR}${COMPFILE#.}; then + if [ -n "${AUTO_UPGRADE}" -a -n "${CHANGED}" ]; then + case "${CHANGED}" in + *:${DESTDIR}${COMPFILE#.}:*) ;; # File has been modified + *) echo '' echo " *** ${COMPFILE} has not been user modified." echo '' @@ -128,10 +130,11 @@ diff_loop () { AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES} ${DESTDIR}${COMPFILE#.} " else - echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" + echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" fi return - fi + ;; + esac fi if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then echo '' @@ -348,7 +351,7 @@ fi case "${AUTO_UPGRADE}" in '') ;; # If the option is not set no need to run the test or warn the user *) - if [ ! -f "${DESTDIR}${MTREEFILE}" ]; then + if [ ! -s "${DESTDIR}${MTREEFILE}" ]; then echo '' echo "*** Unable to find mtree database. Skipping auto-upgrade." echo '' @@ -459,14 +462,15 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCED # Check DESTDIR against the mergemaster mtree database to see what # files the user changed from the reference files. # -CHANGED= -if [ -n "${AUTO_UPGRADE}" -a -f "${DESTDIR}${MTREEFILE}" ]; then - for file in `mtree -eq -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \ +if [ -n "${AUTO_UPGRADE}" -a -s "${DESTDIR}${MTREEFILE}" ]; then + CHANGED=: + for file in `mtree -eqL -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \ 2>/dev/null | awk '($2 == "changed") {print $1}'`; do if [ -f "${DESTDIR}/$file" ]; then - CHANGED="${CHANGED} ${DESTDIR}/$file" + CHANGED="${CHANGED}${DESTDIR}/${file}:" fi done + [ "$CHANGED" = ':' ] && unset CHANGED fi # Check the width of the user's terminal @@ -1055,7 +1059,7 @@ done # This is for the for way up there echo '' echo "*** Comparison complete" -if [ -f "${MTREENEW}" ]; then +if [ -s "${MTREENEW}" ]; then echo "*** Saving mtree database for future upgrades" test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE} mv ${MTREENEW} ${DESTDIR}${MTREEFILE} From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 10:09:06 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 042BF1065670; Mon, 25 May 2009 10:09:06 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E44A58FC17; Mon, 25 May 2009 10:09:05 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PA95aG018953; Mon, 25 May 2009 10:09:05 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PA95AT018952; Mon, 25 May 2009 10:09:05 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <200905251009.n4PA95AT018952@svn.freebsd.org> From: Maxim Konovalov Date: Mon, 25 May 2009 10:09:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192749 - stable/7/share/man/man5 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 10:09:06 -0000 Author: maxim Date: Mon May 25 10:09:05 2009 New Revision: 192749 URL: http://svn.freebsd.org/changeset/base/192749 Log: MFC r191454: correct geli(8) command line. Modified: stable/7/share/man/man5/rc.conf.5 Modified: stable/7/share/man/man5/rc.conf.5 ============================================================================== --- stable/7/share/man/man5/rc.conf.5 Mon May 25 09:57:18 2009 (r192748) +++ stable/7/share/man/man5/rc.conf.5 Mon May 25 10:09:05 2009 (r192749) @@ -1466,7 +1466,7 @@ Options passed to the .Xr geli 8 utility when encrypted GEOM providers for swap partitions are created. The default is -.Dq Li "-a aes -l 256 -s 4096 -d" . +.Dq Li "-e aes -l 256 -s 4096 -d" . .It Va root_rw_mount .Pq Vt bool Set to From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 10:10:47 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26019106564A; Mon, 25 May 2009 10:10:47 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 133EB8FC0A; Mon, 25 May 2009 10:10:47 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PAAkc9019057; Mon, 25 May 2009 10:10:46 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PAAknC019056; Mon, 25 May 2009 10:10:46 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <200905251010.n4PAAknC019056@svn.freebsd.org> From: Maxim Konovalov Date: Mon, 25 May 2009 10:10:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192750 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 10:10:47 -0000 Author: maxim Date: Mon May 25 10:10:46 2009 New Revision: 192750 URL: http://svn.freebsd.org/changeset/base/192750 Log: MFC r191682: correct ng_hole(4) control messages names. Modified: stable/7/share/man/man4/ng_hole.4 Modified: stable/7/share/man/man4/ng_hole.4 ============================================================================== --- stable/7/share/man/man4/ng_hole.4 Mon May 25 10:09:05 2009 (r192749) +++ stable/7/share/man/man4/ng_hole.4 Mon May 25 10:10:46 2009 (r192750) @@ -58,20 +58,20 @@ as long as the name is unique. This node type supports the generic control messages, plus the following: .Bl -tag -width indent -.It Dv NGM_BPF_GET_STATS +.It Dv NGM_HOLE_GET_STATS This command takes an .Tn ASCII string argument, the hook name, and returns the statistics associated with the hook as a .Vt "struct ng_hole_hookstat" . -.It Dv NGM_BPF_CLR_STATS +.It Dv NGM_HOLE_CLR_STATS This command takes an .Tn ASCII string argument, the hook name, and clears the statistics associated with the hook. -.It Dv NGM_BPF_GETCLR_STATS +.It Dv NGM_HOLE_GETCLR_STATS This command is identical to -.Dv NGM_BPF_GET_STATS , +.Dv NGM_HOLE_GET_STATS , except that the statistics are also atomically cleared. .El .Sh SHUTDOWN From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 10:12:27 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7CB61065672; Mon, 25 May 2009 10:12:27 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5D2E8FC20; Mon, 25 May 2009 10:12:27 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PACREq019158; Mon, 25 May 2009 10:12:27 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PACRgu019157; Mon, 25 May 2009 10:12:27 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <200905251012.n4PACRgu019157@svn.freebsd.org> From: Maxim Konovalov Date: Mon, 25 May 2009 10:12:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192751 - stable/7/etc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 10:12:28 -0000 Author: maxim Date: Mon May 25 10:12:27 2009 New Revision: 192751 URL: http://svn.freebsd.org/changeset/base/192751 Log: MFC r192198: add missed semicolon in action script. Modified: stable/7/etc/devd.conf Modified: stable/7/etc/devd.conf ============================================================================== --- stable/7/etc/devd.conf Mon May 25 10:10:46 2009 (r192750) +++ stable/7/etc/devd.conf Mon May 25 10:12:27 2009 (r192751) @@ -130,7 +130,7 @@ attach 100 { match "vendor" "0x1645"; match "product" "0x8001"; match "release" "0x0101"; - action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name"; + action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi; /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name"; }; # This entry starts the ColdSync tool in daemon mode. Make sure you have an up From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 10:22:40 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 067DD106566B; Mon, 25 May 2009 10:22:40 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E7F818FC08; Mon, 25 May 2009 10:22:39 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PAMdVm019577; Mon, 25 May 2009 10:22:39 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PAMdFe019576; Mon, 25 May 2009 10:22:39 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <200905251022.n4PAMdFe019576@svn.freebsd.org> From: Maxim Konovalov Date: Mon, 25 May 2009 10:22:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192752 - stable/7/share/misc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 10:22:42 -0000 Author: maxim Date: Mon May 25 10:22:39 2009 New Revision: 192752 URL: http://svn.freebsd.org/changeset/base/192752 Log: MFC r191681,191698,191834: NetBSD 5.0, OpenBSD 4.5, FreeBSD 7.2 added. Modified: stable/7/share/misc/bsd-family-tree Modified: stable/7/share/misc/bsd-family-tree ============================================================================== --- stable/7/share/misc/bsd-family-tree Mon May 25 10:12:27 2009 (r192751) +++ stable/7/share/misc/bsd-family-tree Mon May 25 10:22:39 2009 (r192752) @@ -227,6 +227,8 @@ FreeBSD 5.2 | | | | | | | | | FreeBSD 7.1 | | | | | | | | | DragonFly 2.2.0 + | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | + | | | | | | | V | | | | | | | | | FreeBSD 8 -current | NetBSD -current OpenBSD -current | @@ -496,6 +498,9 @@ OpenBSD 4.4 2008-11-01 [OBD] FreeBSD 6.4 2008-11-28 [FBD] FreeBSD 7.1 2009-01-04 [FBD] DragonFly 2.2.0 2009-02-17 [DFB] +NetBSD 5.0 2009-04-29 [NBD] +OpenBSD 4.5 2009-05-01 [OBD] +FreeBSD 7.2 2009-05-04 [FBD] Bibliography ------------------------ From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 14:36:21 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 764BF1065670; Mon, 25 May 2009 14:36:21 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 62B068FC15; Mon, 25 May 2009 14:36:21 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PEaLwd026521; Mon, 25 May 2009 14:36:21 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PEaL72026517; Mon, 25 May 2009 14:36:21 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905251436.n4PEaL72026517@svn.freebsd.org> From: Dmitry Chagin Date: Mon, 25 May 2009 14:36:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192759 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 14:36:22 -0000 Author: dchagin Date: Mon May 25 14:36:21 2009 New Revision: 192759 URL: http://svn.freebsd.org/changeset/base/192759 Log: Merge r191269 from HEAD to stable/7: Remove support for FUTEX_REQUEUE operation. Glibc does not use this operation since 2.3.3 version (Jun 2004), as it is racy and replaced by FUTEX_CMP_REQUEUE operation. Glibc versions prior to 2.3.3 fall back to FUTEX_WAKE when FUTEX_REQUEUE returned EINVAL. Any application directly using FUTEX_REQUEUE without return value checking are definitely broken. Limit quantity of messages per process about unsupported operation. Approved by: kib(mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_emul.c stable/7/sys/compat/linux/linux_emul.h stable/7/sys/compat/linux/linux_futex.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/linux/linux_emul.c ============================================================================== --- stable/7/sys/compat/linux/linux_emul.c Mon May 25 13:52:51 2009 (r192758) +++ stable/7/sys/compat/linux/linux_emul.c Mon May 25 14:36:21 2009 (r192759) @@ -86,6 +86,7 @@ linux_proc_init(struct thread *td, pid_t em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; em->pdeath_signal = 0; + em->used_requeue = 0; em->robust_futexes = NULL; if (flags & LINUX_CLONE_THREAD) { /* handled later in the code */ Modified: stable/7/sys/compat/linux/linux_emul.h ============================================================================== --- stable/7/sys/compat/linux/linux_emul.h Mon May 25 13:52:51 2009 (r192758) +++ stable/7/sys/compat/linux/linux_emul.h Mon May 25 14:36:21 2009 (r192759) @@ -51,6 +51,7 @@ struct linux_emuldata { struct linux_emuldata_shared *shared; int pdeath_signal; /* parent death signal */ + int used_requeue; /* uses deprecated futex op */ struct linux_robust_list_head *robust_futexes; Modified: stable/7/sys/compat/linux/linux_futex.c ============================================================================== --- stable/7/sys/compat/linux/linux_futex.c Mon May 25 13:52:51 2009 (r192758) +++ stable/7/sys/compat/linux/linux_futex.c Mon May 25 14:36:21 2009 (r192759) @@ -114,6 +114,7 @@ linux_sys_futex(struct thread *td, struc struct timeval tv = {0, 0}; struct futex *f2; int op_ret; + struct linux_emuldata *em; #ifdef DEBUG if (ldebug(sys_futex)) @@ -262,19 +263,6 @@ linux_sys_futex(struct thread *td, struc FUTEX_SYSTEM_UNLOCK; break; - case LINUX_FUTEX_REQUEUE: - FUTEX_SYSTEM_LOCK; - - f = futex_get(args->uaddr, FUTEX_UNLOCKED); - newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf, - (int)(unsigned long)args->timeout); - futex_put(f); - futex_put(newf); - - FUTEX_SYSTEM_UNLOCK; - break; - case LINUX_FUTEX_WAKE_OP: FUTEX_SYSTEM_LOCK; #ifdef DEBUG @@ -342,6 +330,23 @@ linux_sys_futex(struct thread *td, struc /* not yet implemented */ return (ENOSYS); + case LINUX_FUTEX_REQUEUE: + + /* + * Glibc does not use this operation since Jun 2004 (2.3.3), + * as it is racy and replaced by FUTEX_CMP_REQUEUE operation. + * Glibc versions prior to 2.3.3 fall back to FUTEX_WAKE when + * FUTEX_REQUEUE returned EINVAL. + */ + em = em_find(td->td_proc, EMUL_DONTLOCK); + if (em->used_requeue == 0) { + printf("linux(%s (%d)) sys_futex: " + "unsupported futex_requeue op\n", + td->td_proc->p_comm, td->td_proc->p_pid); + em->used_requeue = 1; + } + return (EINVAL); + default: printf("linux_sys_futex: unknown op %d\n", args->op); From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 19:55:00 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C659D106566B; Mon, 25 May 2009 19:55:00 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B1E8A8FC08; Mon, 25 May 2009 19:55:00 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PJt0kV033157; Mon, 25 May 2009 19:55:00 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PJt0hq033155; Mon, 25 May 2009 19:55:00 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905251955.n4PJt0hq033155@svn.freebsd.org> From: Dmitry Chagin Date: Mon, 25 May 2009 19:55:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192767 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 19:55:01 -0000 Author: dchagin Date: Mon May 25 19:55:00 2009 New Revision: 192767 URL: http://svn.freebsd.org/changeset/base/192767 Log: Merge r191988 from HEAD to stable/7: Add forgotten linux to bsd flags argument mapping into the linux_recv(). PR: kern/134276 Submitted by: Thomas Mueller Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_socket.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/linux/linux_socket.c ============================================================================== --- stable/7/sys/compat/linux/linux_socket.c Mon May 25 17:06:24 2009 (r192766) +++ stable/7/sys/compat/linux/linux_socket.c Mon May 25 19:55:00 2009 (r192767) @@ -871,7 +871,7 @@ linux_recv(struct thread *td, struct lin bsd_args.s = args->s; bsd_args.buf = (caddr_t)PTRIN(args->msg); bsd_args.len = args->len; - bsd_args.flags = args->flags; + bsd_args.flags = linux_to_bsd_msg_flags(args->flags); bsd_args.from = NULL; bsd_args.fromlenaddr = 0; return (recvfrom(td, &bsd_args)); From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 20:24:36 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABF0A1065670; Mon, 25 May 2009 20:24:36 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8F3BB8FC17; Mon, 25 May 2009 20:24:36 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PKOaXU033914; Mon, 25 May 2009 20:24:36 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PKOaPf033912; Mon, 25 May 2009 20:24:36 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905252024.n4PKOaPf033912@svn.freebsd.org> From: Dmitry Chagin Date: Mon, 25 May 2009 20:24:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192769 - in stable/7/sys: . amd64/linux32 compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 20:24:37 -0000 Author: dchagin Date: Mon May 25 20:24:36 2009 New Revision: 192769 URL: http://svn.freebsd.org/changeset/base/192769 Log: Merge r191989 from HEAD to stable/7: Translate l_timeval arg to native struct timeval in linux_setsockopt()/linux_getsockopt() for SO_RCVTIMEO, SO_SNDTIMEO opts as l_timeval has MD members. Remove bogus __packed attribute from l_timeval struct on __amd64__. PR: kern/134276 Submitted by: Thomas Mueller Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/linux32/linux.h stable/7/sys/compat/linux/linux_socket.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/amd64/linux32/linux.h ============================================================================== --- stable/7/sys/amd64/linux32/linux.h Mon May 25 20:07:41 2009 (r192768) +++ stable/7/sys/amd64/linux32/linux.h Mon May 25 20:24:36 2009 (r192769) @@ -94,7 +94,7 @@ typedef struct { typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set Modified: stable/7/sys/compat/linux/linux_socket.c ============================================================================== --- stable/7/sys/compat/linux/linux_socket.c Mon May 25 20:07:41 2009 (r192768) +++ stable/7/sys/compat/linux/linux_socket.c Mon May 25 20:24:36 2009 (r192769) @@ -1073,6 +1073,8 @@ linux_setsockopt(struct thread *td, stru caddr_t val; int valsize; } */ bsd_args; + l_timeval linux_tv; + struct timeval tv; int error, name; bsd_args.s = args->s; @@ -1080,6 +1082,23 @@ linux_setsockopt(struct thread *td, stru switch (bsd_args.level) { case SOL_SOCKET: name = linux_to_bsd_so_sockopt(args->optname); + switch (name) { + case SO_RCVTIMEO: + /* FALLTHROUGH */ + case SO_SNDTIMEO: + error = copyin(PTRIN(args->optval), &linux_tv, + sizeof(linux_tv)); + if (error) + return (error); + tv.tv_sec = linux_tv.tv_sec; + tv.tv_usec = linux_tv.tv_usec; + return (kern_setsockopt(td, args->s, bsd_args.level, + name, &tv, UIO_SYSSPACE, sizeof(tv))); + /* NOTREACHED */ + break; + default: + break; + } break; case IPPROTO_IP: name = linux_to_bsd_ip_sockopt(args->optname); @@ -1128,6 +1147,9 @@ linux_getsockopt(struct thread *td, stru caddr_t val; int *avalsize; } */ bsd_args; + l_timeval linux_tv; + struct timeval tv; + socklen_t tv_len; int error, name; bsd_args.s = args->s; @@ -1135,6 +1157,24 @@ linux_getsockopt(struct thread *td, stru switch (bsd_args.level) { case SOL_SOCKET: name = linux_to_bsd_so_sockopt(args->optname); + switch (name) { + case SO_RCVTIMEO: + /* FALLTHROUGH */ + case SO_SNDTIMEO: + tv_len = sizeof(tv); + error = kern_getsockopt(td, args->s, bsd_args.level, + name, &tv, UIO_SYSSPACE, &tv_len); + if (error) + return (error); + linux_tv.tv_sec = tv.tv_sec; + linux_tv.tv_usec = tv.tv_usec; + return (copyout(&linux_tv, PTRIN(args->optval), + sizeof(linux_tv))); + /* NOTREACHED */ + break; + default: + break; + } break; case IPPROTO_IP: name = linux_to_bsd_ip_sockopt(args->optname); From owner-svn-src-stable-7@FreeBSD.ORG Mon May 25 20:35:42 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D76D1065672; Mon, 25 May 2009 20:35:42 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A3A68FC0A; Mon, 25 May 2009 20:35:42 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PKZgT5034183; Mon, 25 May 2009 20:35:42 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PKZgb4034182; Mon, 25 May 2009 20:35:42 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905252035.n4PKZgb4034182@svn.freebsd.org> From: Dmitry Chagin Date: Mon, 25 May 2009 20:35:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192770 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 20:35:42 -0000 Author: dchagin Date: Mon May 25 20:35:41 2009 New Revision: 192770 URL: http://svn.freebsd.org/changeset/base/192770 Log: Merge r191880 from HEAD to stable/7: Change linux struct tms definition to match actual linux one. Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_misc.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/linux/linux_misc.c ============================================================================== --- stable/7/sys/compat/linux/linux_misc.c Mon May 25 20:24:36 2009 (r192769) +++ stable/7/sys/compat/linux/linux_misc.c Mon May 25 20:35:41 2009 (r192770) @@ -655,10 +655,10 @@ linux_time(struct thread *td, struct lin } struct l_times_argv { - l_long tms_utime; - l_long tms_stime; - l_long tms_cutime; - l_long tms_cstime; + l_clock_t tms_utime; + l_clock_t tms_stime; + l_clock_t tms_cutime; + l_clock_t tms_cstime; }; #define CLK_TCK 100 /* Linux uses 100 */ From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 13:37:05 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 935AB106568C; Tue, 26 May 2009 13:37:05 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7627E8FC17; Tue, 26 May 2009 13:37:05 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QDb5lj059608; Tue, 26 May 2009 13:37:05 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QDb5rM059605; Tue, 26 May 2009 13:37:05 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905261337.n4QDb5rM059605@svn.freebsd.org> From: Dmitry Chagin Date: Tue, 26 May 2009 13:37:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192806 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb modules/linux X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 13:37:06 -0000 Author: dchagin Date: Tue May 26 13:37:05 2009 New Revision: 192806 URL: http://svn.freebsd.org/changeset/base/192806 Log: Merge r191877 from HEAD to stable/7: Add preliminary KTR(9) support to the linux emulation layer. Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_mib.c stable/7/sys/compat/linux/linux_util.h stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/modules/linux/Makefile Modified: stable/7/sys/compat/linux/linux_mib.c ============================================================================== --- stable/7/sys/compat/linux/linux_mib.c Tue May 26 12:01:37 2009 (r192805) +++ stable/7/sys/compat/linux/linux_mib.c Tue May 26 13:37:05 2009 (r192806) @@ -318,7 +318,7 @@ linux_set_oss_version(struct thread *td, return (0); } -#ifdef DEBUG +#if defined(DEBUG) || defined(KTR) u_char linux_debug_map[howmany(LINUX_SYS_MAXSYSCALL, sizeof(u_char))]; @@ -377,4 +377,4 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, deb 0, 0, linux_sysctl_debug, "A", "Linux debugging control"); -#endif /* DEBUG */ +#endif /* DEBUG || KTR */ Modified: stable/7/sys/compat/linux/linux_util.h ============================================================================== --- stable/7/sys/compat/linux/linux_util.h Tue May 26 12:01:37 2009 (r192805) +++ stable/7/sys/compat/linux/linux_util.h Tue May 26 13:37:05 2009 (r192806) @@ -104,4 +104,33 @@ int linux_driver_get_major_minor(char *n char *linux_get_char_devices(void); void linux_free_get_char_devices(char *string); +#if defined(KTR) + +#define KTR_LINUX KTR_SUBSYS +#define LINUX_CTRFMT(nm, fmt) #nm"("fmt")" + +#define LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) do { \ + if (ldebug(f)) \ + CTR6(KTR_LINUX, LINUX_CTRFMT(f, m), \ + p1, p2, p3, p4, p5, p6); \ +} while (0) + +#define LINUX_CTR(f) LINUX_CTR6(f, "", 0, 0, 0, 0, 0, 0) +#define LINUX_CTR0(f, m) LINUX_CTR6(f, m, 0, 0, 0, 0, 0, 0) +#define LINUX_CTR1(f, m, p1) LINUX_CTR6(f, m, p1, 0, 0, 0, 0, 0) +#define LINUX_CTR2(f, m, p1, p2) LINUX_CTR6(f, m, p1, p2, 0, 0, 0, 0) +#define LINUX_CTR3(f, m, p1, p2, p3) LINUX_CTR6(f, m, p1, p2, p3, 0, 0, 0) +#define LINUX_CTR4(f, m, p1, p2, p3, p4) LINUX_CTR6(f, m, p1, p2, p3, p4, 0, 0) +#define LINUX_CTR5(f, m, p1, p2, p3, p4, p5) LINUX_CTR6(f, m, p1, p2, p3, p4, p5, 0) +#else +#define LINUX_CTR(f) +#define LINUX_CTR0(f, m) +#define LINUX_CTR1(f, m, p1) +#define LINUX_CTR2(f, m, p1, p2) +#define LINUX_CTR3(f, m, p1, p2, p3) +#define LINUX_CTR4(f, m, p1, p2, p3, p4) +#define LINUX_CTR5(f, m, p1, p2, p3, p4, p5) +#define LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) +#endif + #endif /* !_LINUX_UTIL_H_ */ Modified: stable/7/sys/modules/linux/Makefile ============================================================================== --- stable/7/sys/modules/linux/Makefile Tue May 26 12:01:37 2009 (r192805) +++ stable/7/sys/modules/linux/Makefile Tue May 26 13:37:05 2009 (r192806) @@ -55,6 +55,9 @@ linux${SFX}_genassym.o: linux${SFX}_gena .if !defined(KERNBUILDDIR) opt_inet6.h: echo "#define INET6 1" > opt_inet6.h +.if defined(KTR) +CFLAGS+= -DKTR +.endif .endif .include From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 14:13:12 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 794A7106566B; Tue, 26 May 2009 14:13:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 652068FC17; Tue, 26 May 2009 14:13:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QEDC7d060490; Tue, 26 May 2009 14:13:12 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QEDCvr060488; Tue, 26 May 2009 14:13:12 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200905261413.n4QEDCvr060488@svn.freebsd.org> From: John Baldwin Date: Tue, 26 May 2009 14:13:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192807 - in stable/7/sys: . amd64/amd64 contrib/pf dev/ath/ath_hal dev/cxgb i386/i386 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 14:13:13 -0000 Author: jhb Date: Tue May 26 14:13:12 2009 New Revision: 192807 URL: http://svn.freebsd.org/changeset/base/192807 Log: MFC: Adjust the way we number CPUs on x86 so that we attempt to "group" all logical CPUs in a package. Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/amd64/mp_machdep.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/i386/i386/mp_machdep.c Modified: stable/7/sys/amd64/amd64/mp_machdep.c ============================================================================== --- stable/7/sys/amd64/amd64/mp_machdep.c Tue May 26 13:37:05 2009 (r192806) +++ stable/7/sys/amd64/amd64/mp_machdep.c Tue May 26 14:13:12 2009 (r192807) @@ -354,7 +354,6 @@ cpu_mp_start(void) } else KASSERT(boot_cpu_id == PCPU_GET(apic_id), ("BSP's APIC ID doesn't match boot_cpu_id")); - cpu_apic_ids[0] = boot_cpu_id; /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; @@ -421,28 +420,30 @@ cpu_mp_start(void) void cpu_mp_announce(void) { - int i, x; const char *hyperthread; + int i; - /* List CPUs */ + /* List active CPUs first. */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { - if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + for (i = 1; i < mp_ncpus; i++) { + if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread) + hyperthread = "/HT"; + else + hyperthread = ""; + printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread, + cpu_apic_ids[i]); + } + + /* List disabled CPUs last. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled) continue; - if (cpu_info[x].cpu_hyperthread) { + if (cpu_info[i].cpu_hyperthread) hyperthread = "/HT"; - } else { + else hyperthread = ""; - } - if (cpu_info[x].cpu_disabled) - printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", - hyperthread, x); - else { - KASSERT(i < mp_ncpus, - ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, - hyperthread, x); - } + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread, + i); } } @@ -678,11 +679,18 @@ assign_cpu_ids(void) /* * Assign CPU IDs to local APIC IDs and disable any CPUs - * beyond MAXCPU. CPU 0 has already been assigned to the BSP, - * so we only have to assign IDs for APs. + * beyond MAXCPU. CPU 0 is always assigned to the BSP. + * + * To minimize confusion for userland, we attempt to number + * CPUs such that all threads and cores in a package are + * grouped together. For now we assume that the BSP is always + * the first thread in a package and just start adding APs + * starting with the BSP's APIC ID. */ mp_ncpus = 1; - for (i = 0; i <= MAX_APIC_ID; i++) { + cpu_apic_ids[0] = boot_cpu_id; + for (i = boot_cpu_id + 1; i != boot_cpu_id; + i == MAX_APIC_ID ? i = 0 : i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || cpu_info[i].cpu_disabled) continue; Modified: stable/7/sys/i386/i386/mp_machdep.c ============================================================================== --- stable/7/sys/i386/i386/mp_machdep.c Tue May 26 13:37:05 2009 (r192806) +++ stable/7/sys/i386/i386/mp_machdep.c Tue May 26 14:13:12 2009 (r192807) @@ -404,7 +404,6 @@ cpu_mp_start(void) } else KASSERT(boot_cpu_id == PCPU_GET(apic_id), ("BSP's APIC ID doesn't match boot_cpu_id")); - cpu_apic_ids[0] = boot_cpu_id; /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; @@ -471,28 +470,30 @@ cpu_mp_start(void) void cpu_mp_announce(void) { - int i, x; const char *hyperthread; + int i; - /* List CPUs */ + /* List active CPUs first. */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { - if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + for (i = 1; i < mp_ncpus; i++) { + if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread) + hyperthread = "/HT"; + else + hyperthread = ""; + printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread, + cpu_apic_ids[i]); + } + + /* List disabled CPUs last. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled) continue; - if (cpu_info[x].cpu_hyperthread) { + if (cpu_info[i].cpu_hyperthread) hyperthread = "/HT"; - } else { + else hyperthread = ""; - } - if (cpu_info[x].cpu_disabled) - printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", - hyperthread, x); - else { - KASSERT(i < mp_ncpus, - ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, - hyperthread, x); - } + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread, + i); } } @@ -731,11 +732,18 @@ assign_cpu_ids(void) /* * Assign CPU IDs to local APIC IDs and disable any CPUs - * beyond MAXCPU. CPU 0 has already been assigned to the BSP, - * so we only have to assign IDs for APs. + * beyond MAXCPU. CPU 0 is always assigned to the BSP. + * + * To minimize confusion for userland, we attempt to number + * CPUs such that all threads and cores in a package are + * grouped together. For now we assume that the BSP is always + * the first thread in a package and just start adding APs + * starting with the BSP's APIC ID. */ mp_ncpus = 1; - for (i = 0; i <= MAX_APIC_ID; i++) { + cpu_apic_ids[0] = boot_cpu_id; + for (i = boot_cpu_id + 1; i != boot_cpu_id; + i == MAX_APIC_ID ? i = 0 : i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || cpu_info[i].cpu_disabled) continue; From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 15:30:33 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4267F1065670; Tue, 26 May 2009 15:30:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2EDE08FC13; Tue, 26 May 2009 15:30:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QFUXbP062220; Tue, 26 May 2009 15:30:33 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QFUXHS062219; Tue, 26 May 2009 15:30:33 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200905261530.n4QFUXHS062219@svn.freebsd.org> From: John Baldwin Date: Tue, 26 May 2009 15:30:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192812 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 15:30:33 -0000 Author: jhb Date: Tue May 26 15:30:32 2009 New Revision: 192812 URL: http://svn.freebsd.org/changeset/base/192812 Log: MFC: Only use the ABI compat shim for vfs.bufspace if the old buffer is smaller than a long. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/kern/vfs_bio.c Modified: stable/7/sys/kern/vfs_bio.c ============================================================================== --- stable/7/sys/kern/vfs_bio.c Tue May 26 15:19:04 2009 (r192811) +++ stable/7/sys/kern/vfs_bio.c Tue May 26 15:30:32 2009 (r192812) @@ -291,7 +291,7 @@ sysctl_bufspace(SYSCTL_HANDLER_ARGS) long lvalue; int ivalue; - if (sizeof(int) == sizeof(long) || req->oldlen == sizeof(long)) + if (sizeof(int) == sizeof(long) || req->oldlen >= sizeof(long)) return (sysctl_handle_long(oidp, arg1, arg2, req)); lvalue = *(long *)arg1; if (lvalue > INT_MAX) From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 15:33:34 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCB37106564A; Tue, 26 May 2009 15:33:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE5DF8FC18; Tue, 26 May 2009 15:33:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QFXYl0062346; Tue, 26 May 2009 15:33:34 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QFXYBn062344; Tue, 26 May 2009 15:33:34 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200905261533.n4QFXYBn062344@svn.freebsd.org> From: John Baldwin Date: Tue, 26 May 2009 15:33:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192813 - in stable/7/sys: . amd64/pci contrib/pf dev/ath/ath_hal dev/cxgb i386/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 15:33:35 -0000 Author: jhb Date: Tue May 26 15:33:34 2009 New Revision: 192813 URL: http://svn.freebsd.org/changeset/base/192813 Log: MFC: Add a read-only sysctl hw.pci.mcfg to mirror the tunable by the same name. Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/pci/pci_cfgreg.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/i386/pci/pci_cfgreg.c Modified: stable/7/sys/amd64/pci/pci_cfgreg.c ============================================================================== --- stable/7/sys/amd64/pci/pci_cfgreg.c Tue May 26 15:30:32 2009 (r192812) +++ stable/7/sys/amd64/pci/pci_cfgreg.c Tue May 26 15:33:34 2009 (r192813) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -56,6 +57,8 @@ static void pciereg_cfgwrite(int bus, un static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +SYSCTL_DECL(_hw_pci); + static int cfgmech; static vm_offset_t pcie_base; static int pcie_minbus, pcie_maxbus; @@ -63,6 +66,8 @@ static uint32_t pcie_badslots; static struct mtx pcicfg_mtx; static int mcfg_enable = 0; TUNABLE_INT("hw.pci.mcfg", &mcfg_enable); +SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, + "Enable support for PCI-e memory mapped config access"); /* * Initialise access to PCI configuration space Modified: stable/7/sys/i386/pci/pci_cfgreg.c ============================================================================== --- stable/7/sys/i386/pci/pci_cfgreg.c Tue May 26 15:30:32 2009 (r192812) +++ stable/7/sys/i386/pci/pci_cfgreg.c Tue May 26 15:33:34 2009 (r192813) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -75,6 +76,8 @@ enum { CFGMECH_PCIE, }; +SYSCTL_DECL(_hw_pci); + static TAILQ_HEAD(pcie_cfg_list, pcie_cfg_elem) pcie_list[MAXCPU]; static uint64_t pcie_base; static int pcie_minbus, pcie_maxbus; @@ -84,6 +87,8 @@ static int devmax; static struct mtx pcicfg_mtx; static int mcfg_enable = 0; TUNABLE_INT("hw.pci.mcfg", &mcfg_enable); +SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, + "Enable support for PCI-e memory mapped config access"); static uint32_t pci_docfgregread(int bus, int slot, int func, int reg, int bytes); From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 16:01:51 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61B721065673; Tue, 26 May 2009 16:01:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8BA8FC1C; Tue, 26 May 2009 16:01:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QG1p4j063902; Tue, 26 May 2009 16:01:51 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QG1pDr063899; Tue, 26 May 2009 16:01:51 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200905261601.n4QG1pDr063899@svn.freebsd.org> From: John Baldwin Date: Tue, 26 May 2009 16:01:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192815 - in stable/7/sys: . amd64/amd64 arm/arm contrib/pf dev/ath/ath_hal dev/cxgb i386/i386 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 16:01:52 -0000 Author: jhb Date: Tue May 26 16:01:50 2009 New Revision: 192815 URL: http://svn.freebsd.org/changeset/base/192815 Log: MFC: Reduce the number of bounce zones (and thus the number of bounce pages) used in some cases. Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/amd64/busdma_machdep.c stable/7/sys/arm/arm/busdma_machdep.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/i386/i386/busdma_machdep.c Modified: stable/7/sys/amd64/amd64/busdma_machdep.c ============================================================================== --- stable/7/sys/amd64/amd64/busdma_machdep.c Tue May 26 15:49:09 2009 (r192814) +++ stable/7/sys/amd64/amd64/busdma_machdep.c Tue May 26 16:01:50 2009 (r192815) @@ -94,7 +94,6 @@ struct bounce_zone { int total_bounced; int total_deferred; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -974,7 +973,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat) /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -990,8 +988,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat) bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr); @@ -1037,9 +1034,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat) SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1064,7 +1058,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; Modified: stable/7/sys/arm/arm/busdma_machdep.c ============================================================================== --- stable/7/sys/arm/arm/busdma_machdep.c Tue May 26 15:49:09 2009 (r192814) +++ stable/7/sys/arm/arm/busdma_machdep.c Tue May 26 16:01:50 2009 (r192815) @@ -113,7 +113,6 @@ struct bounce_zone { int total_bounced; int total_deferred; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -683,10 +682,10 @@ _bus_dmamap_count_pages(bus_dma_tag_t dm vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - if (pmap != NULL) - paddr = pmap_extract(pmap, vaddr); - else + if (__predict_true(pmap == pmap_kernel())) paddr = pmap_kextract(vaddr); + else + paddr = pmap_extract(pmap, vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -1259,7 +1258,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat) /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -1275,8 +1273,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat) bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr); @@ -1322,9 +1319,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat) SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1349,7 +1343,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; Modified: stable/7/sys/i386/i386/busdma_machdep.c ============================================================================== --- stable/7/sys/i386/i386/busdma_machdep.c Tue May 26 15:49:09 2009 (r192814) +++ stable/7/sys/i386/i386/busdma_machdep.c Tue May 26 16:01:50 2009 (r192815) @@ -99,7 +99,6 @@ struct bounce_zone { int total_bounced; int total_deferred; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -987,7 +986,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat) /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -1003,8 +1001,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat) bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr); @@ -1050,9 +1047,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat) SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1077,7 +1071,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 16:16:01 2009 Return-Path: Delivered-To: svn-src-stable-7@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 913F3106566B; Tue, 26 May 2009 16:16:01 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (77-93-215-190.static.masterinter.net [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id 46B4C8FC24; Tue, 26 May 2009 16:15:57 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 7C9B09CB0B0; Tue, 26 May 2009 17:56:39 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V6LtrDmkj3Ko; Tue, 26 May 2009 17:56:37 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 3C7B39CB2E5; Tue, 26 May 2009 17:56:37 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id n4QFubYj018552; Tue, 26 May 2009 17:56:37 +0200 (CEST) (envelope-from rdivacky) Date: Tue, 26 May 2009 17:56:37 +0200 From: Roman Divacky To: Dmitry Chagin Message-ID: <20090526155637.GA18075@freebsd.org> References: <200905261337.n4QDb5rM059605@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200905261337.n4QDb5rM059605@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-7@FreeBSD.org Subject: Re: svn commit: r192806 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb modules/linux X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 16:16:02 -0000 On Tue, May 26, 2009 at 01:37:05PM +0000, Dmitry Chagin wrote: > Author: dchagin > Date: Tue May 26 13:37:05 2009 > New Revision: 192806 > URL: http://svn.freebsd.org/changeset/base/192806 > > Log: > Merge r191877 from HEAD to stable/7: > > Add preliminary KTR(9) support to the linux emulation layer. this is probably just bad wording but if it's preliminary why MFC it? From owner-svn-src-stable-7@FreeBSD.ORG Tue May 26 21:40:15 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E19B10656C3; Tue, 26 May 2009 21:40:15 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5AF938FC17; Tue, 26 May 2009 21:40:15 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QLeFEO074600; Tue, 26 May 2009 21:40:15 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QLeFNA074598; Tue, 26 May 2009 21:40:15 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200905262140.n4QLeFNA074598@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 26 May 2009 21:40:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192860 - stable/7/usr.bin/kdump X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 21:40:16 -0000 Author: des Date: Tue May 26 21:40:15 2009 New Revision: 192860 URL: http://svn.freebsd.org/changeset/base/192860 Log: MFC r175936: add shebang. Modified: stable/7/usr.bin/kdump/ (props changed) stable/7/usr.bin/kdump/mkioctls stable/7/usr.bin/kdump/mksubr Modified: stable/7/usr.bin/kdump/mkioctls ============================================================================== --- stable/7/usr.bin/kdump/mkioctls Tue May 26 21:39:09 2009 (r192859) +++ stable/7/usr.bin/kdump/mkioctls Tue May 26 21:40:15 2009 (r192860) @@ -1,7 +1,9 @@ -set -e - +#!/bin/sh +# # $FreeBSD$ +set -e + if [ "x$1" = "x-s" ]; then use_switch=1 shift @@ -65,13 +67,13 @@ BEGIN { } /^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO/ { - + # find where the name starts for (i = 1; i <= NF; i++) if ($i ~ /define/) break; ++i; - # + # if (use_switch) printf("\tcase %s:\n\t\treturn(\"%s\");\n", $i, $i); else Modified: stable/7/usr.bin/kdump/mksubr ============================================================================== --- stable/7/usr.bin/kdump/mksubr Tue May 26 21:39:09 2009 (r192859) +++ stable/7/usr.bin/kdump/mksubr Tue May 26 21:40:15 2009 (r192860) @@ -1,5 +1,7 @@ -set -e - +#!/bin/sh +# +# $FreeBSD$ +# # Generates kdump_subr.c # mkioctls is a special-purpose script, and works fine as it is # now, so it remains independent. The idea behind how it generates @@ -16,7 +18,7 @@ set -e # that the auto_*_type() functions are inappropriate for. # MANUAL: Manually entered and must therefore be manually updated. -# $FreeBSD$ +set -e LC_ALL=C; export LC_ALL @@ -427,7 +429,7 @@ void sendrecvflagsname (int flags) { int or = 0; - + if (flags == 0) { (void)printf("0"); return; From owner-svn-src-stable-7@FreeBSD.ORG Wed May 27 03:51:04 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91A73106564A; Wed, 27 May 2009 03:51:04 +0000 (UTC) (envelope-from bmah@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 75AE38FC14; Wed, 27 May 2009 03:51:04 +0000 (UTC) (envelope-from bmah@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4R3p4Kp082828; Wed, 27 May 2009 03:51:04 GMT (envelope-from bmah@svn.freebsd.org) Received: (from bmah@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4R3p4ln082827; Wed, 27 May 2009 03:51:04 GMT (envelope-from bmah@svn.freebsd.org) Message-Id: <200905270351.n4R3p4ln082827@svn.freebsd.org> From: "Bruce A. Mah" Date: Wed, 27 May 2009 03:51:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192872 - stable/7/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 03:51:05 -0000 Author: bmah Date: Wed May 27 03:51:04 2009 New Revision: 192872 URL: http://svn.freebsd.org/changeset/base/192872 Log: New release note: ZFS version 13. Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed May 27 02:49:08 2009 (r192871) +++ stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed May 27 03:51:04 2009 (r192872) @@ -141,8 +141,6 @@ Hardware Support - - Multimedia Support @@ -174,7 +172,15 @@ File Systems - + ZFS has been updated from version 6 to version 13. + This update includes numerous new ZFS features, such as + permitting non-root users to perform + some administrative functions, supporting additional disks + for caching or the ZFS Intent Log, and partial &man.chflags.2; + support. It also includes some &os;-specific additions, + such as booting from ZFS file systems, removal of ARC + size limitations, ARC backpressure (which allows ZFS to work + without tunables on &arch.amd64;), and many bugfixes. From owner-svn-src-stable-7@FreeBSD.ORG Wed May 27 04:30:46 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 046EA106566B; Wed, 27 May 2009 04:30:46 +0000 (UTC) (envelope-from dchagin@dchagin.static.corbina.ru) Received: from contrabass.post.ru (contrabass.post.ru [85.21.78.5]) by mx1.freebsd.org (Postfix) with ESMTP id A42798FC12; Wed, 27 May 2009 04:30:45 +0000 (UTC) (envelope-from dchagin@dchagin.static.corbina.ru) Received: from corbina.ru (mail.post.ru [195.14.50.16]) by contrabass.post.ru (Postfix) with ESMTP id 153CDA34BC; Wed, 27 May 2009 08:13:27 +0400 (MSD) X-Virus-Scanned: by cgpav Uf39PSi9pFi9oFi9 Received: from [10.208.17.3] (HELO dchagin.static.corbina.ru) by corbina.ru (CommuniGate Pro SMTP 5.1.14) with ESMTPS id 1811664723; Wed, 27 May 2009 08:13:27 +0400 Received: from dchagin.static.corbina.ru (localhost.chd.net [127.0.0.1]) by dchagin.static.corbina.ru (8.14.3/8.14.3) with ESMTP id n4R4DQtS003130; Wed, 27 May 2009 08:13:26 +0400 (MSD) (envelope-from dchagin@dchagin.static.corbina.ru) Received: (from dchagin@localhost) by dchagin.static.corbina.ru (8.14.3/8.14.3/Submit) id n4R4DLL2003129; Wed, 27 May 2009 08:13:21 +0400 (MSD) (envelope-from dchagin) Date: Wed, 27 May 2009 08:13:21 +0400 From: Chagin Dmitry To: Roman Divacky Message-ID: <20090527041321.GA3094@dchagin.static.corbina.ru> References: <200905261337.n4QDb5rM059605@svn.freebsd.org> <20090526155637.GA18075@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2fHTh5uZTiUOsy+g" Content-Disposition: inline In-Reply-To: <20090526155637.GA18075@freebsd.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r192806 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb modules/linux X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 04:30:46 -0000 --2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 26, 2009 at 05:56:37PM +0200, Roman Divacky wrote: > On Tue, May 26, 2009 at 01:37:05PM +0000, Dmitry Chagin wrote: > > Author: dchagin > > Date: Tue May 26 13:37:05 2009 > > New Revision: 192806 > > URL: http://svn.freebsd.org/changeset/base/192806 > >=20 > > Log: > > Merge r191877 from HEAD to stable/7: > > =20 > > Add preliminary KTR(9) support to the linux emulation layer. >=20 > this is probably just bad wording but if it's preliminary why MFC it? Others merge depends on this. --=20 Have fun! chd --2fHTh5uZTiUOsy+g Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (FreeBSD) iEYEARECAAYFAkocveAACgkQ0t2Tb3OO/O3QvQCfSOeACW24wBQp+IPnGg1XUBQ8 7zgAnAltI4DNOZWYMX9lVtcxosfu4xJG =4064 -----END PGP SIGNATURE----- --2fHTh5uZTiUOsy+g-- From owner-svn-src-stable-7@FreeBSD.ORG Wed May 27 11:03:15 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52BAF10656A5; Wed, 27 May 2009 11:03:15 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E60A8FC15; Wed, 27 May 2009 11:03:15 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RB3FRb094988; Wed, 27 May 2009 11:03:15 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4RB3Fmf094987; Wed, 27 May 2009 11:03:15 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200905271103.n4RB3Fmf094987@svn.freebsd.org> From: Christian Brueffer Date: Wed, 27 May 2009 11:03:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192889 - in stable/7/sys: . compat/ndis contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 11:03:16 -0000 Author: brueffer Date: Wed May 27 11:03:14 2009 New Revision: 192889 URL: http://svn.freebsd.org/changeset/base/192889 Log: MFC: r192036 Fix memory leak in an error case. Modified: stable/7/sys/ (props changed) stable/7/sys/compat/ndis/kern_windrv.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/ndis/kern_windrv.c ============================================================================== --- stable/7/sys/compat/ndis/kern_windrv.c Wed May 27 10:27:14 2009 (r192888) +++ stable/7/sys/compat/ndis/kern_windrv.c Wed May 27 11:03:14 2009 (r192889) @@ -527,7 +527,10 @@ windrv_bus_attach(drv, name) RtlInitAnsiString(&as, name); if (RtlAnsiStringToUnicodeString(&drv->dro_drivername, &as, TRUE)) + { + free(new, M_DEVBUF); return(ENOMEM); + } /* * Set up a fake image pointer to avoid false matches From owner-svn-src-stable-7@FreeBSD.ORG Wed May 27 12:33:58 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6757D106567E; Wed, 27 May 2009 12:33:58 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 35B5D8FC20; Wed, 27 May 2009 12:33:58 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RCXwrC097023; Wed, 27 May 2009 12:33:58 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4RCXwLO097022; Wed, 27 May 2009 12:33:58 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200905271233.n4RCXwLO097022@svn.freebsd.org> From: Edwin Groothuis Date: Wed, 27 May 2009 12:33:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192892 - in stable/7/tools/regression: . bin/date X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 12:33:59 -0000 Author: edwin Date: Wed May 27 12:33:57 2009 New Revision: 192892 URL: http://svn.freebsd.org/changeset/base/192892 Log: MFC of r192482: Add regression tests for the date(1) + argument for user-defined format strings. PR: bin/127514 Added: stable/7/tools/regression/bin/date/ - copied from r192482, head/tools/regression/bin/date/ Modified: stable/7/tools/regression/README Modified: stable/7/tools/regression/README ============================================================================== --- stable/7/tools/regression/README Wed May 27 12:31:55 2009 (r192891) +++ stable/7/tools/regression/README Wed May 27 12:33:57 2009 (r192892) @@ -86,3 +86,4 @@ sysvmsg SysV IPC Message Queue Regressi sysvsem SysV IPC Semaphore Regression Utility sysvshm SysV IPC Shared Memory Regression Utility gaithrstress General threaded getaddrinfo(3) exerciser +date Date(1) + format string regression test From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 04:00:04 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5A2D106566C; Thu, 28 May 2009 04:00:03 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BAF618FC14; Thu, 28 May 2009 04:00:03 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S403HN021813; Thu, 28 May 2009 04:00:03 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4S403NM021811; Thu, 28 May 2009 04:00:03 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905280400.n4S403NM021811@svn.freebsd.org> From: Dmitry Chagin Date: Thu, 28 May 2009 04:00:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192950 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 04:00:04 -0000 Author: dchagin Date: Thu May 28 04:00:03 2009 New Revision: 192950 URL: http://svn.freebsd.org/changeset/base/192950 Log: Merge r191972 from HEAD to stable/7: Introduce linux_kernver() interface which is intended for an exact designation of the emulated kernel version. linux_kernver() returns integer value formatted as 'VVVMMMIII' where VVV - version, MMM - major revision, III - minor revision. Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_mib.c stable/7/sys/compat/linux/linux_mib.h stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/linux/linux_mib.c ============================================================================== --- stable/7/sys/compat/linux/linux_mib.c Thu May 28 02:39:07 2009 (r192949) +++ stable/7/sys/compat/linux/linux_mib.c Thu May 28 04:00:03 2009 (r192950) @@ -52,7 +52,7 @@ struct linux_prison { char pr_osname[LINUX_MAX_UTSNAME]; char pr_osrelease[LINUX_MAX_UTSNAME]; int pr_oss_version; - int pr_use_linux26; /* flag to determine whether to use 2.6 emulation */ + int pr_osrel; }; SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0, @@ -83,7 +83,7 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, osn "Linux kernel OS name"); static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; -static int linux_use_linux26 = 0; +static int linux_osrel = 2004002; static int linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS) @@ -126,6 +126,37 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, oss "Linux OSS version"); /* + * Map the osrelease into integer + */ +static int +linux_map_osrel(char *osrelease, int *osrel) +{ + char *sep, *eosrelease; + int len, v0, v1, v2, v; + + len = strlen(osrelease); + eosrelease = osrelease + len; + v0 = strtol(osrelease, &sep, 10); + if (osrelease == sep || sep + 1 >= eosrelease || *sep != '.') + return (EINVAL); + osrelease = sep + 1; + v1 = strtol(osrelease, &sep, 10); + if (osrelease == sep || sep + 1 >= eosrelease || *sep != '.') + return (EINVAL); + osrelease = sep + 1; + v2 = strtol(osrelease, &sep, 10); + if (osrelease == sep || sep != eosrelease) + return (EINVAL); + + v = v0 * 1000000 + v1 * 1000 + v2; + if (v < 1000000) + return (EINVAL); + + *osrel = v; + return (0); +} + +/* * Returns holding the prison mutex if return non-NULL. */ static struct prison * @@ -229,21 +260,21 @@ linux_get_osrelease(struct thread *td, c } int -linux_use26(struct thread *td) +linux_kernver(struct thread *td) { struct prison *pr; struct linux_prison *lpr; - int use26 = linux_use_linux26; + int osrel; pr = td->td_ucred->cr_prison; if (pr != NULL) { if (pr->pr_linux != NULL) { lpr = (struct linux_prison *)pr->pr_linux; - use26 = lpr->pr_use_linux26; + osrel = lpr->pr_osrel; } - } - - return (use26); + } else + osrel = linux_osrel; + return (osrel); } int @@ -251,20 +282,26 @@ linux_set_osrelease(struct thread *td, c { struct prison *pr; struct linux_prison *lpr; - int use26; - - use26 = (strlen(osrelease) >= 3 && osrelease[2] == '6'); + int error; pr = linux_get_prison(td); if (pr != NULL) { lpr = (struct linux_prison *)pr->pr_linux; + error = linux_map_osrel(osrelease, &lpr->pr_osrel); + if (error) { + mtx_unlock(&pr->pr_mtx); + return (error); + } strcpy(lpr->pr_osrelease, osrelease); - lpr->pr_use_linux26 = use26; mtx_unlock(&pr->pr_mtx); } else { mtx_lock(&osname_lock); + error = linux_map_osrel(osrelease, &linux_osrel); + if (error) { + mtx_unlock(&osname_lock); + return (error); + } strcpy(linux_osrelease, osrelease); - linux_use_linux26 = use26; mtx_unlock(&osname_lock); } Modified: stable/7/sys/compat/linux/linux_mib.h ============================================================================== --- stable/7/sys/compat/linux/linux_mib.h Thu May 28 02:39:07 2009 (r192949) +++ stable/7/sys/compat/linux/linux_mib.h Thu May 28 04:00:03 2009 (r192950) @@ -40,6 +40,10 @@ int linux_set_osrelease(struct thread *t int linux_get_oss_version(struct thread *td); int linux_set_oss_version(struct thread *td, int oss_version); -int linux_use26(struct thread *td); +int linux_kernver(struct thread *td); + +#define LINUX_KERNVER_2006000 2006000 + +#define linux_use26(t) (linux_kernver(t) >= LINUX_KERNVER_2006000) #endif /* _LINUX_MIB_H_ */ From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 04:08:07 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C50FB106566C; Thu, 28 May 2009 04:08:07 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 974598FC13; Thu, 28 May 2009 04:08:07 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S4873n022045; Thu, 28 May 2009 04:08:07 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4S487g6022044; Thu, 28 May 2009 04:08:07 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905280408.n4S487g6022044@svn.freebsd.org> From: Dmitry Chagin Date: Thu, 28 May 2009 04:08:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192952 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 04:08:08 -0000 Author: dchagin Date: Thu May 28 04:08:07 2009 New Revision: 192952 URL: http://svn.freebsd.org/changeset/base/192952 Log: Merge r192373 from HEAD to stable/7: Validate user-supplied arguments values. Args argument is a pointer to the structure located in user space in which the socketcall arguments are packed. The structure must be copied to the kernel instead of direct dereferencing. Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/compat/linux/linux_socket.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/linux/linux_socket.c ============================================================================== --- stable/7/sys/compat/linux/linux_socket.c Thu May 28 04:03:16 2009 (r192951) +++ stable/7/sys/compat/linux/linux_socket.c Thu May 28 04:08:07 2009 (r192952) @@ -1203,11 +1203,38 @@ linux_getsockopt(struct thread *td, stru return (error); } +/* Argument list sizes for linux_socketcall */ + +#define LINUX_AL(x) ((x) * sizeof(l_ulong)) + +static const unsigned char lxs_args[] = { + LINUX_AL(0) /* unused*/, LINUX_AL(3) /* socket */, + LINUX_AL(3) /* bind */, LINUX_AL(3) /* connect */, + LINUX_AL(2) /* listen */, LINUX_AL(3) /* accept */, + LINUX_AL(3) /* getsockname */, LINUX_AL(3) /* getpeername */, + LINUX_AL(4) /* socketpair */, LINUX_AL(4) /* send */, + LINUX_AL(4) /* recv */, LINUX_AL(6) /* sendto */, + LINUX_AL(6) /* recvfrom */, LINUX_AL(2) /* shutdown */, + LINUX_AL(5) /* setsockopt */, LINUX_AL(5) /* getsockopt */, + LINUX_AL(3) /* sendmsg */, LINUX_AL(3) /* recvmsg */ +}; + +#define LINUX_AL_SIZE sizeof(lxs_args) / sizeof(lxs_args[0]) - 1 + int linux_socketcall(struct thread *td, struct linux_socketcall_args *args) { - void *arg = (void *)(intptr_t)args->args; + l_ulong a[6]; + void *arg; + int error; + + if (args->what < LINUX_SOCKET || args->what > LINUX_AL_SIZE) + return (EINVAL); + error = copyin(PTRIN(args->args), a, lxs_args[args->what]); + if (error) + return (error); + arg = a; switch (args->what) { case LINUX_SOCKET: return (linux_socket(td, arg)); From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 07:37:50 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49BC91065670; Thu, 28 May 2009 07:37:50 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 379588FC0C; Thu, 28 May 2009 07:37:50 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S7boMF027318; Thu, 28 May 2009 07:37:50 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4S7bout027317; Thu, 28 May 2009 07:37:50 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905280737.n4S7bout027317@svn.freebsd.org> From: Kip Macy Date: Thu, 28 May 2009 07:37:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192969 - stable/7/sys/boot/i386/libi386 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 07:37:50 -0000 Author: kmacy Date: Thu May 28 07:37:49 2009 New Revision: 192969 URL: http://svn.freebsd.org/changeset/base/192969 Log: MFC 185095 r185095 | dfr | 2008-11-19 08:04:07 -0800 (Wed, 19 Nov 2008) | 3 lines If we free the GPT partition list in bd_open_gpt() because of an error, don't try to free it again in bd_closedisk(). While I'm here, fix a DEBUG print. Modified: stable/7/sys/boot/i386/libi386/biosdisk.c Modified: stable/7/sys/boot/i386/libi386/biosdisk.c ============================================================================== --- stable/7/sys/boot/i386/libi386/biosdisk.c Thu May 28 07:26:36 2009 (r192968) +++ stable/7/sys/boot/i386/libi386/biosdisk.c Thu May 28 07:37:49 2009 (r192969) @@ -996,8 +996,10 @@ bd_open_gpt(struct open_disk *od, struct od->od_boff = gp->gp_start; out: - if (error) + if (error) { free(od->od_partitions); + od->od_flags &= ~BD_GPTOK; + } return (error); } @@ -1088,7 +1090,7 @@ bd_realstrategy(void *devdata, int rw, d switch(rw){ case F_READ: - DEBUG("read %d from %d to %p", blks, dblk, buf); + DEBUG("read %d from %lld to %p", blks, dblk, buf); if (blks && bd_read(od, dblk, blks, buf)) { DEBUG("read error"); From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 14:48:11 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 322951065698; Thu, 28 May 2009 14:48:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1EE238FC1D; Thu, 28 May 2009 14:48:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SEmBAn040734; Thu, 28 May 2009 14:48:11 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SEmBWh040733; Thu, 28 May 2009 14:48:11 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200905281448.n4SEmBWh040733@svn.freebsd.org> From: John Baldwin Date: Thu, 28 May 2009 14:48:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192975 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/mpt X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 14:48:11 -0000 Author: jhb Date: Thu May 28 14:48:10 2009 New Revision: 192975 URL: http://svn.freebsd.org/changeset/base/192975 Log: MFC: Largely revert the earlier change to use a single CCB for the RAID recovery thread. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/mpt/mpt_raid.c Modified: stable/7/sys/dev/mpt/mpt_raid.c ============================================================================== --- stable/7/sys/dev/mpt/mpt_raid.c Thu May 28 13:16:23 2009 (r192974) +++ stable/7/sys/dev/mpt/mpt_raid.c Thu May 28 14:48:10 2009 (r192975) @@ -658,19 +658,19 @@ mpt_terminate_raid_thread(struct mpt_sof static void mpt_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb) { + xpt_free_path(ccb->ccb_h.path); + xpt_free_ccb(ccb); } static void mpt_raid_thread(void *arg) { struct mpt_softc *mpt; - union ccb *ccb; int firstrun; mpt = (struct mpt_softc *)arg; firstrun = 1; - ccb = xpt_alloc_ccb(); MPT_LOCK(mpt); while (mpt->shutdwn_raid == 0) { @@ -698,15 +698,21 @@ mpt_raid_thread(void *arg) } if (mpt->raid_rescan != 0) { + union ccb *ccb; struct cam_path *path; int error; mpt->raid_rescan = 0; + MPT_UNLOCK(mpt); + ccb = xpt_alloc_ccb(); + + MPT_LOCK(mpt); error = xpt_create_path(&path, xpt_periph, cam_sim_path(mpt->phydisk_sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); if (error != CAM_REQ_CMP) { + xpt_free_ccb(ccb); mpt_prt(mpt, "Unable to rescan RAID Bus!\n"); } else { xpt_setup_ccb(&ccb->ccb_h, path, 5); @@ -719,7 +725,6 @@ mpt_raid_thread(void *arg) } } } - xpt_free_ccb(ccb); mpt->raid_thread = NULL; wakeup(&mpt->raid_thread); MPT_UNLOCK(mpt); From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 16:05:23 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 400F8106568C; Thu, 28 May 2009 16:05:23 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2D2A38FC1C; Thu, 28 May 2009 16:05:23 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SG5NAs042739; Thu, 28 May 2009 16:05:23 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SG5NQw042738; Thu, 28 May 2009 16:05:23 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905281605.n4SG5NQw042738@svn.freebsd.org> From: Dmitry Chagin Date: Thu, 28 May 2009 16:05:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192981 - stable/7/sys/compat/linux X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 16:05:23 -0000 Author: dchagin Date: Thu May 28 16:05:22 2009 New Revision: 192981 URL: http://svn.freebsd.org/changeset/base/192981 Log: Direct commit. Fix error introduced in my r192950 merge. Osrel variable should be initialized before use. Pointyhat to: me Approved by: kib (mentor) Modified: stable/7/sys/compat/linux/linux_mib.c Modified: stable/7/sys/compat/linux/linux_mib.c ============================================================================== --- stable/7/sys/compat/linux/linux_mib.c Thu May 28 15:41:41 2009 (r192980) +++ stable/7/sys/compat/linux/linux_mib.c Thu May 28 16:05:22 2009 (r192981) @@ -267,11 +267,9 @@ linux_kernver(struct thread *td) int osrel; pr = td->td_ucred->cr_prison; - if (pr != NULL) { - if (pr->pr_linux != NULL) { - lpr = (struct linux_prison *)pr->pr_linux; - osrel = lpr->pr_osrel; - } + if (pr != NULL && pr->pr_linux != NULL) { + lpr = (struct linux_prison *)pr->pr_linux; + osrel = lpr->pr_osrel; } else osrel = linux_osrel; return (osrel); From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 16:08:33 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C84DB1065670; Thu, 28 May 2009 16:08:33 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B53058FC1F; Thu, 28 May 2009 16:08:33 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SG8XTg042842; Thu, 28 May 2009 16:08:33 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SG8XHP042841; Thu, 28 May 2009 16:08:33 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200905281608.n4SG8XHP042841@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 28 May 2009 16:08:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192982 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 16:08:34 -0000 Author: kib Date: Thu May 28 16:08:33 2009 New Revision: 192982 URL: http://svn.freebsd.org/changeset/base/192982 Log: MFC r191895: Eliminate the loop and the call to pause(9) in vfs_vget_ino(). Tested by: Mykola Dzham Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/kern/vfs_vnops.c Modified: stable/7/sys/kern/vfs_vnops.c ============================================================================== --- stable/7/sys/kern/vfs_vnops.c Thu May 28 16:05:22 2009 (r192981) +++ stable/7/sys/kern/vfs_vnops.c Thu May 28 16:08:33 2009 (r192982) @@ -1226,26 +1226,30 @@ int vn_vget_ino(struct vnode *vp, ino_t ino, int lkflags, struct vnode **rvp) { struct mount *mp; + struct thread *td; int ltype, error; mp = vp->v_mount; - ltype = VOP_ISLOCKED(vp, curthread); + td = curthread; + ltype = VOP_ISLOCKED(vp, td); KASSERT(ltype == LK_EXCLUSIVE || ltype == LK_SHARED, ("vn_vget_ino: vp not locked")); - for (;;) { - error = vfs_busy(mp, LK_NOWAIT, NULL, curthread); - if (error == 0) - break; - VOP_UNLOCK(vp, 0, curthread); - pause("vn_vget", 1); - vn_lock(vp, ltype | LK_RETRY, curthread); - if (vp->v_iflag & VI_DOOMED) + error = vfs_busy(mp, LK_NOWAIT, NULL, td); + if (error != 0) { + VOP_UNLOCK(vp, 0, td); + error = vfs_busy(mp, 0, NULL, td); + vn_lock(vp, ltype | LK_RETRY, td); + if (error != 0) + return (ENOENT); + if (vp->v_iflag & VI_DOOMED) { + vfs_unbusy(mp, td); return (ENOENT); + } } - VOP_UNLOCK(vp, 0, curthread); + VOP_UNLOCK(vp, 0, td); error = VFS_VGET(mp, ino, lkflags, rvp); - vfs_unbusy(mp, curthread); - vn_lock(vp, ltype | LK_RETRY, curthread); + vfs_unbusy(mp, td); + vn_lock(vp, ltype | LK_RETRY, td); if (vp->v_iflag & VI_DOOMED) { if (error == 0) vput(*rvp); From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 17:36:45 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60E721065757; Thu, 28 May 2009 17:36:45 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E83B8FC2B; Thu, 28 May 2009 17:36:45 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHajkK044865; Thu, 28 May 2009 17:36:45 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SHajUp044864; Thu, 28 May 2009 17:36:45 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200905281736.n4SHajUp044864@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Thu, 28 May 2009 17:36:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192985 - stable/7/sys/cddl/boot/zfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 17:36:47 -0000 Author: des Date: Thu May 28 17:36:44 2009 New Revision: 192985 URL: http://svn.freebsd.org/changeset/base/192985 Log: Expand keywords. Modified: stable/7/sys/cddl/boot/zfs/zfssubr.c (contents, props changed) Modified: stable/7/sys/cddl/boot/zfs/zfssubr.c ============================================================================== --- stable/7/sys/cddl/boot/zfs/zfssubr.c Thu May 28 17:36:36 2009 (r192984) +++ stable/7/sys/cddl/boot/zfs/zfssubr.c Thu May 28 17:36:44 2009 (r192985) @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: stable/7/sys/cddl/boot/zfs/zfssubr.c 192202 2009-05-16 18:08:28Z kmacy $"); +__FBSDID("$FreeBSD$"); static uint64_t zfs_crc64_table[256]; From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 18:26:19 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79261106566C; Thu, 28 May 2009 18:26:19 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5BF268FC18; Thu, 28 May 2009 18:26:19 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SIQJMJ046070; Thu, 28 May 2009 18:26:19 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SIQJ3D046065; Thu, 28 May 2009 18:26:19 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <200905281826.n4SIQJ3D046065@svn.freebsd.org> From: Dmitry Chagin Date: Thu, 28 May 2009 18:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192987 - in stable/7/sys: . amd64/linux32 compat/linux contrib/pf dev/ath/ath_hal dev/cxgb i386/linux X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 18:26:20 -0000 Author: dchagin Date: Thu May 28 18:26:18 2009 New Revision: 192987 URL: http://svn.freebsd.org/changeset/base/192987 Log: Merge r191883,191966,191973 from HEAD to stable/7: Linux exports HZ value to user space via AT_CLKTCK auxiliary vector entry since 2.4.0. Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), glibc falls back to the hard-coded CLK_TCK value when aux entry is not present. Glibc versions prior to 2.2.1 always use hard-coded CLK_TCK value. For older applications/libc's which depends on hard-coded CLK_TCK value user should set compat.linux.osrelease less than 2.4.0. linux_times() shall use the value that is exported to user space. PR: kern/134251 Approved by: kib (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/linux32/linux32_sysvec.c stable/7/sys/compat/linux/linux_mib.h stable/7/sys/compat/linux/linux_misc.c stable/7/sys/compat/linux/linux_misc.h stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/i386/linux/linux_sysvec.c Modified: stable/7/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- stable/7/sys/amd64/linux32/linux32_sysvec.c Thu May 28 18:11:09 2009 (r192986) +++ stable/7/sys/amd64/linux32/linux32_sysvec.c Thu May 28 18:26:18 2009 (r192987) @@ -263,7 +263,17 @@ elf_linux_fixup(register_t **stack_base, pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1120,6 +1130,7 @@ linux_elf_modevent(module_t mod, int typ linux_proc_exec, NULL, 1000); linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else Modified: stable/7/sys/compat/linux/linux_mib.h ============================================================================== --- stable/7/sys/compat/linux/linux_mib.h Thu May 28 18:11:09 2009 (r192986) +++ stable/7/sys/compat/linux/linux_mib.h Thu May 28 18:26:18 2009 (r192987) @@ -42,6 +42,7 @@ int linux_set_oss_version(struct thread int linux_kernver(struct thread *td); +#define LINUX_KERNVER_2004000 2004000 #define LINUX_KERNVER_2006000 2006000 #define linux_use26(t) (linux_kernver(t) >= LINUX_KERNVER_2006000) Modified: stable/7/sys/compat/linux/linux_misc.c ============================================================================== --- stable/7/sys/compat/linux/linux_misc.c Thu May 28 18:11:09 2009 (r192986) +++ stable/7/sys/compat/linux/linux_misc.c Thu May 28 18:26:18 2009 (r192987) @@ -90,6 +90,8 @@ __FBSDID("$FreeBSD$"); #include #include +int stclohz; /* Statistics clock frequency */ + #define BSD_TO_LINUX_SIGNAL(sig) \ (((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig) @@ -661,9 +663,19 @@ struct l_times_argv { l_clock_t tms_cstime; }; -#define CLK_TCK 100 /* Linux uses 100 */ -#define CONVTCK(r) (r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK)) +/* + * Glibc versions prior to 2.2.1 always use hard-coded CLK_TCK value. + * Since 2.2.1 Glibc uses value exported from kernel via AT_CLKTCK + * auxiliary vector entry. + */ +#define CLK_TCK 100 + +#define CONVOTCK(r) (r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK)) +#define CONVNTCK(r) (r.tv_sec * stclohz + r.tv_usec / (1000000 / stclohz)) + +#define CONVTCK(r) (linux_kernver(td) >= LINUX_KERNVER_2004000 ? \ + CONVNTCK(r) : CONVOTCK(r)) int linux_times(struct thread *td, struct linux_times_args *args) Modified: stable/7/sys/compat/linux/linux_misc.h ============================================================================== --- stable/7/sys/compat/linux/linux_misc.h Thu May 28 18:11:09 2009 (r192986) +++ stable/7/sys/compat/linux/linux_misc.h Thu May 28 18:26:18 2009 (r192987) @@ -65,4 +65,6 @@ extern const char *linux_platform; #define __LINUX_NPXCW__ 0x37f #endif +extern int stclohz; + #endif /* _LINUX_MISC_H_ */ Modified: stable/7/sys/i386/linux/linux_sysvec.c ============================================================================== --- stable/7/sys/i386/linux/linux_sysvec.c Thu May 28 18:11:09 2009 (r192986) +++ stable/7/sys/i386/linux/linux_sysvec.c Thu May 28 18:26:18 2009 (r192987) @@ -257,7 +257,17 @@ elf_linux_fixup(register_t **stack_base, pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY(pos, AT_PHENT, args->phent); AUXARGS_ENTRY(pos, AT_PHNUM, args->phnum); @@ -1091,6 +1101,7 @@ linux_elf_modevent(module_t mod, int typ linux_get_machine(&linux_platform); linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 21:17:28 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 543F710656A4; Thu, 28 May 2009 21:17:28 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 420638FC17; Thu, 28 May 2009 21:17:28 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SLHSGl050031; Thu, 28 May 2009 21:17:28 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SLHSi7050030; Thu, 28 May 2009 21:17:28 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200905282117.n4SLHSi7050030@svn.freebsd.org> From: Xin LI Date: Thu, 28 May 2009 21:17:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192995 - stable/7/lib/libufs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 21:17:28 -0000 Author: delphij Date: Thu May 28 21:17:27 2009 New Revision: 192995 URL: http://svn.freebsd.org/changeset/base/192995 Log: Merge r190646: Bail out when memory allocation is failed, rather than referencing a NULL pointer. PR: kern/94480 Submitted by: Michiel Pelt Modified: stable/7/lib/libufs/ (props changed) stable/7/lib/libufs/block.c Modified: stable/7/lib/libufs/block.c ============================================================================== --- stable/7/lib/libufs/block.c Thu May 28 21:12:43 2009 (r192994) +++ stable/7/lib/libufs/block.c Thu May 28 21:17:27 2009 (r192995) @@ -63,8 +63,10 @@ bread(struct uufsd *disk, ufs2_daddr_t b */ if (((intptr_t)data) & 0x3f) { p2 = malloc(size); - if (p2 == NULL) + if (p2 == NULL) { ERROR(disk, "allocate bounce buffer"); + goto fail; + } } cnt = pread(disk->d_fd, p2, size, (off_t)(blockno * disk->d_bsize)); if (cnt == -1) { @@ -114,8 +116,10 @@ bwrite(struct uufsd *disk, ufs2_daddr_t */ if (((intptr_t)data) & 0x3f) { p2 = malloc(size); - if (p2 == NULL) + if (p2 == NULL) { ERROR(disk, "allocate bounce buffer"); + return (-1); + } memcpy(p2, data, size); data = p2; } From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 21:52:01 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAEB610656CA; Thu, 28 May 2009 21:52:01 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E24D8FC1E; Thu, 28 May 2009 21:52:01 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SLq1Tl050971; Thu, 28 May 2009 21:52:01 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SLq1ex050970; Thu, 28 May 2009 21:52:01 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200905282152.n4SLq1ex050970@svn.freebsd.org> From: Xin LI Date: Thu, 28 May 2009 21:52:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192999 - in stable/7/lib/libc: . gen string X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 21:52:05 -0000 Author: delphij Date: Thu May 28 21:52:00 2009 New Revision: 192999 URL: http://svn.freebsd.org/changeset/base/192999 Log: Merge r192129+r190661: Properly handle malloc() failures. PR: bin/83338 Modified: stable/7/lib/libc/ (props changed) stable/7/lib/libc/gen/getcap.c stable/7/lib/libc/string/ffsll.c (props changed) stable/7/lib/libc/string/flsll.c (props changed) Modified: stable/7/lib/libc/gen/getcap.c ============================================================================== --- stable/7/lib/libc/gen/getcap.c Thu May 28 21:41:01 2009 (r192998) +++ stable/7/lib/libc/gen/getcap.c Thu May 28 21:52:00 2009 (r192999) @@ -189,7 +189,7 @@ getent(char **cap, u_int *len, char **db { DB *capdbp; char *r_end, *rp, **db_p; - int myfd, eof, foundit, retval, clen; + int myfd, eof, foundit, retval; char *record, *cbuf; int tc_not_resolved; char pbuf[_POSIX_PATH_MAX]; @@ -251,14 +251,16 @@ getent(char **cap, u_int *len, char **db return (retval); } /* save the data; close frees it */ - clen = strlen(record); - cbuf = malloc(clen + 1); - memcpy(cbuf, record, clen + 1); + cbuf = strdup(record); if (capdbp->close(capdbp) < 0) { free(cbuf); return (-2); } - *len = clen; + if (cbuf == NULL) { + errno = ENOMEM; + return (-2); + } + *len = strlen(cbuf); *cap = cbuf; return (retval); } else { From owner-svn-src-stable-7@FreeBSD.ORG Thu May 28 23:05:18 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0356C1065672; Thu, 28 May 2009 23:05:18 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CAE558FC0A; Thu, 28 May 2009 23:05:17 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SN5HBB052678; Thu, 28 May 2009 23:05:17 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SN5HfR052677; Thu, 28 May 2009 23:05:17 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905282305.n4SN5HfR052677@svn.freebsd.org> From: Kip Macy Date: Thu, 28 May 2009 23:05:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193003 - stable/7/rescue/rescue X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 23:05:18 -0000 Author: kmacy Date: Thu May 28 23:05:17 2009 New Revision: 193003 URL: http://svn.freebsd.org/changeset/base/193003 Log: MFC 192617 add zfs and zpool to /rescue Modified: stable/7/rescue/rescue/Makefile Modified: stable/7/rescue/rescue/Makefile ============================================================================== --- stable/7/rescue/rescue/Makefile Thu May 28 22:12:14 2009 (r193002) +++ stable/7/rescue/rescue/Makefile Thu May 28 23:05:17 2009 (r193003) @@ -71,7 +71,7 @@ CRUNCH_SRCDIRS+= bin CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd \ realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil +CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil .if ${MK_OPENSSL} != "no" CRUNCH_LIBS+= -lcrypto .endif @@ -129,6 +129,10 @@ CRUNCH_PROGS_sbin+= ping6 .if ${MK_IPFILTER} != "no" CRUNCH_PROGS_sbin+= ipf .endif +.if ${MK_ZFS} != "no" +CRUNCH_PROGS_sbin+= zfs +CRUNCH_PROGS_sbin+= zpool +.endif # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd @@ -137,6 +141,9 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld .if ${MK_IPX} != "no" CRUNCH_LIBS+= -lipx .endif +.if ${MK_ZFS} != "no" +CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl +.endif CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz .if ${MACHINE_ARCH} == "i386" @@ -173,6 +180,10 @@ CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../. CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf +.if ${MK_ZFS} != "no" +CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs +CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool +.endif CRUNCH_ALIAS_reboot= fastboot halt fasthalt CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_dump= rdump @@ -210,6 +221,11 @@ CRUNCH_SRCDIRS+= usr.sbin CRUNCH_PROGS_usr.sbin+= chroot +CRUNCH_PROGS_usr.sbin+= chown +CRUNCH_ALIAS_chown= chgrp +################################################################## +CRUNCH_LIBS+= -lm + ################################################################## # The following is pretty nearly a generic crunchgen-handling makefile # From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 06:55:15 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF8ED106564A; Fri, 29 May 2009 06:55:15 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC6628FC13; Fri, 29 May 2009 06:55:15 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T6tFQ0062679; Fri, 29 May 2009 06:55:15 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4T6tFmH062675; Fri, 29 May 2009 06:55:15 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200905290655.n4T6tFmH062675@svn.freebsd.org> From: Xin LI Date: Fri, 29 May 2009 06:55:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193019 - in stable/7/lib/libc: . gen string X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 06:55:16 -0000 Author: delphij Date: Fri May 29 06:55:15 2009 New Revision: 193019 URL: http://svn.freebsd.org/changeset/base/193019 Log: MFC r178253 and r178256: Implement fdopendir(3) by splitting __opendir2() into two parts, the upper part deals with the usual __opendir2() calls, and the rest part with an interface translator to expose fdopendir(3) functionality. Manual page was obtained from kib@'s work for *at(2) system calls. Modified: stable/7/lib/libc/ (props changed) stable/7/lib/libc/gen/Makefile.inc stable/7/lib/libc/gen/Symbol.map stable/7/lib/libc/gen/directory.3 stable/7/lib/libc/gen/opendir.c stable/7/lib/libc/string/ffsll.c (props changed) stable/7/lib/libc/string/flsll.c (props changed) Modified: stable/7/lib/libc/gen/Makefile.inc ============================================================================== --- stable/7/lib/libc/gen/Makefile.inc Fri May 29 06:41:23 2009 (r193018) +++ stable/7/lib/libc/gen/Makefile.inc Fri May 29 06:55:15 2009 (r193019) @@ -71,6 +71,7 @@ MLINKS+=arc4random.3 arc4random_addrando MLINKS+=ctermid.3 ctermid_r.3 MLINKS+=devname.3 devname_r.3 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \ + directory.3 fdopendir.3 \ directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \ directory.3 seekdir.3 directory.3 telldir.3 MLINKS+=dlopen.3 dlclose.3 dlopen.3 dlerror.3 dlopen.3 dlfunc.3 \ Modified: stable/7/lib/libc/gen/Symbol.map ============================================================================== --- stable/7/lib/libc/gen/Symbol.map Fri May 29 06:41:23 2009 (r193018) +++ stable/7/lib/libc/gen/Symbol.map Fri May 29 06:55:15 2009 (r193019) @@ -336,6 +336,10 @@ FBSD_1.0 { wordfree; }; +FBSD_1.1 { + fdopendir; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; Modified: stable/7/lib/libc/gen/directory.3 ============================================================================== --- stable/7/lib/libc/gen/directory.3 Fri May 29 06:41:23 2009 (r193018) +++ stable/7/lib/libc/gen/directory.3 Fri May 29 06:55:15 2009 (r193019) @@ -28,11 +28,12 @@ .\" @(#)directory.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd April 16, 2008 .Dt DIRECTORY 3 .Os .Sh NAME .Nm opendir , +.Nm fdopendir , .Nm readdir , .Nm readdir_r , .Nm telldir , @@ -48,6 +49,8 @@ .In dirent.h .Ft DIR * .Fn opendir "const char *filename" +.Ft DIR * +.Fn fdopendir "int fd" .Ft struct dirent * .Fn readdir "DIR *dirp" .Ft int @@ -84,6 +87,36 @@ cannot be accessed, or if it cannot enough memory to hold the whole thing. .Pp The +.Fn fdopendir +function is equivalent to the +.Fn opendir +function except that the directory is specified by a file descriptor +.Fa fd +rather than by a name. +The file offset associated with the file descriptor at the time of the call +determines which entries are returned. +.Pp +Upon successful return from +.Fn fdopendir , +the file descriptor is under the control of the system, +and if any attempt is made to close the file descriptor, +or to modify the state of the associated description other than by means +of +.Fn closedir , +.Fn readdir , +.Fn readdir_r , +or +.Fn rewinddir , +the behavior is undefined. +Upon calling +.Fn closedir +the file descriptor is closed. +The +.Dv FD_CLOEXEC +flag is set on the file descriptor by a successful call to +.Fn fdopendir . +.Pp +The .Fn readdir function returns a pointer to the next directory entry. @@ -202,3 +235,7 @@ and .Fn dirfd functions appeared in .Bx 4.2 . +The +.Fn fdopendir +function appeared in +.Fx 8.0 . Modified: stable/7/lib/libc/gen/opendir.c ============================================================================== --- stable/7/lib/libc/gen/opendir.c Fri May 29 06:41:23 2009 (r193018) +++ stable/7/lib/libc/gen/opendir.c Fri May 29 06:55:15 2009 (r193019) @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * @@ -47,32 +47,38 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" #include "telldir.h" + +static DIR * __opendir_common(int, const char *, int); + /* * Open a directory. */ DIR * -opendir(name) - const char *name; +opendir(const char *name) { return (__opendir2(name, DTF_HIDEW|DTF_NODUP)); } +/* + * Open a directory with existing file descriptor. + */ DIR * -__opendir2(name, flags) - const char *name; - int flags; +fdopendir(int fd) +{ + + return (__opendir_common(fd, NULL, DTF_HIDEW|DTF_NODUP)); +} + +DIR * +__opendir2(const char *name, int flags) { - DIR *dirp; int fd; - int incr; - int saved_errno; - int unionstack; struct stat statb; /* * stat() before _open() because opening of special files may be - * harmful. _fstat() after open because the file may have changed. + * harmful. */ if (stat(name, &statb) != 0) return (NULL); @@ -82,7 +88,24 @@ __opendir2(name, flags) } if ((fd = _open(name, O_RDONLY | O_NONBLOCK)) == -1) return (NULL); + + return __opendir_common(fd, name, flags); +} + +/* + * Common routine for opendir(3), __opendir2(3) and fdopendir(3). + */ +static DIR * +__opendir_common(int fd, const char *name, int flags) +{ + DIR *dirp; + int incr; + int saved_errno; + int unionstack; + struct stat statb; + dirp = NULL; + /* _fstat() the open handler because the file may have changed. */ if (_fstat(fd, &statb) != 0) goto fail; if (!S_ISDIR(statb.st_mode)) { From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 06:57:45 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5B511065670; Fri, 29 May 2009 06:57:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B340C8FC1A; Fri, 29 May 2009 06:57:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T6vj3A062766; Fri, 29 May 2009 06:57:45 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4T6vjMt062765; Fri, 29 May 2009 06:57:45 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200905290657.n4T6vjMt062765@svn.freebsd.org> From: Xin LI Date: Fri, 29 May 2009 06:57:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193020 - stable/7/sys/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 06:57:46 -0000 Author: delphij Date: Fri May 29 06:57:45 2009 New Revision: 193020 URL: http://svn.freebsd.org/changeset/base/193020 Log: Bump __FreeBSDversion for fdopendir(3) MFC. Modified: stable/7/sys/sys/param.h Modified: stable/7/sys/sys/param.h ============================================================================== --- stable/7/sys/sys/param.h Fri May 29 06:55:15 2009 (r193019) +++ stable/7/sys/sys/param.h Fri May 29 06:57:45 2009 (r193020) @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 702101 /* Master, propagated to newvers */ +#define __FreeBSD_version 702102 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 14:42:02 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B51B10656A3; Fri, 29 May 2009 14:42:02 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 797B78FC24; Fri, 29 May 2009 14:42:02 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEg2nX077821; Fri, 29 May 2009 14:42:02 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TEg290077819; Fri, 29 May 2009 14:42:02 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <200905291442.n4TEg290077819@svn.freebsd.org> From: Andriy Gapon Date: Fri, 29 May 2009 14:42:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193040 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 14:42:03 -0000 Author: avg Date: Fri May 29 14:42:02 2009 New Revision: 193040 URL: http://svn.freebsd.org/changeset/base/193040 Log: use new btxld when building world in older environment This is a direct commit to the branch. This is for the benefit of those who define LOADER_ZFS_SUPPORT but should't hurt anybody else. Build of zfsboot requires new feature of btxld that it obtained (via MFC) in r192697: "merge 177933. Allow for a zero length 'loader'" (btxld is a build tool and a cross-build tool) Please note that __FreeBSD_version was bumped some time after r192697 for an unrelated change. Reviewed by: des Approved by: jhb (mentor) Modified: stable/7/Makefile.inc1 Modified: stable/7/Makefile.inc1 ============================================================================== --- stable/7/Makefile.inc1 Fri May 29 14:25:51 2009 (r193039) +++ stable/7/Makefile.inc1 Fri May 29 14:42:02 2009 (r193040) @@ -985,7 +985,7 @@ build-tools: # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 17:26:02 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA2BD1065687; Fri, 29 May 2009 17:26:02 +0000 (UTC) (envelope-from niclas.zeising@gmail.com) Received: from mx6.bahnhof.se (mx6.bahnhof.se [213.80.101.16]) by mx1.freebsd.org (Postfix) with ESMTP id 684EA8FC13; Fri, 29 May 2009 17:26:02 +0000 (UTC) (envelope-from niclas.zeising@gmail.com) Received: from localhost (mx6.local [127.0.0.1]) by mx6-reinject (Postfix) with ESMTP id F1BE5211074; Fri, 29 May 2009 19:26:00 +0200 (CEST) Received: from mx6.bahnhof.se ([127.0.0.1]) by localhost (mx6.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 89095-10; Fri, 29 May 2009 19:25:56 +0200 (CEST) Received: from [79.136.90.99] (h-90-99.A163.priv.bahnhof.se [79.136.90.99]) by mx6.bahnhof.se (Postfix) with ESMTP id B6E362110B9; Fri, 29 May 2009 19:25:56 +0200 (CEST) Received: from 127.0.0.1 (AVG SMTP 8.5.339 [270.12.44/2140]); Fri, 29 May 2009 19:25:56 +0200 Message-ID: <4A201AA4.2080106@gmail.com> Date: Fri, 29 May 2009 19:25:56 +0200 From: Niclas Zeising User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: Andriy Gapon References: <200905291442.n4TEg290077819@svn.freebsd.org> <4A2016DC.80001@gmail.com> <4A2018BA.9040305@freebsd.org> In-Reply-To: <4A2018BA.9040305@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MX6) X-Spam-Status: No, score=1.44 tagged_above=-99 required=5 tests=[DNS_FROM_RFC_POST=1.44] X-Spam-Score: 1.44 X-Spam-Level: * Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r193040 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 17:26:03 -0000 Andriy Gapon wrote: > on 29/05/2009 20:09 Niclas Zeising said the following: >> Is it possible to get something along this line in 8-CURRENT as well? I >> accidentally removed btxld once and when I was building world it stopped >> in sys/boot because it was missing. I had to manually build and install >> it before i could continue with my buildworld, which was a bit annoying. > > Short answer: no, it was your fault :-) > > Long answer: possibly - there are a number of tools that are always used > from /usr/obj (so to speak), but some other tools are used that way only > if there is a good reason to do so. But I think that we could always use > those latter tools from /usr/obj, I don't see why we couldn't. Obviously it was my fault, and had it bin cc or make I wouldn't have complained, but it's such a small utility, I didn't even know it existed or that it was needed... I was just asking, I apologize if I sounded a bit angry in the previous mail. Regards! //Niclas -- From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 17:29:42 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 034031065686; Fri, 29 May 2009 17:29:42 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 2A7518FC14; Fri, 29 May 2009 17:29:39 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id UAA25199; Fri, 29 May 2009 20:17:48 +0300 (EEST) (envelope-from avg@freebsd.org) Received: from localhost.topspin.kiev.ua ([127.0.0.1] helo=edge.pp.kiev.ua) by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1MA5iG-000ASi-E4; Fri, 29 May 2009 20:17:48 +0300 Message-ID: <4A2018BA.9040305@freebsd.org> Date: Fri, 29 May 2009 20:17:46 +0300 From: Andriy Gapon User-Agent: Thunderbird 2.0.0.21 (X11/20090406) MIME-Version: 1.0 To: Niclas Zeising References: <200905291442.n4TEg290077819@svn.freebsd.org> <4A2016DC.80001@gmail.com> In-Reply-To: <4A2016DC.80001@gmail.com> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r193040 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 17:29:42 -0000 on 29/05/2009 20:09 Niclas Zeising said the following: > > Is it possible to get something along this line in 8-CURRENT as well? I > accidentally removed btxld once and when I was building world it stopped > in sys/boot because it was missing. I had to manually build and install > it before i could continue with my buildworld, which was a bit annoying. Short answer: no, it was your fault :-) Long answer: possibly - there are a number of tools that are always used from /usr/obj (so to speak), but some other tools are used that way only if there is a good reason to do so. But I think that we could always use those latter tools from /usr/obj, I don't see why we couldn't. -- Andriy Gapon From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 17:35:44 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92B13106567B; Fri, 29 May 2009 17:35:44 +0000 (UTC) (envelope-from niclas.zeising@gmail.com) Received: from mxf1.bahnhof.se (mxf1.bahnhof.se [213.80.101.25]) by mx1.freebsd.org (Postfix) with ESMTP id 45FC38FC33; Fri, 29 May 2009 17:35:44 +0000 (UTC) (envelope-from niclas.zeising@gmail.com) Received: from localhost (mxf1.local [127.0.0.1]) by mxf1-reinject (Postfix) with ESMTP id C82F05D0E; Fri, 29 May 2009 19:09:50 +0200 (CEST) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MXF1) X-Spam-Score: 2.819 X-Spam-Level: ** X-Spam-Status: No, score=2.819 tagged_above=-99 required=5 tests=[DNS_FROM_RFC_POST=1.44, SPF_NEUTRAL=1.379] Received: from mxf1.bahnhof.se ([127.0.0.1]) by localhost (mxf1.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hPPgdc-lFtBa; Fri, 29 May 2009 19:09:48 +0200 (CEST) Received: from [79.136.90.99] (h-90-99.A163.priv.bahnhof.se [79.136.90.99]) by mxf1.bahnhof.se (Postfix) with ESMTP id 939845D05; Fri, 29 May 2009 19:09:48 +0200 (CEST) Received: from 127.0.0.1 (AVG SMTP 8.5.339 [270.12.44/2140]); Fri, 29 May 2009 19:09:48 +0200 Message-ID: <4A2016DC.80001@gmail.com> Date: Fri, 29 May 2009 19:09:48 +0200 From: Niclas Zeising User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: Andriy Gapon References: <200905291442.n4TEg290077819@svn.freebsd.org> In-Reply-To: <200905291442.n4TEg290077819@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r193040 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 17:35:45 -0000 Andriy Gapon wrote: > Author: avg > Date: Fri May 29 14:42:02 2009 > New Revision: 193040 > URL: http://svn.freebsd.org/changeset/base/193040 > > Log: > use new btxld when building world in older environment > > This is a direct commit to the branch. > This is for the benefit of those who define LOADER_ZFS_SUPPORT but > should't hurt anybody else. > Build of zfsboot requires new feature of btxld that it obtained > (via MFC) in r192697: "merge 177933. Allow for a zero length 'loader'" > (btxld is a build tool and a cross-build tool) > Please note that __FreeBSD_version was bumped some time after r192697 > for an unrelated change. > > Reviewed by: des > Approved by: jhb (mentor) > > Modified: > stable/7/Makefile.inc1 > > Modified: stable/7/Makefile.inc1 > ============================================================================== > --- stable/7/Makefile.inc1 Fri May 29 14:25:51 2009 (r193039) > +++ stable/7/Makefile.inc1 Fri May 29 14:42:02 2009 (r193040) > @@ -985,7 +985,7 @@ build-tools: > # > # cross-tools: Build cross-building tools > # > -.if ${TARGET_ARCH} != ${MACHINE_ARCH} > +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102 > .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" > _btxld= usr.sbin/btxld > .endif > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" > Is it possible to get something along this line in 8-CURRENT as well? I accidentally removed btxld once and when I was building world it stopped in sys/boot because it was missing. I had to manually build and install it before i could continue with my buildworld, which was a bit annoying. Regards! Niclas -- From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 18:14:49 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8B4B106566B; Fri, 29 May 2009 18:14:49 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 597F78FC12; Fri, 29 May 2009 18:14:47 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id VAA25625; Fri, 29 May 2009 21:14:46 +0300 (EEST) (envelope-from avg@freebsd.org) Received: from localhost.topspin.kiev.ua ([127.0.0.1] helo=edge.pp.kiev.ua) by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1MA6bN-000AW5-MZ; Fri, 29 May 2009 21:14:45 +0300 Message-ID: <4A202614.7060609@freebsd.org> Date: Fri, 29 May 2009 21:14:44 +0300 From: Andriy Gapon User-Agent: Thunderbird 2.0.0.21 (X11/20090406) MIME-Version: 1.0 To: Niclas Zeising References: <200905291442.n4TEg290077819@svn.freebsd.org> <4A2016DC.80001@gmail.com> <4A2018BA.9040305@freebsd.org> <4A201AA4.2080106@gmail.com> In-Reply-To: <4A201AA4.2080106@gmail.com> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r193040 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 18:14:50 -0000 on 29/05/2009 20:25 Niclas Zeising said the following: > Andriy Gapon wrote: >> on 29/05/2009 20:09 Niclas Zeising said the following: >>> Is it possible to get something along this line in 8-CURRENT as well? I >>> accidentally removed btxld once and when I was building world it stopped >>> in sys/boot because it was missing. I had to manually build and install >>> it before i could continue with my buildworld, which was a bit annoying. >> >> Short answer: no, it was your fault :-) >> >> Long answer: possibly - there are a number of tools that are always used >> from /usr/obj (so to speak), but some other tools are used that way only >> if there is a good reason to do so. But I think that we could always use >> those latter tools from /usr/obj, I don't see why we couldn't. > > Obviously it was my fault, and had it bin cc or make I wouldn't have > complained, but it's such a small utility, I didn't even know it existed > or that it was needed... I was just asking, I apologize if I sounded a > bit angry in the previous mail. Oh, not at all. I started to wonder myself why such small tools couldn't always (unconditionally) be build-tools. Would save some hassle in cases like this. And I don't see any down-side. Anyone? -- Andriy Gapon From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 19:37:17 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94C30106566C; Fri, 29 May 2009 19:37:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 81F028FC13; Fri, 29 May 2009 19:37:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TJbH2W084516; Fri, 29 May 2009 19:37:17 GMT (envelope-from lulf@svn.freebsd.org) Received: (from lulf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TJbHek084515; Fri, 29 May 2009 19:37:17 GMT (envelope-from lulf@svn.freebsd.org) Message-Id: <200905291937.n4TJbHek084515@svn.freebsd.org> From: Ulf Lilleengen Date: Fri, 29 May 2009 19:37:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193053 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb geom X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 19:37:18 -0000 Author: lulf Date: Fri May 29 19:37:17 2009 New Revision: 193053 URL: http://svn.freebsd.org/changeset/base/193053 Log: MFC r179097: - Assert that we don't send new provider event for a provider which has G_PF_WITHER flag set. - Fix typo in assertion condition (sorry, but I forgot who report that). MFC r179151: Force commit to note, that the typo in KASSERT() was: PR: kern/116896 Reported by: VANHULLEBUS Yvan Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/geom/geom_subr.c Modified: stable/7/sys/geom/geom_subr.c ============================================================================== --- stable/7/sys/geom/geom_subr.c Fri May 29 19:27:52 2009 (r193052) +++ stable/7/sys/geom/geom_subr.c Fri May 29 19:37:17 2009 (r193053) @@ -531,6 +531,8 @@ g_new_provider_event(void *arg, int flag return; pp = arg; G_VALID_PROVIDER(pp); + KASSERT(!(pp->flags & G_PF_WITHER), + ("g_new_provider_event but withered")); LIST_FOREACH(mp, &g_classes, class) { if (mp->taste == NULL) continue; @@ -620,7 +622,7 @@ g_destroy_provider(struct g_provider *pp ("g_destroy_provider but attached")); KASSERT (pp->acr == 0, ("g_destroy_provider with acr")); KASSERT (pp->acw == 0, ("g_destroy_provider with acw")); - KASSERT (pp->acw == 0, ("g_destroy_provider with ace")); + KASSERT (pp->ace == 0, ("g_destroy_provider with ace")); g_cancel_event(pp); LIST_REMOVE(pp, provider); gp = pp->geom; From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 20:22:57 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7ACDA106566B; Fri, 29 May 2009 20:22:57 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 683028FC39; Fri, 29 May 2009 20:22:57 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TKMvBk085710; Fri, 29 May 2009 20:22:57 GMT (envelope-from emax@svn.freebsd.org) Received: (from emax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TKMvuE085709; Fri, 29 May 2009 20:22:57 GMT (envelope-from emax@svn.freebsd.org) Message-Id: <200905292022.n4TKMvuE085709@svn.freebsd.org> From: Maksim Yevmenkin Date: Fri, 29 May 2009 20:22:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193060 - stable/7/usr.sbin/bluetooth/btpand X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 20:22:58 -0000 Author: emax Date: Fri May 29 20:22:56 2009 New Revision: 193060 URL: http://svn.freebsd.org/changeset/base/193060 Log: MFC r192308 Teach btpand(8) to recognized Bluetooth device node names. Tested by: Daniel O'Connor Modified: stable/7/usr.sbin/bluetooth/btpand/ (props changed) stable/7/usr.sbin/bluetooth/btpand/btpand.c Modified: stable/7/usr.sbin/bluetooth/btpand/btpand.c ============================================================================== --- stable/7/usr.sbin/bluetooth/btpand/btpand.c Fri May 29 20:01:50 2009 (r193059) +++ stable/7/usr.sbin/bluetooth/btpand/btpand.c Fri May 29 20:22:56 2009 (r193060) @@ -101,7 +101,7 @@ main(int argc, char *argv[]) break; case 'd': /* local address */ - if (!bt_aton(optarg, &local_bdaddr)) { + if (!bt_devaddr(optarg, &local_bdaddr)) { struct hostent *he; if ((he = bt_gethostbyname(optarg)) == NULL) From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 20:25:03 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81CD21065674; Fri, 29 May 2009 20:25:03 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6FE2A8FC5E; Fri, 29 May 2009 20:25:03 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TKP3sF085802; Fri, 29 May 2009 20:25:03 GMT (envelope-from emax@svn.freebsd.org) Received: (from emax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TKP3f2085801; Fri, 29 May 2009 20:25:03 GMT (envelope-from emax@svn.freebsd.org) Message-Id: <200905292025.n4TKP3f2085801@svn.freebsd.org> From: Maksim Yevmenkin Date: Fri, 29 May 2009 20:25:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193061 - stable/7/lib/libbluetooth X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 20:25:04 -0000 Author: emax Date: Fri May 29 20:25:03 2009 New Revision: 193061 URL: http://svn.freebsd.org/changeset/base/193061 Log: MFC r192113 Avoid floating point arithmetic while calculating iquiry length. Submitted by: Iain Hibbert < plunky -at- rya-online -dot- net > Modified: stable/7/lib/libbluetooth/ (props changed) stable/7/lib/libbluetooth/hci.c Modified: stable/7/lib/libbluetooth/hci.c ============================================================================== --- stable/7/lib/libbluetooth/hci.c Fri May 29 20:22:56 2009 (r193060) +++ stable/7/lib/libbluetooth/hci.c Fri May 29 20:25:03 2009 (r193061) @@ -410,7 +410,6 @@ bt_devinquiry(char const *devname, time_ ng_hci_inquiry_response *ir; struct bt_devinquiry *i; int s, n; - time_t to; if (ii == NULL) { errno = EINVAL; @@ -452,16 +451,20 @@ bt_devinquiry(char const *devname, time_ cp->lap[1] = 0x8b; cp->lap[2] = 0x9e; - /* Calculate inquire length in 1.28 second units */ - to = (time_t) ((double) length / 1.28); - if (to <= 0) - cp->inquiry_length = 4; /* 5.12 seconds */ - else if (to > 254) - cp->inquiry_length = 255; /* 326.40 seconds */ - else - cp->inquiry_length = to + 1; + /* + * Calculate inquire length in 1.28 second units + * v2.x specification says that 1.28 -> 61.44 seconds + * range is acceptable + */ + + if (length <= 0) + length = 5; + else if (length == 1) + length = 2; + else if (length > 62) + length = 62; - to = (time_t)((double) cp->inquiry_length * 1.28) + 1; + cp->inquiry_length = (uint8_t)((length * 100) / 128); if (num_rsp <= 0 || num_rsp > 255) num_rsp = 8; @@ -484,7 +487,7 @@ bt_devinquiry(char const *devname, time_ wait_for_more: - n = bt_devrecv(s, buf, sizeof(buf), to); + n = bt_devrecv(s, buf, sizeof(buf), length); if (n < 0) { free(i); bt_devclose(s); From owner-svn-src-stable-7@FreeBSD.ORG Sat May 30 05:19:11 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 333EE106566C; Sat, 30 May 2009 05:19:11 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1FE748FC12; Sat, 30 May 2009 05:19:11 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U5JA24097347; Sat, 30 May 2009 05:19:10 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4U5JA9P097346; Sat, 30 May 2009 05:19:10 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200905300519.n4U5JA9P097346@svn.freebsd.org> From: Edwin Groothuis Date: Sat, 30 May 2009 05:19:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193081 - stable/7/share/misc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 05:19:11 -0000 Author: edwin Date: Sat May 30 05:19:10 2009 New Revision: 193081 URL: http://svn.freebsd.org/changeset/base/193081 Log: MFC of 192627 and 192626 Updated against http://www.loc.gov/standards/iso639-2/langhome.html Snapshot was taken on 16 September 2008. Update share/misc/iso639 Snapshot was taken on 23 May 2009. Modified: stable/7/share/misc/iso639 (contents, props changed) Modified: stable/7/share/misc/iso639 ============================================================================== --- stable/7/share/misc/iso639 Sat May 30 04:46:24 2009 (r193080) +++ stable/7/share/misc/iso639 Sat May 30 05:19:10 2009 (r193081) @@ -27,6 +27,12 @@ # # For general discussion about ISO language codes, write to: iso639@dkuug.dk +# +# Download the file http://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt +# and run head/tools/tools/iso/check-iso639.pl to see if everything is up +# to date. +# + # a2: ISO 639-1 Alpha-2 code # bib: ISO 639-2/B bibliographic code # term: ISO 639-2/B terminology code @@ -37,69 +43,75 @@ ab abk abk Abkhazian ace ace Achinese ach ach Acoli ada ada Adangme - afa afa Afro-Asiatic (Other) + ady ady Adyghe; Adygei + afa afa Afro-Asiatic languages afh afh Afrihili af afr afr Afrikaans - aka aka Akan + ain ain Ainu +ak aka aka Akan akk akk Akkadian sq alb sqi Albanian ale ale Aleut alg alg Algonquian languages + alt alt Southern Altai am amh amh Amharic ang ang English, Old (ca.450-1100) + anp anp Angika apa apa Apache languages ar ara ara Arabic - arc arc Aramaic + arc arc Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE) +an arg arg Aragonese hy arm hye Armenian - arn arn Araucanian + arn arn Mapudungun; Mapuche arp arp Arapaho - art art Artificial (Other) + art art Artificial languages arw arw Arawak as asm asm Assamese - ast ast Asturian; Bable + ast ast Asturian; Bable; Leonese; Asturleonese ath ath Athapascan languages aus aus Australian languages - ava ava Avaric +av ava ava Avaric ae ave ave Avestan awa awa Awadhi ay aym aym Aymara az aze aze Azerbaijani - bad bad Banda + bad bad Banda languages bai bai Bamileke languages ba bak bak Bashkir bal bal Baluchi - bam bam Bambara +bm bam bam Bambara ban ban Balinese eu baq eus Basque bas bas Basa - bat bat Baltic (Other) - bej bej Beja + bat bat Baltic languages + bej bej Beja; Bedawiyet be bel bel Belarusian bem bem Bemba bn ben ben Bengali - ber ber Berber (Other) + ber ber Berber languages bho bho Bhojpuri bh bih bih Bihari bik bik Bikol - bin bin Bini + bin bin Bini; Edo bi bis bis Bislama bla bla Siksika bnt bnt Bantu (Other) bs bos bos Bosnian bra bra Braj br bre bre Breton - btk btk Batak (Indonesia) + btk btk Batak languages bua bua Buriat bug bug Buginese bg bul bul Bulgarian my bur mya Burmese + byn byn Blin; Bilin cad cad Caddo - cai cai Central American Indian (Other) - car car Carib -ca cat cat Catalan - cau cau Caucasian (Other) + cai cai Central American Indian languages + car car Galibi Carib +ca cat cat Catalan; Valencian + cau cau Caucasian languages ceb ceb Cebuano - cel cel Celtic (Other) + cel cel Celtic languages ch cha cha Chamorro chb chb Chibcha ce che che Chechen @@ -109,35 +121,39 @@ zh chi zho Chinese chm chm Mari chn chn Chinook jargon cho cho Choctaw - chp chp Chipewyan + chp chp Chipewyan; Dene Suline chr chr Cherokee -cu chu chu Church Slavic +cu chu chu Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic cv chv chv Chuvash chy chy Cheyenne cmc cmc Chamic languages cop cop Coptic kw cor cor Cornish co cos cos Corsican - cpe cpe Creoles and pidgins, English based (Other) - cpf cpf Creoles and pidgins, French-based (Other) - cpp cpp Creoles and pidgins, Portuguese-based (Other) - cre cre Cree - crp crp Creoles and pidgins (Other) - cus cus Cushitic (Other) + cpe cpe Creoles and pidgins, English based + cpf cpf Creoles and pidgins, French-based + cpp cpp Creoles and pidgins, Portuguese-based +cr cre cre Cree + crh crh Crimean Tatar; Crimean Turkish + crp crp Creoles and pidgins + csb csb Kashubian + cus cus Cushitic languages cs cze ces Czech dak dak Dakota da dan dan Danish - day day Dayak + dar dar Dargwa + day day Land Dayak languages del del Delaware den den Slave (Athapascan) dgr dgr Dogrib din din Dinka - div div Divehi +dv div div Divehi; Dhivehi; Maldivian doi doi Dogri - dra dra Dravidian (Other) + dra dra Dravidian languages + dsb dsb Lower Sorbian dua dua Duala dum dum Dutch, Middle (ca.1050-1350) -nl dut nld Dutch +nl dut nld Dutch; Flemish dyu dyu Dyula dz dzo dzo Dzongkha efi efi Efik @@ -148,32 +164,35 @@ en eng eng English enm enm English, Middle (1100-1500) eo epo epo Esperanto et est est Estonian - ewe ewe Ewe +ee ewe ewe Ewe ewo ewo Ewondo fan fan Fang fo fao fao Faroese fat fat Fanti fj fij fij Fijian + fil fil Filipino; Pilipino fi fin fin Finnish - fiu fiu Finno-Ugrian (Other) + fiu fiu Finno-Ugrian languages fon fon Fon fr fre fra French frm frm French, Middle (ca.1400-1600) fro fro French, Old (842-ca.1400) -fy fry fry Frisian - ful ful Fulah + frr frr Northern Frisian + frs frs Eastern Frisian +fy fry fry Western Frisian +ff ful ful Fulah fur fur Friulian gaa gaa Ga gay gay Gayo gba gba Gbaya - gem gem Germanic (Other) + gem gem Germanic languages ka geo kat Georgian de ger deu German gez gez Geez gil gil Gilbertese -gd gla gla Gaelic (Scots) +gd gla gla Gaelic; Scottish Gaelic ga gle gle Irish -gl glg glg Gallegan +gl glg glg Galician gv glv glv Manx gmh gmh German, Middle High (ca.1050-1500) goh goh German, Old High (ca.750-1050) @@ -184,9 +203,11 @@ gv glv glv Manx grc grc Greek, Ancient (to 1453) el gre ell Greek, Modern (1453-) gn grn grn Guarani + gsw gsw Swiss German; Alemannic; Alsatian gu guj guj Gujarati - gwi gwi Gwich´in + gwi gwi Gwich'in hai hai Haida +ht hat hat Haitian; Haitian Creole ha hau hau Hausa haw haw Hawaiian he heb heb Hebrew @@ -197,55 +218,64 @@ hi hin hin Hindi hit hit Hittite hmn hmn Hmong ho hmo hmo Hiri Motu +hr hrv hrv Croatian + hsb hsb Upper Sorbian hu hun hun Hungarian hup hup Hupa iba iba Iban - ibo ibo Igbo +ig ibo ibo Igbo is ice isl Icelandic - ijo ijo Ijo +io ido ido Ido +ii iii iii Sichuan Yi; Nuosu + ijo ijo Ijo languages iu iku iku Inuktitut -ie ile ile Interlingue +ie ile ile Interlingue; Occidental ilo ilo Iloko -ia ina ina Interlingua (International Auxiliary Language Association) - inc inc Indic (Other) +ia ina ina Interlingua (International Auxiliary Language Association) + inc inc Indic languages id ind ind Indonesian - ine ine Indo-European (Other) + ine ine Indo-European languages + inh inh Ingush ik ipk ipk Inupiaq - ira ira Iranian (Other) + ira ira Iranian languages iro iro Iroquoian languages it ita ita Italian jv jav jav Javanese + jbo jbo Lojban ja jpn jpn Japanese jpr jpr Judeo-Persian jrb jrb Judeo-Arabic kaa kaa Kara-Kalpak kab kab Kabyle - kac kac Kachin -kl kal kal Kalaallisut + kac kac Kachin; Jingpho +kl kal kal Kalaallisut; Greenlandic kam kam Kamba kn kan kan Kannada - kar kar Karen + kar kar Karen languages ks kas kas Kashmiri - kau kau Kanuri +kr kau kau Kanuri kaw kaw Kawi kk kaz kaz Kazakh + kbd kbd Kabardian kha kha Khasi - khi khi Khoisan (Other) -km khm khm Khmer - kho kho Khotanese -ki kik kik Kikuyu + khi khi Khoisan languages +km khm khm Central Khmer + kho kho Khotanese; Sakan +ki kik kik Kikuyu; Gikuyu rw kin kin Kinyarwanda -ky kir kir Kirghiz +ky kir kir Kirghiz; Kyrgyz kmb kmb Kimbundu kok kok Konkani kv kom kom Komi - kon kon Kongo +kg kon kon Kongo ko kor kor Korean kos kos Kosraean kpe kpe Kpelle - kro kro Kru + krc krc Karachay-Balkar + krl krl Karelian + kro kro Kru languages kru kru Kurukh -kj kua kua Kuanyama +kj kua kua Kuanyama; Kwanyama kum kum Kumyk ku kur kur Kurdish kut kut Kutenai @@ -256,112 +286,120 @@ lo lao lao Lao la lat lat Latin lv lav lav Latvian lez lez Lezghian +li lim lim Limburgan; Limburger; Limburgish ln lin lin Lingala lt lit lit Lithuanian lol lol Mongo loz loz Lozi -lb ltz ltz Letzeburgesch +lb ltz ltz Luxembourgish; Letzeburgesch lua lua Luba-Lulua - lub lub Luba-Katanga - lug lug Ganda +lu lub lub Luba-Katanga +lg lug lug Ganda lui lui Luiseno lun lun Lunda luo luo Luo (Kenya and Tanzania) - lus lus lushai + lus lus Lushai mk mac mkd Macedonian mad mad Madurese mag mag Magahi -mh mah mah Marshall +mh mah mah Marshallese mai mai Maithili mak mak Makasar ml mal mal Malayalam man man Mandingo mi mao mri Maori - map map Austronesian (Other) + map map Austronesian languages mr mar mar Marathi mas mas Masai ms may msa Malay + mdf mdf Moksha mdr mdr Mandar men men Mende mga mga Irish, Middle (900-1200) - mic mic Micmac + mic mic Mi'kmaq; Micmac min min Minangkabau - mis mis Miscellaneous languages - mkh mkh Mon-Khmer (Other) + mis mis Uncoded languages + mkh mkh Mon-Khmer languages mg mlg mlg Malagasy mt mlt mlt Maltese mnc mnc Manchu mni mni Manipuri mno mno Manobo languages moh moh Mohawk -mo mol mol Moldavian mn mon mon Mongolian mos mos Mossi mul mul Multiple languages mun mun Munda languages mus mus Creek + mwl mwl Mirandese mwr mwr Marwari myn myn Mayan languages - nah nah Nahuatl - nai nai North American Indian + myv myv Erzya + nah nah Nahuatl languages + nai nai North American Indian languages + nap nap Neapolitan na nau nau Nauru -nv nav nav Navajo -nr nbl nbl Ndebele, South -nd nde nde Ndebele, North +nv nav nav Navajo; Navaho +nr nbl nbl Ndebele, South; South Ndebele +nd nde nde Ndebele, North; North Ndebele ng ndo ndo Ndonga nds nds Low German; Low Saxon; German, Low; Saxon, Low ne nep nep Nepali - new new Newari + new new Nepal Bhasa; Newari nia nia Nias - nic nic Niger-Kordofanian (Other) + nic nic Niger-Kordofanian languages niu niu Niuean + nog nog Nogai non non Norse, Old no nor nor Norwegian -nn nno nno Norwegian Nynorsk -nb nob nob Norwegian Bokmål - nso nso Sotho, Northern +nn nno nno Norwegian Nynorsk; Nynorsk, Norwegian +nb nob nob BokmÃ¥l, Norwegian; Norwegian BokmÃ¥l + nqo nqo N'Ko + nso nso Pedi; Sepedi; Northern Sotho nub nub Nubian languages -ny nya nya Chichewa; Nyanja + nwc nwc Classical Newari; Old Newari; Classical Nepal Bhasa +ny nya nya Chichewa; Chewa; Nyanja nym nym Nyamwezi nyn nyn Nyankole nyo nyo Nyoro nzi nzi Nzima -oc oci oci Occitan (post 1500); Provençal - oji oji Ojibwa +oc oci oci Occitan (post 1500); Provençal +oj oji oji Ojibwa or ori ori Oriya om orm orm Oromo osa osa Osage os oss oss Ossetian; Ossetic ota ota Turkish, Ottoman (1500-1928) oto oto Otomian languages - paa paa Papuan (Other) + paa paa Papuan languages pag pag Pangasinan pal pal Pahlavi - pam pam Pampanga -pa pan pan Panjabi + pam pam Pampanga; Kapampangan +pa pan pan Panjabi; Punjabi pap pap Papiamento pau pau Palauan peo peo Persian, Old (ca.600-400 B.C.) fa per fas Persian - phi phi Philippine (Other) + phi phi Philippine languages phn phn Phoenician pi pli pli Pali pl pol pol Polish pon pon Pohnpeian pt por por Portuguese pra pra Prakrit languages - pro pro Provençal, Old (to 1500) -ps pus pus Pushto + pro pro Provençal, Old (to 1500) +ps pus pus Pushto; Pashto qaa-qtz qaa-qtz Reserved for local use qu que que Quechua raj raj Rajasthani rap rap Rapanui - rar rar Rarotongan - roa roa Romance (Other) -rm roh roh Raeto-Romance + rar rar Rarotongan; Cook Islands Maori + roa roa Romance languages +rm roh roh Romansh rom rom Romany -ro rum ron Romanian +ro rum ron Romanian; Moldavian; Moldovan rn run run Rundi + rup rup Aromanian; Arumanian; Macedo-Romanian ru rus rus Russian sad sad Sandawe sg sag sag Sango @@ -372,35 +410,40 @@ sg sag sag Sango sa san san Sanskrit sas sas Sasak sat sat Santali -sr scc srp Serbian + scn scn Sicilian sco sco Scots -hr scr hrv Croatian sel sel Selkup - sem sem Semitic (Other) + sem sem Semitic languages sga sga Irish, Old (to 900) sgn sgn Sign Languages shn shn Shan sid sid Sidamo -si sin sin Sinhalese +si sin sin Sinhala; Sinhalese sio sio Siouan languages - sit sit Sino-Tibetan (Other) - sla sla Slavic (Other) + sit sit Sino-Tibetan languages + sla sla Slavic languages sk slo slk Slovak sl slv slv Slovenian + sma sma Southern Sami se sme sme Northern Sami - smi smi Sami languages (Other) + smi smi Sami languages + smj smj Lule Sami + smn smn Inari Sami sm smo smo Samoan + sms sms Skolt Sami sn sna sna Shona sd snd snd Sindhi snk snk Soninke sog sog Sogdian so som som Somali - son son Songhai -st sot sot Sotho, Southern -es spa spa Spanish + son son Songhai languages +st sot sot Sotho, Southern +es spa spa Spanish; Castilian sc srd srd Sardinian + srn srn Sranan Tongo +sr srp srp Serbian srr srr Serer - ssa ssa Nilo-Saharan (Other) + ssa ssa Nilo-Saharan languages ss ssw ssw Swati suk suk Sukuma su sun sun Sundanese @@ -408,9 +451,10 @@ su sun sun Sundanese sux sux Sumerian sw swa swa Swahili sv swe swe Swedish + syc syc Classical Syriac syr syr Syriac ty tah tah Tahitian - tai tai Tai (Other) + tai tai Tai languages ta tam tam Tamil tt tat tat Tatar te tel tel Telugu @@ -426,6 +470,7 @@ ti tir tir Tigrinya tiv tiv Tiv tkl tkl Tokelau tli tli Tlingit + tlh tlh Klingon; tlhIngan-Hol tmh tmh Tamashek tog tog Tonga (Nyasa) to ton ton Tonga (Tonga Islands) @@ -435,22 +480,24 @@ tn tsn tsn Tswana ts tso tso Tsonga tk tuk tuk Turkmen tum tum Tumbuka + tup tup Tupi languages tr tur tur Turkish - tut tut Altaic (Other) + tut tut Altaic languages tvl tvl Tuvalu tw twi twi Twi tyv tyv Tuvinian + udm udm Udmurt uga uga Ugaritic -ug uig uig Uighur +ug uig uig Uighur; Uyghur uk ukr ukr Ukrainian umb umb Umbundu und und Undetermined ur urd urd Urdu uz uzb uzb Uzbek vai vai Vai - ven ven Venda +ve ven ven Venda vi vie vie Vietnamese -vo vol vol Volapük +vo vol vol Volapük vot vot Votic wak wak Wakashan languages wal wal Walamo @@ -458,7 +505,9 @@ vo vol vol Volapük was was Washo cy wel cym Welsh wen wen Sorbian languages +wa wln wln Walloon wo wol wol Wolof + xal xal Kalmyk; Oirat xh xho xho Xhosa yao yao Yao yap yap Yapese @@ -466,8 +515,11 @@ yi yid yid Yiddish yo yor yor Yoruba ypk ypk Yupik languages zap zap Zapotec + zbl zbl Blissymbols; Blissymbolics; Bliss zen zen Zenaga -za zha zha Zhuang - znd znd Zande +za zha zha Zhuang; Chuang + znd znd Zande languages zu zul zul Zulu zun zun Zuni + zxx zxx No linguistic content; Not applicable + zza zza Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki From owner-svn-src-stable-7@FreeBSD.ORG Sat May 30 23:27:50 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B481B106564A; Sat, 30 May 2009 23:27:50 +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 9D4A88FC26; Sat, 30 May 2009 23:27:50 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UNRoK9022792; Sat, 30 May 2009 23:27:50 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UNRmxV022733; Sat, 30 May 2009 23:27:48 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <200905302327.n4UNRmxV022733@svn.freebsd.org> From: Attilio Rao Date: Sat, 30 May 2009 23:27:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193134 - in stable/7: lib/libc/i386/stdlib lib/libc/i386/string lib/libc_r/arch/amd64 lib/libc_r/arch/i386 lib/libstand/i386 lib/msun/amd64 lib/msun/i387 lib/msun/ia64 tools/KSE/ksetes... X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 23:27:52 -0000 Author: attilio Date: Sat May 30 23:27:48 2009 New Revision: 193134 URL: http://svn.freebsd.org/changeset/base/193134 Log: MFC r192760: Use the END() macro appropriately in order to improve debugging for tools (Valgrind mainly). Modified: stable/7/lib/libc/i386/stdlib/ldiv.S stable/7/lib/libc/i386/string/wcscmp.S stable/7/lib/libc_r/arch/amd64/_atomic_lock.S stable/7/lib/libc_r/arch/i386/_atomic_lock.S stable/7/lib/libstand/i386/_setjmp.S stable/7/lib/msun/amd64/e_sqrt.S stable/7/lib/msun/amd64/e_sqrtf.S stable/7/lib/msun/amd64/s_lrint.S stable/7/lib/msun/amd64/s_lrintf.S stable/7/lib/msun/amd64/s_remquo.S stable/7/lib/msun/amd64/s_remquof.S stable/7/lib/msun/amd64/s_scalbn.S stable/7/lib/msun/amd64/s_scalbnf.S stable/7/lib/msun/amd64/s_scalbnl.S stable/7/lib/msun/i387/e_exp.S stable/7/lib/msun/i387/e_fmod.S stable/7/lib/msun/i387/e_log.S stable/7/lib/msun/i387/e_log10.S stable/7/lib/msun/i387/e_log10f.S stable/7/lib/msun/i387/e_remainder.S stable/7/lib/msun/i387/e_remainderf.S stable/7/lib/msun/i387/e_sqrt.S stable/7/lib/msun/i387/e_sqrtf.S stable/7/lib/msun/i387/s_ceil.S stable/7/lib/msun/i387/s_ceilf.S stable/7/lib/msun/i387/s_ceill.S stable/7/lib/msun/i387/s_copysign.S stable/7/lib/msun/i387/s_copysignf.S stable/7/lib/msun/i387/s_copysignl.S stable/7/lib/msun/i387/s_cos.S stable/7/lib/msun/i387/s_finite.S stable/7/lib/msun/i387/s_floor.S stable/7/lib/msun/i387/s_floorf.S stable/7/lib/msun/i387/s_floorl.S stable/7/lib/msun/i387/s_llrint.S stable/7/lib/msun/i387/s_llrintf.S stable/7/lib/msun/i387/s_logb.S stable/7/lib/msun/i387/s_logbf.S stable/7/lib/msun/i387/s_lrint.S stable/7/lib/msun/i387/s_lrintf.S stable/7/lib/msun/i387/s_remquo.S stable/7/lib/msun/i387/s_remquof.S stable/7/lib/msun/i387/s_rint.S stable/7/lib/msun/i387/s_rintf.S stable/7/lib/msun/i387/s_scalbn.S stable/7/lib/msun/i387/s_scalbnf.S stable/7/lib/msun/i387/s_scalbnl.S stable/7/lib/msun/i387/s_significand.S stable/7/lib/msun/i387/s_significandf.S stable/7/lib/msun/i387/s_sin.S stable/7/lib/msun/i387/s_tan.S stable/7/lib/msun/i387/s_trunc.S stable/7/lib/msun/i387/s_truncf.S stable/7/lib/msun/i387/s_truncl.S stable/7/lib/msun/ia64/s_fma.S stable/7/lib/msun/ia64/s_fmaf.S stable/7/lib/msun/ia64/s_fmal.S stable/7/tools/KSE/ksetest/kse_asm.S stable/7/tools/KSE/rr/kse_asm.S Modified: stable/7/lib/libc/i386/stdlib/ldiv.S ============================================================================== --- stable/7/lib/libc/i386/stdlib/ldiv.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/libc/i386/stdlib/ldiv.S Sat May 30 23:27:48 2009 (r193134) @@ -40,3 +40,4 @@ ENTRY(ldiv) movl %edx,8(%esp) ret END(ldiv) +END(ldiv) Modified: stable/7/lib/libc/i386/string/wcscmp.S ============================================================================== --- stable/7/lib/libc/i386/string/wcscmp.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/libc/i386/string/wcscmp.S Sat May 30 23:27:48 2009 (r193134) @@ -78,3 +78,4 @@ no0: subl (%esi),%eax popl %edi ret END(wcscmp) +END(wcscmp) Modified: stable/7/lib/libc_r/arch/amd64/_atomic_lock.S ============================================================================== --- stable/7/lib/libc_r/arch/amd64/_atomic_lock.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/libc_r/arch/amd64/_atomic_lock.S Sat May 30 23:27:48 2009 (r193134) @@ -38,4 +38,5 @@ ENTRY(_atomic_lock) movl $1, %eax xchgq %rax, (%rdi) ret +END(_atomic_lock) Modified: stable/7/lib/libc_r/arch/i386/_atomic_lock.S ============================================================================== --- stable/7/lib/libc_r/arch/i386/_atomic_lock.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/libc_r/arch/i386/_atomic_lock.S Sat May 30 23:27:48 2009 (r193134) @@ -39,4 +39,5 @@ ENTRY(_atomic_lock) movl $1, %eax xchg %eax, (%ecx) ret +END(_atomic_lock) Modified: stable/7/lib/libstand/i386/_setjmp.S ============================================================================== --- stable/7/lib/libstand/i386/_setjmp.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/libstand/i386/_setjmp.S Sat May 30 23:27:48 2009 (r193134) @@ -58,6 +58,7 @@ ENTRY(_setjmp) movl %edi,20(%eax) xorl %eax,%eax ret +END(_setjmp) ENTRY(_longjmp) movl 4(%esp),%edx @@ -73,3 +74,4 @@ ENTRY(_longjmp) incl %eax 1: movl %ecx,0(%esp) ret +END(_longjmp) Modified: stable/7/lib/msun/amd64/e_sqrt.S ============================================================================== --- stable/7/lib/msun/amd64/e_sqrt.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/e_sqrt.S Sat May 30 23:27:48 2009 (r193134) @@ -30,4 +30,5 @@ __FBSDID("$FreeBSD$") ENTRY(sqrt) sqrtsd %xmm0, %xmm0 ret +END(sqrt) Modified: stable/7/lib/msun/amd64/e_sqrtf.S ============================================================================== --- stable/7/lib/msun/amd64/e_sqrtf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/e_sqrtf.S Sat May 30 23:27:48 2009 (r193134) @@ -30,3 +30,4 @@ __FBSDID("$FreeBSD$") ENTRY(sqrtf) sqrtss %xmm0, %xmm0 ret +END(sqrtf) Modified: stable/7/lib/msun/amd64/s_lrint.S ============================================================================== --- stable/7/lib/msun/amd64/s_lrint.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_lrint.S Sat May 30 23:27:48 2009 (r193134) @@ -34,3 +34,4 @@ __FBSDID("$FreeBSD$") ENTRY(fn) cvtsd2si %xmm0, %rax ret +END(fn) Modified: stable/7/lib/msun/amd64/s_lrintf.S ============================================================================== --- stable/7/lib/msun/amd64/s_lrintf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_lrintf.S Sat May 30 23:27:48 2009 (r193134) @@ -34,3 +34,4 @@ __FBSDID("$FreeBSD$") ENTRY(fn) cvtss2si %xmm0, %rax ret +END(fn) Modified: stable/7/lib/msun/amd64/s_remquo.S ============================================================================== --- stable/7/lib/msun/amd64/s_remquo.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_remquo.S Sat May 30 23:27:48 2009 (r193134) @@ -63,3 +63,4 @@ ENTRY(remquo) fstpl -8(%rsp) movsd -8(%rsp),%xmm0 ret +END(remquo) Modified: stable/7/lib/msun/amd64/s_remquof.S ============================================================================== --- stable/7/lib/msun/amd64/s_remquof.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_remquof.S Sat May 30 23:27:48 2009 (r193134) @@ -63,3 +63,4 @@ ENTRY(remquof) fstps -4(%rsp) movss -4(%rsp),%xmm0 ret +END(remquof) Modified: stable/7/lib/msun/amd64/s_scalbn.S ============================================================================== --- stable/7/lib/msun/amd64/s_scalbn.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_scalbn.S Sat May 30 23:27:48 2009 (r193134) @@ -37,3 +37,4 @@ ENTRY(scalbn) fstpl -8(%rsp) movsd -8(%rsp),%xmm0 ret +END(scalbn) Modified: stable/7/lib/msun/amd64/s_scalbnf.S ============================================================================== --- stable/7/lib/msun/amd64/s_scalbnf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_scalbnf.S Sat May 30 23:27:48 2009 (r193134) @@ -37,6 +37,7 @@ ENTRY(scalbnf) fstps -8(%rsp) movss -8(%rsp),%xmm0 ret +END(scalbnf) .globl CNAME(ldexpf) .set CNAME(ldexpf),CNAME(scalbnf) Modified: stable/7/lib/msun/amd64/s_scalbnl.S ============================================================================== --- stable/7/lib/msun/amd64/s_scalbnl.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/amd64/s_scalbnl.S Sat May 30 23:27:48 2009 (r193134) @@ -14,6 +14,7 @@ ENTRY(scalbnl) fscale fstp %st(1) ret +END(scalbnl) .globl CNAME(ldexpl) .set CNAME(ldexpl),CNAME(scalbnl) Modified: stable/7/lib/msun/i387/e_exp.S ============================================================================== --- stable/7/lib/msun/i387/e_exp.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_exp.S Sat May 30 23:27:48 2009 (r193134) @@ -96,3 +96,4 @@ x_Inf_or_NaN: x_not_minus_Inf: fldl 4(%esp) ret +END(exp) Modified: stable/7/lib/msun/i387/e_fmod.S ============================================================================== --- stable/7/lib/msun/i387/e_fmod.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_fmod.S Sat May 30 23:27:48 2009 (r193134) @@ -46,3 +46,4 @@ ENTRY(fmod) jp 1b fstp %st(1) ret +END(fmod) Modified: stable/7/lib/msun/i387/e_log.S ============================================================================== --- stable/7/lib/msun/i387/e_log.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_log.S Sat May 30 23:27:48 2009 (r193134) @@ -42,3 +42,4 @@ ENTRY(log) fldl 4(%esp) fyl2x ret +END(log) Modified: stable/7/lib/msun/i387/e_log10.S ============================================================================== --- stable/7/lib/msun/i387/e_log10.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_log10.S Sat May 30 23:27:48 2009 (r193134) @@ -42,3 +42,4 @@ ENTRY(log10) fldl 4(%esp) fyl2x ret +END(log10) Modified: stable/7/lib/msun/i387/e_log10f.S ============================================================================== --- stable/7/lib/msun/i387/e_log10f.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_log10f.S Sat May 30 23:27:48 2009 (r193134) @@ -13,3 +13,4 @@ ENTRY(log10f) flds 4(%esp) fyl2x ret +END(log10f) Modified: stable/7/lib/msun/i387/e_remainder.S ============================================================================== --- stable/7/lib/msun/i387/e_remainder.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_remainder.S Sat May 30 23:27:48 2009 (r193134) @@ -46,3 +46,4 @@ ENTRY(remainder) jp 1b fstp %st(1) ret +END(remainder) Modified: stable/7/lib/msun/i387/e_remainderf.S ============================================================================== --- stable/7/lib/msun/i387/e_remainderf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_remainderf.S Sat May 30 23:27:48 2009 (r193134) @@ -17,3 +17,4 @@ ENTRY(remainderf) jp 1b fstp %st(1) ret +END(remainderf) Modified: stable/7/lib/msun/i387/e_sqrt.S ============================================================================== --- stable/7/lib/msun/i387/e_sqrt.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_sqrt.S Sat May 30 23:27:48 2009 (r193134) @@ -41,3 +41,4 @@ ENTRY(sqrt) fldl 4(%esp) fsqrt ret +END(sqrt) Modified: stable/7/lib/msun/i387/e_sqrtf.S ============================================================================== --- stable/7/lib/msun/i387/e_sqrtf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/e_sqrtf.S Sat May 30 23:27:48 2009 (r193134) @@ -12,3 +12,4 @@ ENTRY(sqrtf) flds 4(%esp) fsqrt ret +END(sqrtf) Modified: stable/7/lib/msun/i387/s_ceil.S ============================================================================== --- stable/7/lib/msun/i387/s_ceil.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_ceil.S Sat May 30 23:27:48 2009 (r193134) @@ -56,3 +56,4 @@ ENTRY(ceil) leave ret +END(ceil) Modified: stable/7/lib/msun/i387/s_ceilf.S ============================================================================== --- stable/7/lib/msun/i387/s_ceilf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_ceilf.S Sat May 30 23:27:48 2009 (r193134) @@ -27,3 +27,4 @@ ENTRY(ceilf) leave ret +END(ceilf) Modified: stable/7/lib/msun/i387/s_ceill.S ============================================================================== --- stable/7/lib/msun/i387/s_ceill.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_ceill.S Sat May 30 23:27:48 2009 (r193134) @@ -25,3 +25,4 @@ ENTRY(ceill) leave ret +END(ceill) Modified: stable/7/lib/msun/i387/s_copysign.S ============================================================================== --- stable/7/lib/msun/i387/s_copysign.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_copysign.S Sat May 30 23:27:48 2009 (r193134) @@ -46,3 +46,4 @@ ENTRY(copysign) movl %eax,8(%esp) fldl 4(%esp) ret +END(copysign) Modified: stable/7/lib/msun/i387/s_copysignf.S ============================================================================== --- stable/7/lib/msun/i387/s_copysignf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_copysignf.S Sat May 30 23:27:48 2009 (r193134) @@ -17,3 +17,4 @@ ENTRY(copysignf) movl %eax,4(%esp) flds 4(%esp) ret +END(copysignf) Modified: stable/7/lib/msun/i387/s_copysignl.S ============================================================================== --- stable/7/lib/msun/i387/s_copysignl.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_copysignl.S Sat May 30 23:27:48 2009 (r193134) @@ -15,3 +15,4 @@ ENTRY(copysignl) movl %eax,12(%esp) fldt 4(%esp) ret +END(copysignl) Modified: stable/7/lib/msun/i387/s_cos.S ============================================================================== --- stable/7/lib/msun/i387/s_cos.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_cos.S Sat May 30 23:27:48 2009 (r193134) @@ -54,3 +54,4 @@ ENTRY(cos) fstp %st(1) fcos ret +END(cos) Modified: stable/7/lib/msun/i387/s_finite.S ============================================================================== --- stable/7/lib/msun/i387/s_finite.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_finite.S Sat May 30 23:27:48 2009 (r193134) @@ -44,3 +44,4 @@ ENTRY(finite) setneb %al andl $0x000000ff, %eax ret +END(finite) Modified: stable/7/lib/msun/i387/s_floor.S ============================================================================== --- stable/7/lib/msun/i387/s_floor.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_floor.S Sat May 30 23:27:48 2009 (r193134) @@ -56,3 +56,4 @@ ENTRY(floor) leave ret +END(floor) Modified: stable/7/lib/msun/i387/s_floorf.S ============================================================================== --- stable/7/lib/msun/i387/s_floorf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_floorf.S Sat May 30 23:27:48 2009 (r193134) @@ -27,3 +27,4 @@ ENTRY(floorf) leave ret +END(floorf) Modified: stable/7/lib/msun/i387/s_floorl.S ============================================================================== --- stable/7/lib/msun/i387/s_floorl.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_floorl.S Sat May 30 23:27:48 2009 (r193134) @@ -25,3 +25,4 @@ ENTRY(floorl) leave ret +END(floorl) Modified: stable/7/lib/msun/i387/s_llrint.S ============================================================================== --- stable/7/lib/msun/i387/s_llrint.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_llrint.S Sat May 30 23:27:48 2009 (r193134) @@ -34,3 +34,4 @@ ENTRY(llrint) popl %eax popl %edx ret +END(llrint) Modified: stable/7/lib/msun/i387/s_llrintf.S ============================================================================== --- stable/7/lib/msun/i387/s_llrintf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_llrintf.S Sat May 30 23:27:48 2009 (r193134) @@ -34,3 +34,4 @@ ENTRY(llrintf) popl %eax popl %edx ret +END(llrintf) Modified: stable/7/lib/msun/i387/s_logb.S ============================================================================== --- stable/7/lib/msun/i387/s_logb.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_logb.S Sat May 30 23:27:48 2009 (r193134) @@ -42,3 +42,4 @@ ENTRY(logb) fxtract fstp %st ret +END(logb) Modified: stable/7/lib/msun/i387/s_logbf.S ============================================================================== --- stable/7/lib/msun/i387/s_logbf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_logbf.S Sat May 30 23:27:48 2009 (r193134) @@ -13,3 +13,4 @@ ENTRY(logbf) fxtract fstp %st ret +END(logbf) Modified: stable/7/lib/msun/i387/s_lrint.S ============================================================================== --- stable/7/lib/msun/i387/s_lrint.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_lrint.S Sat May 30 23:27:48 2009 (r193134) @@ -33,3 +33,4 @@ ENTRY(lrint) fistpl (%esp) popl %eax ret +END(lrint) Modified: stable/7/lib/msun/i387/s_lrintf.S ============================================================================== --- stable/7/lib/msun/i387/s_lrintf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_lrintf.S Sat May 30 23:27:48 2009 (r193134) @@ -33,3 +33,4 @@ ENTRY(lrintf) fistpl (%esp) popl %eax ret +END(lrintf) Modified: stable/7/lib/msun/i387/s_remquo.S ============================================================================== --- stable/7/lib/msun/i387/s_remquo.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_remquo.S Sat May 30 23:27:48 2009 (r193134) @@ -60,3 +60,4 @@ ENTRY(remquo) movl 20(%esp),%ecx movl %eax,(%ecx) ret +END(remquo) Modified: stable/7/lib/msun/i387/s_remquof.S ============================================================================== --- stable/7/lib/msun/i387/s_remquof.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_remquof.S Sat May 30 23:27:48 2009 (r193134) @@ -60,3 +60,4 @@ ENTRY(remquof) movl 12(%esp),%ecx movl %eax,(%ecx) ret +END(remquof) Modified: stable/7/lib/msun/i387/s_rint.S ============================================================================== --- stable/7/lib/msun/i387/s_rint.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_rint.S Sat May 30 23:27:48 2009 (r193134) @@ -41,3 +41,4 @@ ENTRY(rint) fldl 4(%esp) frndint ret +END(rint) Modified: stable/7/lib/msun/i387/s_rintf.S ============================================================================== --- stable/7/lib/msun/i387/s_rintf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_rintf.S Sat May 30 23:27:48 2009 (r193134) @@ -12,3 +12,4 @@ ENTRY(rintf) flds 4(%esp) frndint ret +END(rintf) Modified: stable/7/lib/msun/i387/s_scalbn.S ============================================================================== --- stable/7/lib/msun/i387/s_scalbn.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_scalbn.S Sat May 30 23:27:48 2009 (r193134) @@ -43,3 +43,4 @@ ENTRY(scalbn) fscale fstp %st(1) ret +END(scalbn) Modified: stable/7/lib/msun/i387/s_scalbnf.S ============================================================================== --- stable/7/lib/msun/i387/s_scalbnf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_scalbnf.S Sat May 30 23:27:48 2009 (r193134) @@ -14,6 +14,7 @@ ENTRY(scalbnf) fscale fstp %st(1) /* bug fix for fp stack overflow */ ret +END(scalbnf) .globl CNAME(ldexpf) .set CNAME(ldexpf),CNAME(scalbnf) Modified: stable/7/lib/msun/i387/s_scalbnl.S ============================================================================== --- stable/7/lib/msun/i387/s_scalbnl.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_scalbnl.S Sat May 30 23:27:48 2009 (r193134) @@ -14,6 +14,7 @@ ENTRY(scalbnl) fscale fstp %st(1) ret +END(scalbnl) .globl CNAME(ldexpl) .set CNAME(ldexpl),CNAME(scalbnl) Modified: stable/7/lib/msun/i387/s_significand.S ============================================================================== --- stable/7/lib/msun/i387/s_significand.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_significand.S Sat May 30 23:27:48 2009 (r193134) @@ -42,3 +42,4 @@ ENTRY(significand) fxtract fstp %st(1) ret +END(significand) Modified: stable/7/lib/msun/i387/s_significandf.S ============================================================================== --- stable/7/lib/msun/i387/s_significandf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_significandf.S Sat May 30 23:27:48 2009 (r193134) @@ -13,3 +13,4 @@ ENTRY(significandf) fxtract fstp %st(1) ret +END(significandf) Modified: stable/7/lib/msun/i387/s_sin.S ============================================================================== --- stable/7/lib/msun/i387/s_sin.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_sin.S Sat May 30 23:27:48 2009 (r193134) @@ -54,3 +54,4 @@ ENTRY(sin) fstp %st(1) fsin ret +END(sin) Modified: stable/7/lib/msun/i387/s_tan.S ============================================================================== --- stable/7/lib/msun/i387/s_tan.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_tan.S Sat May 30 23:27:48 2009 (r193134) @@ -56,3 +56,4 @@ ENTRY(tan) fptan fstp %st(0) ret +END(tan) Modified: stable/7/lib/msun/i387/s_trunc.S ============================================================================== --- stable/7/lib/msun/i387/s_trunc.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_trunc.S Sat May 30 23:27:48 2009 (r193134) @@ -24,3 +24,4 @@ ENTRY(trunc) leave ret +END(trunc) Modified: stable/7/lib/msun/i387/s_truncf.S ============================================================================== --- stable/7/lib/msun/i387/s_truncf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_truncf.S Sat May 30 23:27:48 2009 (r193134) @@ -24,3 +24,4 @@ ENTRY(truncf) leave ret +END(truncf) Modified: stable/7/lib/msun/i387/s_truncl.S ============================================================================== --- stable/7/lib/msun/i387/s_truncl.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/i387/s_truncl.S Sat May 30 23:27:48 2009 (r193134) @@ -24,3 +24,4 @@ ENTRY(truncl) leave ret +END(truncl) Modified: stable/7/lib/msun/ia64/s_fma.S ============================================================================== --- stable/7/lib/msun/ia64/s_fma.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/ia64/s_fma.S Sat May 30 23:27:48 2009 (r193134) @@ -32,3 +32,4 @@ ENTRY(fma, 3) fma.d f8 = f8, f9, f10 br.ret.sptk b0 } +END(fma) Modified: stable/7/lib/msun/ia64/s_fmaf.S ============================================================================== --- stable/7/lib/msun/ia64/s_fmaf.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/ia64/s_fmaf.S Sat May 30 23:27:48 2009 (r193134) @@ -32,3 +32,4 @@ ENTRY(fmaf, 3) fma.s f8 = f8, f9, f10 br.ret.sptk b0 } +END(fmaf) Modified: stable/7/lib/msun/ia64/s_fmal.S ============================================================================== --- stable/7/lib/msun/ia64/s_fmal.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/lib/msun/ia64/s_fmal.S Sat May 30 23:27:48 2009 (r193134) @@ -32,3 +32,4 @@ ENTRY(fmal, 3) fma f8 = f8, f9, f10 br.ret.sptk b0 } +END(fmal) Modified: stable/7/tools/KSE/ksetest/kse_asm.S ============================================================================== --- stable/7/tools/KSE/ksetest/kse_asm.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/tools/KSE/ksetest/kse_asm.S Sat May 30 23:27:48 2009 (r193134) @@ -99,6 +99,7 @@ ENTRY(uts_to_thread) pop %ebx /* %ebx off stack */ popf /* flags off stack */ 5: ret /* %eip off stack */ +END(uts_to_thread) /* * int thread_to_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km); @@ -154,4 +155,5 @@ ENTRY(thread_to_uts) pushl KM_FUNC_OFFSET(%edx) /* .. the uts can return to itself */ pushl KM_FUNC_OFFSET(%edx) /* push the address of the uts func */ 2: ret +END(thread_to_uts) Modified: stable/7/tools/KSE/rr/kse_asm.S ============================================================================== --- stable/7/tools/KSE/rr/kse_asm.S Sat May 30 23:01:27 2009 (r193133) +++ stable/7/tools/KSE/rr/kse_asm.S Sat May 30 23:27:48 2009 (r193134) @@ -99,6 +99,7 @@ ENTRY(uts_to_thread) pop %ebx /* %ebx off stack */ popf /* flags off stack */ 5: ret /* %eip off stack */ +END(uts_to_thread) /* * int thread_to_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km); @@ -154,4 +155,5 @@ ENTRY(thread_to_uts) pushl KM_FUNC_OFFSET(%edx) /* .. the uts can return to itself */ pushl KM_FUNC_OFFSET(%edx) /* push the address of the uts func */ 2: ret +END(thread_to_uts)