Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1696a8be authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking: Move the rtmutex code to kernel/locking/ 



Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent e25a64c4

kernel/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -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)

kernel/futex.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 


#include <asm/futex.h>



#include "rtmutex_common.h"

#include "locking/rtmutex_common.h"



int __read_mostly futex_cmpxchg_enabled;

kernel/locking/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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

kernel/rtmutex-debug.c→kernel/locking/rtmutex-debug.c

+0 −0

File moved.

View file

kernel/rtmutex-debug.h→kernel/locking/rtmutex-debug.h

+0 −0

File moved.

View file