diff options
-rw-r--r-- | kernel/Makefile | 3 | ||||
-rw-r--r-- | kernel/locking/Makefile | 4 | ||||
-rw-r--r-- | kernel/locking/spinlock.c (renamed from kernel/spinlock.c) | 0 | ||||
-rw-r--r-- | kernel/locking/spinlock_debug.c (renamed from lib/spinlock_debug.c) | 0 | ||||
-rw-r--r-- | lib/Makefile | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 4fffd6ee42c1..4bce165dce5d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -43,9 +43,6 @@ obj-$(CONFIG_SMP) += smp.o | |||
43 | ifneq ($(CONFIG_SMP),y) | 43 | ifneq ($(CONFIG_SMP),y) |
44 | obj-y += up.o | 44 | obj-y += up.o |
45 | endif | 45 | endif |
46 | obj-$(CONFIG_SMP) += spinlock.o | ||
47 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o | ||
48 | obj-$(CONFIG_PROVE_LOCKING) += spinlock.o | ||
49 | obj-$(CONFIG_UID16) += uid16.o | 46 | obj-$(CONFIG_UID16) += uid16.o |
50 | obj-$(CONFIG_MODULES) += module.o | 47 | obj-$(CONFIG_MODULES) += module.o |
51 | obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o modsign_certificate.o | 48 | obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o modsign_certificate.o |
diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile index c103599fc1ba..674d2152d10f 100644 --- a/kernel/locking/Makefile +++ b/kernel/locking/Makefile | |||
@@ -13,3 +13,7 @@ obj-$(CONFIG_LOCKDEP) += lockdep.o | |||
13 | ifeq ($(CONFIG_PROC_FS),y) | 13 | ifeq ($(CONFIG_PROC_FS),y) |
14 | obj-$(CONFIG_LOCKDEP) += lockdep_proc.o | 14 | obj-$(CONFIG_LOCKDEP) += lockdep_proc.o |
15 | endif | 15 | endif |
16 | obj-$(CONFIG_SMP) += spinlock.o | ||
17 | obj-$(CONFIG_PROVE_LOCKING) += spinlock.o | ||
18 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o | ||
19 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o | ||
diff --git a/kernel/spinlock.c b/kernel/locking/spinlock.c index 4b082b5cac9e..4b082b5cac9e 100644 --- a/kernel/spinlock.c +++ b/kernel/locking/spinlock.c | |||
diff --git a/lib/spinlock_debug.c b/kernel/locking/spinlock_debug.c index 0374a596cffa..0374a596cffa 100644 --- a/lib/spinlock_debug.c +++ b/kernel/locking/spinlock_debug.c | |||
diff --git a/lib/Makefile b/lib/Makefile index f3bb2cb98adf..bee27e1d3431 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
@@ -42,7 +42,6 @@ obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o | |||
42 | obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o | 42 | obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o |
43 | obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o | 43 | obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o |
44 | obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o | 44 | obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o |
45 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o | ||
46 | lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o | 45 | lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o |
47 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o | 46 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o |
48 | lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o | 47 | lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o |