PERFORCE change 157439 for review

John Baldwin jhb at FreeBSD.org
Mon Feb 9 08:15:56 PST 2009


http://perforce.freebsd.org/chv.cgi?CH=157439

Change 157439 by jhb at jhb_jhbbsd on 2009/02/09 16:14:58

	IFC @157437

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#29 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#47 integrate
.. //depot/projects/smpng/sys/amd64/include/legacyvar.h#7 integrate
.. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#22 integrate
.. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#27 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#53 integrate
.. //depot/projects/smpng/sys/conf/NOTES#160 integrate
.. //depot/projects/smpng/sys/conf/files#226 integrate
.. //depot/projects/smpng/sys/conf/options#161 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#24 integrate
.. //depot/projects/smpng/sys/conf/options.i386#63 integrate
.. //depot/projects/smpng/sys/conf/options.ia64#22 integrate
.. //depot/projects/smpng/sys/conf/options.mips#3 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#61 integrate
.. //depot/projects/smpng/sys/crypto/via/padlock.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_panasonic.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#27 integrate
.. //depot/projects/smpng/sys/dev/agp/agp.c#5 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#5 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212.h#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#5 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#65 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#18 integrate
.. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_isa.c#5 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#103 integrate
.. //depot/projects/smpng/sys/dev/bm/if_bm.c#5 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus_device.c#4 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#3 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#3 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_reg.h#2 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_var.h#2 integrate
.. //depot/projects/smpng/sys/dev/exca/exca.c#25 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#87 integrate
.. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#26 integrate
.. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#20 integrate
.. //depot/projects/smpng/sys/dev/lmc/if_lmc.h#7 integrate
.. //depot/projects/smpng/sys/dev/my/if_my.c#29 integrate
.. //depot/projects/smpng/sys/dev/nve/if_nve.c#18 integrate
.. //depot/projects/smpng/sys/dev/pccard/card_if.m#17 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccard.c#47 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#28 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccardvarp.h#5 integrate
.. //depot/projects/smpng/sys/dev/pcn/if_pcn.c#3 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppc.c#24 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppcvar.h#8 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#70 integrate
.. //depot/projects/smpng/sys/dev/safe/safe.c#13 integrate
.. //depot/projects/smpng/sys/dev/scc/scc_if.m#3 integrate
.. //depot/projects/smpng/sys/dev/si/si.c#26 integrate
.. //depot/projects/smpng/sys/dev/sound/macio/aoa.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/macio/aoa.h#2 integrate
.. //depot/projects/smpng/sys/dev/sound/macio/davbus.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/macio/i2s.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/macio/snapper.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/macio/tumbler.c#2 integrate
.. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#2 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#3 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rum.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/if_urtw.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#125 integrate
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_devid.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_devtable.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2.c#5 integrate
.. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#6 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#49 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs.h#5 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#8 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate
.. //depot/projects/smpng/sys/fs/udf/ecma167-udf.h#7 integrate
.. //depot/projects/smpng/sys/fs/udf/udf.h#10 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#42 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#45 integrate
.. //depot/projects/smpng/sys/geom/part/g_part.c#14 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#10 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#1 branch
.. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#6 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#138 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#48 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#90 integrate
.. //depot/projects/smpng/sys/i386/xen/clock.c#5 integrate
.. //depot/projects/smpng/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/smpng/sys/ia64/conf/NOTES#11 integrate
.. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#30 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#64 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#97 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#72 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#59 integrate
.. //depot/projects/smpng/sys/kern/subr_clist.c#5 integrate
.. //depot/projects/smpng/sys/kern/tty.c#85 integrate
.. //depot/projects/smpng/sys/kern/uipc_debug.c#6 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#120 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#115 integrate
.. //depot/projects/smpng/sys/kern/vfs_init.c#27 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#88 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#162 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#141 integrate
.. //depot/projects/smpng/sys/mips/mips/busdma_machdep.c#3 integrate
.. //depot/projects/smpng/sys/mips/mips/in_cksum.c#3 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_part/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_ebr/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/libalias/libalias/Makefile#3 integrate
.. //depot/projects/smpng/sys/net/if.c#111 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#69 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#14 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#10 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_output.c#37 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#20 integrate
.. //depot/projects/smpng/sys/netinet/in.c#48 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#91 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#7 integrate
.. //depot/projects/smpng/sys/netinet/ip_ipsec.c#12 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#102 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias.c#8 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#10 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_local.h#7 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_sctp.c#1 branch
.. //depot/projects/smpng/sys/netinet/libalias/alias_sctp.h#1 branch
.. //depot/projects/smpng/sys/netinet/raw_ip.c#76 integrate
.. //depot/projects/smpng/sys/netinet/sctp_crc32.c#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_crc32.h#6 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#26 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#106 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#73 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#88 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#50 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.c#58 integrate
.. //depot/projects/smpng/sys/netinet6/in6_src.c#39 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_forward.c#27 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_ipsec.c#7 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#59 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#57 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#54 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec.c#31 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec.h#18 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec6.h#7 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#40 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#16 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#66 integrate
.. //depot/projects/smpng/sys/rpc/clnt_rc.c#5 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm.c#15 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#14 integrate
.. //depot/projects/smpng/sys/security/audit/audit_pipe.c#15 integrate
.. //depot/projects/smpng/sys/security/audit/audit_private.h#13 integrate
.. //depot/projects/smpng/sys/sys/bus_dma.h#4 integrate
.. //depot/projects/smpng/sys/sys/cfictl.h#3 integrate
.. //depot/projects/smpng/sys/sys/jail.h#22 integrate
.. //depot/projects/smpng/sys/sys/lockmgr.h#27 integrate
.. //depot/projects/smpng/sys/sys/mount.h#71 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#55 integrate
.. //depot/projects/smpng/sys/sys/tty.h#28 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#50 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#72 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#42 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#93 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#40 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#73 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#104 integrate
.. //depot/projects/smpng/sys/vm/vm_object.h#36 integrate
.. //depot/projects/smpng/sys/vm/vm_unix.c#12 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#68 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.h#7 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#29 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.86 2008/07/15 03:34:49 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.87 2009/02/08 22:54:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1128,6 +1128,13 @@
 	bz->active_bpages++;
 	mtx_unlock(&bounce_lock);
 
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* page offset needs to be preserved */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);

