Date: Thu, 14 Sep 2006 17:51:45 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 106104 for review Message-ID: <200609141751.k8EHpj4h038492@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=106104 Change 106104 by imp@imp_paco-paco on 2006/09/14 17:51:08 IFC @106102 minus new bintuils/etc changes Affected files ... .. //depot/projects/arm/src/MAINTAINERS#3 integrate .. //depot/projects/arm/src/lib/libc/sys/send.2#2 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_login_access/login.access.5#2 integrate .. //depot/projects/arm/src/sbin/mount_std/mount_std.c#2 integrate .. //depot/projects/arm/src/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/arm/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/arm/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/arm/src/share/man/man4/tcp.4#2 integrate .. //depot/projects/arm/src/share/man/man7/hier.7#4 integrate .. //depot/projects/arm/src/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/arm/src/share/mk/bsd.lib.mk#4 integrate .. //depot/projects/arm/src/share/mk/bsd.prog.mk#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#9 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#29 integrate .. //depot/projects/arm/src/sys/dev/ichsmb/ichsmb.c#5 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/arm/src/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/arm/src/sys/dev/smbus/smb.c#4 integrate .. //depot/projects/arm/src/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/arm/src/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/arm/src/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/arm/src/sys/dev/smbus/smbus.c#5 integrate .. //depot/projects/arm/src/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/arm/src/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/arm/src/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/arm/src/sys/fs/udf/osta.h#2 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#18 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#21 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#17 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#11 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/arm/src/sys/kern/bus_if.m#7 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#17 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/arm/src/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/pf/Makefile#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/arm/src/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/arm/src/sys/pci/alpm.c#4 integrate .. //depot/projects/arm/src/sys/pci/amdpm.c#6 integrate .. //depot/projects/arm/src/sys/pci/amdsmb.c#3 integrate .. //depot/projects/arm/src/sys/pci/intpm.c#4 integrate .. //depot/projects/arm/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/arm/src/sys/pci/nfsmb.c#4 integrate .. //depot/projects/arm/src/sys/pci/viapm.c#6 integrate .. //depot/projects/arm/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/arm/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/arm/src/sys/sys/mac.h#4 integrate .. //depot/projects/arm/src/sys/sys/mac_policy.h#7 integrate .. //depot/projects/arm/src/sys/sys/mount.h#12 integrate .. //depot/projects/arm/src/tools/regression/priv/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/priv/main.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/main.h#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_acct.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_adjtime.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_clock_settime.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_io.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_kenv_set.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_kenv_unset.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_proc_setlogin.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_proc_setrlimit.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_sched_rtprio.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_sched_setpriority.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_settimeofday.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_sysctl_write.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_admin.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_chown.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_chroot.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_clearsugid.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_extattr_system.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_fhopen.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_fhstat.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_fhstatfs.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_generation.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_getfh.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_read_write.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_setgid.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vfs_stickyfile.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vm_madv_protect.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vm_mlock.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/priv_vm_munlock.c#1 branch .. //depot/projects/arm/src/tools/regression/priv/test_utimes.c#1 branch .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/arm/src/usr.bin/indent/indent.c#2 integrate .. //depot/projects/arm/src/usr.bin/login/login.1#2 integrate .. //depot/projects/arm/src/usr.bin/paste/paste.c#2 integrate .. //depot/projects/arm/src/usr.bin/su/su.1#2 integrate .. //depot/projects/arm/src/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/arm/src/usr.sbin/rpc.statd/procs.c#3 integrate .. //depot/projects/arm/src/usr.sbin/rpc.statd/statd.c#2 integrate Differences ... ==== //depot/projects/arm/src/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ +$FreeBSD: src/MAINTAINERS,v 1.141 2006/09/11 19:39:46 simon Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -119,6 +119,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. +openssl simon Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/arm/src/lib/libc/sys/send.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.32 2005/06/15 19:04:04 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.33 2006/09/13 19:48:00 joel Exp $ .\" -.Dd February 15, 1995 +.Dd September 13, 2006 .Dt SEND 2 .Os .Sh NAME @@ -130,10 +130,7 @@ .Dv SOCK_STREAM sockets in the .Dv PF_INET -protocol family, and is used to implement Transaction -.Tn TCP -(see -.Xr ttcp 4 ) . +protocol family. .Dv MSG_DONTROUTE is usually used only by diagnostic or routing programs. .Dv MSG_NOSIGNAL ==== //depot/projects/arm/src/lib/libpam/modules/pam_login_access/login.access.5#2 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/login.access.5,v 1.15 2006/03/06 13:15:12 yar Exp $ +.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/login.access.5,v 1.17 2006/09/13 18:34:32 joel Exp $ .\" -.Dd April 30, 1994 +.Dd September 13, 2006 .Dt LOGIN.ACCESS 5 .Os .Sh NAME @@ -52,7 +52,6 @@ .El .Sh SEE ALSO .Xr login 1 , -.Xr pam 8 , .Xr pam_login_access 8 .Sh AUTHORS .An Guido van Rooij ==== //depot/projects/arm/src/sbin/mount_std/mount_std.c#2 (text+ko) ==== @@ -37,10 +37,8 @@ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.21 2005/06/10 09:51:42 delphij Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.22 2006/09/13 04:50:44 charnier Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -68,15 +66,13 @@ static void usage(void) __dead2; static void -catchsig(int s) +catchsig(int s __unused) { caughtsig = 1; } int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { int ch, mntflags; char mntpath[MAXPATHLEN]; @@ -154,7 +150,7 @@ } void -usage() +usage(void) { (void)fprintf(stderr, "usage: mount_%s [-o options] what_to_mount mount_point\n", ==== //depot/projects/arm/src/sbin/sconfig/sconfig.c#2 (text+ko) ==== @@ -15,8 +15,11 @@ * all derivative works or modified versions. * * Cronyx Id: sconfig.c,v 1.4.2.2 2005/11/09 13:01:35 rik Exp $ - * $FreeBSD: src/sbin/sconfig/sconfig.c,v 1.3 2006/01/30 21:08:30 rik Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sbin/sconfig/sconfig.c,v 1.4 2006/09/12 17:54:35 charnier Exp $"); + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -39,9 +42,6 @@ int adapter_type; /* 0-sigma, 1-tau, 2-taupci, 3-tau32 */ char chan_name[16]; -extern char *optarg; -extern int optind; - static void usage (void) { @@ -257,7 +257,11 @@ } static void +#ifdef __linux__ print_ifconfig (int fd) +#else +print_ifconfig (int fd __unused) +#endif { char buf [64]; #ifdef __linux__ @@ -508,14 +512,14 @@ } static char * -format_e3_cv (unsigned long cv, unsigned long baud, unsigned long time) +format_e3_cv (unsigned long cv, unsigned long baud, unsigned long atime) { static char buf[80]; - if (!cv || !baud || !time) + if (!cv || !baud || !atime) sprintf (buf, " - "); else - sprintf (buf, "%10lu (%.1e)", cv, (double)cv/baud/time); + sprintf (buf, "%10lu (%.1e)", cv, (double)cv/baud/atime); return buf; } ==== //depot/projects/arm/src/share/examples/etc/make.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.277 2006/07/19 11:27:19 des Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.278 2006/09/13 10:20:56 ru Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -48,10 +48,14 @@ # CFLAGS controls the compiler settings used when compiling C code. # Note that optimization settings other than -O and -O2 are not recommended # or supported for compiling the world or the kernel - please revert any -# nonstandard optimization settings to "-O" or -O2 before submitting bug -# reports without patches to the developers. +# nonstandard optimization settings to "-O" or "-O2 -fno-strict-aliasing" +# before submitting bug reports without patches to the developers. +# +# Compiling with -fstrict-aliasing optimization breaks some [notable] ports. +# GCC turns on -fstrict-aliasing optimization at all levels above -O[1], so +# explicitly turn it off when using compiling with the -O2 optimization level. # -#CFLAGS= -O -pipe +#CFLAGS= -O2 -fno-strict-aliasing -pipe # # CXXFLAGS controls the compiler settings used when compiling C++ code. # Note that CXXFLAGS is initially set to the value of CFLAGS. If you wish ==== //depot/projects/arm/src/share/man/man4/ipmi.4#2 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.4 2006/04/20 18:29:59 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.5 2006/09/13 21:11:13 jhb Exp $ .\" .Dd April 20, 2006 .Dt IPMI 4 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Cd "device ipmi" .Pp -.In sys/dev/ipmi.h +.In sys/ipmi.h .Ft int .Fn ioctl "int d" "IPMICTL_RECEIVE_MSG_TRUNC" "struct ipmi_recv *" .Ft int ==== //depot/projects/arm/src/share/man/man4/tcp.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.52 2005/08/25 13:47:41 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.54 2006/09/13 15:47:26 glebius Exp $ .\" -.Dd August 25, 2005 +.Dd September 13, 2006 .Dt TCP 4 .Os .Sh NAME @@ -460,6 +460,24 @@ .It Va sack.initburst Control the number of SACK retransmissions done upon initiation of SACK recovery. +.It Va maxtcptw +When a TCP connection enters the +.Dv TIME_WAIT +state, its associated socket structure is freed, since it is of +negligible size and use, and a new structure is allocated to contain a +minimal amount of information necessary for sustaining a connection in +this state, called the compressed TCP TIME_WAIT state. +Since this structure is smaller than a socket structure, it can save +a significant amount of system memory. +The +.Va net.inet.tcp.maxtcptw +MIB variable controls the maximum number of these structures allocated. +By default, it is initialized to +.Va kern.ipc.maxsockets +/ 5. +.It Va nolocaltimewait +Suppress creating of compressed TCP TIME_WAIT states for connections in +which both endpoints are local. .El .Sh ERRORS A socket operation may fail with one of the following errors returned: ==== //depot/projects/arm/src/share/man/man7/hier.7#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.120 2006/08/03 05:46:32 jb Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.121 2006/09/13 17:46:19 joel Exp $ .\" -.Dd May 10, 2006 +.Dd September 13, 2006 .Dt HIER 7 .Os .Sh NAME @@ -121,9 +121,7 @@ .Xr named 8 .It Pa pam.d/ configuration files for the Pluggable Authentication Modules (PAM) -library; -see -.Xr pam 8 +library .It Pa periodic/ scripts that are run daily, weekly, and monthly, via .Xr cron 8 ; ==== //depot/projects/arm/src/share/man/man9/device_add_child.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.23 2006/01/13 11:24:08 ru Exp $ +.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.25 2006/09/12 15:48:22 imp Exp $ .\" -.Dd May 13, 2004 +.Dd September 12, 2006 .Dt DEVICE_ADD_CHILD 9 .Os .Sh NAME @@ -108,9 +108,15 @@ Authors of bus drivers must likewise be careful when adding children when they are loaded and unloaded to avoid duplication of children devices. +.Pp +Identify routines should use +.Xr BUS_ADD_CHILD 9 +instead of +.Xr device_add_child 9 . .Sh RETURN VALUES The new device if successful, NULL otherwise. .Sh SEE ALSO +.Xr BUS_ADD_CHILD 9 , .Xr device 9 , .Xr device_find_child 9 , .Xr DEVICE_IDENTIFY 9 ==== //depot/projects/arm/src/share/mk/bsd.lib.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.177 2006/09/11 05:35:56 imp Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.178 2006/09/13 23:27:21 obrien Exp $ # .include <bsd.init.mk> @@ -30,6 +30,7 @@ .if ${MK_ASSERT_DEBUG} == "no" CFLAGS+= -DNDEBUG +NO_WERROR= .endif .if defined(DEBUG_FLAGS) ==== //depot/projects/arm/src/share/mk/bsd.prog.mk#3 (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.148 2006/09/11 05:35:57 imp Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.149 2006/09/13 23:27:21 obrien Exp $ .include <bsd.init.mk> @@ -12,6 +12,7 @@ .if ${MK_ASSERT_DEBUG} == "no" CFLAGS+= -DNDEBUG +NO_WERROR= .endif .if defined(DEBUG_FLAGS) ==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.28 2006/09/06 22:05:34 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -794,6 +794,76 @@ } } } + +static void +dump_mask(const char *prefix, uint32_t v, int base) +{ + int i, first; + + first = 1; + for (i = 0; i < 32; i++) + if (v & (1 << i)) { + if (first) { + db_printf("%s:", prefix); + first = 0; + } + db_printf(" %02x", base + i); + } + if (!first) + db_printf("\n"); +} + +/* Show info from the lapic regs for this CPU. */ +DB_SHOW_COMMAND(lapic, db_show_lapic) +{ + uint32_t v; + + db_printf("lapic ID = %d\n", lapic_id()); + v = lapic->version; + db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, + v & 0xf); + db_printf("max LVT = %d\n", (v & APIC_VER_MAXLVT) >> MAXLVTSHIFT); + v = lapic->svr; + db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, + v & APIC_SVR_ENABLE ? "enabled" : "disabled"); + db_printf("TPR = %02x\n", lapic->tpr); + +#define dump_field(prefix, index) \ + dump_mask(__XSTRING(prefix ## index), lapic->prefix ## index, \ + index * 32) + + db_printf("In-service Interrupts:\n"); + dump_field(isr, 0); + dump_field(isr, 1); + dump_field(isr, 2); + dump_field(isr, 3); + dump_field(isr, 4); + dump_field(isr, 5); + dump_field(isr, 6); + dump_field(isr, 7); + + db_printf("TMR Interrupts:\n"); + dump_field(tmr, 0); + dump_field(tmr, 1); + dump_field(tmr, 2); + dump_field(tmr, 3); + dump_field(tmr, 4); + dump_field(tmr, 5); + dump_field(tmr, 6); + dump_field(tmr, 7); + + db_printf("IRR Interrupts:\n"); + dump_field(irr, 0); + dump_field(irr, 1); + dump_field(irr, 2); + dump_field(irr, 3); + dump_field(irr, 4); + dump_field(irr, 5); + dump_field(irr, 6); + dump_field(irr, 7); + +#undef dump_field +} #endif /* ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.276 2006/05/16 14:32:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.277 2006/09/11 20:10:42 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -342,7 +342,10 @@ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); - + + /* Install an inter-CPU IPI for cache invalidation. */ + setidt(IPI_INVLCACHE, IDTVEC(invlcache), SDT_SYSIGT, SEL_KPL, 0); + /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/arm/src/sys/contrib/pf/net/pf.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.40 2005/12/25 23:52:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.41 2006/09/12 04:25:11 csjp Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -42,6 +42,7 @@ #endif #ifdef __FreeBSD__ +#include "opt_mac.h" #include "opt_bpf.h" #include "opt_pf.h" @@ -78,6 +79,7 @@ #include <sys/kernel.h> #include <sys/time.h> #ifdef __FreeBSD__ +#include <sys/mac.h> #include <sys/sysctl.h> #include <sys/endian.h> #else @@ -192,7 +194,12 @@ struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t *, u_int16_t *, u_int16_t *, u_int16_t *, u_int8_t, sa_family_t); +#ifdef __FreeBSD__ +void pf_send_tcp(struct mbuf *, + const struct pf_rule *, sa_family_t, +#else void pf_send_tcp(const struct pf_rule *, sa_family_t, +#endif const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, @@ -1114,7 +1121,11 @@ cur->local_flags |= PFSTATE_EXPIRING; #endif if (cur->src.state == PF_TCPS_PROXY_DST) +#ifdef __FreeBSD__ + pf_send_tcp(NULL, cur->rule.ptr, cur->af, +#else pf_send_tcp(cur->rule.ptr, cur->af, +#endif &cur->ext.addr, &cur->lan.addr, cur->ext.port, cur->lan.port, cur->src.seqhi, cur->src.seqlo + 1, @@ -1574,7 +1585,11 @@ } void +#ifdef __FreeBSD__ +pf_send_tcp(struct mbuf *replyto, const struct pf_rule *r, sa_family_t af, +#else pf_send_tcp(const struct pf_rule *r, sa_family_t af, +#endif const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, @@ -1613,6 +1628,16 @@ m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) return; +#ifdef __FreeBSD__ +#ifdef MAC + if (replyto) + mac_create_mbuf_netlayer(replyto, m); + else + mac_create_mbuf_from_firewall(m); +#else + (void)replyto; +#endif +#endif if (tag) { #ifdef __FreeBSD__ m->m_flags |= M_SKIP_FIREWALL; @@ -3146,7 +3171,11 @@ ack++; if (th->th_flags & TH_FIN) ack++; +#ifdef __FreeBSD__ + pf_send_tcp(m, r, af, pd->dst, +#else pf_send_tcp(r, af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, r->return_ttl, 1, pd->eh, kif->pfik_ifp); @@ -3347,7 +3376,11 @@ mss = pf_calc_mss(saddr, af, mss); mss = pf_calc_mss(daddr, af, mss); s->src.mss = mss; +#ifdef __FreeBSD__ + pf_send_tcp(NULL, r, af, daddr, saddr, th->th_dport, +#else pf_send_tcp(r, af, daddr, saddr, th->th_dport, +#endif th->th_sport, s->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, s->src.mss, 0, 1, NULL, NULL); REASON_SET(&reason, PFRES_SYNPROXY); @@ -4348,7 +4381,11 @@ REASON_SET(reason, PFRES_SYNPROXY); return (PF_DROP); } +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, pd->dst, +#else pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, (*state)->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, 1, @@ -4387,7 +4424,12 @@ (*state)->src.max_win = MAX(ntohs(th->th_win), 1); if ((*state)->dst.seqhi == 1) (*state)->dst.seqhi = htonl(arc4random()); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, + &src->addr, +#else pf_send_tcp((*state)->rule.ptr, pd->af, &src->addr, +#endif &dst->addr, src->port, dst->port, (*state)->dst.seqhi, 0, TH_SYN, 0, (*state)->src.mss, 0, 0, NULL, NULL); @@ -4401,12 +4443,21 @@ } else { (*state)->dst.max_win = MAX(ntohs(th->th_win), 1); (*state)->dst.seqlo = ntohl(th->th_seq); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, pd->dst, +#else pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ntohl(th->th_seq) + 1, TH_ACK, (*state)->src.max_win, 0, 0, 0, NULL, NULL); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, + &src->addr, +#else pf_send_tcp((*state)->rule.ptr, pd->af, &src->addr, +#endif &dst->addr, src->port, dst->port, (*state)->src.seqhi + 1, (*state)->src.seqlo + 1, TH_ACK, (*state)->dst.max_win, 0, 0, 1, @@ -4685,7 +4736,11 @@ (*state)->src.state == TCPS_SYN_SENT) { /* Send RST for state mismatches during handshake */ if (!(th->th_flags & TH_RST)) +#ifdef __FreeBSD__ + pf_send_tcp(m, (*state)->rule.ptr, pd->af, +#else pf_send_tcp((*state)->rule.ptr, pd->af, +#endif pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), 0, TH_RST, 0, 0, ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.174 2006/09/11 19:48:30 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.175 2006/09/12 22:06:39 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -4869,7 +4869,7 @@ ata_default_registers(dev); for (i = ATA_BMCMD_PORT; i <= ATA_BMDTP_PORT; i++) { ch->r_io[i].res = ctlr->r_res1; - ch->r_io[i].offset = i - ATA_BMCMD_PORT; + ch->r_io[i].offset = (i - ATA_BMCMD_PORT)+(ch->unit * ATA_BMIOSIZE); } ata_pci_hw(dev); } ==== //depot/projects/arm/src/sys/dev/ata/ata-raid.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.44 2006/02/17 13:02:10 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.45 2006/09/12 20:37:22 sos Exp $ */ /* misc defines */ @@ -76,7 +76,7 @@ #define AR_F_SII_RAID 0x0800 #define AR_F_SIS_RAID 0x1000 #define AR_F_VIA_RAID 0x2000 -#define AR_F_FORMAT_MASK 0x1fff +#define AR_F_FORMAT_MASK 0x3fff u_int generation; u_int64_t total_sectors; ==== //depot/projects/arm/src/sys/dev/bktr/bktr_i2c.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.27 2005/05/29 04:42:19 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.28 2006/09/11 20:52:40 jhb Exp $"); /* * I2C support for the bti2c chipset. @@ -119,7 +119,7 @@ return (error); } -int bti2c_smb_callback(device_t dev, int index, caddr_t *data) +int bti2c_smb_callback(device_t dev, int index, void *data) { struct bktr_softc *bktr_sc = (struct bktr_softc *)device_get_softc(dev); struct bktr_i2c_softc *sc = &bktr_sc->i2c_sc; @@ -338,4 +338,6 @@ return (0); } +DRIVER_MODULE(smbus, bktr, smbus_driver, smbus_devclass, 0, 0); + #endif /* defined(BKTR_USE_FREEBSD_SMBUS) */ ==== //depot/projects/arm/src/sys/dev/em/if_em.c#29 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.143 2006/09/10 19:23:27 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.144 2006/09/11 20:59:01 pdeuskar Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1516,8 +1516,10 @@ */ if (do_tso && (m_head->m_len <= M_TSO_LEN)) { m_head = m_pullup(m_head, M_TSO_LEN + 4); - if (m_head == NULL) + *m_headp = m_head; + if (m_head == NULL) { return (ENOBUFS); + } } /* @@ -1578,7 +1580,7 @@ /* Do hardware assists */ m_head = *m_headp; - if ( ifp->if_hwassist > 0) { + if (ifp->if_hwassist > 0) { if (em_tso_setup(adapter, m_head, &txd_upper, &txd_lower)) { /* we need to make a final sentinel transmit desc */ tso_desc = TRUE; ==== //depot/projects/arm/src/sys/dev/ichsmb/ichsmb.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.15 2006/01/03 17:01:43 brian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.16 2006/09/11 20:52:41 jhb Exp $"); /* * Support for the SMBus controller logical device which is part of the @@ -51,6 +51,7 @@ #include <sys/kernel.h> #include <sys/errno.h> #include <sys/lock.h> +#include <sys/module.h> #include <sys/mutex.h> #include <sys/syslog.h> #include <sys/bus.h> @@ -136,7 +137,7 @@ ********************************************************************/ int -ichsmb_callback(device_t dev, int index, caddr_t data) +ichsmb_callback(device_t dev, int index, void *data) { int smb_error = 0; @@ -381,7 +382,7 @@ KASSERT(sc->ich_cmd == -1, ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd)); if (count < 1 || count > 32) - return (EINVAL); + return (SMB_EINVAL); bcopy(buf, sc->block_data, count); sc->block_count = count; sc->block_index = 1; @@ -403,7 +404,7 @@ } int -ichsmb_bread(device_t dev, u_char slave, char cmd, u_char count, char *buf) +ichsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf) { const sc_p sc = device_get_softc(dev); int smb_error; @@ -411,10 +412,10 @@ DBG("slave=0x%02x cmd=0x%02x count=%d\n", slave, (u_char)cmd, count); KASSERT(sc->ich_cmd == -1, ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd)); - if (count < 1 || count > 32) - return (EINVAL); + if (*count < 1 || *count > 32) + return (SMB_EINVAL); bzero(sc->block_data, sizeof(sc->block_data)); - sc->block_count = count; + sc->block_count = 0; sc->block_index = 0; sc->block_write = 0; @@ -423,11 +424,13 @@ bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA, (slave << 1) | ICH_XMIT_SLVA_READ); bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd); - bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, count); /* XXX? */ + bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, *count); /* XXX? */ bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT, ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd); - if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR) - bcopy(sc->block_data, buf, sc->block_count); + if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR) { + bcopy(sc->block_data, buf, min(sc->block_count, *count)); + *count = sc->block_count; + } mtx_unlock(&sc->mutex); DBG("smb_error=%d\n", smb_error); #if ICHSMB_DEBUG @@ -669,14 +672,20 @@ } } -int ichsmb_detach(device_t dev) +int +ichsmb_detach(device_t dev) { const sc_p sc = device_get_softc(dev); + int error; - mtx_destroy(&sc->mutex); - bus_generic_detach(dev); + error = bus_generic_detach(dev); + if (error) + return (error); device_delete_child(dev, sc->smb); ichsmb_release_resources(sc); + mtx_destroy(&sc->mutex); return 0; } + +DRIVER_MODULE(smbus, ichsmb, smbus_driver, smbus_devclass, 0, 0); ==== //depot/projects/arm/src/sys/dev/iicbus/iicsmb.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.13 2006/04/04 23:29:17 imp Exp $ + * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.14 2006/09/11 20:52:41 jhb Exp $ * */ @@ -83,7 +83,7 @@ static void iicsmb_identify(driver_t *driver, device_t parent); static void iicsmb_intr(device_t dev, int event, char *buf); -static int iicsmb_callback(device_t dev, int index, caddr_t data); +static int iicsmb_callback(device_t dev, int index, void *data); static int iicsmb_quick(device_t dev, u_char slave, int how); static int iicsmb_sendb(device_t dev, u_char slave, char byte); static int iicsmb_recvb(device_t dev, u_char slave, char *byte); @@ -93,7 +93,7 @@ static int iicsmb_readw(device_t dev, u_char slave, char cmd, short *word); static int iicsmb_pcall(device_t dev, u_char slave, char cmd, short sdata, short *rdata); static int iicsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf); -static int iicsmb_bread(device_t dev, u_char slave, char cmd, u_char count, char *buf); +static int iicsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf); static devclass_t iicsmb_devclass; @@ -247,7 +247,7 @@ } static int -iicsmb_callback(device_t dev, int index, caddr_t data) +iicsmb_callback(device_t dev, int index, void *data) { device_t parent = device_get_parent(dev); int error = 0; @@ -482,7 +482,7 @@ } static int -iicsmb_bread(device_t dev, u_char slave, char cmd, u_char count, char *buf) +iicsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf) { device_t parent = device_get_parent(dev); int error, sent, read; @@ -496,9 +496,10 @@ if ((error = iicbus_repeated_start(parent, slave | LSB, IICBUS_TIMEOUT))) goto error; - if ((error = iicbus_read(parent, buf, (int)count, &read, + if ((error = iicbus_read(parent, buf, (int)*count, &read, IIC_LAST_READ, IICBUS_TIMEOUT))) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609141751.k8EHpj4h038492>