diff --git a/[refs] b/[refs] index 380ca27dee56..0fb93d52cbf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f370a23f2a3101886953add4bd7f529e3bba016 +refs/heads/master: ebe7e5fe4b41deeb2731c5b52d8c8e6ac08b1f74 diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h index da19aeb0dbe8..498bfbd3b4e1 100644 --- a/trunk/include/linux/lockdep.h +++ b/trunk/include/linux/lockdep.h @@ -193,7 +193,6 @@ extern void lockdep_free_key_range(void *start, unsigned long size); extern void lockdep_off(void); extern void lockdep_on(void); -extern int lockdep_internal(void); /* * These methods are used by specific locking variants (spinlocks, @@ -255,11 +254,6 @@ static inline void lockdep_on(void) { } -static inline int lockdep_internal(void) -{ - return 0; -} - # define lock_acquire(l, s, t, r, c, i) do { } while (0) # define lock_release(l, n, i) do { } while (0) # define lockdep_init() do { } while (0) diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 300d61bb314b..3926c3674354 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -140,13 +140,6 @@ void lockdep_on(void) EXPORT_SYMBOL(lockdep_on); -int lockdep_internal(void) -{ - return current->lockdep_recursion != 0; -} - -EXPORT_SYMBOL(lockdep_internal); - /* * Debugging switches: */