==== //depot/projects/smpng/sys/amd64/conf/NOTES#47 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.83 2008/12/01 16:53:01 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.86 2009/02/07 00:01:10 wkoszek Exp $
 #
 
 #
@@ -150,6 +150,11 @@
 # AGP GART support
 device		agp
 
+#
+# AGP debugging.
+#
+options		AGP_DEBUG
+
 
 #####################################################################
 # HARDWARE DEVICE CONFIGURATION
@@ -267,7 +272,6 @@
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
 # ral:	Ralink Technology IEEE 802.11 wireless adapter
-# ural:	Ralink Technology RT2500USB IEEE 802.11 wireless adapter
 # wpi:	Intel 3945ABG Wireless LAN controller
 
 device		ed
@@ -277,10 +281,9 @@
 device		iwi
 device		iwn
 device		ipw
-device		nfe		# nVidia nForce MCP on-board Ethernet Networking
-device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		nfe
+device		nve
 device		ral
-device		ural
 device		wpi
 
 device		ath			# Atheros pci/cardbus NIC's
@@ -356,9 +359,11 @@
 # Miscellaneous hardware:
 #
 # ipmi: Intelligent Platform Management Interface
+# pbio: Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
 # smbios: DMI/SMBIOS entry point
 # vpd: Vital Product Data kernel interface
 # asmc: Apple System Management Controller
+# si: Specialix International SI/XIO or SX intelligent serial card
 
 # Notes on the Specialix SI/XIO driver:
 #  The host card is memory, not IO mapped.
@@ -367,13 +372,14 @@
 #  The cards can use an IRQ of 11, 12 or 15.
 
 device		ipmi
-# Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
 device		pbio
 hint.pbio.0.at="isa"
 hint.pbio.0.port="0x360"
 device		smbios
 device		vpd
 device		asmc
+#device		si
+
 #
 # Laptop/Notebook options:
 #

==== //depot/projects/smpng/sys/amd64/include/legacyvar.h#7 (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/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.9 2009/02/08 07:03:34 imp Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
@@ -43,12 +43,12 @@
 #undef LEGACY_ACCESSOR
 
 int	legacy_pcib_maxslots(device_t dev);
