diff --git a/sys/arm/arm/platform.c b/sys/arm/arm/platform.c index 7703be63f11f..0b9aea802b80 100644 --- a/sys/arm/arm/platform.c +++ b/sys/arm/arm/platform.c @@ -218,7 +218,7 @@ platform_delay(int usec, void *arg __unused) } #endif -#if defined(SMP) && defined(PLATFORM_SMP) +#if defined(SMP) void platform_mp_setmaxid(void) { diff --git a/sys/arm/conf/ALPINE b/sys/arm/conf/ALPINE index 259fc5290e6d..bb64740b56f9 100644 --- a/sys/arm/conf/ALPINE +++ b/sys/arm/conf/ALPINE @@ -28,7 +28,6 @@ makeoptions WERROR="-Werror" options SCHED_4BSD # 4BSD scheduler options SMP # Enable multiple cores options PLATFORM -options PLATFORM_SMP # Interrupt controller device gic diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common index 2f176afcdb8e..5bfc9c792265 100644 --- a/sys/arm/conf/EXYNOS5.common +++ b/sys/arm/conf/EXYNOS5.common @@ -23,7 +23,6 @@ makeoptions WERROR="-Werror" include "std.armv6" options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC -options PLATFORM_SMP options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index e9dd817c7b75..667046cb94dd 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -62,7 +62,6 @@ options SOC_OMAP4 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM -options PLATFORM_SMP options MULTIDELAY options LINUX_BOOT_ABI diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 5d09edcc3cda..0f35fffa5b2c 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -30,7 +30,6 @@ options SCHED_ULE # ULE scheduler #options NFSD # Network Filesystem Server options INCLUDE_CONFIG_FILE # Include this file in kernel options PLATFORM -options PLATFORM_SMP options SMP # Enable multiple cores options MULTIDELAY diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index 2a0170d71abd..05ea2af69962 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -34,7 +34,6 @@ makeoptions MODULES_EXTRA=dtb/omap4 options SCHED_ULE # ULE scheduler options PLATFORM -options PLATFORM_SMP options SMP # Enable multiple cores # NFS root from boopt/dhcp diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188 index 15b98cfbef86..e88551b93d3a 100644 --- a/sys/arm/conf/RK3188 +++ b/sys/arm/conf/RK3188 @@ -28,7 +28,6 @@ options SOC_ROCKCHIP_RK3188 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM -options PLATFORM_SMP options MULTIDELAY # Root mount from MMC/SD card diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2 index 0c92e17859a6..5cd0fdae448b 100644 --- a/sys/arm/conf/RPI2 +++ b/sys/arm/conf/RPI2 @@ -31,7 +31,6 @@ options INTRNG options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM -options PLATFORM_SMP options MULTIDELAY # NFS root from boopt/dhcp diff --git a/sys/arm/conf/SOCFPGA b/sys/arm/conf/SOCFPGA index a4c8654b1386..f1497f7e5598 100644 --- a/sys/arm/conf/SOCFPGA +++ b/sys/arm/conf/SOCFPGA @@ -28,7 +28,6 @@ makeoptions WERROR="-Werror" options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC -options PLATFORM_SMP options SMP # Enable multiple cores options MULTIDELAY diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124 index eb60b2a2a6cf..bdfac00c1d42 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -25,7 +25,6 @@ ident TEGRA124 options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC -options PLATFORM_SMP options MULTIDELAY options SMP # Enable multiple cores options LINUX_BOOT_ABI diff --git a/sys/arm/conf/VIRT b/sys/arm/conf/VIRT index ad266c7ceff3..f2622b5d1b1e 100644 --- a/sys/arm/conf/VIRT +++ b/sys/arm/conf/VIRT @@ -25,7 +25,6 @@ include "../qemu/std.virt" options SCHED_ULE # ULE scheduler options PLATFORM -options PLATFORM_SMP options SMP # Enable multiple cores options MULTIDELAY diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index c743a69c1ccc..4085aa8d1370 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -28,7 +28,6 @@ makeoptions MODULES_EXTRA="dtb/zynq" options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC -options PLATFORM_SMP #options NFSSD # Network Filesystem Server options SMP # Enable multiple cores diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 6668ccf9e504..b38f01b22d36 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -38,7 +38,6 @@ MULTIDELAY opt_global.h NKPT2PG opt_pmap.h PHYSADDR opt_global.h PLATFORM opt_global.h -PLATFORM_SMP opt_global.h SOCDEV_PA opt_global.h SOCDEV_VA opt_global.h PV_STATS opt_pmap.h