Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753676AbcD0J4h (ORCPT ); Wed, 27 Apr 2016 05:56:37 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:54947 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753619AbcD0J4f (ORCPT ); Wed, 27 Apr 2016 05:56:35 -0400 From: Arnd Bergmann To: Greg Kroah-Hartman , Jiri Slaby Cc: Richard Guy Briggs , Paul Moore , Arnd Bergmann , Peter Hurley , Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH] tty: provide tty_name() even without CONFIG_TTY Date: Wed, 27 Apr 2016 11:56:04 +0200 Message-Id: <1461750975-2735137-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:TUGMx0o3amZudgdiqaOR7Nrb7NosO7KSASe4faCODjsciCa7o2G 79GgrENuIn28DGa/6LpjINhLbwn8urZD3iBjWeJ92sQWlaKlBN39et6DQR0mM1PlJRjlxZg qSKUgt9k8kUis+WMr35sqOrAZmr2F5YKYinJ27+cKLCBSCJEi5XhsAjpd5vsW1OybxmoBaa swpU/l+m/sR2XYmkXMa4A== X-UI-Out-Filterresults: notjunk:1;V01:K0:cIVquYcIy+s=:/c2crbmG1p1uM6GKm3TkbR BsTzmAoq+r6Akyjr8I/xGkMJVXokYKqxO3shC4AclRZ1TMXmr7VGTlTMBze7UObgLW/ZBVAiT KAYXUdIgjQ/ZtXDDPMfAmxcIU2ATk9QMOmP9giNwFLpSubqfMEwMiA8JYOndi13KcrEolooW5 qslhTg4pigz7FAHT5rEf1RdkD5gq+Zq7fQg0Eyc74DywmCWCoDHGtfgxOn/vU1EzbvP5hh8bk Cq2IZ72+R47h2MQIHrygN/gW+k+iPtk2r/dsOnod/i2PM5yuUGy56T7C9rukHxwyEWi/BfPbV lIJazetQ76B9jdHSakIJZ3mxCPhjaGcUoGYKMaZ3P7lDxY5MfeAbRqKDPSBv0RWDl7j+qiosM 8T4qW91w/FbIz0uZ6Hupwe6329GccPBymUjFQWUTpfyzMCKSCS38xHAE+0c65YdQyIfISXdqi oc6SrDTXsBQG/pi36MuhJ54f9DxJWWPzfVM6yMBrr6y7tFxGAOWKRvIuTJer4dX7xUaYgeSR3 m/HePor0Xkk3fJbDIU7Amr17gfaDT9l4hG1fGzirX4jA8+EI/MXsvGodi1f2EQnQ80eOzXvz2 5HAE+iffkMuaR7QRBUQRKyzixXW8zHkfIeW9vxdBATlW/Ir70Xj+PSq8Iy4NfWmtNFpTof+mx qZWKujhOV3HE38PwdKA+4SlsmxbPe2p5/Y4AEPxpuYB1yFp8T7cv0FVa8U5y51v8wgXA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1749 Lines: 48 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(-) 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); -- 2.7.0