Date: Fri, 12 Nov 2004 23:29:15 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 64980 for review Message-ID: <200411122329.iACNTFG5041750@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=64980 Change 64980 by peter@peter_daintree on 2004/11/12 23:28:39 IFC @64978 Affected files ... .. //depot/projects/hammer/Makefile.inc1#75 integrate .. //depot/projects/hammer/contrib/gcc/gcc.1#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#17 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#6 delete .. //depot/projects/hammer/libexec/rtld-elf/arm/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/ia64/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/powerpc/lockdflt.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/sparc64/lockdflt.c#3 delete .. //depot/projects/hammer/sbin/gpt/create.c#6 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#8 integrate .. //depot/projects/hammer/share/man/man4/altq.4#3 integrate .. //depot/projects/hammer/share/man/man4/polling.4#12 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#28 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#11 integrate .. //depot/projects/hammer/share/mk/sys.mk#17 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/hammer/sys/boot/common/commands.c#5 integrate .. //depot/projects/hammer/sys/conf/NOTES#73 integrate .. //depot/projects/hammer/sys/conf/files#92 integrate .. //depot/projects/hammer/sys/conf/files.i386#43 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#26 integrate .. //depot/projects/hammer/sys/conf/options#62 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_snc.c#1 branch .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#33 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#19 integrate .. //depot/projects/hammer/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#13 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#10 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/pbio.c#3 delete .. //depot/projects/hammer/sys/kern/sched_ule.c#52 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#9 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#15 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#17 integrate .. //depot/projects/hammer/sys/kern/tty.c#33 edit .. //depot/projects/hammer/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#16 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_snc/Makefile#1 branch .. //depot/projects/hammer/sys/netinet/in.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#27 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#25 integrate .. //depot/projects/hammer/sys/sys/msg.h#4 integrate .. //depot/projects/hammer/sys/sys/pbioio.h#2 delete .. //depot/projects/hammer/sys/sys/sem.h#4 integrate .. //depot/projects/hammer/sys/sys/shm.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#33 integrate .. //depot/projects/hammer/tools/regression/README#5 integrate .. //depot/projects/hammer/tools/regression/TODO#1 branch .. //depot/projects/hammer/tools/regression/geom/RunTest.t#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_gate/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_gate/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_gate/test-3.t#1 branch .. //depot/projects/hammer/tools/regression/include/tgmath/tgmath.c#2 integrate .. //depot/projects/hammer/tools/regression/include/tgmath/tgmath.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-btowc.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-iswctype.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mblen.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrlen.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrtowc.c#4 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbstowcs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbtowc.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-towctrans.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcrtomb.c#4 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcstombs.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wctomb.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_aton.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_line.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-perror.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#7 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-heapsort.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-mergesort.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-qsort.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/string/test-strerror.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.c#3 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.t#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-ilogb.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-ilogb.t#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.t#1 branch .. //depot/projects/hammer/tools/regression/pipe/bigpipetest.c#3 integrate .. //depot/projects/hammer/tools/regression/pipe/bigpipetest.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#5 integrate .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/accf_data_attach.c#3 integrate .. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/kqueue/kqueue.c#3 integrate .. //depot/projects/hammer/tools/regression/sockets/kqueue/kqueue.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/join/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/join/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/jot/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/m4/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/m4/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#10 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/regress.m4#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/uudecode/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/uudecode/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/uuencode/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/uuencode/regress.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/xargs/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/xargs/regress.t#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_5.rc#6 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_5.rc#2 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#5 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#9 integrate .. //depot/projects/hammer/usr.bin/make/config.h#4 integrate .. //depot/projects/hammer/usr.bin/make/job.c#12 integrate .. //depot/projects/hammer/usr.bin/make/job.h#9 integrate .. //depot/projects/hammer/usr.bin/make/main.c#17 integrate .. //depot/projects/hammer/usr.bin/make/make.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.8#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#17 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#75 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.451 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -83,7 +83,7 @@ .endif CVS?= cvs -CVSFLAGS?= -A -P -d +CVSFLAGS?= -A -P -d -I! SUP?= /usr/local/bin/cvsup SUPFLAGS?= -g -L 2 -P - .if defined(SUPHOST) @@ -201,7 +201,7 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == "amd64" # 32 bit world LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 @@ -378,7 +378,7 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == "amd64" build32: @echo @echo "--------------------------------------------------------------" @@ -436,7 +436,7 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) WMAKE_TGTS+= build32 .endif @@ -569,7 +569,7 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif ==== //depot/projects/hammer/contrib/gcc/gcc.1#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.19 2003/06/25 16:12:05 obrien Exp $ +.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.21 2004/11/11 07:50:09 obrien Exp $ .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution .\" @@ -24,7 +24,7 @@ .Id $Id: gcc.1,v 1.9 1998/12/16 20:55:57 law Exp $ .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools" .SH NAME -gcc, g++ \- GNU project C and C++ Compiler (gcc-3.2.1) +gcc, g++ \- GNU project C and C++ Compiler .SH SYNOPSIS .B gcc .RI "[ " option " | " filename " ].\|.\|." @@ -2461,10 +2461,11 @@ .B \-finline\-functions. .TP .B \-Os -Optimize for size. This enables all +Optimize for size. +This enables all .B \-O2 -optimizations that do not typically increase code size. It also performs -further optimizations designed to reduce code size. +optimizations that do not typically increase code size. +It also performs further optimizations designed to reduce code size. .TP .B \-O0 Do not optimize. @@ -3628,17 +3629,19 @@ (pentium), .B pentium, .B i686 -(pentiumpro), and +(pentiumpro), +and .B pentiumpro. While picking a specific CPU TYPE will schedule things appropriately for that -particular chip, the compiler will not generate any code that does not run on -the i386 without the +particular chip, +the compiler will not generate any code that does not run on the i386 without +the .B \-march=\fIcpu type\fP option being used. .TP .B \-march=\fIcpu type\fP -Generate instructions for the machine type CPU TYPE. The choices for CPU TYPE -are: +Generate instructions for the machine type CPU TYPE. +The choices for CPU TYPE are: .B i386, .B i486, .B pentium, ==== //depot/projects/hammer/games/fortune/datfiles/fortunes2#17 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.77 2004/09/29 19:52:19 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.78 2004/11/12 10:15:43 schweikh Exp $ % ======================================================================= || || @@ -19979,6 +19979,9 @@ Hear about the Californian terrorist that tried to blow up a bus? Burned his lips on the exhaust pipe. % +Hear about the young Chinese woman who just won the lottery? +One fortunate cookie... +% Hear me, my chiefs, I am tired; my heart is sick and sad. From where the sun now stands I Will Fight No More Forever. -- Chief Joseph of the Nez Perce @@ -20094,9 +20097,6 @@ No stellar recognition's given. There are not stars enough in heaven. % -Here about the young Chinese woman who just won the lottery? -One fortunate cookie... -% Here at the Phone Company, we serve all kinds of people; from President's and Kings to the scum of the earth... % ==== //depot/projects/hammer/sbin/gpt/create.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.8 2004/10/25 03:39:31 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.9 2004/11/12 04:34:46 marcel Exp $"); #include <sys/types.h> @@ -63,6 +63,8 @@ struct gpt_ent *ent; unsigned int i; + last = mediasz / secsz - 1LL; + if (map_find(MAP_TYPE_PRI_GPT_HDR) != NULL || map_find(MAP_TYPE_SEC_GPT_HDR) != NULL) { warnx("%s: error: device already contains a GPT", device_name); @@ -92,12 +94,12 @@ mbr->mbr_part[0].part_esect = 0xff; mbr->mbr_part[0].part_ecyl = 0xff; mbr->mbr_part[0].part_start_lo = htole16(1); - if (mediasz > 0xffffffff) { + if (last > 0xffffffff) { mbr->mbr_part[0].part_size_lo = htole16(0xffff); mbr->mbr_part[0].part_size_hi = htole16(0xffff); } else { - mbr->mbr_part[0].part_size_lo = htole16(mediasz); - mbr->mbr_part[0].part_size_hi = htole16(mediasz >> 16); + mbr->mbr_part[0].part_size_lo = htole16(last); + mbr->mbr_part[0].part_size_hi = htole16(last >> 16); } map = map_add(0LL, 1LL, MAP_TYPE_PMBR, mbr); gpt_write(fd, map); @@ -118,8 +120,6 @@ blocks++; /* Don't forget the header itself */ } - last = mediasz / secsz - 1LL; - /* Never cross the median of the device. */ if ((blocks + 1LL) > ((last + 1LL) >> 1)) blocks = ((last + 1LL) >> 1) - 1LL; ==== //depot/projects/hammer/sbin/gpt/migrate.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.11 2004/10/31 02:20:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.12 2004/11/12 04:34:46 marcel Exp $"); #include <sys/types.h> #include <sys/disklabel.h> @@ -313,12 +313,12 @@ mbr->mbr_part[0].part_esect = 0xff; mbr->mbr_part[0].part_ecyl = 0xff; mbr->mbr_part[0].part_start_lo = htole16(1); - if (mediasz > 0xffffffff) { + if (last > 0xffffffff) { mbr->mbr_part[0].part_size_lo = htole16(0xffff); mbr->mbr_part[0].part_size_hi = htole16(0xffff); } else { - mbr->mbr_part[0].part_size_lo = htole16(mediasz); - mbr->mbr_part[0].part_size_hi = htole16(mediasz >> 16); + mbr->mbr_part[0].part_size_lo = htole16(last); + mbr->mbr_part[0].part_size_hi = htole16(last >> 16); } gpt_write(fd, map); } ==== //depot/projects/hammer/share/man/man4/altq.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.3 2004/11/01 11:43:07 mlaier Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.5 2004/11/12 18:13:54 brueffer Exp $ .\" -.Dd October 7, 2004 +.Dd November 12, 2004 .Dt ALTQ 4 .Os .Sh NAME @@ -79,7 +79,7 @@ .It Dv ALTQ_CDNR build the traffic conditioner. This option is meaningless at the moment as the conditioner is not used by -any of the available disciplines or consumer. +any of the available disciplines or consumers. .It Dv ALTQ_PRIQ build the .Dq "Priority Queuing" @@ -92,7 +92,7 @@ .Pp Note that .Nm Ns -disciplines -can not be loaded as kernel modules. +cannot be loaded as kernel modules. In order to use a certain discipline you have to build it into a custom kernel. The @@ -103,9 +103,9 @@ .Sh SUPPORTED DEVICES The driver modifications described in .Xr altq 9 -and required to use a certain network card with -.Nm -have been applied to the following hardware drivers +are required to use a certain network card with +.Nm . +They have been applied to the following hardware drivers: .Xr an 4 , .Xr ath 4 , .Xr awi 4 , @@ -119,6 +119,7 @@ .Xr wi 4 , .Xr de 4 , .Xr rl 4 , +.Xr sf 4 , .Xr sis 4 , .Xr vr 4 and ==== //depot/projects/hammer/share/man/man4/polling.4#12 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/polling.4,v 1.14 2004/10/11 13:27:44 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/polling.4,v 1.15 2004/11/10 23:31:15 brueffer Exp $ .\" -.Dd April 5, 2004 +.Dd November 11, 2004 .Dt POLLING 4 .Os .Sh NAME @@ -186,6 +186,7 @@ .Xr nge 4 , .Xr re 4 , .Xr rl 4 , +.Xr sf 4 , .Xr sis 4 , .Xr ste 4 , .Xr vge 4 , ==== //depot/projects/hammer/share/man/man5/make.conf.5#28 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.99 2004/11/04 12:57:40 phk Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.100 2004/11/12 00:01:07 imp Exp $ .\" .Dd October 15, 2004 .Dt MAKE.CONF 5 @@ -352,6 +352,9 @@ .It Va MODULES_OVERRIDE .Pq Vt str Set to a list of modules to build instead of all of them. +.It Va PORTS_MODULES +Set this to the list of ports you wish to rebuild every time the kernel +is built. .It Va NO_KERNELCONFIG .Pq Vt bool Set this to skip running ==== //depot/projects/hammer/share/mk/bsd.prog.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.137 2004/11/03 18:01:18 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.138 2004/11/12 13:24:34 ru Exp $ .include <bsd.init.mk> @@ -115,9 +115,12 @@ .if !target(install) -.if defined(PRECIOUSPROG) && !defined(NOFSCHG) +.if defined(PRECIOUSPROG) +.if !defined(NOFSCHG) INSTALLFLAGS+= -fschg .endif +INSTALLFLAGS+= -S +.endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} ==== //depot/projects/hammer/share/mk/sys.mk#17 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.81 2004/10/25 20:04:50 des Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.82 2004/11/11 01:09:56 obrien Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -37,7 +37,7 @@ CFLAGS ?= -O .else CC ?= cc -CFLAGS ?= -O2 -pipe +CFLAGS ?= -O2 -fno-strict-aliasing -pipe .endif CXX ?= c++ ==== //depot/projects/hammer/sys/arm/arm/genassym.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.2 2004/09/23 22:11:06 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.3 2004/11/12 21:49:05 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/assym.h> @@ -43,6 +43,7 @@ #include <machine/proc.h> #include <machine/cpufunc.h> #include <machine/pte.h> +#include <machine/intr.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -109,3 +110,6 @@ ASSYM(P_SIGEVENT, P_SIGEVENT); ASSYM(P_PROFIL, P_PROFIL); ASSYM(TRAPFRAMESIZE, sizeof(struct trapframe)); + +ASSYM(MAXCOMLEN, MAXCOMLEN); +ASSYM(NIRQ, NIRQ); ==== //depot/projects/hammer/sys/arm/arm/intr.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.3 2004/09/23 22:09:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.4 2004/11/12 21:49:05 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/syslog.h> @@ -50,7 +50,10 @@ #include <machine/intr.h> #include <machine/cpu.h> -struct ithd *ithreads[NIRQ]; +static struct ithd *ithreads[NIRQ]; +static int intrcnt_tab[NIRQ]; +static int intrcnt_index = 0; +static int last_printed = 0; struct arm_intr { driver_intr_t *handler; void *arg; @@ -69,7 +72,8 @@ void arm_handler_execute(void *, int); -void arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, +void +arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct ithd *cur_ith; @@ -87,6 +91,14 @@ if (error) return; ithreads[irq] = cur_ith; + last_printed += + snprintf(intrnames + last_printed, + MAXCOMLEN + 1, + "irq%d: %s", irq, name); + last_printed++; + intrcnt_tab[irq] = intrcnt_index; + intrcnt_index++; + } if (!(flags & INTR_FAST)) { intr->handler = hand; @@ -120,6 +132,7 @@ arm_mask_irqs(irqnb); while (irqnb != 0) { i = ffs(irqnb) - 1; + intrcnt[intrcnt_tab[i]]++; irqnb &= ~(1U << i); ithd = ithreads[i]; if (!ithd) ==== //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#3 (text+ko) ==== @@ -72,7 +72,7 @@ #include <machine/asm.h> #include <machine/asmacros.h> #include <machine/armreg.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.2 2004/09/23 22:09:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.3 2004/11/12 21:49:05 cognet Exp $"); /* * irq_entry: @@ -102,18 +102,13 @@ .align 0 - /* - * XXX Provide intrnames/intrcnt for legacy code, but - * don't actually use them. - */ - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) .global _C_LABEL(intrcnt), _C_LABEL(eintrcnt) _C_LABEL(intrnames): + .space NIRQ * (MAXCOMLEN + 1) _C_LABEL(eintrnames): - - .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt) _C_LABEL(intrcnt): + .space NIRQ * 4 _C_LABEL(eintrcnt): .global _C_LABEL(current_intr_depth) ==== //depot/projects/hammer/sys/boot/common/commands.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.20 2004/09/29 13:43:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.21 2004/11/12 13:27:49 ru Exp $"); #include <stand.h> #include <string.h> @@ -214,12 +214,23 @@ command_commandlist(int argc, char *argv[]) { struct bootblk_command **cmdp; - - printf("Available commands:\n"); + int res; + char name[20]; + + res = 0; + pager_open(); + res = pager_output("Available commands:\n"); SET_FOREACH(cmdp, Xcommand_set) { - if (((*cmdp)->c_name != NULL) && ((*cmdp)->c_desc != NULL)) - printf(" %-15s %s\n", (*cmdp)->c_name, (*cmdp)->c_desc); + if (res) + break; + if (((*cmdp)->c_name != NULL) && ((*cmdp)->c_desc != NULL)) { + sprintf(name, " %-15s ", (*cmdp)->c_name); + pager_output(name); + pager_output((*cmdp)->c_desc); + res = pager_output("\n"); + } } + pager_close(); return(CMD_OK); } ==== //depot/projects/hammer/sys/conf/NOTES#73 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1287 2004/11/08 19:05:21 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1288 2004/11/12 19:44:30 peter Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -756,7 +756,6 @@ options NFSCLIENT #Network File System client # The rest are optional: -options AUTOFS #Auto File System options CD9660 #ISO 9660 filesystem options FDESCFS #File descriptor filesystem options HPFS #OS/2 File system ==== //depot/projects/hammer/sys/conf/files#92 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.962 2004/11/10 19:54:17 markm Exp $ +# $FreeBSD: src/sys/conf/files,v 1.966 2004/11/12 04:48:24 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -300,6 +300,7 @@ dev/acpica/Osd/OsdStream.c optional acpi dev/acpica/Osd/OsdSynch.c optional acpi dev/acpica/Osd/OsdTable.c optional acpi +dev/acpica/acpi_snc.c optional acpi_snc acpi dev/acpica/acpi_video.c optional acpi_video acpi dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa @@ -594,6 +595,7 @@ dev/patm/if_patm_tx.c optional patm pci dev/patm/if_patm_attach.c optional patm pci dev/patm/if_patm_rtables.c optional patm pci +dev/pbio/pbio.c optional pbio isa dev/pccard/card_if.m standard dev/pccard/pccard.c optional pccard dev/pccard/pccard_cis.c optional pccard ==== //depot/projects/hammer/sys/conf/files.i386#43 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.506 2004/10/24 08:53:40 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.507 2004/11/11 04:53:46 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -292,7 +292,6 @@ i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx -i386/isa/pbio.c optional pbio i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt ==== //depot/projects/hammer/sys/conf/kern.post.mk#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.70 2004/09/23 08:34:50 phk Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.72 2004/11/12 20:44:51 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -27,6 +27,20 @@ .endif .endfor +# Handle out of tree ports +.if defined(PORTS_MODULES) +.if defined(SYSDIR) +PORTSMODULESENV=SYSDIR=${SYSDIR} +.endif +.for target in all install clean +${target}: ports-${target} +ports-${target}: +.for __i in ${PORTS_MODULES} + cd /usr/ports/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${target} +.endfor +.endfor +.endif + .ORDER: kernel-install modules-install kernel-all: ${KERNEL_KO} ==== //depot/projects/hammer/sys/conf/options#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.486 2004/10/27 19:26:01 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.487 2004/11/12 19:44:30 peter Exp $ # # On the handling of kernel options # @@ -162,7 +162,6 @@ # time, since the corresponding lkms cannot work if there are any static # dependencies. Unusability is enforced by hiding the defines for the # options in a never-included header. -AUTOFS opt_dontuse.h CD9660 opt_dontuse.h CODA opt_dontuse.h EXT2FS opt_dontuse.h ==== //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.50 2004/08/13 06:22:07 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.51 2004/11/11 22:33:08 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -70,11 +70,13 @@ /* * Get the PCI interrupt routing table for this bus. If we can't - * get it, this is not an error but may reduce functionality. + * get it, this is not an error but may reduce functionality. There + * are several valid bridges in the field that do not have a _PRT, so + * only warn about missing tables if bootverbose is set. */ prt->Length = ACPI_ALLOCATE_BUFFER; status = AcpiGetIrqRoutingTable(acpi_get_handle(dev), prt); - if (ACPI_FAILURE(status)) + if (ACPI_FAILURE(status) && (bootverbose || status != AE_NOT_FOUND)) device_printf(dev, "could not get PCI interrupt routing table for %s - %s\n", acpi_name(acpi_get_handle(dev)), AcpiFormatException(status)); ==== //depot/projects/hammer/sys/dev/aha/aha_isa.c#9 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.29 2004/03/17 17:50:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.31 2004/11/12 02:18:42 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -122,7 +122,7 @@ port_rid = 0; port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &port_rid, - 0, ~0, AHA_NREGS, RF_ACTIVE); + 0, ~0, AHA_NREGS, RF_ACTIVE); if (port_res == NULL) return (ENXIO); @@ -150,7 +150,7 @@ "settings for adapter at %#jx. Failing probe\n", (uintmax_t)port_start); aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, port_rid, + bus_release_resource(dev, SYS_RES_IOPORT, port_rid, port_res); return (ENXIO); } @@ -208,7 +208,8 @@ RF_ACTIVE); if (!aha->irq) { device_printf(dev, "Unable to allocate excluse use of irq\n"); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); return ENOMEM; } @@ -217,7 +218,8 @@ RF_ACTIVE); if (!aha->drq) { device_printf(dev, "Unable to allocate drq\n"); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); return ENOMEM; } @@ -247,41 +249,45 @@ /* lockfunc */ busdma_lock_mutex, /* lockarg */ &Giant, &aha->parent_dmat) != 0) { - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (ENOMEM); - } + aha_free(aha); + return (ENOMEM); + } - if (aha_init(aha)) { + if (aha_init(aha)) { device_printf(dev, "init failed\n"); - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (ENOMEM); - } + aha_free(aha); + return (ENOMEM); + } error = aha_attach(aha); if (error) { device_printf(dev, "attach failed\n"); - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (error); + aha_free(aha); + return (error); } - error = bus_setup_intr(dev, aha->irq, INTR_TYPE_CAM|INTR_ENTROPY, aha_intr, aha, - &ih); + error = bus_setup_intr(dev, aha->irq, INTR_TYPE_CAM|INTR_ENTROPY, + aha_intr, aha, &ih); if (error) { device_printf(dev, "Unable to register interrupt handler\n"); - aha_free(aha); - bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); + bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, + aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); - return (error); + aha_free(aha); + return (error); } return (0); ==== //depot/projects/hammer/sys/dev/em/if_em.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.51 2004/11/03 14:11:18 phk Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.53 2004/11/12 11:03:07 rwatson Exp $*/ #include <dev/em/if_em.h> @@ -161,7 +161,7 @@ static int em_get_buf(int i, struct adapter *, struct mbuf *); static void em_enable_vlans(struct adapter *); -static int em_encap(struct adapter *, struct mbuf *); +static int em_encap(struct adapter *, struct mbuf **); static void em_smartspeed(struct adapter *); static int em_82547_fifo_workaround(struct adapter *, int); static void em_82547_update_fifo_head(struct adapter *, int); @@ -310,26 +310,14 @@ em_adapter_list = adapter; /* SYSCTL stuff */ - sysctl_ctx_init(&adapter->sysctl_ctx); - adapter->sysctl_tree = SYSCTL_ADD_NODE(&adapter->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_hw), - OID_AUTO, - device_get_nameunit(dev), - CTLFLAG_RD, - 0, ""); - if (adapter->sysctl_tree == NULL) { - error = EIO; - goto err_sysctl; - } - - SYSCTL_ADD_PROC(&adapter->sysctl_ctx, - SYSCTL_CHILDREN(adapter->sysctl_tree), + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug_info", CTLTYPE_INT|CTLFLAG_RW, (void *)adapter, 0, em_sysctl_debug_info, "I", "Debug Information"); - SYSCTL_ADD_PROC(&adapter->sysctl_ctx, - SYSCTL_CHILDREN(adapter->sysctl_tree), + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, (void *)adapter, 0, em_sysctl_stats, "I", "Statistics"); @@ -504,8 +492,6 @@ err_tx_desc: err_pci: em_free_pci_resources(adapter); - sysctl_ctx_free(&adapter->sysctl_ctx); -err_sysctl: return(error); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411122329.iACNTFG5041750>