From 01768b42dc97a67b4fb33a2535c49fc1969880df Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Thu, 31 Oct 2013 18:11:53 +0100 Subject: [PATCH] locking: Move the mutex code to kernel/locking/ Suggested-by: Ingo Molnar Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-1ditvncg30dgbpvrz2bxfmke@git.kernel.org Signed-off-by: Ingo Molnar --- kernel/Makefile | 6 ++---- kernel/locking/Makefile | 9 +++++++++ kernel/{ => locking}/mutex-debug.c | 0 kernel/{ => locking}/mutex-debug.h | 0 kernel/{ => locking}/mutex.c | 0 kernel/{ => locking}/mutex.h | 0 6 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 kernel/locking/Makefile rename kernel/{ => locking}/mutex-debug.c (100%) rename kernel/{ => locking}/mutex-debug.h (100%) rename kernel/{ => locking}/mutex.c (100%) rename kernel/{ => locking}/mutex.h (100%) diff --git a/kernel/Makefile b/kernel/Makefile index a4d1aa8da9bc..330b14666475 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -7,7 +7,7 @@ obj-y = fork.o exec_domain.o panic.o \ sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.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 mutex.o \ + kthread.o sys_ni.o posix-cpu-timers.o \ hrtimer.o rwsem.o nsproxy.o semaphore.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o groups.o lglock.o smpboot.o @@ -16,13 +16,12 @@ ifdef CONFIG_FUNCTION_TRACER # Do not trace debug files and internal ftrace files CFLAGS_REMOVE_lockdep.o = -pg CFLAGS_REMOVE_lockdep_proc.o = -pg -CFLAGS_REMOVE_mutex-debug.o = -pg -CFLAGS_REMOVE_rtmutex-debug.o = -pg CFLAGS_REMOVE_cgroup-debug.o = -pg CFLAGS_REMOVE_irq_work.o = -pg endif obj-y += sched/ +obj-y += locking/ obj-y += power/ obj-y += printk/ obj-y += cpu/ @@ -34,7 +33,6 @@ obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += time/ -obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o obj-$(CONFIG_LOCKDEP) += lockdep.o ifeq ($(CONFIG_PROC_FS),y) obj-$(CONFIG_LOCKDEP) += lockdep_proc.o diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile new file mode 100644 index 000000000000..fe8bd58b22f8 --- /dev/null +++ b/kernel/locking/Makefile @@ -0,0 +1,9 @@ + +obj-y += mutex.o + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_mutex-debug.o = -pg +CFLAGS_REMOVE_rtmutex-debug.o = -pg +endif + +obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o diff --git a/kernel/mutex-debug.c b/kernel/locking/mutex-debug.c similarity index 100% rename from kernel/mutex-debug.c rename to kernel/locking/mutex-debug.c diff --git a/kernel/mutex-debug.h b/kernel/locking/mutex-debug.h similarity index 100% rename from kernel/mutex-debug.h rename to kernel/locking/mutex-debug.h diff --git a/kernel/mutex.c b/kernel/locking/mutex.c similarity index 100% rename from kernel/mutex.c rename to kernel/locking/mutex.c diff --git a/kernel/mutex.h b/kernel/locking/mutex.h similarity index 100% rename from kernel/mutex.h rename to kernel/locking/mutex.h -- 2.34.1