git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
linux
/
generic_serial.h
diff --git
a/include/linux/generic_serial.h
b/include/linux/generic_serial.h
index
c82cad4
..
652611a
100644
(file)
--- a/
include/linux/generic_serial.h
+++ b/
include/linux/generic_serial.h
@@
-12,6
+12,8
@@
#ifndef GENERIC_SERIAL_H
#define GENERIC_SERIAL_H
#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 *);
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;
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;
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;
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;
int close_delay;
struct real_driver *rd;
int wakeup_chars;