aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-06 23:38:21 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:39 -0500
commitebe7e5fe4b41deeb2731c5b52d8c8e6ac08b1f74 (patch)
tree4fde2d9f7562776ef3b227d81a6dcd0928d9b13d
parent1f370a23f2a3101886953add4bd7f529e3bba016 (diff)
[PATCH] remove kernel/lockdep.c:lockdep_internal
Remove the no longer used lockdep_internal(). Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/lockdep.h6
-rw-r--r--kernel/lockdep.c7
2 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index da19aeb0dbe8..498bfbd3b4e1 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -193,7 +193,6 @@ extern void lockdep_free_key_range(void *start, unsigned long size);
193 193
194extern void lockdep_off(void); 194extern void lockdep_off(void);
195extern void lockdep_on(void); 195extern void lockdep_on(void);
196extern int lockdep_internal(void);
197 196
198/* 197/*
199 * These methods are used by specific locking variants (spinlocks, 198 * These methods are used by specific locking variants (spinlocks,
@@ -255,11 +254,6 @@ static inline void lockdep_on(void)
255{ 254{
256} 255}
257 256
258static inline int lockdep_internal(void)
259{
260 return 0;
261}
262
263# define lock_acquire(l, s, t, r, c, i) do { } while (0) 257# define lock_acquire(l, s, t, r, c, i) do { } while (0)
264# define lock_release(l, n, i) do { } while (0) 258# define lock_release(l, n, i) do { } while (0)
265# define lockdep_init() do { } while (0) 259# define lockdep_init() do { } while (0)
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 300d61bb314b..3926c3674354 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -140,13 +140,6 @@ void lockdep_on(void)
140 140
141EXPORT_SYMBOL(lockdep_on); 141EXPORT_SYMBOL(lockdep_on);
142 142
143int lockdep_internal(void)
144{
145 return current->lockdep_recursion != 0;
146}
147
148EXPORT_SYMBOL(lockdep_internal);
149
150/* 143/*
151 * Debugging switches: 144 * Debugging switches:
152 */ 145 */