locking/rtmutex: Remove rtmutex deadlock tester leftovers

[linux-2.6-microblaze.git] / include / linux / rtmutex.h

diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index 6fd615a..48b334b 100644 (file)
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -32,10 +32,7 @@ struct rt_mutex {
        struct rb_root_cached   waiters;
        struct task_struct      *owner;
 #ifdef CONFIG_DEBUG_RT_MUTEXES
-       int                     save_state;
-       const char              *name, *file;
-       int                     line;
-       void                    *magic;
+       const char              *name;
 #endif
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
        struct lockdep_map      dep_map;
@@ -60,7 +57,7 @@ struct hrtimer_sleeper;
 
 #ifdef CONFIG_DEBUG_RT_MUTEXES
 # define __DEBUG_RT_MUTEX_INITIALIZER(mutexname) \
-       , .name = #mutexname, .file = __FILE__, .line = __LINE__
+       , .name = #mutexname
 
 # define rt_mutex_init(mutex) \
 do { \
@@ -115,9 +112,6 @@ extern void rt_mutex_lock(struct rt_mutex *lock);
 #endif
 
 extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
-extern int rt_mutex_timed_lock(struct rt_mutex *lock,
-                              struct hrtimer_sleeper *timeout);
-
 extern int rt_mutex_trylock(struct rt_mutex *lock);
 
 extern void rt_mutex_unlock(struct rt_mutex *lock);