From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
linux-kernel@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH 06/12] tty: Remove __lockfunc annotation from tty lock functions
Date: Fri, 27 Nov 2015 21:25:51 -0500 [thread overview]
Message-ID: <1448677557-16420-7-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1448677557-16420-1-git-send-email-peter@hurleysoftware.com>
The tty lock/unlock code does not belong in the special lockfunc section
which is treated specially by stack backtraces.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/tty_ldisc.c | 16 +++++++---------
drivers/tty/tty_mutex.c | 8 ++++----
include/linux/tty.h | 8 ++++----
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 9b3c11a..8a960fd 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -314,13 +314,13 @@ void tty_ldisc_deref(struct tty_ldisc *ld)
EXPORT_SYMBOL_GPL(tty_ldisc_deref);
-static inline int __lockfunc
+static inline int
__tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
{
return ldsem_down_write(&tty->ldisc_sem, timeout);
}
-static inline int __lockfunc
+static inline int
__tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)
{
return ldsem_down_write_nested(&tty->ldisc_sem,
@@ -332,8 +332,7 @@ static inline void __tty_ldisc_unlock(struct tty_struct *tty)
ldsem_up_write(&tty->ldisc_sem);
}
-static int __lockfunc
-tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
+static int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
{
int ret;
@@ -350,7 +349,7 @@ static void tty_ldisc_unlock(struct tty_struct *tty)
__tty_ldisc_unlock(tty);
}
-static int __lockfunc
+static int
tty_ldisc_lock_pair_timeout(struct tty_struct *tty, struct tty_struct *tty2,
unsigned long timeout)
{
@@ -386,14 +385,13 @@ tty_ldisc_lock_pair_timeout(struct tty_struct *tty, struct tty_struct *tty2,
return 0;
}
-static void __lockfunc
-tty_ldisc_lock_pair(struct tty_struct *tty, struct tty_struct *tty2)
+static void tty_ldisc_lock_pair(struct tty_struct *tty, struct tty_struct *tty2)
{
tty_ldisc_lock_pair_timeout(tty, tty2, MAX_SCHEDULE_TIMEOUT);
}
-static void __lockfunc tty_ldisc_unlock_pair(struct tty_struct *tty,
- struct tty_struct *tty2)
+static void tty_ldisc_unlock_pair(struct tty_struct *tty,
+ struct tty_struct *tty2)
{
__tty_ldisc_unlock(tty);
if (tty2)
diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index 77703a3..79dac6f 100644
--- 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;
@@ -19,7 +19,7 @@ void __lockfunc tty_lock(struct tty_struct *tty)
}
EXPORT_SYMBOL(tty_lock);
-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;
@@ -28,13 +28,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);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index f8915f0..c3ea90a 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -644,10 +644,10 @@ extern long vt_compat_ioctl(struct tty_struct *tty,
/* tty_mutex.c */
/* functions for preparation of BKL removal */
-extern void __lockfunc tty_lock(struct tty_struct *tty);
-extern void __lockfunc tty_unlock(struct tty_struct *tty);
-extern void __lockfunc tty_lock_slave(struct tty_struct *tty);
-extern void __lockfunc tty_unlock_slave(struct tty_struct *tty);
+extern void tty_lock(struct tty_struct *tty);
+extern void tty_unlock(struct tty_struct *tty);
+extern void tty_lock_slave(struct tty_struct *tty);
+extern void tty_unlock_slave(struct tty_struct *tty);
extern void tty_set_lock_subclass(struct tty_struct *tty);
#ifdef CONFIG_PROC_FS
--
2.6.3
next prev parent reply other threads:[~2015-11-28 2:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-28 2:25 [PATCH 00/12] Rework tty_reopen() Peter Hurley
2015-11-28 2:25 ` [PATCH 01/12] tty: Fix ldisc leak in failed tty_init_dev() Peter Hurley
2015-11-28 2:25 ` [PATCH 02/12] tty: Remove !tty check from free_tty_struct() Peter Hurley
2015-11-28 2:25 ` [PATCH 03/12] tty: Fix tty_init_termios() declaration Peter Hurley
2015-11-28 2:25 ` [PATCH 04/12] tty: Re-declare tty_driver_remove_tty() file scope Peter Hurley
2015-11-28 2:25 ` [PATCH 05/12] pty: Remove pty_unix98_shutdown() Peter Hurley
2015-11-28 2:25 ` Peter Hurley [this message]
2015-11-28 2:25 ` [PATCH 07/12] tty: Wait interruptibly for tty lock on reopen Peter Hurley
2015-11-28 2:25 ` [PATCH 08/12] pty: Prepare to redefine tty driver remove() interface Peter Hurley
2015-11-28 2:25 ` [PATCH 09/12] tty: Re-define " Peter Hurley
2015-11-28 2:25 ` [PATCH 10/12] tty: Consolidate noctty checks in tty_open() Peter Hurley
2015-11-28 2:25 ` [PATCH 11/12] tty: Refactor tty_open() Peter Hurley
2015-11-28 2:25 ` [PATCH 12/12] tty: Retry failed reopen if tty teardown in-progress Peter Hurley
2015-12-16 15:43 ` [PATCH 00/12] Rework tty_reopen() Peter Hurley
2015-12-17 5:53 ` Pratyush Anand
2015-12-17 7:15 ` Greg Kroah-Hartman
2016-01-10 5:13 ` [PATCH v2 00/10] " Peter Hurley
2016-01-10 5:13 ` [PATCH v2 01/10] tty: Wait interruptibly for tty lock on reopen Peter Hurley
2016-01-10 5:13 ` [PATCH v2 02/10] tty: Retry failed reopen if tty teardown in-progress Peter Hurley
2016-01-10 5:13 ` [PATCH v2 03/10] tty: Fix ldisc leak in failed tty_init_dev() Peter Hurley
2016-01-10 5:13 ` [PATCH v2 04/10] tty: Remove !tty check from free_tty_struct() Peter Hurley
2016-01-10 5:13 ` [PATCH v2 05/10] tty: Fix tty_init_termios() declaration Peter Hurley
2016-01-19 9:17 ` Johan Hovold
2016-01-10 5:13 ` [PATCH v2 06/10] tty: Re-declare tty_driver_remove_tty() file scope Peter Hurley
2016-01-10 5:13 ` [PATCH v2 07/10] pty: Remove pty_unix98_shutdown() Peter Hurley
2016-01-10 5:13 ` [PATCH v2 08/10] tty: Remove __lockfunc annotation from tty lock functions Peter Hurley
2016-01-10 5:13 ` [PATCH v2 09/10] tty: Consolidate noctty checks in tty_open() Peter Hurley
2016-03-26 17:58 ` Richard Weinberger
2016-03-26 19:06 ` Peter Hurley
2016-03-26 19:14 ` Richard Weinberger
2016-01-10 5:13 ` [PATCH v2 10/10] tty: Refactor tty_open() Peter Hurley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448677557-16420-7-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox