Clone Kip's Xen on stable/6 tree so that I can work on improving FreeBSD/amd64

performance in Xen's HVM mode.

7 files changed, 0 insertions, 930 deletions

diff --git a/sys/amd64/conf/.cvsignore b/sys/amd64/conf/.cvsignore
deleted file mode 100644
index 232298e..0000000
--- a/sys/amd64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
deleted file mode 100644
index cf822b3..0000000
--- a/sys/amd64/conf/DEFAULTS
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
-#
-# $FreeBSD$
-
-# Not yet, this would break all existing configs
-#machine		amd64
-
-# Bus support.
-device		isa
-
-# Pseudo devices.
-device		mem		# Memory and kernel memory devices
-device		io		# I/O device
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
deleted file mode 100644
index e895867..0000000
--- a/sys/amd64/conf/GENERIC
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-# GENERIC -- Generic kernel configuration file for FreeBSD/amd64
-#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
-#
-#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES.
-#
-# $FreeBSD$
-
-machine		amd64
-cpu		HAMMER
-ident		GENERIC
-
-# To statically compile in device wiring instead of /boot/device.hints
-#hints		"GENERIC.hints"		# Default places to look for devices.
-
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
-options 	SCHED_4BSD		# 4BSD scheduler
-options 	PREEMPTION		# Enable kernel thread preemption
-options 	INET			# InterNETworking
-options 	INET6			# IPv6 communications protocols
-options 	FFS			# Berkeley Fast Filesystem
-options 	SOFTUPDATES		# Enable FFS soft updates support
-options 	UFS_ACL			# Support for access control lists
-options 	UFS_DIRHASH		# Improve performance on big directories
-options 	MD_ROOT			# MD is a potential root device
-options 	NFSCLIENT		# Network Filesystem Client
-options 	NFSSERVER		# Network Filesystem Server
-options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
-options 	NTFS			# NT File System
-options 	MSDOSFS			# MSDOS Filesystem
-options 	CD9660			# ISO 9660 Filesystem
-options 	PROCFS			# Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_GPT		# GUID Partition Tables.
-options 	COMPAT_43		# Needed by COMPAT_LINUX32
-options 	COMPAT_IA32		# Compatible with i386 binaries
-options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-options 	COMPAT_LINUX32		# Compatible with i386 linux binaries 
-options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
-options 	KTRACE			# ktrace(1) support
-options 	SYSVSHM			# SYSV-style shared memory
-options 	SYSVMSG			# SYSV-style message queues
-options 	SYSVSEM			# SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-
-# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
-device		atpic			# 8259A compatability
-
-# Linux 32-bit ABI support
-options 	LINPROCFS		# Cannot be a module yet.
-
-# Bus support.
-device		acpi
-device		pci
-
-# Floppy drives
-device		fdc
-
-# ATA and ATAPI devices
-device		ata
-device		atadisk		# ATA disk drives
-device		ataraid		# ATA RAID drives
-device		atapicd		# ATAPI CDROM drives
-device		atapifd		# ATAPI floppy drives
-device		atapist		# ATAPI tape drives
-options 	ATA_STATIC_ID	# Static device numbering
-
-# SCSI Controllers
-device		ahc		# AHA2940 and onboard AIC7xxx devices
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-device		ahd		# AHA39320/29320 and onboard AIC79xx devices
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
-device		amd		# AMD 53C974 (Tekram DC-390(T))
-device		isp		# Qlogic family
-#device 	ispfw		# Firmware for QLogic HBAs- normally a module
-device		mpt		# LSI-Logic MPT-Fusion
-#device		ncr		# NCR/Symbios Logic
-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
-device		trm		# Tekram DC395U/UW/F DC315U adapters
-
-device		adv		# Advansys SCSI adapters
-device		adw		# Advansys wide SCSI adapters
-device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
-device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
-
-
-# SCSI peripherals
-device		scbus		# SCSI bus (required for SCSI)
-device		ch		# SCSI media changers
-device		da		# Direct Access (disks)
-device		sa		# Sequential Access (tape etc)
-device		cd		# CD
-device		pass		# Passthrough device (direct SCSI access)
-device		ses		# SCSI Environmental Services (and SAF-TE)
-
-# RAID controllers interfaced to the SCSI subsystem
-device		amr		# AMI MegaRAID
-device		arcmsr		# Areca SATA II RAID
-device		ciss		# Compaq Smart RAID 5*
-device		dpt		# DPT Smartcache III, IV - See NOTES for options
-device		hptmv		# Highpoint RocketRAID 182x
-device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device		rr232x		# Highpoint RocketRAID 232x
-device		iir		# Intel Integrated RAID
-device		ips		# IBM (Adaptec) ServeRAID
-device		mly		# Mylex AcceleRAID/eXtremeRAID
-device		twa		# 3ware 9000 series PATA/SATA RAID
-
-# RAID controllers
-device		aac		# Adaptec FSA RAID
-device		aacp		# SCSI passthrough for aac (requires CAM)
-device		ida		# Compaq Smart RAID
-device		mfi		# LSI MegaRAID SAS
-device		mlx		# Mylex DAC960 family
-#XXX pointer/int warnings
-#device		pst		# Promise Supertrak SX6000
-device		twe		# 3ware ATA RAID
-
-# atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc		# AT keyboard controller
-device		atkbd		# AT keyboard
-device		psm		# PS/2 mouse
-
-device		kbdmux		# keyboard multiplexer
-
-device		vga		# VGA video card driver
-
-device		splash		# Splash screen and screen saver support
-
-# syscons is the default console driver, resembling an SCO console
-device		sc
-
-device		agp		# support several AGP chipsets
-
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb		# cardbus (yenta) bridge
-device		pccard		# PC Card (16-bit) bus
-device		cardbus		# CardBus (32-bit) bus
-
-# Serial (COM) ports
-device		sio		# 8250, 16[45]50 based serial ports
-
-# Parallel port
-device		ppc
-device		ppbus		# Parallel port bus (required)
-device		lpt		# Printer
-device		plip		# TCP/IP over parallel
-device		ppi		# Parallel port interface device
-#device		vpo		# Requires scbus and da
-
-# If you've got a "dumb" serial or parallel PCI card that is
-# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
-#device		puc
-
-# PCI Ethernet NICs.
-device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
-device		ixgb		# Intel PRO/10GbE Ethernet Card
-device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-device		txp		# 3Com 3cR990 (``Typhoon'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
-
-# PCI Ethernet NICs that use the common MII bus controller code.
-# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
-device		miibus		# MII bus support
-device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
-device		bfe		# Broadcom BCM440x 10/100 Ethernet
-device		bge		# Broadcom BCM570xx Gigabit Ethernet
-device		dc		# DEC/Intel 21143 and various workalikes
-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
-device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
-device		lge		# Level 1 LXT1001 gigabit Ethernet
-device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-device		nge		# NatSemi DP83820 gigabit Ethernet
-device		nve		# nVidia nForce MCP on-board Ethernet Networking
-device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
-device		re		# RealTek 8139C+/8169/8169S/8110S
-device		rl		# RealTek 8129/8139
-device		sf		# Adaptec AIC-6915 (``Starfire'')
-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
-device		tl		# Texas Instruments ThunderLAN
-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
-device		vge		# VIA VT612x gigabit Ethernet
-device		vr		# VIA Rhine, Rhine II
-device		wb		# Winbond W89C840F
-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
-
-# ISA Ethernet NICs.  pccard NICs included.
-device		cs		# Crystal Semiconductor CS89x0 NIC
-# 'device ed' requires 'device miibus'
-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
-device		ex		# Intel EtherExpress Pro/10 and Pro/10+
-device		ep		# Etherlink III based cards
-device		fe		# Fujitsu MB8696x based cards
-device		sn		# SMC's 9000 series of Ethernet chips
-device		xe		# Xircom pccard Ethernet
-
-# Wireless NIC cards
-device		wlan		# 802.11 support
-device		wlan_wep	# 802.11 WEP support
-device		wlan_ccmp	# 802.11 CCMP support
-device		wlan_tkip	# 802.11 TKIP support
-device		an		# Aironet 4500/4800 802.11 wireless NICs.
-device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
-device		ath_rate_sample	# SampleRate tx rate control for ath
-device		awi		# BayStack 660 and others
-device		ral		# Ralink Technology RT2500 wireless NICs.
-device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-
-# Pseudo devices.
-device		loop		# Network loopback
-device		random		# Entropy device
-device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
-device		tun		# Packet tunnel.
-device		pty		# Pseudo-ttys (telnet etc)
-device		md		# Memory "disks"
-device		gif		# IPv6 and IPv4 tunneling
-device		faith		# IPv6-to-IPv4 relaying (translation)
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device		bpf		# Berkeley packet filter
-
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface (USB 2.0)
-device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
-device		ulpt		# Printer
-device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
-device		ural		# Ralink Technology RT2500USB wireless NICs
-device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
-# USB Ethernet, requires miibus
-device		aue		# ADMtek USB Ethernet
-device		axe		# ASIX Electronics USB Ethernet
-device		cdce		# Generic USB over Ethernet
-device		cue		# CATC USB Ethernet
-device		kue		# Kawasaki LSI USB Ethernet
-device		rue		# RealTek RTL8150 USB Ethernet
-
-# FireWire support
-device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints
deleted file mode 100644
index 9400343..0000000
--- a/sys/amd64/conf/GENERIC.hints
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-hint.fdc.0.at="isa"
-hint.fdc.0.port="0x3F0"
-hint.fdc.0.irq="6"
-hint.fdc.0.drq="2"
-hint.fd.0.at="fdc0"
-hint.fd.0.drive="0"
-hint.fd.1.at="fdc0"
-hint.fd.1.drive="1"
-hint.atkbdc.0.at="isa"
-hint.atkbdc.0.port="0x060"
-hint.atkbd.0.at="atkbdc"
-hint.atkbd.0.irq="1"
-hint.psm.0.at="atkbdc"
-hint.psm.0.irq="12"
-hint.vga.0.at="isa"
-hint.sc.0.at="isa"
-hint.sc.0.flags="0x100"
-hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
-hint.sio.0.flags="0x10"
-hint.sio.0.irq="4"
-hint.sio.1.at="isa"
-hint.sio.1.port="0x2F8"
-hint.sio.1.irq="3"
-hint.sio.2.at="isa"
-hint.sio.2.disabled="1"
-hint.sio.2.port="0x3E8"
-hint.sio.2.irq="5"
-hint.sio.3.at="isa"
-hint.sio.3.disabled="1"
-hint.sio.3.port="0x2E8"
-hint.sio.3.irq="9"
-hint.ppc.0.at="isa"
-hint.ppc.0.irq="7"
diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile
deleted file mode 100644
index 2c006e9..0000000
--- a/sys/amd64/conf/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
deleted file mode 100644
index 7f54da5..0000000
--- a/sys/amd64/conf/NOTES
+++ /dev/null
@@ -1,588 +0,0 @@
-#
-# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
-#
-# This file contains machine dependent kernel configuration notes.  For
-# machine independent notes, look in /sys/conf/NOTES.
-#
-# $FreeBSD$
-#
-
-#
-# This directive is mandatory; it defines the architecture to be
-# configured for; in this case, the AMD64 family based machines.
-#
-machine		amd64
-
-#
-# We want LINT to cover profiling as well.
-profile         2
-
-
-#####################################################################
-# SMP OPTIONS:
-#
-# Notes:
-#
-# IPI_PREEMPTION instructs the kernel to preempt threads running on other
-#	  CPUS if needed.  Relies on the PREEMPTION option
-
-# Optional:
-options 	IPI_PREEMPTION
-device		atpic			# Optional legacy pic support
-device		mptable			# Optional MPSPEC mptable support
-
-#
-# Watchdog routines.
-#
-options 	MP_WATCHDOG
-
-# 
-# Debugging options.
-#
-options		KDB_STOP_NMI		# Stop CPUS using NMI instead of IPI
-
-
-
-#####################################################################
-# CPU OPTIONS
-
-#
-# You must specify at least one CPU (the one you intend to run on);
-# deleting the specification for CPUs you don't need to use may make
-# parts of the system run faster.
-#
-cpu		HAMMER			# aka K8, aka Opteron & Athlon64
-
-#
-# Options for CPU features.
-#
-
-#
-# PERFMON causes the driver for Pentium/Pentium Pro performance counters
-# to be compiled.  See perfmon(4) for more information.
-#
-#XXX#options 	PERFMON
-
-
-#####################################################################
-# NETWORKING OPTIONS
-
-#
-# DEVICE_POLLING adds support for mixed interrupt-polling handling
-# of network device drivers, which has significant benefits in terms
-# of robustness to overloads and responsivity, as well as permitting
-# accurate scheduling of the CPU time between kernel network processing
-# and other activities.  The drawback is a moderate (up to 1/HZ seconds)
-# potential increase in response times.
-# It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING
-# to achieve smoother behaviour.
-# Additionally, you can enable/disable polling at runtime with help of
-# the ifconfig(8) utility, and select the CPU fraction reserved to
-# userland with the sysctl variable kern.polling.user_frac
-# (default 50, range 0..100).
-#
-# Not all device drivers support this mode of operation at the time of
-# this writing.  See polling(4) for more details.
-
-options 	DEVICE_POLLING
-
-
-#####################################################################
-# CLOCK OPTIONS
-
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
-# Provide read/write access to the memory in the clock chip.
-device		nvram		# Access to rtc cmos via /dev/nvram
-
-
-#####################################################################
-# MISCELLANEOUS DEVICES AND OPTIONS
-
-device		speaker		#Play IBM BASIC-style noises out your speaker
-hint.speaker.0.at="isa"
-hint.speaker.0.port="0x61"
-device		gzip		#Exec gzipped a.out's.  REQUIRES COMPAT_AOUT!
-
-
-#####################################################################
-# HARDWARE BUS CONFIGURATION
-
-#
-# ISA bus
-#
-device		isa
-
-#
-# Options for `isa':
-#
-# AUTO_EOI_1 enables the `automatic EOI' feature for the master 8259A
-# interrupt controller.  This saves about 0.7-1.25 usec for each interrupt.
-# This option breaks suspend/resume on some portables.
-#
-# AUTO_EOI_2 enables the `automatic EOI' feature for the slave 8259A
-# interrupt controller.  This saves about 0.7-1.25 usec for each interrupt.
-# Automatic EOI is documented not to work for for the slave with the
-# original i8259A, but it works for some clones and some integrated
-# versions.
-#
-# MAXMEM specifies the amount of RAM on the machine; if this is not
-# specified, FreeBSD will first read the amount of memory from the CMOS
-# RAM, so the amount of memory will initially be limited to 64MB or 16MB
-# depending on the BIOS.  If the BIOS reports 64MB, a memory probe will
-# then attempt to detect the installed amount of RAM.  If this probe
-# fails to detect >64MB RAM you will have to use the MAXMEM option.
-# The amount is in kilobytes, so for a machine with 128MB of RAM, it would
-# be 131072 (128 * 1024).
-#
-# BROKEN_KEYBOARD_RESET disables the use of the keyboard controller to
-# reset the CPU for reboot.  This is needed on some systems with broken
-# keyboard controllers.
-
-options 	AUTO_EOI_1
-#options 	AUTO_EOI_2
-
-options 	MAXMEM=(128*1024)
-#options 	BROKEN_KEYBOARD_RESET
-
-#
-# PCI bus & PCI options:
-#
-device		pci
-
-#
-# AGP GART support
-device		agp
-
-
-#####################################################################
-# HARDWARE DEVICE CONFIGURATION
-
-#
-# Optional devices:
-#
-
-# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support.  This will create
-# the /dev/3dfx0 device to work with glide implementations.  This should get
-# linked to /dev/3dfx and /dev/voodoo.  Note that this is not the same as
-# the tdfx DRI module from XFree86 and is completely unrelated.
-#
-# To enable Linuxulator support, one must also include COMPAT_LINUX in the
-# config as well, or you will not have the dependencies.  The other option
-# is to load both as modules.
-
-device		tdfx			# Enable 3Dfx Voodoo support
-#XXX#options 	TDFX_LINUX		# Enable Linuxulator support
-
-#
-# ACPI support using the Intel ACPI Component Architecture reference
-# implementation.
-#
-# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer
-# kernel environment variables to select initial debugging levels for the
-# Intel ACPICA code.  (Note that the Intel code must also have USE_DEBUGGER
-# defined when it is built).
-#
-# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op.
-#
-# ACPICA_PEDANTIC enables strict checking of AML.  Our default is to
-# relax these checks to allow code generated by the Microsoft compiler
-# to still execute.
-#
-# Note that building ACPI into the kernel is deprecated; the module is
-# normally loaded automatically by the loader.
-
-device		acpi
-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		i915drm		# Intel i830 through i915
-device		mach64drm	# ATI Rage Pro, Rage Mobility P/M, Rage XL
-device		mgadrm		# AGP Matrox G200, G400, G450, G550
-device		r128drm		# ATI Rage 128
-device		radeondrm	# ATI Radeon
-device		savagedrm	# S3 Savage3D, Savage4
-device		sisdrm		# SiS 300/305, 540, 630
-device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
-options 	DRM_DEBUG	# Include debug printfs (slow)
-
-#
-# Network interfaces:
-#
-
-# ath:  Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
-# ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-#       HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf)
-#       (requires miibus)
-# lnc:  Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
-#       Am79C960)
-# mxge: Myricom Myri-10G 10GbE NIC
-# nve:	nVidia nForce MCP on-board Ethernet Networking
-
-#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
-device		mxge		# Myricom Myri-10G 10GbE NIC
-device		nve		# nVidia nForce MCP on-board Ethernet Networking
-
-device		ath
-device		ath_hal		# Atheros HAL (includes binary component)
-#device		ath_rate_amrr	# AMRR rate control for ath driver
-#device		ath_rate_onoe	# Onoe rate control for ath driver
-device		ath_rate_sample	# SampleRate rate control for the ath driver
-#device		wlan		# 802.11 layer
-
-#
-#XXX this stores pointers in a 32bit field that is defined by the hardware
-#device	pst
-
-#
-# Areca 11xx and 12xx series of SATA II RAID controllers.
-# CAM is required.
-#
-device		arcmsr		# Areca SATA II RAID
-
-#
-# 3ware 9000 series PATA/SATA RAID controller driver and options.
-# The driver is implemented as a SIM, and so, needs the CAM infrastructure.
-#
-options 	TWA_DEBUG		# 0-10; 10 prints the most messages.
-options 	TWA_FLASH_FIRMWARE	# firmware image bundled when defined.
-device		twa			# 3ware 9000 series PATA/SATA RAID
-
-#
-# SCSI host adapters:
-#
-# ncv: NCR 53C500 based SCSI host adapters.
-# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters.
-# stg: TMC 18C30, 18C50 based SCSI host adapters.
-
-device		ncv
-device		nsp
-device		stg
-
-#
-# Adaptec FSA RAID controllers, including integrated DELL controllers,
-# the Dell PERC 2/QC and the HP NetRAID-4M
-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
-
-# 
-# Highpoint RocketRAID.  Supports RR172x, RR222x, RR2240, RR232x, RR2340,
-# RR2210, RR174x, RR2522, RR231x, RR230x.
-device		hptrr
-
-#
-# Highpoint RocketRAID 232x.  This is software RAID but with hardware
-# acceleration assistance for RAID_5.
-device		rr232x
-
-#
-# IBM (now Adaptec) ServeRAID controllers
-device		ips
-
-#
-# SafeNet crypto driver: can be moved to the MI NOTES as soon as
-# it's tested on a big-endian machine
-#
-device		safe		# SafeNet 1141
-options 	SAFE_DEBUG	# enable debugging support: hw.safe.debug
-options 	SAFE_RNDTEST	# enable rndtest support
-
-#####################################################################
-
-#
-# Miscellaneous hardware:
-#
-# cy: Cyclades serial driver
-# digi: Digiboard driver
-# ipmi: Intelligent Platform Management Interface
-# smbios: DMI/SMBIOS entry point
-
-# Notes on the Specialix SI/XIO driver:
-#  The host card is memory, not IO mapped.
-#  The Rev 1 host cards use a 64K chunk, on a 32K boundary.
-#  The Rev 2 host cards use a 32K chunk, on a 32K boundary.
-#  The cards can use an IRQ of 11, 12 or 15.
-
-device		cy
-options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
-device		digi
-# BIOS & FEP/OS components of device digi.
-device		digi_CX
-device		digi_CX_PCI
-device		digi_EPCX
-device		digi_EPCX_PCI
-device		digi_Xe
-device		digi_Xem
-device		digi_Xr
-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
-# sx device is i386 and pc98 only at the moment.
-device		sx
-options 	SX_DEBUG
-# HOT1 Xilinx 6200 card (http://www.vcc.com/)
-device		xrpu
-
-#
-# Laptop/Notebook options:
-#
-
-
-#
-# I2C Bus
-#
-
-#
-# Hardware watchdog timers:
-#
-# ichwd: Intel ICH watchdog timer
-#
-device		ichwd
-
-#
-# Temperature sensors:
-#
-# coretemp: on-die sensor on Intel Core and newer CPUs
-#
-device		coretemp
-
-#---------------------------------------------------------------------------
-# ISDN4BSD
-#
-# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
-#
-# i4b passive ISDN cards support contains the following hardware drivers:
-#
-#	isic  - Siemens/Infineon ISDN ISAC/HSCX/IPAC chipset driver
-#	iwic  - Winbond W6692 PCI bus ISDN S/T interface controller
-#	ifpi  - AVM Fritz!Card PCI driver
-#	ifpi2  - AVM Fritz!Card PCI version 2 driver
-#	itjc  - Siemens ISAC / TJNet Tiger300/320 chipset
-#
-# i4b active ISDN cards support contains the following hardware drivers:
-#
-#	iavc  - AVM B1 PCI, AVM B1 ISA, AVM T1
-#
-# Note that the ``options'' (if given) and ``device'' lines must BOTH
-# be uncommented to enable support for a given card !
-#
-# In addition to a hardware driver (and probably an option) the mandatory
-# ISDN protocol stack devices and the mandatory support device must be
-# enabled as well as one or more devices from the optional devices section.
-#
-#---------------------------------------------------------------------------
-#	isic driver (Siemens/Infineon chipsets)
-#
-#XXX#device	isic
-#
-# PCI bus Cards:
-# --------------
-#
-# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
-options 	ELSA_QS1PCI
-#
-#---------------------------------------------------------------------------
-#	ifpi2 driver for AVM Fritz!Card PCI version 2
-#
-# AVM Fritz!Card PCI version 2
-#XXX#device	ifpi2
-#
-#---------------------------------------------------------------------------
-#	iwic driver for Winbond W6692 chipset
-#
-# ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards)
-#XXX#device	iwic
-#
-#---------------------------------------------------------------------------
-#	itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset
-#
-# Traverse Technologies NETjet-S
-# Teles PCI-TJ
-#XXX#device	itjc
-#
-#---------------------------------------------------------------------------
-#	iavc driver (AVM active cards, needs i4bcapi driver!)
-#
-#XXX#device	iavc
-#
-#---------------------------------------------------------------------------
-#	ISDN Protocol Stack - mandatory for all hardware drivers
-#
-# Q.921 / layer 2 - i4b passive cards D channel handling
-#XXX#device	i4bq921
-#
-# Q.931 / layer 3 - i4b passive cards D channel handling
-#XXX#device	i4bq931
-#
-# layer 4 - i4b common passive and active card handling
-#XXX#device	i4b
-#
-#---------------------------------------------------------------------------
-#	ISDN devices - mandatory for all hardware drivers
-#
-# userland driver to do ISDN tracing (for passive cards only)
-#XXX#device	i4btrc
-#XXX#options 	NI4BTRC=4
-#
-# userland driver to control the whole thing
-#XXX#device	i4bctl
-#
-#---------------------------------------------------------------------------
-#	ISDN devices - optional
-#
-# userland driver for access to raw B channel
-#XXX#device	i4brbch
-#XXX#options 	NI4BRBCH=4
-#
-# userland driver for telephony
-#XXX#device	i4btel
-#XXX#options 	NI4BTEL=2
-#
-# network driver for IP over raw HDLC ISDN
-#XXX#device	i4bipr
-#XXX#options 	NI4BIPR=4
-# enable VJ header compression detection for ipr i/f
-options 	IPR_VJ
-# enable logging of the first n IP packets to isdnd (n=32 here)
-options 	IPR_LOG=32
-#
-# network driver for sync PPP over ISDN; requires an equivalent
-# number of sppp device to be configured
-#XXX#device	i4bisppp
-#XXX#options 	NI4BISPPP=4
-#
-# B-channel interface to the netgraph subsystem
-#XXX#device	i4bing
-#XXX#options 	NI4BING=2
-#
-# CAPI driver needed for active ISDN cards (see iavc driver above)
-#XXX#device	i4bcapi
-#
-#---------------------------------------------------------------------------
-
-#
-# System Management Bus (SMB)
-#
-options 	ENABLE_ALART		# Control alarm on Intel intpm driver
-
-#
-# Set the number of PV entries per process.  Increasing this can
-# stop panics related to heavy use of shared memory.  However, that can
-# (combined with large amounts of physical memory) cause panics at
-# boot time due the kernel running out of VM space.
-#
-# If you're tweaking this, you might also want to increase the sysctls
-# "vm.v_free_min", "vm.v_free_reserved", and "vm.v_free_target".
-#
-# The value below is the one more than the default.
-#
-options 	PMAP_SHPGPERPROC=201
-
-
-#####################################################################
-# ABI Emulation
-
-#XXX keep these here for now and reactivate when support for emulating
-#XXX these 32 bit binaries is added.
-
-# Enable 32-bit runtime support for FreeBSD/i386 binaries.
-options 	COMPAT_IA32
-
-# Enable iBCS2 runtime support for SCO and ISC binaries
-#XXX#options 	IBCS2
-
-# Emulate spx device for client side of SVR3 local X interface
-#XXX#options 	SPX_HACK
-
-# Enable Linux ABI emulation
-#XXX#options 	COMPAT_LINUX
-
-# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and COMPAT_IA32)
-options 	COMPAT_LINUX32
-
-# Enable the linux-like proc filesystem support (requires COMPAT_LINUX32
-# and PSEUDOFS)
-options 	LINPROCFS
-
-#
-# SysVR4 ABI emulation
-#
-# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
-# a KLD module.
-# The STREAMS network emulation code can also be compiled statically or as a
-# module.  If loaded as a module, it must be loaded before the svr4 module
-# (the /usr/sbin/svr4 script does this for you).  If compiling statically,
-# the `streams' device must be configured into any kernel which also
-# specifies COMPAT_SVR4.  It is possible to have a statically-configured
-# STREAMS device and a dynamically loadable svr4 emulator;  the /usr/sbin/svr4
-# script understands that it doesn't need to load the `streams' module under
-# those circumstances.
-# Caveat:  At this time, `options KTRACE' is required for the svr4 emulator
-# (whether static or dynamic).
-#
-#XXX#options 	COMPAT_SVR4	# build emulator statically
-#XXX#options 	DEBUG_SVR4	# enable verbose debugging
-#XXX#device	streams		# STREAMS network driver (required for svr4).
-
-
-#####################################################################
-# VM OPTIONS
-
-# KSTACK_PAGES is the number of memory pages to assign to the kernel
-# stack of each thread.
-
-options 	KSTACK_PAGES=3
-
-#####################################################################
-
-# More undocumented options for linting.
-# Note that documenting these are not considered an affront.
-
-options 	FB_INSTALL_CDEV		# install a CDEV entry in /dev
-
-options 	KBDIO_DEBUG=2
-options 	KBD_MAXRETRY=4
-options 	KBD_MAXWAIT=6
-options 	KBD_RESETDELAY=201
-
-options 	PSM_DEBUG=1
-
-options 	TIMER_FREQ=((14318182+6)/12)
-
-options 	VM_KMEM_SIZE
-options 	VM_KMEM_SIZE_MAX
-options 	VM_KMEM_SIZE_SCALE
-
-
-# The I/O device
-device		io
diff --git a/sys/amd64/conf/SMP b/sys/amd64/conf/SMP
deleted file mode 100644
index 8cd80be..0000000
--- a/sys/amd64/conf/SMP
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# SMP -- Generic kernel configuration file for FreeBSD/amd64 SMP
-#	 Use this for multi-processor machines
-#
-# $FreeBSD$
-
-include GENERIC
-
-ident	SMP-GENERIC
-
-options	SMP