Merge: Cleanup SRCU remnants from Kconfig files

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3450 ``` Upstream recently removed the Sleepable Read-Copy Update's (SRCU) kernel configuration option ('CONFIG_SRCU'): merge commit 5dfb75e842e0 Merge tag 'rcu.6.4.april5.20233 v6.4-rc1 commit e035e8876e6c "rcu: Remove CONFIG_SRCU"). merge commit 8cc01d43f882 Merge tag 'rcu.2023.02.10a' v6.3-rc1 This removal was back-ported to RHEL: [RHEL9.4] Backport upstream RCU commits up to v6.4 with additional fixes https://issues.redhat.com/browse/RHEL-5228 rcu: Backport upstream RCU commits up to v6.4 https://gitlab.com/.../centos-stream-9/-/merge_requests/3099 However, after the removal, some remnants were left scattered in various 'Kconfig' files. These should be innocuous no-ops, but it's best to clean things up. -v2 Re-based patch series due to GitLab reporting a conflict with MR 3289. Patch 02 of 17 was modified to account for the conflict which was with pre-context content. JIRA: https://issues.redhat.com/browse/RHEL-18042 Depends: N/A Signed-off-by: Myron Stowe <mstowe@redhat.com> ``` Approved-by: Dean Nelson <dnelson@redhat.com> Approved-by: Waiman Long <longman@redhat.com> Approved-by: Alexander Aring <aahringo@redhat.com> Approved-by: Gavin Shan <gshan@redhat.com> Approved-by: Phil Sutter <psutter@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Scott Weaver <scweaver@redhat.com>
2023-12-12 12:42:09 -05:00 · 2023-12-12 12:42:09 -05:00 · e64b78b506
parent 45a7872f46 0d82e433d8
commit e64b78b506
21 changed files with 0 additions and 22 deletions
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@ -28,7 +28,6 @@ menuconfig KVM
 	select KVM_MMIO
 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 	select KVM_XFER_TO_GUEST_WORK
-	select SRCU
 	select KVM_VFIO
 	select HAVE_KVM_EVENTFD
 	select HAVE_KVM_IRQFD
--- a/arch/mips/kvm/Kconfig
+++ b/arch/mips/kvm/Kconfig
@ -26,7 +26,6 @@ config KVM
 	select HAVE_KVM_VCPU_ASYNC_IOCTL
 	select KVM_MMIO
 	select KVM_GENERIC_MMU_NOTIFIER
-	select SRCU
 	select INTERVAL_TREE
 	select KVM_GENERIC_HARDWARE_ENABLING
 	help
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@ -22,7 +22,6 @@ config KVM
 	select PREEMPT_NOTIFIERS
 	select HAVE_KVM_EVENTFD
 	select HAVE_KVM_VCPU_ASYNC_IOCTL
-	select SRCU
 	select KVM_VFIO
 	select IRQ_BYPASS_MANAGER
 	select HAVE_KVM_IRQ_BYPASS
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@ -31,7 +31,6 @@ config KVM
 	select HAVE_KVM_IRQ_ROUTING
 	select HAVE_KVM_INVALID_WAKEUPS
 	select HAVE_KVM_NO_POLL
-	select SRCU
 	select KVM_VFIO
 	select INTERVAL_TREE
 	select MMU_NOTIFIER
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@ -278,7 +278,6 @@ config X86
 	select RTC_LIB
 	select RTC_MC146818_LIB
 	select SPARSE_IRQ
-	select SRCU
 	select SYSCTL_EXCEPTION_TRACE
 	select THREAD_INFO_IN_TASK
 	select TRACE_IRQFLAGS_SUPPORT
@ -1928,7 +1927,6 @@ config X86_SGX
 	depends on X86_64 && CPU_SUP_INTEL
 	depends on CRYPTO=y
 	depends on CRYPTO_SHA256=y
-	select SRCU
 	select MMU_NOTIFIER
 	select NUMA_KEEP_MEMINFO if NUMA
 	select XARRAY_MULTI
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@ -46,7 +46,6 @@ config KVM
 	select KVM_XFER_TO_GUEST_WORK
 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 	select KVM_VFIO
