summaryrefslogtreecommitdiff
path: root/include/linux/generic_serial.h
diff options
context:
space:
mode:
authorPatrick vd Lageweg <patrick@bitwizard.nl>2005-03-28 04:05:36 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-28 04:05:36 -0800
commit9f1820994478d08cebc58b3cb56394d75a1cba1a (patch)
tree19d0e660821dd0db42361be0dd3b602a4e66d9ff /include/linux/generic_serial.h
parent831dd35e92e0d56dad76820cad62eafaaef16f49 (diff)
[PATCH] generic-serial cli() conversion
This patch converts all save_flags/restore_flags to the new spin_lock_irqsave/spin_unlock_irqrestore calls, as well as some other 2.6.X cleanups. This prepares the way for the "io8+", "sx" and "rio" drivers to become SMP safe. Patches for those drivers follow. Signed-off-by: Patrick vd Lageweg <patrick@bitwizard.nl> Signed-off-by: Rogier Wolff <R.E.Wolff@BitWizard.nl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/generic_serial.h')
-rw-r--r--include/linux/generic_serial.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index 326b2b9ea233..0abe9d9a0069 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -34,7 +34,7 @@ struct gs_port {
int xmit_head;
int xmit_tail;
int xmit_cnt;
- /* struct semaphore port_write_sem; */
+ struct semaphore port_write_sem;
int flags;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
@@ -49,6 +49,7 @@ struct gs_port {
int baud_base;
int baud;
int custom_divisor;
+ spinlock_t driver_lock;
};
@@ -70,6 +71,7 @@ struct gs_port {
#define GS_DEBUG_STUFF 0x00000008
#define GS_DEBUG_CLOSE 0x00000010
#define GS_DEBUG_FLOW 0x00000020
+#define GS_DEBUG_WRITE 0x00000040
void gs_put_char(struct tty_struct *tty, unsigned char ch);