Sync i386->amd64.

* Add ichwd (The Intel EM64T folks have an ICH)
* Cosmetic comment syncs
* Merge cpufreq change over to NOTES
* add pbio (it compiles, but isn't useful since no boxes have ISA slots)
* copy ath settings (note: wlan disabled here since its in global NOTES)
* copy profiling, including fixing a previous i386->amd64 merge typo.

Approved by:	re (blanket i386 <-> amd64 sync/convergence)

3 files changed, 31 insertions, 7 deletions

diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 97335cb..5d7685b 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -148,7 +148,7 @@ IDTVEC(timerint)
 	movq	lapic, %rdx
 	movl	$0, LA_EOI(%rdx)	/* End Of Interrupt to APIC */
 
-	FAKE_MCOUNT(TF_EIP(%esp))
+	FAKE_MCOUNT(TF_RIP(%rsp))
 
 	call	lapic_handle_timer
 	MEXITCOUNT
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 35332f0..9eb97f9 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -15,7 +15,7 @@ machine		amd64
 
 #
 # We want LINT to cover profiling as well.
-#XXX#profile         2
+profile         2
 
 
 #####################################################################
@@ -202,6 +202,9 @@ options 	ACPI_DEBUG
 #!options 	ACPI_NO_SEMAPHORES
 #!options 	ACPICA_PEDANTIC
 
+# The cpufreq(4) driver provides support for non-ACPI CPU frequency control
+device		cpufreq
+
 # Direct Rendering modules for 3D acceleration.
 device		drm		# DRM core module required by DRM drivers
 device		mach64drm	# ATI Rage Pro, Rage Mobility P/M, Rage XL
@@ -225,15 +228,19 @@ options 	DRM_DEBUG	# Include debug printfs (slow)
 
 #XXX#	still calls MD i386 kvtop function instead of vtophys etc
 #XXX#device		ed
+#XXX#options 		ED_3C503
+#XXX#options 		ED_HPP
+#XXX#options 		ED_SIC
 #XXX#device		lnc
 
-#XXX#device	ath
-#XXX#device	ath_hal		# Atheros HAL (includes binary component)
-device		wlan		# 802.11 layer
+device		ath
+device		ath_hal		# Atheros HAL (includes binary component)
+device		ath_rate_onoe	# Onoe rate control for ath driver
+#device		ath_rate_amrr	# AMRR rate control for ath driver
+#device		ath_rate_sample	# SampleRate rate control for the ath driver
+#device		wlan		# 802.11 layer
 
 #
-# ATA raid adapters
-#
 #XXX this stores pointers in a 32bit field that is defined by the hardware
 #device	pst
 
@@ -269,6 +276,11 @@ device		aac
 device		aacp	# SCSI Passthrough interface (optional, CAM required)
 
 #
+# Highpoint RocketRAID 182x.  This is really just software RAID on a
+# Marvell SATA chip.
+#device		hptmv	# Broken, i386-only binary.
+
+#
 # IBM (now Adaptec) ServeRAID controllers
 device		ips
 
@@ -305,6 +317,10 @@ device		digi_EPCX_PCI
 device		digi_Xe
 device		digi_Xem
 device		digi_Xr
+# 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"
 # sx device is i386 and pc98 only at the moment.
 device		sx
 options 	SX_DEBUG
@@ -320,6 +336,13 @@ device		xrpu
 # I2C Bus
 #
 
+#
+# Hardware watchdog timers:
+#
+# ichwd: Intel ICH watchdog timer
+#
+device		ichwd
+
 #---------------------------------------------------------------------------
 # ISDN4BSD
 #
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index ced87e9..a2b594c 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -140,6 +140,7 @@ dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
 dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
+dev/ichwd/ichwd.c		optional	ichwd
 dev/if_ndis/if_ndis.c		optional	ndis
 dev/if_ndis/if_ndis_pccard.c	optional	ndis pccard
 dev/if_ndis/if_ndis_pci.c	optional	ndis cardbus