X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fgeneric_serial.h;h=652611a4bdcd1ea05aa0bcd6e6a2d9d1a2a39da7;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=c82cad4bd19f47753847d73df2d25741a20d1b90;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index c82cad4bd..652611a4b 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -12,6 +12,8 @@
 #ifndef GENERIC_SERIAL_H
 #define GENERIC_SERIAL_H
 
+#include <linux/mutex.h>
+
 struct real_driver {
   void                    (*disable_tx_interrupts) (void *);
   void                    (*enable_tx_interrupts) (void *);
@@ -34,7 +36,7 @@ struct gs_port {
   int                     xmit_head;
   int                     xmit_tail;
   int                     xmit_cnt;
-  struct semaphore        port_write_sem;
+  struct mutex            port_write_mutex;
   int                     flags;
   wait_queue_head_t       open_wait;
   wait_queue_head_t       close_wait;
@@ -42,7 +44,7 @@ struct gs_port {
   int                     blocked_open;
   struct tty_struct       *tty;
   unsigned long           event;
-  unsigned int            closing_wait;
+  unsigned short          closing_wait;
   int                     close_delay;
   struct real_driver      *rd;
   int                     wakeup_chars;