summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-10-31 18:16:43 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-06 07:55:22 +0100
commite25a64c4017e3a3cda17454b040737e410a12991 (patch)
tree4193af56e05fd0c161b1e925b7191756446f42fa
parent60fc28746a7b61775ae28950ddf7a4ac15955639 (diff)
locking: Move the semaphore core 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-vmw5sf6vzmua1z6nx1cg69h2@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/Makefile2
-rw-r--r--kernel/locking/Makefile2
-rw-r--r--kernel/locking/semaphore.c (renamed from kernel/semaphore.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 4bce165dce5d..45e5ae26dc03 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y = fork.o exec_domain.o panic.o \
signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
extable.o params.o posix-timers.o \
kthread.o sys_ni.o posix-cpu-timers.o \
- hrtimer.o rwsem.o nsproxy.o semaphore.o \
+ hrtimer.o rwsem.o nsproxy.o \
notifier.o ksysfs.o cred.o reboot.o \
async.o range.o groups.o lglock.o smpboot.o
diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
index 674d2152d10f..5978fddf1412 100644
--- a/kernel/locking/Makefile
+++ b/kernel/locking/Makefile
@@ -1,5 +1,5 @@
-obj-y += mutex.o
+obj-y += mutex.o semaphore.o
ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_lockdep.o = -pg
diff --git a/kernel/semaphore.c b/kernel/locking/semaphore.c
index 6815171a4fff..6815171a4fff 100644
--- a/kernel/semaphore.c
+++ b/kernel/locking/semaphore.c