linux-kernel - [tip:core/locking] locking: Move the lockdep code to kernel/ locking/

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 6 Nov 2013 03:19:52 -0800
From:	tip-bot for Peter Zijlstra <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	peterz@...radead.org, tglx@...utronix.de
Subject: [tip:core/locking] locking: Move the lockdep code to kernel/
 locking/

Commit-ID:  8eddac3f103736163f49255bcb109edadea167f6
Gitweb:     http://git.kernel.org/tip/8eddac3f103736163f49255bcb109edadea167f6
Author:     Peter Zijlstra <peterz@...radead.org>
AuthorDate: Thu, 31 Oct 2013 18:14:17 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 6 Nov 2013 07:55:08 +0100

locking: Move the lockdep code to kernel/locking/

Suggested-by: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/n/tip-wl7s3tta5isufzfguc23et06@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@...nel.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/