-uint32_t legacy_pcib_read_config(device_t dev, int bus, int slot, int func,
-    int reg, int bytes);
+uint32_t legacy_pcib_read_config(device_t dev, u_int bus, u_int slot,
+    u_int func, u_int reg, int bytes);
 int	legacy_pcib_read_ivar(device_t dev, device_t child, int which,
     uintptr_t *result);
-void	legacy_pcib_write_config(device_t dev, int bus, int slot, int func,
-    int reg, u_int32_t data, int bytes);
+void	legacy_pcib_write_config(device_t dev, u_int bus, u_int slot,
+    u_int func, u_int reg, uint32_t data, int bytes);
 int	legacy_pcib_write_ivar(device_t dev, device_t child, int which,
     uintptr_t value);
 struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,

==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#22 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.123 2009/02/08 07:02:42 imp Exp $");
 
 #include "opt_cpu.h"
 
@@ -55,9 +55,9 @@
 
 /* read configuration space register */
 
-u_int32_t
-legacy_pcib_read_config(device_t dev, int bus, int slot, int func,
-			int reg, int bytes)
+uint32_t
+legacy_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func,
+			u_int reg, int bytes)
 {
 	return(pci_cfgregread(bus, slot, func, reg, bytes));
 }
@@ -65,8 +65,8 @@
 /* write configuration space register */
 
 void
-legacy_pcib_write_config(device_t dev, int bus, int slot, int func,
-			 int reg, u_int32_t data, int bytes)
+legacy_pcib_write_config(device_t dev, u_int bus, u_int slot, u_int func,
+			 u_int reg, uint32_t data, int bytes)
 {
 	pci_cfgregwrite(bus, slot, func, reg, data, bytes);
 }

==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#27 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.42 2009/02/04 01:14:06 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.43 2009/02/08 22:54:58 imp Exp $");
 
 /*
  * ARM bus dma support routines
@@ -1417,6 +1417,13 @@
 	bz->active_bpages++;
 	mtx_unlock(&bounce_lock);
 
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* page offset needs to be preserved */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);

==== //depot/projects/smpng/sys/cam/cam_xpt.c#53 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.208 2009/01/23 21:08:00 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.209 2009/02/08 22:08:48 trasz Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -4178,7 +4178,7 @@
 	struct sbuf sb;
 
 #ifdef INVARIANTS
-	if (path != NULL && path->bus != NULL && path->bus->sim != NULL)
+	if (path != NULL && path->bus != NULL)
 		mtx_assert(path->bus->sim->mtx, MA_OWNED);
 #endif
 

==== //depot/projects/smpng/sys/conf/NOTES#160 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1524 2009/01/20 02:08:21 sobomax Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1527 2009/02/08 12:33:05 wkoszek Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -714,40 +714,81 @@
 #
 # Network interfaces:
 #  The `loop' device is MANDATORY when networking is enabled.
+device		loop
+
 #  The `ether' device provides generic code to handle
 #  Ethernets; it is MANDATORY when an Ethernet device driver is
 #  configured or token-ring is enabled.
+device		ether
+
 #  The `vlan' device implements the VLAN tagging of Ethernet frames
 #  according to IEEE 802.1Q.  It requires `device miibus'.
+device		vlan
+
 #  The `wlan' device provides generic code to support 802.11
 #  drivers, including host AP mode; it is MANDATORY for the wi,
 #  and ath drivers and will eventually be required by all 802.11 drivers.
+device		wlan
+options		IEEE80211_DEBUG		#enable debugging msgs
+options		IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
+
 #  The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
 #  support for WEP, TKIP, and AES-CCMP crypto protocols optionally
 #  used with 802.11 devices that depend on the `wlan' module.
+device		wlan_wep
+device		wlan_ccmp
+device		wlan_tkip
+
 #  The `wlan_xauth' device provides support for external (i.e. user-mode)
 #  authenticators for use with 802.11 drivers that use the `wlan'
 #  module and support 802.1x and/or WPA security protocols.
+device		wlan_xauth
+
 #  The `wlan_acl' device provides a MAC-based access control mechanism
 #  for use with 802.11 drivers operating in ap mode and using the
 #  `wlan' module.
