qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Scott Weaver 2023-12-12 12:42:09 -05:00
parent 45a7872f46 0d82e433d8
commit e64b78b506
21 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/kvm/Kconfig
View File

@ -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

1
arch/mips/kvm/Kconfig
View File

@ -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

1
arch/powerpc/kvm/Kconfig
View File

@ -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

1
arch/s390/kvm/Kconfig
View File

@ -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

2
arch/x86/Kconfig
View File

@ -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

1
arch/x86/kvm/Kconfig
View File

@ -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

1
drivers/clk/Kconfig
View File

@ -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

1
drivers/dax/Kconfig
View File

@ -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

1
drivers/devfreq/Kconfig
View File

@ -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.

1
drivers/hwtracing/stm/Kconfig
View File

@ -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.

1
drivers/md/Kconfig
View File

@ -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.

1
drivers/net/Kconfig
View File

@ -320,7 +320,6 @@ config NETCONSOLE_DYNAMIC
config NETPOLL
def_bool NETCONSOLE
select SRCU
config NET_POLL_CONTROLLER
def_bool NETPOLL

1
drivers/opp/Kconfig
View File

@ -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

1
fs/btrfs/Kconfig
View File

@ -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

1
fs/dlm/Kconfig
View File

@ -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.

1
fs/notify/Kconfig
View File

@ -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"

1
fs/quota/Kconfig
View File

@ -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

1
init/Kconfig
View File

@ -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.

1
kernel/power/Kconfig
View File

@ -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

1
mm/Kconfig
View File

@ -647,7 +647,6 @@ config BOUNCE
config MMU_NOTIFIER
bool
select SRCU
select INTERVAL_TREE
config KSM

1
security/tomoyo/Kconfig
View File

@ -6,7 +6,6 @@ config SECURITY_TOMOYO
select SECURITYFS
select SECURITY_PATH
select SECURITY_NETWORK
select SRCU
select BUILD_BIN2C
default n
help