locking: Move the rtmutex 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-p9ijt8div0hwldexwfm4nlhj@git.kernel.org [ Fixed build failure in kernel/rcu/tree_plugin.h. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
mariux64 · Nov 6, 2013 · 1696a8b · 1696a8b
1 parent e25a64c
commit 1696a8b
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/kernel/Makefile b/kernel/Makefile
@@ -35,9 +35,6 @@ obj-$(CONFIG_FUTEX) += futex.o
 ifeq ($(CONFIG_COMPAT),y)
 obj-$(CONFIG_FUTEX) += futex_compat.o
 endif
-obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
-obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
-obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
 obj-$(CONFIG_SMP) += smp.o
 ifneq ($(CONFIG_SMP),y)

diff --git a/kernel/futex.c b/kernel/futex.c
@@ -66,7 +66,7 @@
 
 #include <asm/futex.h>
 
-#include "rtmutex_common.h"
+#include "locking/rtmutex_common.h"
 
 int __read_mostly futex_cmpxchg_enabled;
 

diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
@@ -15,5 +15,8 @@ obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
 endif
 obj-$(CONFIG_SMP) += spinlock.o
 obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
+obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
+obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
+obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
diff --git a/kernel/rtmutex-debug.c → kernel/locking/rtmutex-debug.c b/kernel/rtmutex-debug.c → kernel/locking/rtmutex-debug.c
diff --git a/kernel/rtmutex-debug.h → kernel/locking/rtmutex-debug.h b/kernel/rtmutex-debug.h → kernel/locking/rtmutex-debug.h
diff --git a/kernel/rtmutex-tester.c → kernel/locking/rtmutex-tester.c b/kernel/rtmutex-tester.c → kernel/locking/rtmutex-tester.c
diff --git a/kernel/rtmutex.c → kernel/locking/rtmutex.c b/kernel/rtmutex.c → kernel/locking/rtmutex.c
diff --git a/kernel/rtmutex.h → kernel/locking/rtmutex.h b/kernel/rtmutex.h → kernel/locking/rtmutex.h
diff --git a/kernel/rtmutex_common.h → kernel/locking/rtmutex_common.h b/kernel/rtmutex_common.h → kernel/locking/rtmutex_common.h
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
@@ -1133,7 +1133,7 @@ void exit_rcu(void)
 
 #ifdef CONFIG_RCU_BOOST
 
-#include "../rtmutex_common.h"
+#include "../locking/rtmutex_common.h"
 
 #ifdef CONFIG_RCU_TRACE