diff options
author | Oleg Nesterov <oleg@redhat.com> | 2015-08-11 11:26:29 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2015-08-15 07:52:11 -0400 |
commit | bf3eac84c42da7017610abc8cfba64921ea92c76 (patch) | |
tree | c044f252a7340910f2cb7ae18d79bc599568bd5a | |
parent | 55cc156505f2e43fa45dbd4bfe8f9c9d848ca44c (diff) |
percpu-rwsem: kill CONFIG_PERCPU_RWSEM
Remove CONFIG_PERCPU_RWSEM, the next patch adds the unconditional
user of percpu_rw_semaphore.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-rw-r--r-- | arch/Kconfig | 1 | ||||
-rw-r--r-- | init/Kconfig | 1 | ||||
-rw-r--r-- | kernel/locking/Makefile | 3 | ||||
-rw-r--r-- | lib/Kconfig | 3 |
4 files changed, 1 insertions, 7 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 8a8ea7110de8..8f3638674e05 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -87,7 +87,6 @@ config KPROBES_ON_FTRACE | |||
87 | 87 | ||
88 | config UPROBES | 88 | config UPROBES |
89 | def_bool n | 89 | def_bool n |
90 | select PERCPU_RWSEM | ||
91 | help | 90 | help |
92 | Uprobes is the user-space counterpart to kprobes: they | 91 | Uprobes is the user-space counterpart to kprobes: they |
93 | enable instrumentation applications (such as 'perf probe') | 92 | enable instrumentation applications (such as 'perf probe') |
diff --git a/init/Kconfig b/init/Kconfig index af09b4fb43d2..288c0122c2a5 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -925,7 +925,6 @@ config NUMA_BALANCING_DEFAULT_ENABLED | |||
925 | menuconfig CGROUPS | 925 | menuconfig CGROUPS |
926 | bool "Control Group support" | 926 | bool "Control Group support" |
927 | select KERNFS | 927 | select KERNFS |
928 | select PERCPU_RWSEM | ||
929 | help | 928 | help |
930 | This option adds support for grouping sets of processes together, for | 929 | This option adds support for grouping sets of processes together, for |
931 | use with process control subsystems such as Cpusets, CFS, memory | 930 | use with process control subsystems such as Cpusets, CFS, memory |
diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile index 7dd5c9918e4c..4c6a97e1a849 100644 --- a/kernel/locking/Makefile +++ b/kernel/locking/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | obj-y += mutex.o semaphore.o rwsem.o | 2 | obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o |
3 | 3 | ||
4 | ifdef CONFIG_FUNCTION_TRACER | 4 | ifdef CONFIG_FUNCTION_TRACER |
5 | CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE) | 5 | CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE) |
@@ -25,6 +25,5 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o | |||
25 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o | 25 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o |
26 | obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o | 26 | obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o |
27 | obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o | 27 | obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o |
28 | obj-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o | ||
29 | obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o | 28 | obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o |
30 | obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o | 29 | obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o |
diff --git a/lib/Kconfig b/lib/Kconfig index 3a2ef67db6c7..f6aa03dc1576 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
@@ -53,9 +53,6 @@ config GENERIC_IO | |||
53 | config STMP_DEVICE | 53 | config STMP_DEVICE |
54 | bool | 54 | bool |
55 | 55 | ||
56 | config PERCPU_RWSEM | ||
57 | bool | ||
58 | |||
59 | config ARCH_USE_CMPXCHG_LOCKREF | 56 | config ARCH_USE_CMPXCHG_LOCKREF |
60 | bool | 57 | bool |
61 | 58 | ||