+#  The 'wlan_amrr' device provides AMRR transmit rate control algorithm
+device		wlan_acl
+device		wlan_amrr
+
+# Generic TokenRing
+device		token
+
 #  The `fddi' device provides generic code to support FDDI.
+device		fddi
+
 #  The `arcnet' device provides generic code to support Arcnet.
+device		arcnet
+
 #  The `sppp' device serves a similar role for certain types
 #  of synchronous PPP links (like `cx', `ar').
+device		sppp
+
 #  The `sl' device implements the Serial Line IP (SLIP) service.
 #  The `ppp' device implements the Point-to-Point Protocol.
+
+
 #  The `bpf' device enables the Berkeley Packet Filter.  Be
 #  aware of the legal and administrative consequences of enabling this
 #  option.  The number of devices determines the maximum number of
 #  simultaneous BPF clients programs runnable.  DHCP requires bpf.
+device		bpf
+
 #  The `disc' device implements a minimal network interface,
 #  which throws away all packets sent and never receives any.  It is
 #  included for testing and benchmarking purposes.
+device		disc
+
 #  The `edsc' device implements a minimal Ethernet interface,
 #  which discards all packets sent and receives none.
+device		edsc
+
 #  The `tap' device is a pty-like virtual Ethernet interface
-#  The `tun' device implements (user-)ppp and nos-tun
+device		tap
+
+#  The `tun' device implements (user-)ppp and nos-tun(8)
+device		tun
+
 #  The `gif' device implements IPv6 over IP4 tunneling,
 #  IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and
 #  IPv6 over IPv6 tunneling.
@@ -755,17 +796,45 @@
 #  GRE and MOBILE, as specified in the RFC1701 and RFC2004.
 #  The XBONEHACK option allows the same pair of addresses to be configured on
 #  multiple gif interfaces.
+device		gif
+device		gre
+options 	XBONEHACK
+
 #  The `faith' device captures packets sent to it and diverts them
 #  to the IPv4/IPv6 translation daemon.
 #  The `stf' device implements 6to4 encapsulation.
+device		faith
+device		stf
+
 #  The `ef' device provides support for multiple ethernet frame types
 #  specified via ETHER_* options. See ef(4) for details.
-#
+device		ef
+options 	ETHER_II		# enable Ethernet_II frame
+options 	ETHER_8023		# enable Ethernet_802.3 (Novell) frame
+options 	ETHER_8022		# enable Ethernet_802.2 frame
+options 	ETHER_SNAP		# enable Ethernet_802.2/SNAP frame
+
 # The pf packet filter consists of three devices:
 #  The `pf' device provides /dev/pf and the firewall code itself.
 #  The `pflog' device provides the pflog0 interface which logs packets.
 #  The `pfsync' device provides the pfsync0 interface used for
 #   synchronization of firewall state tables (over the net).
+device		pf
+device		pflog
+device		pfsync
+
+# Bridge interface.
+device		if_bridge
+
+# Common Address Redundancy Protocol. See carp(4) for more details.
+device		carp
+
+# IPsec interface.
+device		enc
+
+# Link aggregation interface.
+device		lagg
+
 #
 # The PPP_BSDCOMP option enables support for compress(1) style entire
 # packet compression, the PPP_DEFLATE is for zlib/gzip style compression.
@@ -773,48 +842,8 @@
 # events for resetting the demand dial activity timer - requires bpf.
 # See pppd(8) for more details.
 #
-device		ether			#Generic Ethernet
-device		vlan			#VLAN support (needs miibus)
-device		wlan			#802.11 support
-options		IEEE80211_DEBUG		#enable debugging msgs
-options		IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
-device		wlan_wep		#802.11 WEP support
-device		wlan_ccmp		#802.11 CCMP support
-device		wlan_tkip		#802.11 TKIP support
-device		wlan_xauth		#802.11 external authenticator support
-device		wlan_acl		#802.11 MAC ACL support
-device		wlan_amrr		#AMRR transmit rate control algorithm
-device		token			#Generic TokenRing
-device		fddi			#Generic FDDI
-device		arcnet			#Generic Arcnet
-device		sppp			#Generic Synchronous PPP
-device		loop			#Network loopback device
-device		bpf			#Berkeley packet filter
-device		disc			#Discard device based on loopback
-device		edsc			#Ethernet discard device
-device		tap			#Virtual Ethernet driver
-device		tun			#Tunnel driver (ppp(8), nos-tun(8))
-device		gre			#IP over IP tunneling
-device		if_bridge		#Bridge interface
-device		pf			#PF OpenBSD packet-filter firewall
-device		pflog			#logging support interface for PF
-device		pfsync			#synchronization interface for PF
-device		carp			#Common Address Redundancy Protocol
-device		enc			#IPsec interface
-device		lagg			#Link aggregation interface
 
