Date: Wed, 18 Aug 2010 14:04:05 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 182561 for review Message-ID: <201008181404.o7IE45oF006939@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@182561?ac=10 Change 182561 by jhb@jhb_jhbbsd on 2010/08/18 14:03:49 IFC @182560 Affected files ... .. //depot/projects/smpng/share/man/man9/DEVICE_PROBE.9#4 integrate .. //depot/projects/smpng/share/man/man9/Makefile#17 integrate .. //depot/projects/smpng/share/man/man9/VOP_LISTEXTATTR.9#3 integrate .. //depot/projects/smpng/share/man/man9/VOP_VPTOCNP.9#4 integrate .. //depot/projects/smpng/share/man/man9/crypto.9#2 integrate .. //depot/projects/smpng/share/man/man9/g_geom.9#2 integrate .. //depot/projects/smpng/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211.9#6 integrate .. //depot/projects/smpng/share/man/man9/kproc.9#4 integrate .. //depot/projects/smpng/share/man/man9/netisr.9#6 integrate .. //depot/projects/smpng/share/man/man9/runqueue.9#2 integrate .. //depot/projects/smpng/share/man/man9/vm_page_bits.9#3 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#70 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#111 integrate .. //depot/projects/smpng/sys/amd64/include/elf.h#10 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#93 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#71 integrate .. //depot/projects/smpng/sys/conf/kern.mk#28 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#69 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#79 integrate .. //depot/projects/smpng/sys/conf/options.mips#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#124 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#38 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#76 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#17 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212.h#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#12 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9160.ini#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#90 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#20 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#9 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#16 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#17 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#35 integrate .. //depot/projects/smpng/sys/dev/flash/mx25l.c#3 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#17 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#120 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#42 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#26 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_if.m#9 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#20 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#17 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#16 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#24 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#36 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#88 integrate .. //depot/projects/smpng/sys/i386/acpica/Makefile#9 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#131 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#150 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#12 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#17 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#132 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#75 integrate .. //depot/projects/smpng/sys/kern/subr_autoconf.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#92 integrate .. //depot/projects/smpng/sys/kern/subr_rtc.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#133 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#181 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_cpudef.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar71xxreg.h#4 integrate .. //depot/projects/smpng/sys/mips/atheros/ar724xreg.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar91xxreg.h#1 branch .. //depot/projects/smpng/sys/mips/conf/XLR#3 integrate .. //depot/projects/smpng/sys/mips/conf/XLR64#2 integrate .. //depot/projects/smpng/sys/mips/conf/XLRN32#3 integrate .. //depot/projects/smpng/sys/mips/include/bus.h#5 integrate .. //depot/projects/smpng/sys/mips/include/cpuregs.h#7 integrate .. //depot/projects/smpng/sys/mips/include/elf.h#6 integrate .. //depot/projects/smpng/sys/mips/include/intr_machdep.h#3 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#15 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#7 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#8 integrate .. //depot/projects/smpng/sys/mips/mips/locore.S#7 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#14 integrate .. //depot/projects/smpng/sys/mips/mips/mpboot.S#5 integrate .. //depot/projects/smpng/sys/mips/mips/pm_machdep.c#9 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#24 integrate .. //depot/projects/smpng/sys/mips/mips/trap.c#10 integrate .. //depot/projects/smpng/sys/mips/mips/vm_machdep.c#10 integrate .. //depot/projects/smpng/sys/mips/rmi/std.xlr#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#176 integrate .. //depot/projects/smpng/sys/modules/em/Makefile#15 integrate .. //depot/projects/smpng/sys/modules/igb/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/ixgbe/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/sem/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/tpm/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if.c#136 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#108 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#52 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#55 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#47 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#75 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#57 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#93 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#67 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#123 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#79 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#100 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#67 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#16 integrate .. //depot/projects/smpng/sys/sun4v/include/elf.h#6 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#43 integrate .. //depot/projects/smpng/sys/sys/imgact.h#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#81 integrate .. //depot/projects/smpng/sys/vm/memguard.c#7 integrate .. //depot/projects/smpng/sys/vm/memguard.h#6 integrate .. //depot/projects/smpng/sys/vm/uma.h#26 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#81 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/DEVICE_PROBE.9#4 (text+ko) ==== @@ -26,7 +26,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/share/man/man9/DEVICE_PROBE.9,v 1.24 2010/07/31 10:01:15 joel Exp $ +.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.25 2010/08/16 15:18:30 joel Exp $ .\" .Dd March 3, 2008 .Dt DEVICE_PROBE 9 @@ -91,7 +91,7 @@ .Bl -tag -width BUS_PROBE_NOWILDCARD .It BUS_PROBE_SPECIFIC The device that cannot be reprobed, and that no -possible other driver may exist (typically legacy drivers who don't fallow +possible other driver may exist (typically legacy drivers who don't follow all the rules, or special needs drivers). .It BUS_PROBE_VENDOR The device is supported by a vendor driver. ==== //depot/projects/smpng/share/man/man9/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.370 2010/08/06 16:50:48 stefanf Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.371 2010/08/15 21:25:52 brueffer Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -994,7 +994,7 @@ rtalloc.9 rtalloc_ign.9 \ rtalloc.9 RTFREE.9 \ rtalloc.9 rtfree.9 -MLINKS+=runqueue.9 chooseproc.9 \ +MLINKS+=runqueue.9 choosethread.9 \ runqueue.9 procrunnable.9 \ runqueue.9 remrunqueue.9 \ runqueue.9 setrunqueue.9 ==== //depot/projects/smpng/share/man/man9/VOP_LISTEXTATTR.9#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LISTEXTATTR.9,v 1.8 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LISTEXTATTR.9,v 1.9 2010/08/16 15:18:30 joel Exp $ .\" .Dd August 19, 2005 .Dt VOP_LISTEXTATTR 9 @@ -78,7 +78,7 @@ .Dv NULL when .Fa size -is not, and vise versa. +is not, and vice versa. .It Fa cred The user credentials to use in authorizing the request. .It Fa td ==== //depot/projects/smpng/share/man/man9/VOP_VPTOCNP.9#4 (text+ko) ==== @@ -26,7 +26,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/share/man/man9/VOP_VPTOCNP.9,v 1.5 2010/07/31 12:14:28 joel Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.6 2010/08/16 15:18:30 joel Exp $ .\" .Dd December 7, 2008 .Dt VOP_VPTOCNP 9 @@ -42,7 +42,7 @@ .Sh DESCRIPTION This translates a vnode into its component name, and writes that name to the head of the buffer specified by -.Fa buf +.Fa buf . .Bl -tag -width buflen .It Fa vp The vnode to translate. ==== //depot/projects/smpng/share/man/man9/crypto.9#2 (text+ko) ==== @@ -15,7 +15,7 @@ .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR .\" PURPOSE. .\" -.\" $FreeBSD: src/share/man/man9/crypto.9,v 1.14 2007/09/19 16:28:46 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/crypto.9,v 1.15 2010/08/15 21:37:30 brueffer Exp $ .\" .Dd September 19, 2007 .Dt CRYPTO 9 @@ -143,7 +143,7 @@ The same holds for the framework. Thus, a callback mechanism is used to notify a consumer that a request has been completed (the -callback is specified by the consumer on an per-request basis). +callback is specified by the consumer on a per-request basis). The callback is invoked by the framework whether the request was successfully completed or not. An error indication is provided in the latter case. ==== //depot/projects/smpng/share/man/man9/g_geom.9#2 (text+ko) ==== @@ -22,7 +22,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/share/man/man9/g_geom.9,v 1.7 2004/07/06 08:21:12 ru Exp $ +.\" $FreeBSD: src/share/man/man9/g_geom.9,v 1.8 2010/08/16 15:18:30 joel Exp $ .\" .Dd January 16, 2004 .Dt G_GEOM 9 @@ -109,9 +109,9 @@ .Fn g_destroy_geom : .Bl -item -offset indent .It -The geom cannot posses any providers. +The geom cannot possess any providers. .It -The geom cannot posses any consumers. +The geom cannot possess any consumers. .It The topology lock has to be held. .El ==== //depot/projects/smpng/share/man/man9/g_wither_geom.9#2 (text+ko) ==== @@ -22,7 +22,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/share/man/man9/g_wither_geom.9,v 1.5 2004/07/06 08:21:12 ru Exp $ +.\" $FreeBSD: src/share/man/man9/g_wither_geom.9,v 1.6 2010/08/16 15:18:30 joel Exp $ .\" .Dd January 16, 2004 .Dt G_WITHER_GEOM 9 @@ -54,7 +54,7 @@ to avoid duplicated code in all classes. Before it is called, field .Va softc -should be disposed off and set to +should be disposed of and set to .Dv NULL . Note that the .Fn g_wither_geom ==== //depot/projects/smpng/share/man/man9/ieee80211.9#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.8 2010/04/28 13:29:48 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.9 2010/08/16 15:18:30 joel Exp $ .\" .Dd April 28, 2010 .Dt IEEE80211 9 @@ -205,11 +205,11 @@ Transmit a raw 802.11 frame. The default method drops the frame and generates a message on the console. .It Dv ic_updateslot -Update hardware state after an 802.11 IFS slot time change, +Update hardware state after an 802.11 IFS slot time change. There is no default method; the pointer may be NULL in which case it will not be used. .It Dv ic_update_mcast -Update hardware for a change in the multicast packet filter, +Update hardware for a change in the multicast packet filter. The default method prints a console message. .It Dv ic_update_promisc Update hardware for a change in the promiscuous mode setting. @@ -261,13 +261,13 @@ and pending frames in the receive reorder queues (for stations using A-MPDU). .It Dv ic_node_drain Reclaim all optional resources associated with a node. -This call is used to free up resources when they are in short supply, +This call is used to free up resources when they are in short supply. .It Dv ic_node_getrssi Return the Receive Signal Strength Indication (RSSI) in .5 dBm units for the specified node. This interface returns a subset of the information returned by -.Dv ic_node_getsignal , +.Dv ic_node_getsignal . The default method calculates a filtered average over the last ten samples passed in to .Xr ieee80211_input 9 @@ -341,7 +341,7 @@ for handling transmit A-MPDU. .It Dv ic_addb_response Process a received ADDBA Response Action frame and setup resources as -needed for doing transmit A-MPDU, +needed for doing transmit A-MPDU. .It Dv ic_addb_stop Shutdown an A-MPDU transmit stream for the specified station and AC. The default method reclaims local state after sending a DelBA Action frame. @@ -490,7 +490,7 @@ The follow general 802.11n capabilities are defined. The first capabilities are defined exactly as they appear in the 802.11n specification. -Capabilities beginning with IEEE80211_HTC_AMPDU are used soley by the +Capabilities beginning with IEEE80211_HTC_AMPDU are used solely by the .Nm layer. .Bl -tag -width IEEE80211_C_8023ENCAP ==== //depot/projects/smpng/share/man/man9/kproc.9#4 (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/share/man/man9/kproc.9,v 1.5 2010/07/31 10:01:15 joel Exp $ +.\" $FreeBSD: src/share/man/man9/kproc.9,v 1.6 2010/08/16 15:18:30 joel Exp $ .\" .Dd October 19, 2007 .Dt KPROC 9 @@ -244,7 +244,7 @@ The .Fa procptr pointer points to a -.Vt "struct proc " +.Vt "struct proc" pointer that is the location to be updated with the new proc pointer if a new process is created, or if not .Dv NULL , @@ -255,7 +255,7 @@ If not NULL, the .Fa tdptr pointer points to a -.Vt "struct thread " +.Vt "struct thread" pointer that is the location to be updated with the new thread pointer. The .Fa flags ==== //depot/projects/smpng/share/man/man9/netisr.9#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.6 2010/07/31 12:14:28 joel Exp $ +.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.7 2010/08/16 15:18:30 joel Exp $ .\" .Dd February 22, 2010 .Dt NETISR 9 @@ -103,7 +103,7 @@ .Va nh_m2flow , then .Nm -will query the protocol in the evet that the +will query the protocol in the event that the .Vt mbuf doesn't have a flow ID, falling back on source ordering. .It NETISR_POLICY_CPU @@ -120,7 +120,7 @@ .Bl -tag -width "netisr_handler_t nh_handler" .It Vt "const char *" Va nh_name Unique character string name of the protocol, which may be included in -.Xr 2 sysctl +.Xr sysctl 2 MIB names, so should not contain whitespace. .It Vt netisr_handler_t Va nh_handler Protocol handler function that will be invoked on each packet received for ==== //depot/projects/smpng/share/man/man9/runqueue.9#2 (text+ko) ==== @@ -21,13 +21,13 @@ .\" (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/runqueue.9,v 1.6 2004/07/07 07:56:36 ru Exp $ +.\" $FreeBSD: src/share/man/man9/runqueue.9,v 1.7 2010/08/15 21:25:52 brueffer Exp $ .\" -.Dd November 3, 2000 +.Dd August 15, 2010 .Dt RUNQUEUE 9 .Os .Sh NAME -.Nm chooseproc , +.Nm choosethread , .Nm procrunnable , .Nm remrunqueue , .Nm setrunqueue ==== //depot/projects/smpng/share/man/man9/vm_page_bits.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vm_page_bits.9,v 1.4 2010/01/04 14:58:41 kib Exp $ +.\" $FreeBSD: src/share/man/man9/vm_page_bits.9,v 1.5 2010/08/16 15:18:30 joel Exp $ .\" .Dd December 1, 2001 .Dt VM_PAGE_BITS 9 @@ -84,7 +84,7 @@ .Dv DEV_BSIZE aligned and no larger than .Dv PAGE_SIZE . -If it is not properly aligned, any unaligned chucks of the +If it is not properly aligned, any unaligned chunks of the .Dv DEV_BSIZE blocks at the beginning and end of the range will be zeroed. .Pp ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.36 2010/08/12 00:20:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.37 2010/08/13 22:08:42 jkim Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -278,13 +278,13 @@ for (;;) ia32_pause(); } else { - acpi_resync_clock(sc); - PCPU_SET(switchtime, cpu_ticks()); + PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); #ifdef SMP if (wakeup_cpus != 0) acpi_wakeup_cpus(sc, wakeup_cpus); #endif + acpi_resync_clock(sc); ret = 0; } ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#70 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.328 2010/08/12 00:20:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.330 2010/08/13 22:08:42 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1324,10 +1324,8 @@ cpumask_t cpumask; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); savectx(&stoppcbs[cpu]); @@ -1358,10 +1356,8 @@ register_t cr3, rf; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); rf = intr_disable(); cr3 = rcr3(); @@ -1370,7 +1366,7 @@ wbinvd(); atomic_set_int(&stopped_cpus, cpumask); } else { - PCPU_SET(switchtime, cpu_ticks()); + PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); } @@ -1542,14 +1538,10 @@ #endif int retval; + mask = PCPU_GET(cpumask); #ifdef MP_WATCHDOG - sched_pin(); - mask = PCPU_GET(cpumask); cpuid = PCPU_GET(cpuid); - sched_unpin(); ap_watchdog(cpuid); -#else - mask = PCPU_GET(cpumask); #endif retval = 0; ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#111 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.710 2010/08/10 16:14:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.711 2010/08/17 12:17:24 gahr Exp $"); /* * Manages physical address maps. @@ -620,7 +620,8 @@ if (sysenv != NULL) { if (strncmp(sysenv, "MacBook5,1", 10) == 0 || strncmp(sysenv, "MacBookPro5,5", 13) == 0 || - strncmp(sysenv, "Macmini3,1", 10) == 0) + strncmp(sysenv, "Macmini3,1", 10) == 0 || + strncmp(sysenv, "iMac9,1", 7) == 0) pat_works = 0; freeenv(sysenv); } ==== //depot/projects/smpng/sys/amd64/include/elf.h#10 (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/amd64/include/elf.h,v 1.23 2010/03/11 14:49:06 nwhitehorn Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.24 2010/08/17 08:55:45 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -88,8 +88,14 @@ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_COUNT 22 /* Count of defined aux entry types. */ /* * Relocation types. ==== //depot/projects/smpng/sys/arm/include/elf.h#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.12 2010/08/17 08:55:45 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -76,8 +76,14 @@ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_COUNT 22 /* Count of defined aux entry types. */ #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#93 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.249 2010/07/25 15:43:52 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.250 2010/08/17 17:11:15 mjacob Exp $"); #include <sys/param.h> @@ -958,6 +958,8 @@ static void daoninvalidate(struct cam_periph *periph) { + struct ccb_abort cab; + struct ccb_hdr *ccb_h, *ccb_h_t; struct da_softc *softc; softc = (struct da_softc *)periph->softc; @@ -967,15 +969,29 @@ */ xpt_register_async(0, daasync, periph, periph->path); + /* + * Invalidate the pack label + */ softc->flags |= DA_FLAG_PACK_INVALID; /* * Return all queued I/O with ENXIO. - * XXX Handle any transactions queued to the card - * with XPT_ABORT_CCB. */ bioq_flush(&softc->bio_queue, NULL, ENXIO); + /* + * Issue aborts for any pending commands. + */ + xpt_setup_ccb(&cab.ccb_h, periph->path, CAM_PRIORITY_NORMAL+1); + cab.ccb_h.func_code = XPT_ABORT; + LIST_FOREACH_SAFE(ccb_h, &softc->pending_ccbs, periph_links.le, ccb_h_t) { + cab.abort_ccb = (union ccb *)ccb_h; + xpt_action((union ccb *)&cab); + } + + /* + * This disk is *history*.... + */ disk_gone(softc->disk); xpt_print(periph->path, "lost device\n"); } ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#71 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.114 2010/08/07 11:57:13 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.115 2010/08/17 08:55:45 kib Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2525,11 +2525,13 @@ register_t * freebsd32_copyout_strings(struct image_params *imgp) { - int argc, envc; + int argc, envc, i; u_int32_t *vectp; char *stringp, *destp; u_int32_t *stack_base; struct freebsd32_ps_strings *arginfo; + char canary[sizeof(long) * 8]; + int32_t pagesizes32[MAXPAGESIZES]; size_t execpath_len; int szsigcode; @@ -2545,8 +2547,10 @@ sv_psstrings; szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE - - roundup(execpath_len, sizeof(char *)) - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + roundup(execpath_len, sizeof(char *)) - + roundup(sizeof(canary), sizeof(char *)) - + roundup(sizeof(pagesizes32), sizeof(char *)) - + roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); /* * install sigcode @@ -2565,6 +2569,25 @@ } /* + * Prepare the canary for SSP. + */ + arc4rand(canary, sizeof(canary), 0); + imgp->canary = (uintptr_t)arginfo - szsigcode - execpath_len - + sizeof(canary); + copyout(canary, (void *)imgp->canary, sizeof(canary)); + imgp->canarylen = sizeof(canary); + + /* + * Prepare the pagesizes array. + */ + for (i = 0; i < MAXPAGESIZES; i++) + pagesizes32[i] = (uint32_t)pagesizes[i]; + imgp->pagesizes = (uintptr_t)arginfo - szsigcode - execpath_len - + roundup(sizeof(canary), sizeof(char *)) - sizeof(pagesizes32); + copyout(pagesizes32, (void *)imgp->pagesizes, sizeof(pagesizes32)); + imgp->pagesizeslen = sizeof(pagesizes32); + + /* * If we have a valid auxargs ptr, prepare some room * on the stack. */ ==== //depot/projects/smpng/sys/conf/kern.mk#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.65 2010/07/22 18:47:41 rpaulo Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.66 2010/08/17 20:39:28 rpaulo Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -6,7 +6,7 @@ # Note that the newly added -Wcast-qual is responsible for generating # most of the remaining warnings. Warnings introduced with -Wall will # also pop up, but are easier to fix. -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" #CWARNFLAGS= -w2 # use this if you are terribly bored CWARNFLAGS= .else @@ -29,8 +29,8 @@ # operations inside the kernel itself. These operations are exclusively # reserved for user applications. # -.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" -.if ${CC} != "clang" +.if ${MACHINE_ARCH} == "i386" && ${CC:T:Micc} != "icc" +.if ${CC:T:Mclang} != "clang" CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 .endif CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 @@ -93,20 +93,20 @@ # GCC 3.0 and above like to do certain optimizations based on the # assumption that the program is linked against libc. Stop this. # -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" CFLAGS+= -nolib_inline .else CFLAGS+= -ffreestanding .endif -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" CFLAGS+= -restrict .endif # # GCC SSP support. # -.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \ +.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && ${MACHINE_ARCH} != "ia64" && \ ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" CFLAGS+= -fstack-protector .endif ==== //depot/projects/smpng/sys/conf/kern.pre.mk#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.115 2010/07/22 21:31:35 rpaulo Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.116 2010/08/17 20:39:28 rpaulo Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -23,7 +23,7 @@ OBJCOPY?= objcopy SIZE?= size -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" COPTFLAGS?= -O .else . if defined(DEBUG) @@ -48,7 +48,7 @@ COPTFLAGS+= ${_CPUCFLAGS} . endif .endif -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" C_DIALECT= NOSTDINC= -X .else @@ -92,8 +92,8 @@ CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS} CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -.if ${CC} != "icc" -.if ${CC} != "clang" +.if ${CC:T:Micc} != "icc" +.if ${CC:T:Mclang} != "clang" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} .if ${MACHINE_CPUARCH} != "mips" CFLAGS+= --param inline-unit-growth=100 @@ -111,7 +111,7 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -.if ${CC} == "icc" || ${CC} == "clang" +.if ${CC:T:Micc} == "icc" || ${CC:T:Mclang} == "clang" .error "Profiling doesn't work with icc or clang yet" .endif CFLAGS+= -DGPROF -falign-functions=16 ==== //depot/projects/smpng/sys/conf/kmod.mk#79 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.236 2010/07/22 18:47:41 rpaulo Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.237 2010/08/17 20:39:28 rpaulo Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -81,7 +81,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .else . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) @@ -94,7 +94,7 @@ CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" NOSTDINC= -X .else CSTD= c99 @@ -114,7 +114,7 @@ # for example. CFLAGS+= -I@/contrib/altq -.if ${CC} != "icc" && ${CC} != "clang" +.if ${CC:T:Micc} != "icc" && ${CC:T:Mclang} != "clang" CFLAGS+= -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 @@ -122,7 +122,7 @@ # Disallow common variables, and if we end up with commons from # somewhere unexpected, allocate storage for them in the module itself. -.if ${CC} != "icc" +.if ${CC:T:Micc} != "icc" CFLAGS+= -fno-common .endif LDFLAGS+= -d -warn-common ==== //depot/projects/smpng/sys/conf/options.mips#6 (text+ko) ==== @@ -26,7 +26,7 @@ # SUCH DAMAGE. # # JNPR: options.mips,v 1.2 2006/09/15 12:52:34 -# $FreeBSD: src/sys/conf/options.mips,v 1.8 2010/07/20 19:25:11 jmallett Exp $ +# $FreeBSD: src/sys/conf/options.mips,v 1.10 2010/08/15 19:07:44 imp Exp $ CPU_MIPS4KC opt_global.h CPU_MIPS32 opt_global.h @@ -35,6 +35,7 @@ CPU_HAVEFPU opt_global.h CPU_SB1 opt_global.h CPU_CNMIPS opt_global.h +CPU_RMI opt_global.h ISA_MIPS1 opt_cputype.h ISA_MIPS3 opt_cputype.h @@ -50,8 +51,6 @@ CFE_ENV_SIZE opt_global.h NOFPU opt_global.h -TARGET_EMULATOR opt_ddb.h -TARGET_XLR_XLS opt_global.h TICK_USE_YAMON_FREQ opt_global.h TICK_USE_MALTA_RTC opt_global.h ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#124 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.283 2010/07/15 23:24:06 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.284 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -129,8 +129,6 @@ static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret); -static int acpi_device_pwr_for_sleep(device_t bus, device_t dev, - int *dstate); static ACPI_STATUS acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level, void *context, void **retval); static ACPI_STATUS acpi_device_scan_children(device_t bus, device_t dev, @@ -1415,7 +1413,7 @@ return (AcpiEvaluateObject(h, pathname, parameters, ret)); } -static int +int acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate) { struct acpi_softc *sc; ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#38 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.63 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.64 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -275,3 +275,14 @@ return_VALUE (interrupt); } + +int +acpi_pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate) +{ + device_t acpi_dev; + + acpi_dev = devclass_get_device(devclass_find("acpi"), 0); + acpi_device_pwr_for_sleep(acpi_dev, dev, pstate); + return (0); +} + ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#32 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.61 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.62 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -116,6 +116,7 @@ DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, acpi_pcib_map_msi), + DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), {0, 0} }; ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.19 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.20 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" @@ -80,6 +80,7 @@ /* pcib interface */ DEVMETHOD(pcib_route_interrupt, acpi_pcib_pci_route_interrupt), + DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), {0, 0} }; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008181404.o7IE45oF006939>