From 1696a8bee390929fed05c6297164816ae2ced280 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Thu, 31 Oct 2013 18:18:19 +0100 Subject: [PATCH] locking: Move the rtmutex code to kernel/locking/ Suggested-by: Ingo Molnar Signed-off-by: Peter Zijlstra 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 --- kernel/Makefile | 3 --- kernel/futex.c | 2 +- kernel/locking/Makefile | 3 +++ kernel/{ => locking}/rtmutex-debug.c | 0 kernel/{ => locking}/rtmutex-debug.h | 0 kernel/{ => locking}/rtmutex-tester.c | 0 kernel/{ => locking}/rtmutex.c | 0 kernel/{ => locking}/rtmutex.h | 0 kernel/{ => locking}/rtmutex_common.h | 0 kernel/rcu/tree_plugin.h | 2 +- 10 files changed, 5 insertions(+), 5 deletions(-) rename kernel/{ => locking}/rtmutex-debug.c (100%) rename kernel/{ => locking}/rtmutex-debug.h (100%) rename kernel/{ => locking}/rtmutex-tester.c (100%) rename kernel/{ => locking}/rtmutex.c (100%) rename kernel/{ => locking}/rtmutex.h (100%) rename kernel/{ => locking}/rtmutex_common.h (100%) diff --git a/kernel/Makefile b/kernel/Makefile index 45e5ae26dc03..9c2ad1852223 100644 --- 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 index c3a1a55a5214..80ba086f021d 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -66,7 +66,7 @@ #include -#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 index 5978fddf1412..59f66dec2bf9 100644 --- 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 b/kernel/locking/rtmutex-debug.c similarity index 100% rename from kernel/rtmutex-debug.c rename to kernel/locking/rtmutex-debug.c diff --git a/kernel/rtmutex-debug.h b/kernel/locking/rtmutex-debug.h similarity index 100% rename from kernel/rtmutex-debug.h rename to kernel/locking/rtmutex-debug.h diff --git a/kernel/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c similarity index 100% rename from kernel/rtmutex-tester.c rename to kernel/locking/rtmutex-tester.c diff --git a/kernel/rtmutex.c b/kernel/locking/rtmutex.c similarity index 100% rename from kernel/rtmutex.c rename to kernel/locking/rtmutex.c diff --git a/kernel/rtmutex.h b/kernel/locking/rtmutex.h similarity index 100% rename from kernel/rtmutex.h rename to kernel/locking/rtmutex.h diff --git a/kernel/rtmutex_common.h b/kernel/locking/rtmutex_common.h similarity index 100% rename from kernel/rtmutex_common.h rename to kernel/locking/rtmutex_common.h diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 3822ac0c4b27..6abb03dff5c0 100644 --- 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 -- 2.30.2