remove sem/mutex hacks needed for old klmirqd

2 files changed, 0 insertions, 19 deletions

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index cb47debbf24d..a940fe435aca 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -126,15 +126,6 @@ static inline int mutex_is_locked(struct mutex *lock)
         return atomic_read(&lock->count) != 1;
 }
 
-/* return non-zero to abort.  only pre-side-effects may abort */
-typedef int (*side_effect_t)(unsigned long);
-extern void mutex_lock_sfx(struct mutex *lock,
-                                                   side_effect_t pre, unsigned long pre_arg,
-                                                   side_effect_t post, unsigned long post_arg);
-extern void mutex_unlock_sfx(struct mutex *lock,
-                                                         side_effect_t pre, unsigned long pre_arg,
-                                                         side_effect_t post, unsigned long post_arg);
-
 /*
  * See kernel/mutex.c for detailed documentation of these APIs.
  * Also see Documentation/mutex-design.txt.
@@ -162,7 +153,6 @@ extern void mutex_lock(struct mutex *lock);
 extern int __must_check mutex_lock_interruptible(struct mutex *lock);
 extern int __must_check mutex_lock_killable(struct mutex *lock);
 
-
 # define mutex_lock_nested(lock, subclass) mutex_lock(lock)
 # define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
 # define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock)
diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
index c83fc2b65f01..39fa04966aa8 100644
--- a/include/linux/semaphore.h
+++ b/include/linux/semaphore.h
@@ -43,13 +43,4 @@ extern int __must_check down_trylock(struct semaphore *sem);
 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
 extern void up(struct semaphore *sem);
 
-extern void __down(struct semaphore *sem);
-extern void __up(struct semaphore *sem);
-
-struct semaphore_waiter {
-        struct list_head list;
-        struct task_struct *task;
-        int up;
-};
-
 #endif /* __LINUX_SEMAPHORE_H */