Commit-ID: cd4d241d57c99c6b00ef1799ad797d90f75a1da9 Gitweb: http://git.kernel.org/tip/cd4d241d57c99c6b00ef1799ad797d90f75a1da9 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Mon, 4 Nov 2013 11:51:33 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Wed, 6 Nov 2013 09:24:20 +0100 locking: Move the lglocks code to kernel/locking/ Suggested-by: Ingo Molnar <mingo@xxxxxxxxxx> Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Link: http://lkml.kernel.org/n/tip-amd6pg1mif6tikbyktfvby3y@xxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- kernel/Makefile | 2 +- kernel/locking/Makefile | 2 +- kernel/{ => locking}/lglock.c | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 1aef002..09a9c94 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -10,7 +10,7 @@ obj-y = fork.o exec_domain.o panic.o \ kthread.o sys_ni.o posix-cpu-timers.o \ hrtimer.o nsproxy.o \ notifier.o ksysfs.o cred.o reboot.o \ - async.o range.o groups.o lglock.o smpboot.o + async.o range.o groups.o smpboot.o ifdef CONFIG_FUNCTION_TRACER # Do not trace debug files and internal ftrace files diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile index b0e0d73..bdd313a 100644 --- a/kernel/locking/Makefile +++ b/kernel/locking/Makefile @@ -1,5 +1,5 @@ -obj-y += mutex.o semaphore.o rwsem.o +obj-y += mutex.o semaphore.o rwsem.o lglock.o ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_lockdep.o = -pg diff --git a/kernel/lglock.c b/kernel/locking/lglock.c similarity index 100% rename from kernel/lglock.c rename to kernel/locking/lglock.c -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html