-	select SRCU
 	select INTERVAL_TREE
 	select HAVE_KVM_PM_NOTIFIER if PM
 	select KVM_GENERIC_HARDWARE_ENABLING
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@ -23,7 +23,6 @@ menuconfig COMMON_CLK
 	depends on !HAVE_LEGACY_CLK
 	select HAVE_CLK_PREPARE
 	select HAVE_CLK
-	select SRCU
 	select RATIONAL
 	help
 	  The common clock framework is a single definition of struct
--- a/drivers/dax/Kconfig
+++ b/drivers/dax/Kconfig
@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menuconfig DAX
 	tristate "DAX: direct access to differentiated memory"
-	select SRCU
 	default m if NVDIMM_DAX

 if DAX
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menuconfig PM_DEVFREQ
 	bool "Generic Dynamic Voltage and Frequency Scaling (DVFS) support"
-	select SRCU
 	select PM_OPP
 	help
 	  A device may have a list of frequencies and voltages available.
--- a/drivers/hwtracing/stm/Kconfig
+++ b/drivers/hwtracing/stm/Kconfig
@ -2,7 +2,6 @@
 config STM
 	tristate "System Trace Module devices"
 	select CONFIGFS_FS
-	select SRCU
 	help
 	  A System Trace Module (STM) is a device exporting data in System
 	  Trace Protocol (STP) format as defined by MIPI STP standards.
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@ -6,7 +6,6 @@
 menuconfig MD
 	bool "Multiple devices driver support (RAID and LVM)"
 	depends on BLOCK
-	select SRCU
 	help
 	  Support multiple physical spindles through a single logical device.
 	  Required for RAID and logical volume management.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@ -320,7 +320,6 @@ config NETCONSOLE_DYNAMIC

 config NETPOLL
 	def_bool NETCONSOLE
-	select SRCU

 config NET_POLL_CONTROLLER
 	def_bool NETPOLL
--- a/drivers/opp/Kconfig
+++ b/drivers/opp/Kconfig
@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config PM_OPP
 	bool
-	select SRCU
 	help
 	  SOCs have a standard set of tuples consisting of frequency and
 	  voltage pairs that the device will support per voltage domain. This
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@ -17,7 +17,6 @@ config BTRFS_FS
 	select FS_IOMAP
 	select RAID6_PQ
 	select XOR_BLOCKS
-	select SRCU
 	depends on !PPC_256K_PAGES	# powerpc
 	depends on !PAGE_SIZE_256KB	# hexagon

--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@ -4,7 +4,6 @@ menuconfig DLM
 	depends on INET
 	depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n)
 	select IP_SCTP
-	select SRCU
 	help
 	A general purpose distributed lock manager for kernel or userspace
 	applications.
--- a/fs/notify/Kconfig
+++ b/fs/notify/Kconfig
@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config FSNOTIFY
 	def_bool n
-	select SRCU

 source "fs/notify/dnotify/Kconfig"
 source "fs/notify/inotify/Kconfig"
--- a/fs/quota/Kconfig
+++ b/fs/quota/Kconfig
@ -6,7 +6,6 @@
 config QUOTA
 	bool "Quota support"
 	select QUOTACTL
-	select SRCU
 	help
 	  If you say Y here, you will be able to set per user limits for disk
 	  usage (also called disk quotas). Currently, it works for the
--- a/init/Kconfig
+++ b/init/Kconfig
@ -1789,7 +1789,6 @@ config PERF_EVENTS
 	default y if PROFILING
 	depends on HAVE_PERF_EVENTS
 	select IRQ_WORK
-	select SRCU
 	help
 	  Enable kernel support for various performance events provided
 	  by software and hardware.
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@ -118,7 +118,6 @@ config PM_SLEEP
 	def_bool y
 	depends on SUSPEND || HIBERNATE_CALLBACKS
 	select PM
-	select SRCU

 config PM_SLEEP_SMP
 	def_bool y
--- a/mm/Kconfig
+++ b/mm/Kconfig
@ -647,7 +647,6 @@ config BOUNCE

 config MMU_NOTIFIER
 	bool
-	select SRCU
 	select INTERVAL_TREE

 config KSM
--- a/security/tomoyo/Kconfig
+++ b/security/tomoyo/Kconfig
@ -6,7 +6,6 @@ config SECURITY_TOMOYO
 	select SECURITYFS
 	select SECURITY_PATH
 	select SECURITY_NETWORK
-	select SRCU
 	select BUILD_BIN2C
 	default n
 	help