From: Tobias Klauser <tklauser@distanz.ch>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] tty: define and set show_fdinfo only if procfs is enabled
Date: Mon, 2 Mar 2020 11:49:54 +0100 [thread overview]
Message-ID: <20200302104954.2812-2-tklauser@distanz.ch> (raw)
In-Reply-To: <20200302104954.2812-1-tklauser@distanz.ch>
Follow the pattern used with other *_show_fdinfo functions and only
define and use tty_show_fdinfo if CONFIG_PROC_FS is set.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
drivers/tty/tty_io.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index a1453fe10862..4a6b6116aa72 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -467,6 +467,7 @@ static int hung_up_tty_fasync(int fd, struct file *file, int on)
return -ENOTTY;
}
+#ifdef CONFIG_PROC_FS
static void tty_show_fdinfo(struct seq_file *m, struct file *file)
{
struct tty_struct *tty = file_tty(file);
@@ -474,6 +475,7 @@ static void tty_show_fdinfo(struct seq_file *m, struct file *file)
if (tty && tty->ops && tty->ops->show_fdinfo)
tty->ops->show_fdinfo(tty, m);
}
+#endif
static const struct file_operations tty_fops = {
.llseek = no_llseek,
@@ -485,7 +487,9 @@ static const struct file_operations tty_fops = {
.open = tty_open,
.release = tty_release,
.fasync = tty_fasync,
+#ifdef CONFIG_PROC_FS
.show_fdinfo = tty_show_fdinfo,
+#endif
};
static const struct file_operations console_fops = {
--
2.25.0
next prev parent reply other threads:[~2020-03-02 10:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 10:49 [PATCH 1/2] pty: " Tobias Klauser
2020-03-02 10:49 ` Tobias Klauser [this message]
2020-03-02 10:52 ` [PATCH 2/2] tty: " Greg Kroah-Hartman
2020-03-02 10:51 ` [PATCH 1/2] pty: " Greg Kroah-Hartman
2020-03-02 13:37 ` Tobias Klauser
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=20200302104954.2812-2-tklauser@distanz.ch \
--to=tklauser@distanz.ch \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--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
all inboxes | Powered by JetHome®