-device		ef			# Multiple ethernet frames support
-options 	ETHER_II		# enable Ethernet_II frame
-options 	ETHER_8023		# enable Ethernet_802.3 (Novell) frame
-options 	ETHER_8022		# enable Ethernet_802.2 frame
-options 	ETHER_SNAP		# enable Ethernet_802.2/SNAP frame
 
-# for IPv6
-device		gif			#IPv6 and IPv4 tunneling
-options 	XBONEHACK
-device		faith			#for IPv6 and IPv4 translation
-device		stf			#6to4 IPv6 over IPv4 encapsulation
-
 #
 # Internet family options:
 #
@@ -2109,44 +2138,9 @@
 # scd: Sony CD-ROM using proprietary (non-ATAPI) interface
 # mcd: Mitsumi CD-ROM using proprietary (non-ATAPI) interface
 # bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board
-# cy: Cyclades serial driver
 # joy: joystick (including IO DATA PCJOY PC Card joystick)
-# rc: RISCom/8 multiport card
-# rp: Comtrol Rocketport(ISA/PCI) - single card
-# si: Specialix SI/XIO 4-32 port terminal multiplexor
 # cmx: OmniKey CardMan 4040 pccard smartcard reader
 
-# Notes on the Comtrol Rocketport driver:
-#
-# The exact values used for rp0 depend on how many boards you have
-# in the system.  The manufacturer's sample configs are listed as:
-#
-#               device  rp	# core driver support
-#
-#   Comtrol Rocketport ISA single card
-#		hint.rp.0.at="isa"
-#		hint.rp.0.port="0x280"
-#
-#   If instead you have two ISA cards, one installed at 0x100 and the
-#   second installed at 0x180, then you should add the following to
-#   your kernel probe hints:
-#		hint.rp.0.at="isa"
-#		hint.rp.0.port="0x100"
-#		hint.rp.1.at="isa"
-#		hint.rp.1.port="0x180"
-#
-#   For 4 ISA cards, it might be something like this:
-#		hint.rp.0.at="isa"
-#		hint.rp.0.port="0x180"
-#		hint.rp.1.at="isa"
-#		hint.rp.1.port="0x100"
-#		hint.rp.2.at="isa"
-#		hint.rp.2.port="0x340"
-#		hint.rp.3.at="isa"
-#		hint.rp.3.port="0x240"
-#
-#   For PCI cards, you need no hints.
-
 # Mitsumi CD-ROM
 device		mcd
 hint.mcd.0.at="isa"
@@ -2323,6 +2317,7 @@
 # ppi	General-purpose I/O ("Geek Port") + IEEE1284 I/O
 # pps	Pulse per second Timing Interface
 # lpbb	Philips official parallel port I2C bit-banging interface
+# pcfclock Parallel port clock driver.
 #
 # Supported interfaces:
 # ppc	ISA-bus parallel port interfaces.

==== //depot/projects/smpng/sys/conf/files#226 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1365 2009/01/14 10:44:16 rwatson Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1367 2009/02/08 14:43:20 wkoszek Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1036,7 +1036,7 @@
 	dependency	"iwn.fw"					\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
 	no-implicit-rule						\
-	clean		"iwn.fwo"
+	clean		"iwnfw.fwo"
 iwn.fw			optional iwnfw					\
 	dependency	".PHONY"					\
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu"	\
@@ -1234,7 +1234,7 @@
 	dependency	"rt2561.fw"					\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
 	no-implicit-rule						\
-	clean		"rt2561.fwo"
+	clean		"rt2561fw.fwo"
 rt2561.fw			optional rt2561fw | ralfw		\
 	dependency	".PHONY"					\
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
@@ -1248,7 +1248,7 @@
 	dependency	"rt2561s.fw"					\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
 	no-implicit-rule						\
-	clean		"rt2561s.fwo"
+	clean		"rt2561sfw.fwo"
 rt2561s.fw			optional rt2561sfw | ralfw		\
 	dependency	".PHONY"					\
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu"	\
@@ -1262,7 +1262,7 @@
 	dependency	"rt2661.fw"					\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
 	no-implicit-rule						\
-	clean		"rt2661.fwo"
+	clean		"rt2661fw.fwo"
 rt2661.fw			optional rt2661fw | ralfw		\
 	dependency	".PHONY"					\
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu"	\
@@ -1276,7 +1276,7 @@
 	dependency	"rt2860.fw"					\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
 	no-implicit-rule						\
-	clean		"rt2860.fwo"
+	clean		"rt2860fw.fwo"
 rt2860.fw			optional rt2860fw | ralfw		\
 	dependency	".PHONY"					\
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu"	\
@@ -1697,7 +1697,7 @@
 	dependency	"wpi.fw"					\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
 	no-implicit-rule						\
-	clean		"wpi.fwo"
+	clean		"wpifw.fwo"
 wpi.fw			optional wpifw					\
 	dependency	".PHONY"					\
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu"	\
@@ -2387,6 +2387,7 @@
 netinet/libalias/alias_mod.c	optional libalias | netgraph_nat
 netinet/libalias/alias_proxy.c	optional libalias | netgraph_nat
 netinet/libalias/alias_util.c	optional libalias | netgraph_nat
+netinet/libalias/alias_sctp.c	optional libalias | netgraph_nat
 netinet6/dest6.c		optional inet6
 netinet6/frag6.c		optional inet6
 netinet6/icmp6.c		optional inet6

==== //depot/projects/smpng/sys/conf/options#161 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.658 2009/01/28 18:00:22 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.660 2009/02/06 10:30:46 wkoszek Exp $
 #
 #        On the handling of kernel options
 #
@@ -36,7 +36,7 @@
 AHC_DUMP_EEPROM		opt_aic7xxx.h
 AHC_DEBUG		opt_aic7xxx.h
 AHC_DEBUG_OPTS		opt_aic7xxx.h
-AHC_REG_PRETTY_PRINT    opt_aic7xxx.h
+AHC_REG_PRETTY_PRINT	opt_aic7xxx.h
 AHD_DEBUG		opt_aic79xx.h
 AHD_DEBUG_OPTS		opt_aic79xx.h
 AHD_TMODE_ENABLE	opt_aic79xx.h	
@@ -137,7 +137,7 @@
 MBUF_PACKET_ZONE_DISABLE	opt_global.h
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 PPC_DEBUG	opt_ppc.h
-PPC_PROBE_CHIPSET opt_ppc.h
+PPC_PROBE_CHIPSET	opt_ppc.h
 PPS_SYNC	opt_ntp.h
 PREEMPTION	opt_sched.h
 QUOTA
@@ -424,13 +424,13 @@
 #
 SCTP			opt_sctp.h
 SCTP_DEBUG		opt_sctp.h # Enable debug printfs
-SCTP_WITH_NO_CSUM       opt_sctp.h # Use this at your peril
-SCTP_LOCK_LOGGING       opt_sctp.h # Log to KTR lock activity
-SCTP_MBUF_LOGGING       opt_sctp.h # Log to KTR general mbuf aloc/free
+SCTP_WITH_NO_CSUM	opt_sctp.h # Use this at your peril
+SCTP_LOCK_LOGGING	opt_sctp.h # Log to KTR lock activity
+SCTP_MBUF_LOGGING	opt_sctp.h # Log to KTR general mbuf aloc/free
 SCTP_MBCNT_LOGGING	opt_sctp.h # Log to KTR mbcnt activity
-SCTP_PACKET_LOGGING     opt_sctp.h # Log to a packet buffer last N packets
-SCTP_LTRACE_CHUNKS      opt_sctp.h # Log to KTR chunks processed
-SCTP_LTRACE_ERRORS      opt_sctp.h # Log to KTR error returns.
+SCTP_PACKET_LOGGING	opt_sctp.h # Log to a packet buffer last N packets
+SCTP_LTRACE_CHUNKS	opt_sctp.h # Log to KTR chunks processed
+SCTP_LTRACE_ERRORS	opt_sctp.h # Log to KTR error returns.
 #
 #
 #
