summaryrefslogtreecommitdiffstats
path: root/include/linux/tty.h
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-01-09 22:55:31 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-27 16:41:04 -0800
commit37282a77954aa2dbb339d15902290f25b868d2e8 (patch)
treec4c04eac2ad8c45f3b56f4ef4615d4aec5ec1cb9 /include/linux/tty.h
parentb50819f437c094b4beb2e8684fbe12bbe79fb331 (diff)
downloadlinux-37282a77954aa2dbb339d15902290f25b868d2e8.tar.gz
linux-37282a77954aa2dbb339d15902290f25b868d2e8.tar.bz2
linux-37282a77954aa2dbb339d15902290f25b868d2e8.zip
tty: audit: Combine push functions
tty_audit_push() and tty_audit_push_current() perform identical tasks; eliminate the tty_audit_push() implementation and the tty_audit_push_current() name. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty.h')
-rw-r--r--include/linux/tty.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 83d74dcfb3c8..dea7d54d00d4 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -597,8 +597,7 @@ extern void tty_audit_add_data(struct tty_struct *tty, const void *data,
extern void tty_audit_exit(void);
extern void tty_audit_fork(struct signal_struct *sig);
extern void tty_audit_tiocsti(struct tty_struct *tty, char ch);
-extern void tty_audit_push(void);
-extern int tty_audit_push_current(void);
+extern int tty_audit_push(void);
#else
static inline void tty_audit_add_data(struct tty_struct *tty, const void *data,
size_t size)
@@ -613,10 +612,7 @@ static inline void tty_audit_exit(void)
static inline void tty_audit_fork(struct signal_struct *sig)
{
}
-static inline void tty_audit_push(void)
-{
-}
-static inline int tty_audit_push_current(void)
+static inline int tty_audit_push(void)
{
return 0;
}