diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-10-18 16:26:37 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 19:50:54 -0400 |
| commit | 6c633f27ccf783e9a782b84e34aeaeb7949a3359 (patch) | |
| tree | 66180a876a5ff6c7d81672b725288ff4c83f80d9 /include/linux | |
| parent | 3383427a7b325e50af03d6f42b9587ca66d941a6 (diff) | |
TTY: audit, stop accessing tty->icount
This is a private member of n_tty. Stop accessing it. Instead, take is
as an argument.
This is needed to allow clean switch of the private members to a
separate private structure of n_tty.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tty.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index f0b4eb47297c..f02712da5d85 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -535,7 +535,7 @@ extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops); | |||
| 535 | /* tty_audit.c */ | 535 | /* tty_audit.c */ |
| 536 | #ifdef CONFIG_AUDIT | 536 | #ifdef CONFIG_AUDIT |
| 537 | extern void tty_audit_add_data(struct tty_struct *tty, unsigned char *data, | 537 | extern void tty_audit_add_data(struct tty_struct *tty, unsigned char *data, |
| 538 | size_t size); | 538 | size_t size, unsigned icanon); |
| 539 | extern void tty_audit_exit(void); | 539 | extern void tty_audit_exit(void); |
| 540 | extern void tty_audit_fork(struct signal_struct *sig); | 540 | extern void tty_audit_fork(struct signal_struct *sig); |
| 541 | extern void tty_audit_tiocsti(struct tty_struct *tty, char ch); | 541 | extern void tty_audit_tiocsti(struct tty_struct *tty, char ch); |
| @@ -544,7 +544,7 @@ extern int tty_audit_push_task(struct task_struct *tsk, | |||
| 544 | kuid_t loginuid, u32 sessionid); | 544 | kuid_t loginuid, u32 sessionid); |
| 545 | #else | 545 | #else |
| 546 | static inline void tty_audit_add_data(struct tty_struct *tty, | 546 | static inline void tty_audit_add_data(struct tty_struct *tty, |
| 547 | unsigned char *data, size_t size) | 547 | unsigned char *data, size_t size, unsigned icanon) |
| 548 | { | 548 | { |
| 549 | } | 549 | } |
| 550 | static inline void tty_audit_tiocsti(struct tty_struct *tty, char ch) | 550 | static inline void tty_audit_tiocsti(struct tty_struct *tty, char ch) |