@@ -804,3 +804,7 @@
 # Virtualize the network stack
 VIMAGE			opt_global.h
 VIMAGE_GLOBALS		opt_global.h
+
+# Common Flash Interface (CFI) options
+CFI_SUPPORT_STRATAFLASH	opt_cfi.h
+CFI_ARMEDANDDANGEROUS	opt_cfi.h

==== //depot/projects/smpng/sys/conf/options.amd64#24 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.33 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.34 2009/02/06 20:57:10 wkoszek Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -37,6 +37,9 @@
 VGA_SLOW_IOACCESS	opt_vga.h
 VGA_WIDTH90		opt_vga.h
 
+# AGP debugging support
+AGP_DEBUG		opt_agp.h
+
 ATKBD_DFLT_KEYMAP	opt_atkbd.h
 
 # -------------------------------

==== //depot/projects/smpng/sys/conf/options.i386#63 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.244 2009/02/06 20:57:10 wkoszek Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -88,6 +88,9 @@
 VESA
 VESA_DEBUG		opt_vesa.h
 
+# AGP debugging support
+AGP_DEBUG		opt_agp.h
+
 PSM_DEBUG		opt_psm.h
 PSM_HOOKRESUME		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h

==== //depot/projects/smpng/sys/conf/options.ia64#22 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.ia64,v 1.28 2007/07/30 22:42:33 marcel Exp $
+# $FreeBSD: src/sys/conf/options.ia64,v 1.29 2009/02/07 09:57:14 wkoszek Exp $
 # Options specific to the ia64 platform kernels
 
 ITANIUM			opt_global.h
@@ -20,6 +20,9 @@
 VGA_SLOW_IOACCESS	opt_vga.h
 VGA_WIDTH90		opt_vga.h
 
+# AGP debugging.
+AGP_DEBUG		opt_agp.h
+
 PSM_HOOKRESUME		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h

==== //depot/projects/smpng/sys/conf/options.mips#3 (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.2 2008/09/19 03:36:37 imp Exp $
+# $FreeBSD: src/sys/conf/options.mips,v 1.3 2009/02/06 10:30:46 wkoszek Exp $
 
 CPU_MIPS4KC	opt_global.h
 CPU_MIPS32	opt_global.h
@@ -48,7 +48,7 @@
 KERNPHYSADDR	opt_global.h
 KERNVIRTADDR	opt_global.h
 PHYSADDR	opt_global.h
-SOFTFLOAT       opt_global.h
+SOFTFLOAT	opt_global.h
 
 TARGET_OCTEON	opt_global.h
 TARGET_EMULATOR	opt_ddb.h

==== //depot/projects/smpng/sys/conf/options.pc98#61 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.205 2009/02/06 20:57:10 wkoszek Exp $
 # Options specific to the pc98 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -96,6 +96,7 @@
 # Debugging
 NPX_DEBUG		opt_npx.h
 STOP_NMI		opt_cpu.h
+AGP_DEBUG		opt_agp.h
 
 # BPF just-in-time compiler
 BPF_JITTER		opt_bpf.h

==== //depot/projects/smpng/sys/crypto/via/padlock.c#14 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.22 2009/01/12 19:23:46 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.23 2009/02/05 19:30:28 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,7 @@
 MALLOC_DEFINE(M_PADLOCK, "padlock_data", "PadLock Data");
 
 static void
-padlock_identify(device_t *dev, device_t parent)
+padlock_identify(driver_t *drv, device_t parent)
 {
 	/* NB: order 10 is so we get attached after h/w devices */
 	if (device_find_child(parent, "padlock", -1) == NULL &&

==== //depot/projects/smpng/sys/dev/acpi_support/acpi_panasonic.c#7 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.13 2007/06/17 04:40:33 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.14 2009/02/05 18:39:33 imp Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -79,7 +79,7 @@
 static int	acpi_panasonic_probe(device_t dev);
 static int	acpi_panasonic_attach(device_t dev);
 static int	acpi_panasonic_detach(device_t dev);
-static void	acpi_panasonic_shutdown(device_t dev);
+static int	acpi_panasonic_shutdown(device_t dev);
 static int	acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS);
 static ACPI_INTEGER acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index);
 static void	acpi_panasonic_sset(ACPI_HANDLE h, ACPI_INTEGER index,
@@ -220,7 +220,7 @@
 	return (0);
 }
 
