Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753612AbcD0VSr (ORCPT ); Wed, 27 Apr 2016 17:18:47 -0400 Received: from mail-qg0-f48.google.com ([209.85.192.48]:35211 "EHLO mail-qg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752654AbcD0VSp (ORCPT ); Wed, 27 Apr 2016 17:18:45 -0400 From: Paul Moore To: Arnd Bergmann Cc: Greg Kroah-Hartman , Jiri Slaby , Richard Guy Briggs , Peter Hurley , Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: Re: [PATCH] tty: provide tty_name() even without CONFIG_TTY Date: Wed, 27 Apr 2016 17:18:43 -0400 Message-ID: <9390347.RmVTbbrBHm@sifl> User-Agent: KMail/4.14.10 (Linux/4.4.5-gentoo; KDE/4.14.18; x86_64; ; ) In-Reply-To: <1461750975-2735137-1-git-send-email-arnd@arndb.de> References: <1461750975-2735137-1-git-send-email-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1965 Lines: 53 On Wednesday, April 27, 2016 11:56:04 AM Arnd Bergmann wrote: > The audit subsystem just started printing the name of the tty, > but that causes a build failure when CONFIG_TTY is disabled: > > kernel/built-in.o: In function `audit_log_task_info': > memremap.c:(.text+0x5e34c): undefined reference to `tty_name' > kernel/built-in.o: In function `audit_set_loginuid': > memremap.c:(.text+0x63b34): undefined reference to `tty_name' > > This adds tty_name() to the list of functions that are provided > as trivial stubs in that configuration. > > Signed-off-by: Arnd Bergmann > Fixes: db0a6fb5d97a ("audit: add tty field to LOGIN event") > --- > include/linux/tty.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to the audit#next branch, thanks! > diff --git a/include/linux/tty.h b/include/linux/tty.h > index 3b09f235db66..17b247c94440 100644 > --- a/include/linux/tty.h > +++ b/include/linux/tty.h > @@ -371,6 +371,7 @@ extern void proc_clear_tty(struct task_struct *p); > extern struct tty_struct *get_current_tty(void); > /* tty_io.c */ > extern int __init tty_init(void); > +extern const char *tty_name(const struct tty_struct *tty); > #else > static inline void console_init(void) > { } > @@ -391,6 +392,8 @@ static inline struct tty_struct *get_current_tty(void) > /* tty_io.c */ > static inline int __init tty_init(void) > { return 0; } > +static inline const char *tty_name(const struct tty_struct *tty) > +{ return "(none)"; } > #endif > > extern struct ktermios tty_std_termios; > @@ -415,7 +418,6 @@ static inline struct tty_struct *tty_kref_get(struct > tty_struct *tty) return tty; > } > > -extern const char *tty_name(const struct tty_struct *tty); > extern const char *tty_driver_name(const struct tty_struct *tty); > extern void tty_wait_until_sent(struct tty_struct *tty, long timeout); > extern int __tty_check_change(struct tty_struct *tty, int sig); -- paul moore www.paul-moore.com