diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-08 09:43:08 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-08 09:43:08 +1100 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /include/linux/tty.h | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 3787102e4b1..a7bd3b4558d 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -57,6 +57,7 @@ struct tty_buffer { unsigned char *flag_buf_ptr; int used; int size; + int active; /* Data points here */ unsigned long data[0]; }; @@ -64,6 +65,7 @@ struct tty_buffer { struct tty_bufhead { struct work_struct work; struct semaphore pty_sem; + spinlock_t lock; struct tty_buffer *head; /* Queue head */ struct tty_buffer *tail; /* Active buffer */ struct tty_buffer *free; /* Free queue head */ |