Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp2144689ybf; Mon, 2 Mar 2020 02:55:40 -0800 (PST) X-Google-Smtp-Source: APXvYqyPqjsT6bN9X0cIiK5KJSKXkf5iuAkPMVW18hA80nouwmla820z2PbyY37D9R5giPOK5oST X-Received: by 2002:a9d:64d8:: with SMTP id n24mr11954406otl.71.1583146540729; Mon, 02 Mar 2020 02:55:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583146540; cv=none; d=google.com; s=arc-20160816; b=1BJQ+Nfdad9rb0Q99wEO+xmNgTXC57xADoPF1cr35lKmgVywTAA7NjQkCwJu5hadLg 748GwJQp4ZGHim+bxgkKCXbweG2ytBU950Ae83f9GUhW9VYUIP5wg1bHEoMg8EJ2wwqo 3sg1AqvdLaT19FNyUNmORkOObnzFnAHW0J4BBcYjgSLgz8VJVM1X3LipMPkUTdfwGdNA giC+eqyeSxWUbFhjVHiooc2NmSt3ZHPYVO7pAewHBPS7Gkm6iEKlO5WCfWe1+wG2N9s3 A093jyBQ6Ile7O7R5zwkhmJqDUj+sl9SsARXUI3ebGah5al9E/o5QrE5tDoIfvuWWvH2 JuAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=4uhxqt/rwaxdPvuK6U97sD9dILTWKzaUR8b9qFyS6LE=; b=FHOXXNaFWLGOIBxEluaHwjnizAdxuE+rBzKouZf1JuOCTVgVuUyt5rzu+ylNjz2FWN pZ+IFG3xVBOkhy28222kAd2lDFJ04/TolpD7Paimr4NmMDiBgrn9f39rkXIugMpGSVYw KUJB2ZJ59Gco/C6G2L0Lux1Leh+fbgvYeKhC3FFhC8XvGNLtaN8cQeUJHgXQ52sgZibM //yd+mj0RzkSq5H+AWwewN7XQL5k93Ok/jWbnxjVFLxXYCOciwKcZCF9rOWBQhCxhHX/ fwlt+p4Mpa7F+KLjJwA15WnOADu4/gocavcrw9RnOjk0aflXl8NKrJE1m27z9UFTH/dd k3yA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f18si6723079oti.289.2020.03.02.02.55.28; Mon, 02 Mar 2020 02:55:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727691AbgCBKzW (ORCPT + 99 others); Mon, 2 Mar 2020 05:55:22 -0500 Received: from sym2.noone.org ([178.63.92.236]:42044 "EHLO sym2.noone.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727305AbgCBKzV (ORCPT ); Mon, 2 Mar 2020 05:55:21 -0500 Received: by sym2.noone.org (Postfix, from userid 1002) id 48WH366PCBzvjc1; Mon, 2 Mar 2020 11:49:54 +0100 (CET) From: Tobias Klauser To: Greg Kroah-Hartman , Jiri Slaby Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/2] pty: define and set show_fdinfo only if procfs is enabled Date: Mon, 2 Mar 2020 11:49:53 +0100 Message-Id: <20200302104954.2812-1-tklauser@distanz.ch> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Follow the pattern used with other *_show_fdinfo functions and only define and use pty_show_fdinfo if CONFIG_PROC_FS is set. Signed-off-by: Tobias Klauser --- drivers/tty/pty.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 00099a8439d2..dceaff332ca5 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -756,10 +756,12 @@ static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty) } } +#ifdef CONFIG_PROC_FS static void pty_show_fdinfo(struct tty_struct *tty, struct seq_file *m) { seq_printf(m, "tty-index:\t%d\n", tty->index); } +#endif static const struct tty_operations ptm_unix98_ops = { .lookup = ptm_unix98_lookup, @@ -776,7 +778,9 @@ static const struct tty_operations ptm_unix98_ops = { .compat_ioctl = pty_unix98_compat_ioctl, .resize = pty_resize, .cleanup = pty_cleanup, +#ifdef CONFIG_PROC_FS .show_fdinfo = pty_show_fdinfo, +#endif }; static const struct tty_operations pty_unix98_ops = { -- 2.25.0