lircs
diff --git a/‎kernel/Makefile‎
Lines changed: 2 additions & 4 deletions b/‎kernel/Makefile‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎kernel/locking/Makefile‎
Lines changed: 9 additions & 0 deletions b/‎kernel/locking/Makefile‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎kernel/mutex-debug.c‎ ‎kernel/locking/mutex-debug.c‎kernel/mutex-debug.c renamed to kernel/locking/mutex-debug.c b/‎kernel/mutex-debug.c‎ ‎kernel/locking/mutex-debug.c‎kernel/mutex-debug.c renamed to kernel/locking/mutex-debug.c
diff --git a/‎kernel/mutex-debug.h‎ ‎kernel/locking/mutex-debug.h‎kernel/mutex-debug.h renamed to kernel/locking/mutex-debug.h b/‎kernel/mutex-debug.h‎ ‎kernel/locking/mutex-debug.h‎kernel/mutex-debug.h renamed to kernel/locking/mutex-debug.h
diff --git a/‎kernel/mutex.c‎ ‎kernel/locking/mutex.c‎kernel/mutex.c renamed to kernel/locking/mutex.c b/‎kernel/mutex.c‎ ‎kernel/locking/mutex.c‎kernel/mutex.c renamed to kernel/locking/mutex.c
diff --git a/‎kernel/mutex.h‎ ‎kernel/locking/mutex.h‎kernel/mutex.h renamed to kernel/locking/mutex.h b/‎kernel/mutex.h‎ ‎kernel/locking/mutex.h‎kernel/mutex.h renamed to kernel/locking/mutex.h
@@ -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
 
@@ -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