diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2013-11-04 18:05:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 09:24:22 +0100 |
| commit | 32cf7c3c94623514eb882addae307212c1507239 (patch) | |
| tree | 5ad03b0ff2bc78170b5b5f982f18692a9028f794 | |
| parent | cd4d241d57c99c6b00ef1799ad797d90f75a1da9 (diff) | |
| download | linux-32cf7c3c94623514eb882addae307212c1507239.tar.gz linux-32cf7c3c94623514eb882addae307212c1507239.tar.bz2 linux-32cf7c3c94623514eb882addae307212c1507239.zip | |
locking: Move the percpu-rwsem code to kernel/locking/
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-52bjmtty46we26hbfd9sc9iy@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | kernel/locking/Makefile | 3 | ||||
| -rw-r--r-- | kernel/locking/percpu-rwsem.c (renamed from lib/percpu-rwsem.c) | 0 | ||||
| -rw-r--r-- | lib/Makefile | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile index bdd313a3411d..baab8e5e7f66 100644 --- a/kernel/locking/Makefile +++ b/kernel/locking/Makefile @@ -21,4 +21,5 @@ obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o -obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
\ No newline at end of file +obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o +obj-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o diff --git a/lib/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c index 652a8ee8efe9..652a8ee8efe9 100644 --- a/lib/percpu-rwsem.c +++ b/kernel/locking/percpu-rwsem.c diff --git a/lib/Makefile b/lib/Makefile index ca8cadc8fe4d..8d3c62936c8b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -42,7 +42,6 @@ obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o -lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o |