Index: head/sys/arm/allwinner/a20/std.a20
===================================================================
--- head/sys/arm/allwinner/a20/std.a20	(revision 295884)
+++ head/sys/arm/allwinner/a20/std.a20	(revision 295885)
@@ -1,17 +1,15 @@
 # Allwinner A20 common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
 files		"../allwinner/files.allwinner"
 files		"../allwinner/a20/files.a20"
Index: head/sys/arm/allwinner/std.a10
===================================================================
--- head/sys/arm/allwinner/std.a10	(revision 295884)
+++ head/sys/arm/allwinner/std.a10	(revision 295885)
@@ -1,14 +1,12 @@
 # Allwinner A10 common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.a10"
Index: head/sys/arm/altera/socfpga/std.socfpga
===================================================================
--- head/sys/arm/altera/socfpga/std.socfpga	(revision 295884)
+++ head/sys/arm/altera/socfpga/std.socfpga	(revision 295885)
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../altera/socfpga/files.socfpga"
Index: head/sys/arm/amlogic/aml8726/std.aml8726
===================================================================
--- head/sys/arm/amlogic/aml8726/std.aml8726	(revision 295884)
+++ head/sys/arm/amlogic/aml8726/std.aml8726	(revision 295885)
@@ -1,30 +1,28 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 # Physical memory starts at 0x80000000.  We assume the kernel is loaded
 # at 0x80100000 by u-boot (which doesn't support ubldr since it's missing
 # CONFIG_API).  The kernel must be supplied as a binary since u-boot is
 # also missing CONFIG_CMD_ELF.
 #
 #
 options 	KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 
 device		fdt_pinctrl
 
 files		"../amlogic/aml8726/files.aml8726"
 
-options		ARM_L2_PIPT
-
 # Set all global interrupts to be edge triggered, active high.
 options		GIC_DEFAULT_ICFGR_INIT=0xffffffff
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 #options 	EARLY_PRINTF
 #options 	SOCDEV_PA=0xc8100000
 #options 	SOCDEV_VA=0xd8100000
Index: head/sys/arm/annapurna/alpine/std.alpine
===================================================================
--- head/sys/arm/annapurna/alpine/std.alpine	(revision 295884)
+++ head/sys/arm/annapurna/alpine/std.alpine	(revision 295885)
@@ -1,18 +1,16 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
 
 makeoptions	KERNVIRTADDR=0xa0200000
 options 	KERNVIRTADDR=0xa0200000
 
 makeoptions	KERNBASE=0xa0000000
 options 	KERNBASE=0xa0000000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
 files		"../annapurna/alpine/files.alpine"
Index: head/sys/arm/broadcom/bcm2835/std.bcm2836
===================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2836	(revision 295884)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2836	(revision 295885)
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
 machine 	arm armv6
 cpu		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 options 	SOC_BCM2836
 
-options 	ARM_L2_PIPT
 options 	IPI_IRQ_START=76
 
 files	"../broadcom/bcm2835/files.bcm2836"
 files	"../broadcom/bcm2835/files.bcm283x"
 
Index: head/sys/arm/conf/std.armv6
===================================================================
--- head/sys/arm/conf/std.armv6	(revision 295884)
+++ head/sys/arm/conf/std.armv6	(revision 295885)
@@ -1,43 +1,45 @@
 # Standard kernel config items for all ARMv6/v7 systems.
 #
 # $FreeBSD$
 
+options 	ARM_L2_PIPT		# Only L2 PIPT is supported
+
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
 options 	SCTP			# Stream Control Transmission Protocol
 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 options 	QUOTA			# Enable disk quotas for UFS
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	TMPFS			# Efficient memory filesystem
 options 	GEOM_PART_GPT		# GUID Partition Tables
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 
 # DTrace support
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
 makeoptions	WITH_CTF=1
