Date: Tue, 4 Jul 2017 16:52:55 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320647 - in head/sys: arm/arm arm/conf conf Message-ID: <201707041652.v64Gqtfg007302@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Tue Jul 4 16:52:55 2017 New Revision: 320647 URL: https://svnweb.freebsd.org/changeset/base/320647 Log: Remove PLATFORM_SMP. It's unneeded as all configs with both PLATFORM and SMP use it so we can switch to the combination of these as the check. Modified: head/sys/arm/arm/platform.c head/sys/arm/conf/ALPINE head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/GENERIC head/sys/arm/conf/IMX6 head/sys/arm/conf/PANDABOARD head/sys/arm/conf/RK3188 head/sys/arm/conf/RPI2 head/sys/arm/conf/SOCFPGA head/sys/arm/conf/TEGRA124 head/sys/arm/conf/VIRT head/sys/arm/conf/ZEDBOARD head/sys/conf/options.arm Modified: head/sys/arm/arm/platform.c ============================================================================== --- head/sys/arm/arm/platform.c Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/arm/platform.c Tue Jul 4 16:52:55 2017 (r320647) @@ -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) { Modified: head/sys/arm/conf/ALPINE ============================================================================== --- head/sys/arm/conf/ALPINE Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/ALPINE Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/EXYNOS5.common ============================================================================== --- head/sys/arm/conf/EXYNOS5.common Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/EXYNOS5.common Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/GENERIC ============================================================================== --- head/sys/arm/conf/GENERIC Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/GENERIC Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/IMX6 ============================================================================== --- head/sys/arm/conf/IMX6 Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/IMX6 Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/PANDABOARD ============================================================================== --- head/sys/arm/conf/PANDABOARD Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/PANDABOARD Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/RK3188 ============================================================================== --- head/sys/arm/conf/RK3188 Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/RK3188 Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/RPI2 ============================================================================== --- head/sys/arm/conf/RPI2 Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/RPI2 Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/SOCFPGA ============================================================================== --- head/sys/arm/conf/SOCFPGA Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/SOCFPGA Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/TEGRA124 ============================================================================== --- head/sys/arm/conf/TEGRA124 Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/TEGRA124 Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/VIRT ============================================================================== --- head/sys/arm/conf/VIRT Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/VIRT Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/arm/conf/ZEDBOARD ============================================================================== --- head/sys/arm/conf/ZEDBOARD Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/arm/conf/ZEDBOARD Tue Jul 4 16:52:55 2017 (r320647) @@ -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 Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Tue Jul 4 15:53:54 2017 (r320646) +++ head/sys/conf/options.arm Tue Jul 4 16:52:55 2017 (r320647) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707041652.v64Gqtfg007302>