remove sem/mutex hacks needed for old klmirqd

1 files changed, 4 insertions, 9 deletions

diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index c947a046a6d7..94a62c0d4ade 100644
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -33,11 +33,11 @@
 #include <linux/spinlock.h>
 #include <linux/ftrace.h>
 
-noinline void __down(struct semaphore *sem);
+static noinline void __down(struct semaphore *sem);
 static noinline int __down_interruptible(struct semaphore *sem);
 static noinline int __down_killable(struct semaphore *sem);
 static noinline int __down_timeout(struct semaphore *sem, long jiffies);
-noinline void __up(struct semaphore *sem);
+static noinline void __up(struct semaphore *sem);
 
 /**
  * down - acquire the semaphore
@@ -190,13 +190,11 @@ EXPORT_SYMBOL(up);
 
 /* Functions for the contended case */
 
-/*
 struct semaphore_waiter {
         struct list_head list;
         struct task_struct *task;
         int up;
 };
- */
 
 /*
  * Because this function is inlined, the 'state' parameter will be
@@ -235,12 +233,10 @@ static inline int __sched __down_common(struct semaphore *sem, long state,
         return -EINTR;
 }
 
-noinline void __sched __down(struct semaphore *sem)
+static noinline void __sched __down(struct semaphore *sem)
 {
         __down_common(sem, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
 }
-EXPORT_SYMBOL(__down);
-
 
 static noinline int __sched __down_interruptible(struct semaphore *sem)
 {
@@ -257,7 +253,7 @@ static noinline int __sched __down_timeout(struct semaphore *sem, long jiffies)
         return __down_common(sem, TASK_UNINTERRUPTIBLE, jiffies);
 }
 
-noinline void __sched __up(struct semaphore *sem)
+static noinline void __sched __up(struct semaphore *sem)
 {
         struct semaphore_waiter *waiter = list_first_entry(&sem->wait_list,
                                                 struct semaphore_waiter, list);
@@ -265,4 +261,3 @@ noinline void __sched __up(struct semaphore *sem)
         waiter->up = 1;
         wake_up_process(waiter->task);
 }
-EXPORT_SYMBOL(__up);
\ No newline at end of file