From: tip-bot for Peter Zijlstra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, tglx@linutronix.de
Subject: [tip:core/locking] locking: Move the lockdep code to kernel/ locking/
Date: Wed, 6 Nov 2013 03:19:52 -0800 [thread overview]
Message-ID: <tip-wl7s3tta5isufzfguc23et06@git.kernel.org> (raw)
Commit-ID: 8eddac3f103736163f49255bcb109edadea167f6
Gitweb: http://git.kernel.org/tip/8eddac3f103736163f49255bcb109edadea167f6
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Thu, 31 Oct 2013 18:14:17 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 6 Nov 2013 07:55:08 +0100
locking: Move the lockdep 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-wl7s3tta5isufzfguc23et06@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/Makefile | 6 ------
kernel/locking/Makefile | 6 ++++++
kernel/{ => locking}/lockdep.c | 0
kernel/{ => locking}/lockdep_internals.h | 0
kernel/{ => locking}/lockdep_proc.c | 0
kernel/{ => locking}/lockdep_states.h | 0
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index 330b146..4fffd6ee 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -14,8 +14,6 @@ obj-y = fork.o exec_domain.o panic.o \
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_cgroup-debug.o = -pg
CFLAGS_REMOVE_irq_work.o = -pg
endif
@@ -33,10 +31,6 @@ obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
-obj-$(CONFIG_LOCKDEP) += lockdep.o
-ifeq ($(CONFIG_PROC_FS),y)
-obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
-endif
obj-$(CONFIG_FUTEX) += futex.o
ifeq ($(CONFIG_COMPAT),y)
obj-$(CONFIG_FUTEX) += futex_compat.o
diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
index fe8bd58..c103599 100644
--- a/kernel/locking/Makefile
+++ b/kernel/locking/Makefile
@@ -2,8 +2,14 @@
obj-y += mutex.o
ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_lockdep.o = -pg
+CFLAGS_REMOVE_lockdep_proc.o = -pg
CFLAGS_REMOVE_mutex-debug.o = -pg
CFLAGS_REMOVE_rtmutex-debug.o = -pg
endif
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
+obj-$(CONFIG_LOCKDEP) += lockdep.o
+ifeq ($(CONFIG_PROC_FS),y)
+obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
+endif
diff --git a/kernel/lockdep.c b/kernel/locking/lockdep.c
similarity index 100%
rename from kernel/lockdep.c
rename to kernel/locking/lockdep.c
diff --git a/kernel/lockdep_internals.h b/kernel/locking/lockdep_internals.h
similarity index 100%
rename from kernel/lockdep_internals.h
rename to kernel/locking/lockdep_internals.h
diff --git a/kernel/lockdep_proc.c b/kernel/locking/lockdep_proc.c
similarity index 100%
rename from kernel/lockdep_proc.c
rename to kernel/locking/lockdep_proc.c
diff --git a/kernel/lockdep_states.h b/kernel/locking/lockdep_states.h
similarity index 100%
rename from kernel/lockdep_states.h
rename to kernel/locking/lockdep_states.h
reply other threads:[~2013-11-06 11:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-wl7s3tta5isufzfguc23et06@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.