Date: Sun, 4 Mar 2007 23:36:36 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 115314 for review Message-ID: <200703042336.l24NaaGt038951@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=115314 Change 115314 by piso@piso_newluxor on 2007/03/04 23:36:34 IFC@115313 Affected files ... .. //depot/projects/soc2006/intr_filter/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/soc2006/intr_filter/conf/kmod.mk#7 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/nge/if_nge.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#19 integrate .. //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ti/if_ti.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/txp/if_txp.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/vge/if_vge.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acl.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_context.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_event.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exec.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#34 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_jail.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_module.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ntptime.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_prot.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_shutdown.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sysctl.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_time.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_xxx.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/p1003_1b.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_prof.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_trap.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_generic.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_process.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_socket.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_msg.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_sem.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_shm.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#6 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#8 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_syscalls.c#2 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/boot/pc98/cdboot/cdboot.s#2 (text) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/cdboot/cdboot.s,v 1.1 2006/05/14 07:26:02 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/cdboot/cdboot.s,v 1.2 2007/03/04 04:53:17 nyan Exp $ # # Basically, we first create a set of boot arguments to pass to the loaded @@ -705,7 +705,7 @@ twiddle: push %ax # Save push %bx # Save mov twiddle_index,%al # Load index - mov twiddle_chars,%bx # Address table + mov $twiddle_chars,%bx # Address table inc %al # Next and $3,%al # char mov %al,twiddle_index # Save index for next call ==== //depot/projects/soc2006/intr_filter/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.215 2007/03/02 11:42:53 flz Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.216 2007/03/04 19:35:59 flz Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -38,7 +38,7 @@ # # FIRMWS List of firmware images in format filename:shortname:version # -# FIRMWARE_LICENSED +# FIRMWARE_LICENSE # Set to the name of the license the user has to agree on in # order to use this firmware. See /usr/share/doc/legal # ==== //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#13 (text) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.28 2007/02/23 12:18:34 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.29 2007/03/04 03:38:06 csjp Exp $"); /* * The following controllers are supported by this driver: @@ -4726,7 +4726,7 @@ count++; /* Send a copy of the frame to any BPF listeners. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } if (count == 0) { ==== //depot/projects/soc2006/intr_filter/dev/ixgb/if_ixgb.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.21 2007/02/23 12:18:45 piso Exp $*/ +/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.22 2007/03/04 03:38:07 csjp Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -475,7 +475,7 @@ if (ifp->if_bpf) bpf_mtap(ifp, m_head); #else - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); #endif /* Set timeout in case hardware has problems transmitting */ ifp->if_timer = IXGB_TX_TIMEOUT; ==== //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#7 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.10 2007/02/23 12:18:47 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.11 2007/03/04 03:38:07 csjp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2870,7 +2870,7 @@ * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } if (enq > 0) { ==== //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#8 (text+ko) ==== @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.15 2007/02/23 12:18:48 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.16 2007/03/04 03:38:07 csjp Exp $"); /* Uncomment the following line to enable polling. */ /* #define DEVICE_POLLING */ @@ -1700,7 +1700,7 @@ /* packet put in h/w queue, remove from s/w queue */ IFQ_DEQUEUE(&ifp->if_snd, m0); - BPF_MTAP(ifp, m0); + ETHER_BPF_MTAP(ifp, m0); } if (sc->txq.cur == old) { /* nothing sent */ return; ==== //depot/projects/soc2006/intr_filter/dev/nge/if_nge.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.90 2007/02/23 12:18:48 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.91 2007/03/04 03:38:07 csjp Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -1613,7 +1613,7 @@ * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#12 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.156 2007/02/27 17:27:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.157 2007/03/04 19:33:12 imp Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -487,10 +487,13 @@ cbb_removal(sc); } else if (status & CBB_STATE_NOT_A_CARD) { /* - * Up to 20 times, try to rescan the card when we - * see NOT_A_CARD. + * Up to 10 times, try to rescan the card when we see + * NOT_A_CARD. 10 is somehwat arbitrary. When this + * pathology hits, there's a ~40% chance each try will + * fail. 10 tries takes about 5s and results in a + * 99.99% certainty of the results. */ - if (not_a_card++ < 20) { + if (not_a_card++ < 10) { DEVPRINTF((sc->dev, "Not a card bit set, rescanning\n")); cbb_setb(sc, CBB_SOCKET_FORCE, CBB_FORCE_CV_TEST); @@ -505,12 +508,12 @@ mtx_unlock(&Giant); /* - * Wait until it has been 1s since the last time we + * Wait until it has been 250ms since the last time we * get an interrupt. We handle the rest of the interrupt * at the top of the loop. Although we clear the bit in the * ISR, we signal sc->cv from the detach path after we've * set the CBB_KTHREAD_DONE bit, so we can't do a simple - * 1s sleep here. + * 250ms sleep here. * * In our ISR, we turn off the card changed interrupt. Turn * them back on here before we wait for them to happen. We ==== //depot/projects/soc2006/intr_filter/dev/re/if_re.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.86 2007/02/27 18:45:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.87 2007/03/04 03:38:07 csjp Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -2204,7 +2204,7 @@ * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); queued++; } ==== //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/stge/if_stge.c,v 1.5 2007/02/23 12:18:55 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stge/if_stge.c,v 1.6 2007/03/04 03:38:07 csjp Exp $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1346,7 +1346,7 @@ * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } if (enq > 0) { ==== //depot/projects/soc2006/intr_filter/dev/ti/if_ti.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ti/if_ti.c,v 1.127 2007/02/23 12:18:56 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ti/if_ti.c,v 1.128 2007/03/04 03:38:08 csjp Exp $"); #include "opt_ti.h" @@ -3120,7 +3120,7 @@ * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } if (enq > 0) { ==== //depot/projects/soc2006/intr_filter/dev/txp/if_txp.c#5 (text+ko) ==== @@ -35,14 +35,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.43 2007/02/23 12:18:57 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.44 2007/03/04 03:38:08 csjp Exp $"); /* * Driver for 3c990 (Typhoon) Ethernet ASIC */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.43 2007/02/23 12:18:57 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.44 2007/03/04 03:38:08 csjp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,7 +91,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.43 2007/02/23 12:18:57 piso Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.44 2007/03/04 03:38:08 csjp Exp $"; #endif /* @@ -1350,7 +1350,7 @@ ifp->if_timer = 5; - BPF_MTAP(ifp, m); + ETHER_BPF_MTAP(ifp, m); WRITE_REG(sc, r->r_reg, TXP_IDX2OFFSET(prod)); } ==== //depot/projects/soc2006/intr_filter/dev/vge/if_vge.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.30 2007/02/23 12:18:58 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.31 2007/03/04 03:38:08 csjp Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -1847,7 +1847,7 @@ * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } if (idx == sc->vge_ldata.vge_tx_prodidx) { ==== //depot/projects/soc2006/intr_filter/i386/isa/clock.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.233 2007/02/23 12:19:00 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.234 2007/03/04 04:55:19 nyan Exp $"); /* * Routines to handle clock hardware. @@ -760,8 +760,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = ==== //depot/projects/soc2006/intr_filter/kern/kern_acct.c#5 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.86 2007/01/08 20:35:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.87 2007/03/04 22:36:45 rwatson Exp $"); #include "opt_mac.h" @@ -182,10 +182,8 @@ "Accounting suspended or not"); /* - * Accounting system call. Written based on the specification and - * previous implementation done by Mark Tinguely. - * - * MPSAFE + * Accounting system call. Written based on the specification and previous + * implementation done by Mark Tinguely. */ int acct(struct thread *td, struct acct_args *uap) ==== //depot/projects/soc2006/intr_filter/kern/kern_acl.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.50 2007/01/12 22:01:03 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.51 2007/03/04 22:36:45 rwatson Exp $"); #include "opt_mac.h" @@ -185,8 +185,6 @@ /* * Given a file path, get an ACL for it - * - * MPSAFE */ int __acl_get_file(struct thread *td, struct __acl_get_file_args *uap) @@ -207,8 +205,6 @@ /* * Given a file path, get an ACL for it; don't follow links. - * - * MPSAFE */ int __acl_get_link(struct thread *td, struct __acl_get_link_args *uap) @@ -228,9 +224,7 @@ } /* - * Given a file path, set an ACL for it - * - * MPSAFE + * Given a file path, set an ACL for it. */ int __acl_set_file(struct thread *td, struct __acl_set_file_args *uap) @@ -251,8 +245,6 @@ /* * Given a file path, set an ACL for it; don't follow links. - * - * MPSAFE */ int __acl_set_link(struct thread *td, struct __acl_set_link_args *uap) @@ -273,8 +265,6 @@ /* * Given a file descriptor, get an ACL for it - * - * MPSAFE */ int __acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap) @@ -294,8 +284,6 @@ /* * Given a file descriptor, set an ACL for it - * - * MPSAFE */ int __acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap) @@ -315,8 +303,6 @@ /* * Given a file path, delete an ACL from it. - * - * MPSAFE */ int __acl_delete_file(struct thread *td, struct __acl_delete_file_args *uap) @@ -337,8 +323,6 @@ /* * Given a file path, delete an ACL from it; don't follow links. - * - * MPSAFE */ int __acl_delete_link(struct thread *td, struct __acl_delete_link_args *uap) @@ -359,8 +343,6 @@ /* * Given a file path, delete an ACL from it. - * - * MPSAFE */ int __acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap) @@ -379,9 +361,7 @@ } /* - * Given a file path, check an ACL for it - * - * MPSAFE + * Given a file path, check an ACL for it. */ int __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap) @@ -402,8 +382,6 @@ /* * Given a file path, check an ACL for it; don't follow links. - * - * MPSAFE */ int __acl_aclcheck_link(struct thread *td, struct __acl_aclcheck_link_args *uap) @@ -423,9 +401,7 @@ } /* - * Given a file descriptor, check an ACL for it - * - * MPSAFE + * Given a file descriptor, check an ACL for it. */ int __acl_aclcheck_fd(struct thread *td, struct __acl_aclcheck_fd_args *uap) ==== //depot/projects/soc2006/intr_filter/kern/kern_context.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_context.c,v 1.7 2003/11/09 20:31:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_context.c,v 1.8 2007/03/04 22:36:45 rwatson Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -58,9 +58,6 @@ } #endif -/* - * MPSAFE - */ int getcontext(struct thread *td, struct getcontext_args *uap) { @@ -79,9 +76,6 @@ return (ret); } -/* - * MPSAFE - */ int setcontext(struct thread *td, struct setcontext_args *uap) { ==== //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.303 2007/02/15 10:55:43 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.304 2007/03/04 22:36:45 rwatson Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -247,9 +247,6 @@ int dummy; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int getdtablesize(struct thread *td, struct getdtablesize_args *uap) @@ -275,9 +272,6 @@ u_int to; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int dup2(struct thread *td, struct dup2_args *uap) @@ -295,9 +289,6 @@ u_int fd; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int dup(struct thread *td, struct dup_args *uap) @@ -316,9 +307,6 @@ long arg; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int fcntl(struct thread *td, struct fcntl_args *uap) @@ -965,9 +953,6 @@ int fd; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int close(td, uap) @@ -1048,9 +1033,6 @@ struct ostat *sb; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int ofstat(struct thread *td, struct ofstat_args *uap) @@ -1077,9 +1059,6 @@ struct stat *sb; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int fstat(struct thread *td, struct fstat_args *uap) @@ -1120,9 +1099,6 @@ struct nstat *sb; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int nfstat(struct thread *td, struct nfstat_args *uap) @@ -1148,9 +1124,6 @@ int name; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int fpathconf(struct thread *td, struct fpathconf_args *uap) @@ -2223,9 +2196,6 @@ int how; }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int flock(struct thread *td, struct flock_args *uap) ==== //depot/projects/soc2006/intr_filter/kern/kern_event.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.107 2006/11/20 22:17:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.108 2007/03/04 22:36:45 rwatson Exp $"); #include "opt_ktrace.h" @@ -506,9 +506,6 @@ return (kn->kn_data != 0); } -/* - * MPSAFE - */ int kqueue(struct thread *td, struct kqueue_args *uap) { @@ -557,9 +554,6 @@ const struct timespec *timeout; }; #endif -/* - * MPSAFE - */ int kevent(struct thread *td, struct kevent_args *uap) { ==== //depot/projects/soc2006/intr_filter/kern/kern_exec.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.299 2006/11/06 13:42:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.300 2007/03/04 22:36:45 rwatson Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -168,9 +168,6 @@ }; #endif -/* - * MPSAFE - */ int execve(td, uap) struct thread *td; @@ -199,9 +196,6 @@ }; #endif -/* - * MPSAFE - */ int __mac_execve(td, uap) struct thread *td; @@ -277,8 +271,6 @@ /* * In-kernel implementation of execve(). All arguments are assumed to be * userspace pointers from the passed thread. - * - * MPSAFE */ static int do_execve(td, args, mac_p) ==== //depot/projects/soc2006/intr_filter/kern/kern_exit.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.294 2006/10/25 06:18:04 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.295 2007/03/04 22:36:46 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -91,8 +91,6 @@ /* * exit -- * Death of process. - * - * MPSAFE */ void sys_exit(struct thread *td, struct sys_exit_args *uap) @@ -553,9 +551,6 @@ }; #endif -/* - * MPSAFE. - */ int abort2(struct thread *td, struct abort2_args *uap) { @@ -628,8 +623,6 @@ #ifdef COMPAT_43 /* * The dirty work is handled by kern_wait(). - * - * MPSAFE. */ int owait(struct thread *td, struct owait_args *uap __unused) @@ -645,8 +638,6 @@ /* * The dirty work is handled by kern_wait(). - * - * MPSAFE. */ int wait4(struct thread *td, struct wait_args *uap) ==== //depot/projects/soc2006/intr_filter/kern/kern_fork.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.268 2007/02/27 17:22:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.269 2007/03/04 22:36:46 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -82,9 +82,6 @@ }; #endif -/* - * MPSAFE - */ /* ARGSUSED */ int fork(td, uap) @@ -102,9 +99,6 @@ return (error); } -/* - * MPSAFE - */ /* ARGSUSED */ int vfork(td, uap) @@ -122,9 +116,6 @@ return (error); } -/* - * MPSAFE - */ int rfork(td, uap) struct thread *td; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#34 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.141 2007/02/27 17:09:20 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.142 2007/03/02 17:01:45 jhb Exp $"); #include "opt_ddb.h" @@ -758,14 +758,15 @@ * number of back to back interrupts exceeds the storm threshold, * then enter storming mode. */ - if (intr_storm_threshold != 0 && ie->ie_count >= intr_storm_threshold) { + if (intr_storm_threshold != 0 && ie->ie_count >= intr_storm_threshold && + !(ie->ie_flags & IE_SOFT)) { if (ie->ie_warned == 0) { printf( "Interrupt storm detected on \"%s\"; throttling interrupt source\n", ie->ie_name); ie->ie_warned = 1; } - tsleep(&ie->ie_count, 0, "istorm", 1); + pause("istorm", 1); } else ie->ie_count++; ==== //depot/projects/soc2006/intr_filter/kern/kern_jail.c#6 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.59 2007/03/01 20:47:41 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.60 2007/03/04 22:36:46 rwatson Exp $"); #include "opt_mac.h" @@ -94,8 +94,6 @@ SYSINIT(prison, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_prison, NULL); /* - * MPSAFE - * * struct jail_args { * struct jail *jail; * }; @@ -184,8 +182,6 @@ } /* - * MPSAFE - * * struct jail_attach_args { * int jid; * }; ==== //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.115 2007/02/13 00:20:13 mpp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.116 2007/03/04 22:36:46 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -373,9 +373,6 @@ mtx_unlock(&ktrace_mtx); } -/* - * MPSAFE - */ void ktrsyscall(code, narg, args) int code, narg; @@ -407,9 +404,6 @@ ktr_submitrequest(curthread, req); } -/* - * MPSAFE - */ void ktrsysret(code, error, retval) int code, error; @@ -564,8 +558,6 @@ /* * ktrace system call - * - * MPSAFE */ #ifndef _SYS_SYSPROTO_H_ struct ktrace_args { @@ -739,8 +731,6 @@ /* * utrace system call - * - * MPSAFE */ /* ARGSUSED */ int ==== //depot/projects/soc2006/intr_filter/kern/kern_linker.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.146 2007/02/26 16:36:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.147 2007/03/04 22:36:46 rwatson Exp $"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" @@ -841,9 +841,6 @@ /* * Syscalls. */ -/* - * MPSAFE - */ int kern_kldload(struct thread *td, const char *file, int *fileid) { @@ -909,9 +906,6 @@ return (error); } -/* - * MPSAFE - */ int kern_kldunload(struct thread *td, int fileid, int flags) { @@ -960,9 +954,6 @@ return (error); } -/* - * MPSAFE >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703042336.l24NaaGt038951>