-static void
+static int
 acpi_panasonic_shutdown(device_t dev)
 {
 	struct acpi_panasonic_softc *sc;
@@ -230,6 +230,7 @@
 	sc = device_get_softc(dev);
 	mute = 1;
 	hkey_sound_mute(sc->handle, HKEY_SET, &mute);
+	return (0);
 }
 
 static int

==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#27 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.56 2009/02/05 18:40:42 imp Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -68,10 +68,11 @@
 			    int which, uintptr_t *result);
 static int		acpi_pcib_write_ivar(device_t dev, device_t child,
 			    int which, uintptr_t value);
-static uint32_t		acpi_pcib_read_config(device_t dev, int bus, int slot,
-			    int func, int reg, int bytes);
-static void		acpi_pcib_write_config(device_t dev, int bus, int slot,
-			    int func, int reg, uint32_t data, int bytes);
+static uint32_t		acpi_pcib_read_config(device_t dev, u_int bus,
+			    u_int slot, u_int func, u_int reg, int bytes);
+static void		acpi_pcib_write_config(device_t dev, u_int bus,
+			    u_int slot, u_int func, u_int reg, uint32_t data,
+			    int bytes);
 static int		acpi_pcib_acpi_route_interrupt(device_t pcib,
 			    device_t dev, int pin);
 static int		acpi_pcib_alloc_msi(device_t pcib, device_t dev,
@@ -297,15 +298,15 @@
 }
 
 static uint32_t
-acpi_pcib_read_config(device_t dev, int bus, int slot, int func, int reg,
-    int bytes)
+acpi_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func,
+    u_int reg, int bytes)
 {
     return (pci_cfgregread(bus, slot, func, reg, bytes));
 }
 
 static void
-acpi_pcib_write_config(device_t dev, int bus, int slot, int func, int reg,
-    uint32_t data, int bytes)
+acpi_pcib_write_config(device_t dev, u_int bus, u_int slot, u_int func,
+    u_int reg, uint32_t data, int bytes)
 {
     pci_cfgregwrite(bus, slot, func, reg, data, bytes);
 }

==== //depot/projects/smpng/sys/dev/agp/agp.c#5 (text+ko) ====

@@ -25,8 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.61 2008/12/23 16:04:33 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.62 2009/02/06 20:57:10 wkoszek Exp $");
 
+#include "opt_agp.h"
 #include "opt_bus.h"
 
 #include <sys/param.h>
@@ -554,7 +555,7 @@
 		 */
 		m = vm_page_grab(mem->am_obj, OFF_TO_IDX(i),
 		    VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
-		AGP_DPF("found page pa=%#x\n", VM_PAGE_TO_PHYS(m));
+		AGP_DPF("found page pa=%#jx\n", (uintmax_t)VM_PAGE_TO_PHYS(m));
 	}
 	VM_OBJECT_UNLOCK(mem->am_obj);
 
@@ -585,8 +586,8 @@
 		for (j = 0; j < PAGE_SIZE && i + j < mem->am_size;
 		     j += AGP_PAGE_SIZE) {
 			vm_offset_t pa = VM_PAGE_TO_PHYS(m) + j;
-			AGP_DPF("binding offset %#x to pa %#x\n",
-				offset + i + j, pa);
+			AGP_DPF("binding offset %#jx to pa %#jx\n",
+				(uintmax_t)offset + i + j, (uintmax_t)pa);
 			error = AGP_BIND_PAGE(dev, offset + i + j, pa);
 			if (error) {
 				/*

==== //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#5 (text+ko) ====

@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD: src/sys/dev/ath/ath_hal/ah_regdomain.c,v 1.4 2009/02/03 19:00:56 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/ath_hal/ah_regdomain.c,v 1.7 2009/02/07 01:54:57 sam Exp $
  */
 #include "opt_ah.h"

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list