Merge remote-tracking branch 'tty/tty-next'

[karo-tx-linux.git] / drivers / tty / tty_mutex.c

diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index dfa9ec03fa8e06dfe03a6e0ae04c62a2ac774103..d8bae67a6174b65e676a887e08dd9e681c2f5693 100644 (file)
--- a/drivers/tty/tty_mutex.c
+++ b/drivers/tty/tty_mutex.c
@@ -10,7 +10,7 @@
  * Getting the big tty mutex.
  */
 
-void __lockfunc tty_lock(struct tty_struct *tty)
+void tty_lock(struct tty_struct *tty)
 {
        if (WARN(tty->magic != TTY_MAGIC, "L Bad %p\n", tty))
                return;
@@ -32,7 +32,7 @@ int tty_lock_interruptible(struct tty_struct *tty)
        return ret;
 }
 
-void __lockfunc tty_unlock(struct tty_struct *tty)
+void tty_unlock(struct tty_struct *tty)
 {
        if (WARN(tty->magic != TTY_MAGIC, "U Bad %p\n", tty))
                return;
@@ -41,13 +41,13 @@ void __lockfunc tty_unlock(struct tty_struct *tty)
 }
 EXPORT_SYMBOL(tty_unlock);
 
-void __lockfunc tty_lock_slave(struct tty_struct *tty)
+void tty_lock_slave(struct tty_struct *tty)
 {
        if (tty && tty != tty->link)
                tty_lock(tty);
 }
 
-void __lockfunc tty_unlock_slave(struct tty_struct *tty)
+void tty_unlock_slave(struct tty_struct *tty)
 {
        if (tty && tty != tty->link)
                tty_unlock(tty);