diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-10-18 16:26:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 19:53:21 -0400 |
| commit | 2fc20661e3171d45e8e58a61eb5c6b7d8d614fde (patch) | |
| tree | 7e598268df316dcb637c18d5ec49b30744f1c0a6 /include/linux | |
| parent | 57c941212d203979720081198ebda41f51812635 (diff) | |
TTY: move TTY_FLUSH* flags to tty_port
They are only TTY buffers specific. And the buffers will go to
tty_port in the next patches. So to remove the need to have both
tty_port and tty_struct at some places, let us move the flags to
tty_port.
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 08787ece3fdc..b4b3c568d242 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -197,6 +197,9 @@ struct tty_port { | |||
| 197 | wait_queue_head_t close_wait; /* Close waiters */ | 197 | wait_queue_head_t close_wait; /* Close waiters */ |
| 198 | wait_queue_head_t delta_msr_wait; /* Modem status change */ | 198 | wait_queue_head_t delta_msr_wait; /* Modem status change */ |
| 199 | unsigned long flags; /* TTY flags ASY_*/ | 199 | unsigned long flags; /* TTY flags ASY_*/ |
| 200 | unsigned long iflags; /* TTYP_ internal flags */ | ||
| 201 | #define TTYP_FLUSHING 1 /* Flushing to ldisc in progress */ | ||
| 202 | #define TTYP_FLUSHPENDING 2 /* Queued buffer flush pending */ | ||
| 200 | unsigned char console:1; /* port is a console */ | 203 | unsigned char console:1; /* port is a console */ |
| 201 | struct mutex mutex; /* Locking */ | 204 | struct mutex mutex; /* Locking */ |
| 202 | struct mutex buf_mutex; /* Buffer alloc lock */ | 205 | struct mutex buf_mutex; /* Buffer alloc lock */ |
| @@ -309,8 +312,6 @@ struct tty_file_private { | |||
| 309 | #define TTY_PTY_LOCK 16 /* pty private */ | 312 | #define TTY_PTY_LOCK 16 /* pty private */ |
| 310 | #define TTY_NO_WRITE_SPLIT 17 /* Preserve write boundaries to driver */ | 313 | #define TTY_NO_WRITE_SPLIT 17 /* Preserve write boundaries to driver */ |
| 311 | #define TTY_HUPPED 18 /* Post driver->hangup() */ | 314 | #define TTY_HUPPED 18 /* Post driver->hangup() */ |
| 312 | #define TTY_FLUSHING 19 /* Flushing to ldisc in progress */ | ||
| 313 | #define TTY_FLUSHPENDING 20 /* Queued buffer flush pending */ | ||
| 314 | #define TTY_HUPPING 21 /* ->hangup() in progress */ | 315 | #define TTY_HUPPING 21 /* ->hangup() in progress */ |
| 315 | 316 | ||
| 316 | #define TTY_WRITE_FLUSH(tty) tty_write_flush((tty)) | 317 | #define TTY_WRITE_FLUSH(tty) tty_write_flush((tty)) |
