Index: head/sys/conf/makeLINT.mk
===================================================================
--- head/sys/conf/makeLINT.mk	(revision 350966)
+++ head/sys/conf/makeLINT.mk	(revision 350967)
@@ -1,67 +1,68 @@
 # $FreeBSD$
 
 # The LINT files need to end up in the kernel source directory.
 .OBJDIR: ${.CURDIR}
 
 all:
 	@echo "make LINT only"
 
 clean:
 	rm -f LINT
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
 	rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP
 .endif
 
 NOTES+=	${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES
 MAKELINT_SED= ${.CURDIR}/../../conf/makeLINT.sed
 LINT: ${NOTES} ${MAKELINT_SED}
 	cat ${NOTES} | sed -E -n -f ${MAKELINT_SED} > ${.TARGET}
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET
 	echo "ident ${.TARGET}-NOINET"	>> ${.TARGET}-NOINET
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOINET
 	echo "nooptions INET"		>> ${.TARGET}-NOINET
 	echo "nodevice gre"		>> ${.TARGET}-NOINET
 	echo "nodevice netmap"		>> ${.TARGET}-NOINET
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET6
 	echo "ident ${.TARGET}-NOINET6"	>> ${.TARGET}-NOINET6
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOINET6
 	echo "nooptions INET6"		>> ${.TARGET}-NOINET6
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOIP
 	echo "ident ${.TARGET}-NOIP"	>> ${.TARGET}-NOIP
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOIP
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOIP
 	echo "nooptions INET"		>> ${.TARGET}-NOIP
 	echo "nooptions INET6"		>> ${.TARGET}-NOIP
 	echo "nodevice age"		>> ${.TARGET}-NOIP
 	echo "nodevice alc"		>> ${.TARGET}-NOIP
 	echo "nodevice ale"		>> ${.TARGET}-NOIP
 	echo "nodevice bxe"		>> ${.TARGET}-NOIP
 	echo "nodevice em"		>> ${.TARGET}-NOIP
 	echo "nodevice fxp"		>> ${.TARGET}-NOIP
 	echo "nodevice jme"		>> ${.TARGET}-NOIP
 	echo "nodevice msk"		>> ${.TARGET}-NOIP
 	echo "nodevice mxge"		>> ${.TARGET}-NOIP
 	echo "nodevice sge"		>> ${.TARGET}-NOIP
 	echo "nodevice sk"		>> ${.TARGET}-NOIP
 	echo "nodevice txp"		>> ${.TARGET}-NOIP
 	echo "nodevice netmap"		>> ${.TARGET}-NOIP
 .endif
 .if ${TARGET} == "arm"
 	cat ${.TARGET} ${.CURDIR}/NOTES.armv5 > ${.TARGET}-V5
 	cat ${.TARGET} ${.CURDIR}/NOTES.armv7 > ${.TARGET}-V7
 	rm ${.TARGET}
 .endif
 .if ${TARGET} == "mips"
 	echo "machine	${TARGET} ${TARGET_ARCH}" >> ${.TARGET}
 .endif
 .if ${TARGET} == "powerpc"
 	# cat is available, not sure if cp is?
 	cat ${.TARGET} > ${.TARGET}64
 	echo "machine	${TARGET} powerpc" >> ${.TARGET}
 	echo "machine	${TARGET} powerpc64" >> ${.TARGET}64
 # mlx5 needs 64-bit atomics, so exclude from 32-bit PPC
 	echo "nodevice mlx5" >> ${.TARGET}
 	echo "nodevice mlx5en" >> ${.TARGET}
 	echo "nodevice mlx5ib" >> ${.TARGET}
+	echo "nooptions	RATELIMIT" >> ${.TARGET}
 .endif
Index: head/sys/powerpc/conf/NOTES
===================================================================
--- head/sys/powerpc/conf/NOTES	(revision 350966)
+++ head/sys/powerpc/conf/NOTES	(revision 350967)
@@ -1,94 +1,93 @@
 # $FreeBSD$
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 
 #
 # Enable the kernel DTrace hooks which are required to load the DTrace
 # kernel modules.
 #
 options 	KDTRACE_HOOKS
 
 # DTrace core
 # NOTE: introduces CDDL-licensed components into the kernel
 #device		dtrace
 
 # DTrace modules
 #device		dtrace_profile
 #device		dtrace_sdt
 #device		dtrace_fbt
 #device		dtrace_systrace
 #device		dtrace_prototype
 #device		dtnfscl
 #device		dtmalloc
 
 # Alternatively include all the DTrace modules
 #device		dtraceall
 
 
 #####################################################################
 # CPU OPTIONS
 
 # You must specify a machine directive to choose powerpc or powerpc64
 #machine		powerpc powerpc[64]
 
 #
 # You must specify at least one CPU (the one you intend to run on).
 cpu		AIM
 #cpu		BOOKE_E500
 #cpu		BOOKE_PPC440
 
 options 	FPU_EMU
 
 #options 	MPC85XX
 options 	POWERMAC		#NewWorld Apple PowerMacs
 #options	PS3			#Sony Playstation 3
 options 	PSIM			#GDB PSIM ppc simulator
 options 	MAMBO			#IBM Mambo Full System Simulator
 
 # The cpufreq(4) driver provides support for CPU frequency control
 device		cpufreq
 
 # Standard busses
 device		agp
 
 device		glc		# Sony Playstation 3 Ethernet
 device		kiic		# Apple Keywest I2C Controller
 device		ofwd		# Open Firmware disks
 device		adb		# Apple Desktop Bus
 device		cuda		# VIA-CUDA ADB interface
 device          ad7417          # PowerMac7,2 temperature sensor
 device		ds1631		# PowerMac11,2 temperature sensor
 device		ds1775		# PowerMac7,2 temperature sensor
 device		fcu		# Apple Fan Control Unit
 device		max6690		# PowerMac7,2 temperature sensor
 device		pmu		# Apple Power Management Unit
 device		smu		# Apple System Management Unit
 device		snd_ai2s	# Apple I2S Audio
 device		snd_davbus	# Apple Davbus Audio
 device		adm1030		# Apple G4 MDD fan controller
 
 
 #####################################################################
 # Devices we don't want to deal with
 
 nodevice	bktr
 nodevice	ccr
 nodevice	cxgbe		# XXX: builds on powerpc64 only.
 nodevice	cxgbev
 nodevice	mpr		# no 64-bit atomics
 nodevice	mps		# no 64-bit atomics
 nodevice	ppc
 # sound
 nodevice	snd_cmi
 # wants gdb_cur
 nodevice	dcons
 nodevice	dcons_crom
 
 
 #####################################################################
 # Options we don't want to deal with
 
 nooption	PPC_DEBUG
-nooption	PPC_PROBE_CHIPSET
-nooption 	UKBD_DFLT_KEYMAP
+nooption	PPC_PROBE_CHIPSET	# uses inb/outb