Index: head/sys/arm/freescale/imx/std.imx51
===================================================================
--- head/sys/arm/freescale/imx/std.imx51	(revision 295884)
+++ head/sys/arm/freescale/imx/std.imx51	(revision 295885)
@@ -1,12 +1,11 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx5"
Index: head/sys/arm/freescale/imx/std.imx53
===================================================================
--- head/sys/arm/freescale/imx/std.imx53	(revision 295884)
+++ head/sys/arm/freescale/imx/std.imx53	(revision 295885)
@@ -1,12 +1,11 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx5"
Index: head/sys/arm/freescale/imx/std.imx6
===================================================================
--- head/sys/arm/freescale/imx/std.imx6	(revision 295884)
+++ head/sys/arm/freescale/imx/std.imx6	(revision 295885)
@@ -1,16 +1,15 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR		= 0xc2000000
 makeoptions	KERNVIRTADDR		= 0xc2000000
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx6"
 
Index: head/sys/arm/freescale/vybrid/std.vybrid
===================================================================
--- head/sys/arm/freescale/vybrid/std.vybrid	(revision 295884)
+++ head/sys/arm/freescale/vybrid/std.vybrid	(revision 295885)
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 files		"../freescale/vybrid/files.vybrid"
Index: head/sys/arm/mv/armadaxp/std.armadaxp
===================================================================
--- head/sys/arm/mv/armadaxp/std.armadaxp	(revision 295884)
+++ head/sys/arm/mv/armadaxp/std.armadaxp	(revision 295885)
@@ -1,6 +1,4 @@
 # $FreeBSD$
 
 makeoptions	KERNVIRTADDR=0xc0200000
 options		KERNVIRTADDR=0xc0200000
-
-options		ARM_L2_PIPT
Index: head/sys/arm/qemu/std.virt
===================================================================
--- head/sys/arm/qemu/std.virt	(revision 295884)
+++ head/sys/arm/qemu/std.virt	(revision 295885)
@@ -1,14 +1,13 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options 	KERNVIRTADDR		= 0xc1000000
 makeoptions	KERNVIRTADDR		= 0xc1000000
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files "../qemu/files.qemu"
 
Index: head/sys/arm/rockchip/std.rk30xx
===================================================================
--- head/sys/arm/rockchip/std.rk30xx	(revision 295884)
+++ head/sys/arm/rockchip/std.rk30xx	(revision 295885)
@@ -1,16 +1,14 @@
 # Rockchip rk30xx common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0400000
 options		KERNVIRTADDR=0xc0400000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../rockchip/files.rk30xx"
Index: head/sys/arm/samsung/exynos/std.exynos5250
===================================================================
--- head/sys/arm/samsung/exynos/std.exynos5250	(revision 295884)
+++ head/sys/arm/samsung/exynos/std.exynos5250	(revision 295885)
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../samsung/exynos/files.exynos5"
Index: head/sys/arm/samsung/exynos/std.exynos5420
===================================================================
--- head/sys/arm/samsung/exynos/std.exynos5420	(revision 295884)
+++ head/sys/arm/samsung/exynos/std.exynos5420	(revision 295885)
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../samsung/exynos/files.exynos5"
Index: head/sys/arm/ti/am335x/std.am335x
===================================================================
--- head/sys/arm/ti/am335x/std.am335x	(revision 295884)
+++ head/sys/arm/ti/am335x/std.am335x	(revision 295885)
@@ -1,11 +1,9 @@
 # AM335x generic configuration
 #$FreeBSD$
 files		"../ti/am335x/files.am335x"
 include		"../ti/std.ti"
 
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_TI_AM335X
-
-options		ARM_L2_PIPT
Index: head/sys/arm/ti/omap4/std.omap4
===================================================================
--- head/sys/arm/ti/omap4/std.omap4	(revision 295884)
+++ head/sys/arm/ti/omap4/std.omap4	(revision 295885)
@@ -1,11 +1,9 @@
 # Omap4430 generic configuration
 #$FreeBSD$
 files		"../ti/omap4/files.omap4"
 include		"../ti/std.ti"
 
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_OMAP4
-
-options		ARM_L2_PIPT
Index: head/sys/arm/xilinx/std.zynq7
===================================================================
--- head/sys/arm/xilinx/std.zynq7	(revision 295884)
+++ head/sys/arm/xilinx/std.zynq7	(revision 295885)
@@ -1,18 +1,16 @@
 #
 # std.zynq7		- Generic configuration for Xilinx Zynq-7000 PS.
 #
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 files		"../xilinx/files.zynq7"
 
 options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15