aboutsummaryrefslogtreecommitdiffstats
path: root/tty
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-09-14 15:12:21 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-14 15:12:21 -0700
commit0eb78fe0413724e5f018e9cbcea471550de6111c (patch)
tree525c8db5137cf16e9b605974bf5df6b112a43463 /tty
parent6f6c2037b7b488100fff438e172b08e91ccf95d8 (diff)
downloadpatches-0eb78fe0413724e5f018e9cbcea471550de6111c.tar.gz
2.6.31-git2 resync
delete some patches as well.
Diffstat (limited to 'tty')
-rw-r--r--tty/serial-fold-closing-port20
-rw-r--r--tty/serial-move-users12
-rw-r--r--tty/serial-msr-move170
-rw-r--r--tty/tty-fix-typos.patch2
-rw-r--r--tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch2
-rw-r--r--tty/tty-port-close-fn20
-rw-r--r--tty/tty-x86-termios-clean74
7 files changed, 74 insertions, 226 deletions
diff --git a/tty/serial-fold-closing-port b/tty/serial-fold-closing-port
index 9ac78956efdd1b..128f2bb46c5c78 100644
--- a/tty/serial-fold-closing-port
+++ b/tty/serial-fold-closing-port
@@ -15,11 +15,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
3 files changed, 15 insertions(+), 17 deletions(-)
-diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
-index ea53b6f..2d63b13 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
-@@ -651,10 +651,10 @@ static int uart_get_info(struct uart_state *state,
+@@ -651,10 +651,10 @@ static int uart_get_info(struct uart_sta
tmp.flags = port->flags;
tmp.xmit_fifo_size = port->fifosize;
tmp.baud_base = port->uartclk / 16;
@@ -33,7 +31,7 @@ index ea53b6f..2d63b13 100644
tmp.custom_divisor = port->custom_divisor;
tmp.hub6 = port->hub6;
tmp.io_type = port->iotype;
-@@ -724,8 +724,8 @@ static int uart_set_info(struct uart_state *state,
+@@ -724,8 +724,8 @@ static int uart_set_info(struct uart_sta
retval = -EPERM;
if (change_irq || change_port ||
(new_serial.baud_base != port->uartclk / 16) ||
@@ -44,7 +42,7 @@ index ea53b6f..2d63b13 100644
(new_serial.xmit_fifo_size &&
new_serial.xmit_fifo_size != port->fifosize) ||
(((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
-@@ -834,8 +834,8 @@ static int uart_set_info(struct uart_state *state,
+@@ -834,8 +834,8 @@ static int uart_set_info(struct uart_sta
port->flags = (port->flags & ~UPF_CHANGE_MASK) |
(new_flags & UPF_CHANGE_MASK);
port->custom_divisor = new_serial.custom_divisor;
@@ -55,7 +53,7 @@ index ea53b6f..2d63b13 100644
if (new_serial.xmit_fifo_size)
port->fifosize = new_serial.xmit_fifo_size;
if (state->port.tty)
-@@ -1297,8 +1297,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
+@@ -1297,8 +1297,8 @@ static void uart_close(struct tty_struct
*/
tty->closing = 1;
@@ -66,7 +64,7 @@ index ea53b6f..2d63b13 100644
/*
* At this point, we stop accepting input. To do this, we
-@@ -1326,8 +1326,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
+@@ -1326,8 +1326,8 @@ static void uart_close(struct tty_struct
state->port.tty = NULL;
if (state->port.blocked_open) {
@@ -77,7 +75,7 @@ index ea53b6f..2d63b13 100644
} else if (!uart_console(port)) {
uart_change_pm(state, 3);
}
-@@ -2358,11 +2358,11 @@ int uart_register_driver(struct uart_driver *drv)
+@@ -2358,11 +2358,11 @@ int uart_register_driver(struct uart_dri
for (i = 0; i < drv->nr; i++) {
struct uart_state *state = drv->state + i;
@@ -91,8 +89,6 @@ index ea53b6f..2d63b13 100644
init_waitqueue_head(&state->delta_msr_wait);
tasklet_init(&state->tlet, uart_tasklet_action,
(unsigned long)state);
-diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
-index c154270..fd11d4d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -350,8 +350,6 @@ typedef unsigned int __bitwise__ uif_t;
@@ -104,11 +100,9 @@ index c154270..fd11d4d 100644
#define USF_CLOSING_WAIT_INF (0)
#define USF_CLOSING_WAIT_NONE (~0U)
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index b982a17..325ee10 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -204,8 +204,8 @@ struct tty_port {
+@@ -206,8 +206,8 @@ struct tty_port {
unsigned long flags; /* TTY flags ASY_*/
struct mutex mutex; /* Locking */
unsigned char *xmit_buf; /* Optional buffer */
diff --git a/tty/serial-move-users b/tty/serial-move-users
index a27697fe8f546f..ba28916fd41a53 100644
--- a/tty/serial-move-users
+++ b/tty/serial-move-users
@@ -14,11 +14,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2 files changed, 7 insertions(+), 4 deletions(-)
-diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
-index e16d153..3c45a8d 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
-@@ -52,8 +52,6 @@ static struct lock_class_key port_lock_key;
+@@ -52,8 +52,6 @@ static struct lock_class_key port_lock_k
#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
@@ -27,7 +25,7 @@ index e16d153..3c45a8d 100644
#ifdef CONFIG_SERIAL_CORE_CONSOLE
#define uart_console(port) ((port)->cons && (port)->cons->index == (port)->line)
#else
-@@ -758,7 +756,7 @@ static int uart_set_info(struct uart_state *state,
+@@ -758,7 +756,7 @@ static int uart_set_info(struct uart_sta
/*
* Make sure that we are the sole user of this port.
*/
@@ -36,7 +34,7 @@ index e16d153..3c45a8d 100644
goto exit;
/*
-@@ -974,7 +972,7 @@ static int uart_do_autoconfig(struct uart_state *state)
+@@ -974,7 +972,7 @@ static int uart_do_autoconfig(struct uar
return -ERESTARTSYS;
ret = -EBUSY;
@@ -45,11 +43,9 @@ index e16d153..3c45a8d 100644
uart_shutdown(state);
/*
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 6cd35ae..65a7549 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -465,6 +465,11 @@ extern int tty_port_close_start(struct tty_port *port,
+@@ -467,6 +467,11 @@ extern int tty_port_close_start(struct t
extern void tty_port_close_end(struct tty_port *port, struct tty_struct *tty);
extern void tty_port_close(struct tty_port *port,
struct tty_struct *tty, struct file *filp);
diff --git a/tty/serial-msr-move b/tty/serial-msr-move
index 87cef9fd586cd6..3d0ae3b8d1fd79 100644
--- a/tty/serial-msr-move
+++ b/tty/serial-msr-move
@@ -44,11 +44,9 @@ Signed-off-by: Alan Cox <alan@linux.intel.com>
32 files changed, 54 insertions(+), 54 deletions(-)
-diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
-index 73c269f..aa8e8af 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
-@@ -729,7 +729,7 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
+@@ -729,7 +729,7 @@ static void cyy_chip_modem(struct cyclad
if (mdm_change & CyRI)
info->icount.rng++;
@@ -57,7 +55,7 @@ index 73c269f..aa8e8af 100644
}
if ((mdm_change & CyDCD) && (info->port.flags & ASYNC_CHECK_CD)) {
-@@ -1197,7 +1197,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
+@@ -1197,7 +1197,7 @@ static void cyz_handle_cmd(struct cyclad
break;
}
if (delta_count)
@@ -66,7 +64,7 @@ index 73c269f..aa8e8af 100644
if (special_count)
tty_schedule_flip(tty);
tty_kref_put(tty);
-@@ -1464,7 +1464,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
+@@ -1464,7 +1464,7 @@ static void cy_shutdown(struct cyclades_
spin_lock_irqsave(&card->card_lock, flags);
/* Clear delta_msr_wait queue to avoid mem leaks. */
@@ -75,7 +73,7 @@ index 73c269f..aa8e8af 100644
if (info->port.xmit_buf) {
unsigned char *temp;
-@@ -2788,7 +2788,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
+@@ -2788,7 +2788,7 @@ cy_ioctl(struct tty_struct *tty, struct
/* note the counters on entry */
cnow = info->icount;
spin_unlock_irqrestore(&info->card->card_lock, flags);
@@ -84,7 +82,7 @@ index 73c269f..aa8e8af 100644
cy_cflags_changed(info, arg, &cnow));
break;
-@@ -3153,7 +3153,6 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
+@@ -3153,7 +3153,6 @@ static int __devinit cy_init_card(struct
info->port.close_delay = 5 * HZ / 10;
info->port.flags = STD_COM_FLAGS;
init_completion(&info->shutdown_wait);
@@ -92,11 +90,9 @@ index 73c269f..aa8e8af 100644
if (cy_is_Z(cinfo)) {
struct FIRM_ID *firm_id = cinfo->base_addr + ID_ADDRESS;
-diff --git a/drivers/char/esp.c b/drivers/char/esp.c
-index a5c59fc..b19d43c 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
-@@ -572,7 +572,7 @@ static void check_modem_status(struct esp_struct *info)
+@@ -572,7 +572,7 @@ static void check_modem_status(struct es
info->icount.dcd++;
if (status & UART_MSR_DCTS)
info->icount.cts++;
@@ -105,7 +101,7 @@ index a5c59fc..b19d43c 100644
}
if ((info->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
-@@ -927,7 +927,7 @@ static void shutdown(struct esp_struct *info)
+@@ -927,7 +927,7 @@ static void shutdown(struct esp_struct *
* clear delta_msr_wait queue to avoid mem leaks: we may free the irq
* here so the queue might never be waken up
*/
@@ -114,7 +110,7 @@ index a5c59fc..b19d43c 100644
wake_up_interruptible(&info->break_wait);
/* stop a DMA transfer on the port being closed */
-@@ -1800,7 +1800,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file *file,
+@@ -1800,7 +1800,7 @@ static int rs_ioctl(struct tty_struct *t
spin_unlock_irqrestore(&info->lock, flags);
while (1) {
/* FIXME: convert to new style wakeup */
@@ -131,8 +127,6 @@ index a5c59fc..b19d43c 100644
init_waitqueue_head(&info->break_wait);
ports = info;
printk(KERN_INFO "ttyP%d at 0x%04x (irq = %d) is an ESP ",
-diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
-index 30544ca..37058ff 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -258,7 +258,6 @@ struct mxser_port {
@@ -143,7 +137,7 @@ index 30544ca..37058ff 100644
};
struct mxser_board {
-@@ -818,7 +817,7 @@ static void mxser_check_modem_status(struct tty_struct *tty,
+@@ -818,7 +817,7 @@ static void mxser_check_modem_status(str
if (status & UART_MSR_DCTS)
port->icount.cts++;
port->mon_data.modem_status = status;
@@ -152,7 +146,7 @@ index 30544ca..37058ff 100644
if ((port->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
if (status & UART_MSR_DCD)
-@@ -973,7 +972,7 @@ static void mxser_shutdown(struct tty_struct *tty)
+@@ -973,7 +972,7 @@ static void mxser_shutdown(struct tty_st
* clear delta_msr_wait queue to avoid mem leaks: we may free the irq
* here so the queue might never be waken up
*/
@@ -161,7 +155,7 @@ index 30544ca..37058ff 100644
/*
* Free the IRQ, if necessary
-@@ -1762,7 +1761,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
+@@ -1762,7 +1761,7 @@ static int mxser_ioctl(struct tty_struct
cnow = info->icount; /* note the counters on entry */
spin_unlock_irqrestore(&info->slock, flags);
@@ -170,7 +164,7 @@ index 30544ca..37058ff 100644
mxser_cflags_changed(info, arg, &cnow));
/*
* Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-@@ -2414,7 +2413,6 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
+@@ -2414,7 +2413,6 @@ static int __devinit mxser_initbrd(struc
info->port.close_delay = 5 * HZ / 10;
info->port.closing_wait = 30 * HZ;
info->normal_termios = mxvar_sdriver->init_termios;
@@ -178,11 +172,9 @@ index 30544ca..37058ff 100644
memset(&info->mon_data, 0, sizeof(struct mxser_mon));
info->err_shadow = 0;
spin_lock_init(&info->slock);
-diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
-index e42ee4d..0293d25 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
-@@ -23,6 +23,7 @@ void tty_port_init(struct tty_port *port)
+@@ -23,6 +23,7 @@ void tty_port_init(struct tty_port *port
memset(port, 0, sizeof(*port));
init_waitqueue_head(&port->open_wait);
init_waitqueue_head(&port->close_wait);
@@ -190,7 +182,7 @@ index e42ee4d..0293d25 100644
mutex_init(&port->mutex);
spin_lock_init(&port->lock);
port->close_delay = (50 * HZ) / 100;
-@@ -124,6 +125,7 @@ void tty_port_hangup(struct tty_port *port)
+@@ -124,6 +125,7 @@ void tty_port_hangup(struct tty_port *po
port->tty = NULL;
spin_unlock_irqrestore(&port->lock, flags);
wake_up_interruptible(&port->open_wait);
@@ -198,11 +190,9 @@ index e42ee4d..0293d25 100644
tty_port_shutdown(port);
}
EXPORT_SYMBOL(tty_port_hangup);
-diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
-index e415c5e..2209620 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -1510,7 +1510,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
+@@ -1510,7 +1510,7 @@ static unsigned int check_modem_status(s
if (status & UART_MSR_DCTS)
uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
@@ -211,11 +201,9 @@ index e415c5e..2209620 100644
}
return status;
-diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
-index 3903241..429a8ae 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
-@@ -225,7 +225,7 @@ static void pl010_modem_status(struct uart_amba_port *uap)
+@@ -225,7 +225,7 @@ static void pl010_modem_status(struct ua
if (delta & UART01x_FR_CTS)
uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
@@ -224,11 +212,9 @@ index 3903241..429a8ae 100644
}
static irqreturn_t pl010_int(int irq, void *dev_id)
-diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
-index 96dd395..8784c3c 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
-@@ -226,7 +226,7 @@ static void pl011_modem_status(struct uart_amba_port *uap)
+@@ -226,7 +226,7 @@ static void pl011_modem_status(struct ua
if (delta & UART01x_FR_CTS)
uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
@@ -237,11 +223,9 @@ index 96dd395..8784c3c 100644
}
static irqreturn_t pl011_int(int irq, void *dev_id)
-diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
-index 963e3c1..3551c5c 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
-@@ -776,7 +776,7 @@ static void atmel_tasklet_func(unsigned long data)
+@@ -776,7 +776,7 @@ static void atmel_tasklet_func(unsigned
if (status_change & ATMEL_US_CTS)
uart_handle_cts_change(port, !(status & ATMEL_US_CTS));
@@ -250,11 +234,9 @@ index 963e3c1..3551c5c 100644
atmel_port->irq_status_prev = status;
}
-diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
-index 28c83b3..1bb1c6b 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
-@@ -695,7 +695,7 @@ static inline void check_modem_status(struct icom_port *icom_port)
+@@ -695,7 +695,7 @@ static inline void check_modem_status(st
delta_status & ICOM_CTS);
wake_up_interruptible(&icom_port->uart_port.state->
@@ -263,11 +245,9 @@ index 28c83b3..1bb1c6b 100644
old_status = status;
}
spin_unlock(&icom_port->uart_port.lock);
-diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
-index a8fedc5..2327c0e 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
-@@ -248,7 +248,7 @@ static void imx_mctrl_check(struct imx_port *sport)
+@@ -248,7 +248,7 @@ static void imx_mctrl_check(struct imx_p
if (changed & TIOCM_CTS)
uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
@@ -276,7 +256,7 @@ index a8fedc5..2327c0e 100644
}
/*
-@@ -412,7 +412,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id)
+@@ -412,7 +412,7 @@ static irqreturn_t imx_rtsint(int irq, v
writel(USR1_RTSD, sport->port.membase + USR1);
uart_handle_cts_change(&sport->port, !!val);
@@ -285,11 +265,9 @@ index a8fedc5..2327c0e 100644
spin_unlock_irqrestore(&sport->port.lock, flags);
return IRQ_HANDLED;
-diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
-index de4ab1b..d8983dd 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
-@@ -1287,7 +1287,7 @@ static inline int do_read(struct uart_port *the_port, char *buf, int len)
+@@ -1287,7 +1287,7 @@ static inline int do_read(struct uart_po
(port->ip_port, 0);
wake_up_interruptible
(&the_port->state->
@@ -298,7 +276,7 @@ index de4ab1b..d8983dd 100644
}
/* If we had any data to return, we
-@@ -1491,7 +1491,7 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
+@@ -1491,7 +1491,7 @@ ioc3uart_intr_one(struct ioc3_submodule
uart_handle_dcd_change(the_port,
shadow & SHADOW_DCD);
wake_up_interruptible
@@ -307,7 +285,7 @@ index de4ab1b..d8983dd 100644
} else if ((port->ip_notify & N_DDCD)
&& !(shadow & SHADOW_DCD)) {
/* Flag delta DCD/no DCD */
-@@ -1511,7 +1511,7 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
+@@ -1511,7 +1511,7 @@ ioc3uart_intr_one(struct ioc3_submodule
uart_handle_cts_change(the_port, shadow
& SHADOW_CTS);
wake_up_interruptible
@@ -316,7 +294,7 @@ index de4ab1b..d8983dd 100644
}
}
-@@ -1728,7 +1728,7 @@ static void ic3_shutdown(struct uart_port *the_port)
+@@ -1728,7 +1728,7 @@ static void ic3_shutdown(struct uart_por
return;
state = the_port->state;
@@ -325,11 +303,9 @@ index de4ab1b..d8983dd 100644
spin_lock_irqsave(&the_port->lock, port_flags);
set_notification(port, N_ALL, 0);
-diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
-index cd6af04..5ee905a 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
-@@ -1882,7 +1882,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
+@@ -1882,7 +1882,7 @@ static void handle_intr(void *arg, uint3
the_port = port->ip_port;
the_port->icount.dcd = 1;
wake_up_interruptible
@@ -338,7 +314,7 @@ index cd6af04..5ee905a 100644
} else if ((port->ip_notify & N_DDCD)
&& !(shadow & IOC4_SHADOW_DCD)) {
/* Flag delta DCD/no DCD */
-@@ -1904,7 +1904,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
+@@ -1904,7 +1904,7 @@ static void handle_intr(void *arg, uint3
the_port->icount.cts =
(shadow & IOC4_SHADOW_CTS) ? 1 : 0;
wake_up_interruptible
@@ -347,7 +323,7 @@ index cd6af04..5ee905a 100644
}
}
-@@ -2237,7 +2237,7 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
+@@ -2237,7 +2237,7 @@ static inline int do_read(struct uart_po
the_port->icount.dcd = 0;
wake_up_interruptible
(&the_port->state->
@@ -356,7 +332,7 @@ index cd6af04..5ee905a 100644
}
/* If we had any data to return, we
-@@ -2439,7 +2439,7 @@ static void ic4_shutdown(struct uart_port *the_port)
+@@ -2439,7 +2439,7 @@ static void ic4_shutdown(struct uart_por
state = the_port->state;
port->ip_port = NULL;
@@ -365,11 +341,9 @@ index cd6af04..5ee905a 100644
if (state->port.tty)
set_bit(TTY_IO_ERROR, &state->port.tty->flags);
-diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
-index 2e847de..ebff4a1 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
-@@ -354,7 +354,7 @@ static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
+@@ -354,7 +354,7 @@ static void ip22zilog_status_handle(stru
uart_handle_cts_change(&up->port,
(status & CTS));
@@ -378,11 +352,9 @@ index 2e847de..ebff4a1 100644
}
up->prev_status = status;
-diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c
-index ff18d50..b05c5aa 100644
--- a/drivers/serial/msm_serial.c
+++ b/drivers/serial/msm_serial.c
-@@ -169,7 +169,7 @@ static void handle_delta_cts(struct uart_port *port)
+@@ -169,7 +169,7 @@ static void handle_delta_cts(struct uart
{
msm_write(port, UART_CR_CMD_RESET_CTS, UART_CR);
port->icount.cts++;
@@ -391,11 +363,9 @@ index ff18d50..b05c5aa 100644
}
static irqreturn_t msm_irq(int irq, void *dev_id)
-diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
-index 0dc7868..0700cd1 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
-@@ -369,7 +369,7 @@ static void pmz_status_handle(struct uart_pmac_port *uap)
+@@ -369,7 +369,7 @@ static void pmz_status_handle(struct uar
uart_handle_cts_change(&uap->port,
!(status & CTS));
@@ -404,11 +374,9 @@ index 0dc7868..0700cd1 100644
}
if (status & BRK_ABRT)
-diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/serial/pnx8xxx_uart.c
-index 2da7476..0aa75a9 100644
--- a/drivers/serial/pnx8xxx_uart.c
+++ b/drivers/serial/pnx8xxx_uart.c
-@@ -100,7 +100,7 @@ static void pnx8xxx_mctrl_check(struct pnx8xxx_port *sport)
+@@ -100,7 +100,7 @@ static void pnx8xxx_mctrl_check(struct p
if (changed & TIOCM_CTS)
uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
@@ -417,11 +385,9 @@ index 2da7476..0aa75a9 100644
}
/*
-diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
-index ad48919..6443b7f 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
-@@ -220,7 +220,7 @@ static inline void check_modem_status(struct uart_pxa_port *up)
+@@ -220,7 +220,7 @@ static inline void check_modem_status(st
if (status & UART_MSR_DCTS)
uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
@@ -430,11 +396,9 @@ index ad48919..6443b7f 100644
}
/*
-diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
-index 61ef3ae..7f5e268 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
-@@ -117,7 +117,7 @@ static void sa1100_mctrl_check(struct sa1100_port *sport)
+@@ -117,7 +117,7 @@ static void sa1100_mctrl_check(struct sa
if (changed & TIOCM_CTS)
uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
@@ -443,11 +407,9 @@ index 61ef3ae..7f5e268 100644
}
/*
-diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
-index fa5f303..a2f2b32 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
-@@ -440,7 +440,7 @@ static void sbd_status_handle(struct sbd_port *sport)
+@@ -440,7 +440,7 @@ static void sbd_status_handle(struct sbd
if (delta & ((M_DUART_IN_PIN2_VAL | M_DUART_IN_PIN0_VAL) <<
S_DUART_IN_PIN_CHNG))
@@ -456,11 +418,9 @@ index fa5f303..a2f2b32 100644
}
static irqreturn_t sbd_interrupt(int irq, void *dev_id)
-diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
-index 9d42e57..e16d153 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
-@@ -215,7 +215,8 @@ static int uart_startup(struct uart_state *state, int init_hw)
+@@ -215,7 +215,8 @@ static int uart_startup(struct uart_stat
static void uart_shutdown(struct uart_state *state)
{
struct uart_port *uport = state->uart_port;
@@ -470,7 +430,7 @@ index 9d42e57..e16d153 100644
/*
* Set the TTY IO error marker
-@@ -223,7 +224,7 @@ static void uart_shutdown(struct uart_state *state)
+@@ -223,7 +224,7 @@ static void uart_shutdown(struct uart_st
if (tty)
set_bit(TTY_IO_ERROR, &tty->flags);
@@ -479,7 +439,7 @@ index 9d42e57..e16d153 100644
/*
* Turn off DTR and RTS early.
*/
-@@ -237,7 +238,7 @@ static void uart_shutdown(struct uart_state *state)
+@@ -237,7 +238,7 @@ static void uart_shutdown(struct uart_st
* any outstanding file descriptors should be pointing at
* hung_up_tty_fops now.
*/
@@ -488,7 +448,7 @@ index 9d42e57..e16d153 100644
/*
* Free the IRQ and disable the port.
-@@ -1004,11 +1005,15 @@ static int uart_do_autoconfig(struct uart_state *state)
+@@ -1004,11 +1005,15 @@ static int uart_do_autoconfig(struct uar
* - mask passed in arg for lines of interest
* (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
* Caller should use TIOCGICOUNT to see which one it was
@@ -504,7 +464,7 @@ index 9d42e57..e16d153 100644
DECLARE_WAITQUEUE(wait, current);
struct uart_icount cprev, cnow;
int ret;
-@@ -1025,7 +1030,7 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
+@@ -1025,7 +1030,7 @@ uart_wait_modem_status(struct uart_state
uport->ops->enable_ms(uport);
spin_unlock_irq(&uport->lock);
@@ -513,7 +473,7 @@ index 9d42e57..e16d153 100644
for (;;) {
spin_lock_irq(&uport->lock);
memcpy(&cnow, &uport->icount, sizeof(struct uart_icount));
-@@ -1053,7 +1058,7 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
+@@ -1053,7 +1058,7 @@ uart_wait_modem_status(struct uart_state
}
current->state = TASK_RUNNING;
@@ -522,7 +482,7 @@ index 9d42e57..e16d153 100644
return ret;
}
-@@ -1430,7 +1435,7 @@ static void uart_hangup(struct tty_struct *tty)
+@@ -1430,7 +1435,7 @@ static void uart_hangup(struct tty_struc
clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
port->tty = NULL;
wake_up_interruptible(&port->open_wait);
@@ -531,7 +491,7 @@ index 9d42e57..e16d153 100644
}
mutex_unlock(&port->mutex);
}
-@@ -2378,7 +2383,6 @@ int uart_register_driver(struct uart_driver *drv)
+@@ -2378,7 +2383,6 @@ int uart_register_driver(struct uart_dri
tty_port_init(port);
port->close_delay = 500; /* .5 seconds */
port->closing_wait = 30000; /* 30 seconds */
@@ -539,11 +499,9 @@ index 9d42e57..e16d153 100644
tasklet_init(&state->tlet, uart_tasklet_action,
(unsigned long)state);
}
-diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c
-index 9d3034b..e572b32 100644
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
-@@ -262,7 +262,7 @@ static irqreturn_t ks8695uart_modem_status(int irq, void *dev_id)
+@@ -262,7 +262,7 @@ static irqreturn_t ks8695uart_modem_stat
if (status & URMS_URTERI)
port->icount.rng++;
@@ -552,11 +510,9 @@ index 9d3034b..e572b32 100644
return IRQ_HANDLED;
}
-diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
-index 057fc5e..ea74470 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
-@@ -241,7 +241,7 @@ static void lh7a40xuart_modem_status (struct uart_port* port)
+@@ -241,7 +241,7 @@ static void lh7a40xuart_modem_status (st
if (delta & CTS)
uart_handle_cts_change (port, status & CTS);
@@ -565,11 +521,9 @@ index 057fc5e..ea74470 100644
}
static irqreturn_t lh7a40xuart_int (int irq, void* dev_id)
-diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
-index 7c4f2fe..d1ad341 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
-@@ -297,7 +297,7 @@ static void check_status(struct uart_sunsab_port *up,
+@@ -297,7 +297,7 @@ static void check_status(struct uart_sun
up->port.icount.dsr++;
}
@@ -578,11 +532,9 @@ index 7c4f2fe..d1ad341 100644
}
static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
-diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
-index 5a32365..68d262b 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
-@@ -441,7 +441,7 @@ static void check_modem_status(struct uart_sunsu_port *up)
+@@ -441,7 +441,7 @@ static void check_modem_status(struct ua
if (status & UART_MSR_DCTS)
uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
@@ -591,11 +543,9 @@ index 5a32365..68d262b 100644
}
static irqreturn_t sunsu_serial_interrupt(int irq, void *dev_id)
-diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
-index 055034d..ef693ae 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
-@@ -451,7 +451,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,
+@@ -451,7 +451,7 @@ static void sunzilog_status_handle(struc
uart_handle_cts_change(&up->port,
(status & CTS));
@@ -604,11 +554,9 @@ index 055034d..ef693ae 100644
}
up->prev_status = status;
-diff --git a/drivers/serial/timbuart.c b/drivers/serial/timbuart.c
-index 3d40be6..34b31da 100644
--- a/drivers/serial/timbuart.c
+++ b/drivers/serial/timbuart.c
-@@ -231,7 +231,7 @@ static void timbuart_mctrl_check(struct uart_port *port, u32 isr, u32 *ier)
+@@ -231,7 +231,7 @@ static void timbuart_mctrl_check(struct
iowrite32(CTS_DELTA, port->membase + TIMBUART_ISR);
cts = timbuart_get_mctrl(port);
uart_handle_cts_change(port, cts & TIOCM_CTS);
@@ -617,11 +565,9 @@ index 3d40be6..34b31da 100644
}
*ier |= CTS_DELTA;
-diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
-index cf4410e..3beb6ab 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
-@@ -386,7 +386,7 @@ static inline void check_modem_status(struct uart_port *port)
+@@ -386,7 +386,7 @@ static inline void check_modem_status(st
if (msr & UART_MSR_DCTS)
uart_handle_cts_change(port, msr & UART_MSR_CTS);
@@ -630,11 +576,9 @@ index cf4410e..3beb6ab 100644
}
static inline void transmit_chars(struct uart_port *port)
-diff --git a/drivers/serial/zs.c b/drivers/serial/zs.c
-index b9c9fb9..1a7fd3e 100644
--- a/drivers/serial/zs.c
+++ b/drivers/serial/zs.c
-@@ -686,7 +686,7 @@ static void zs_status_handle(struct zs_port *zport, struct zs_port *zport_a)
+@@ -686,7 +686,7 @@ static void zs_status_handle(struct zs_p
uport->icount.rng++;
if (delta)
@@ -643,8 +587,6 @@ index b9c9fb9..1a7fd3e 100644
spin_lock(&scc->zlock);
}
-diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
-index bbebef7..a5049ea 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -578,7 +578,6 @@ struct cyclades_port {
@@ -655,8 +597,6 @@ index bbebef7..a5049ea 100644
int throttle;
};
-diff --git a/include/linux/hayesesp.h b/include/linux/hayesesp.h
-index 940aeb5..92b08cf 100644
--- a/include/linux/hayesesp.h
+++ b/include/linux/hayesesp.h
@@ -96,7 +96,6 @@ struct esp_struct {
@@ -667,8 +607,6 @@ index 940aeb5..92b08cf 100644
wait_queue_head_t break_wait;
struct async_icount icount; /* kernel counters for the 4 input interrupts */
struct hayes_esp_config config; /* port configuration */
-diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
-index 27767ea..bcafecd 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -349,7 +349,6 @@ struct uart_state {
@@ -679,11 +617,9 @@ index 27767ea..bcafecd 100644
struct uart_port *uart_port;
};
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 325ee10..6cd35ae 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -201,6 +201,7 @@ struct tty_port {
+@@ -203,6 +203,7 @@ struct tty_port {
int count; /* Usage count */
wait_queue_head_t open_wait; /* Open waiters */
wait_queue_head_t close_wait; /* Close waiters */
diff --git a/tty/tty-fix-typos.patch b/tty/tty-fix-typos.patch
index 7ad16e38884f20..c14b146de3594c 100644
--- a/tty/tty-fix-typos.patch
+++ b/tty/tty-fix-typos.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
- test_and_clear_bit(ASYNC_INITIALIZED, &port->flags))
+ test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
port->ops->shutdown(port);
-
+
}
@@ -311,7 +311,7 @@ int tty_port_close_start(struct tty_port
port->ops->drop(port);
diff --git a/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch b/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
index a5e079672e3d3d..aa6acaadf39d39 100644
--- a/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
+++ b/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
@@ -254,7 +254,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* semaphore.
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -538,5 +538,8 @@ extern void console_print(const char *);
+@@ -540,5 +540,8 @@ extern void console_print(const char *);
extern int vt_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg);
diff --git a/tty/tty-port-close-fn b/tty/tty-port-close-fn
index b31645149de3e8..dca38b2b57e265 100644
--- a/tty/tty-port-close-fn
+++ b/tty/tty-port-close-fn
@@ -19,11 +19,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2 files changed, 34 insertions(+), 3 deletions(-)
-diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
-index 9769b11..e42ee4d 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
-@@ -96,6 +96,14 @@ void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
+@@ -96,6 +96,14 @@ void tty_port_tty_set(struct tty_port *p
}
EXPORT_SYMBOL(tty_port_tty_set);
@@ -32,13 +30,13 @@ index 9769b11..e42ee4d 100644
+ if (port->ops->shutdown &&
+ test_and_clear_bit(ASYNC_INITIALIZED, &port->flags))
+ port->ops->shutdown(port);
-+
++
+}
+
/**
* tty_port_hangup - hangup helper
* @port: tty port
-@@ -116,6 +124,7 @@ void tty_port_hangup(struct tty_port *port)
+@@ -116,6 +124,7 @@ void tty_port_hangup(struct tty_port *po
port->tty = NULL;
spin_unlock_irqrestore(&port->lock, flags);
wake_up_interruptible(&port->open_wait);
@@ -46,7 +44,7 @@ index 9769b11..e42ee4d 100644
}
EXPORT_SYMBOL(tty_port_hangup);
-@@ -296,15 +305,17 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
+@@ -296,15 +305,17 @@ int tty_port_close_start(struct tty_port
if (port->count) {
spin_unlock_irqrestore(&port->lock, flags);
@@ -66,7 +64,7 @@ index 9769b11..e42ee4d 100644
port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
tty_wait_until_sent(tty, port->closing_wait);
if (port->drain_delay) {
-@@ -318,6 +329,9 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
+@@ -318,6 +329,9 @@ int tty_port_close_start(struct tty_port
timeout = 2 * HZ;
schedule_timeout_interruptible(timeout);
}
@@ -76,7 +74,7 @@ index 9769b11..e42ee4d 100644
return 1;
}
EXPORT_SYMBOL(tty_port_close_start);
-@@ -348,3 +362,14 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)
+@@ -348,3 +362,14 @@ void tty_port_close_end(struct tty_port
spin_unlock_irqrestore(&port->lock, flags);
}
EXPORT_SYMBOL(tty_port_close_end);
@@ -91,11 +89,9 @@ index 9769b11..e42ee4d 100644
+ tty_port_tty_set(port, NULL);
+}
+EXPORT_SYMBOL(tty_port_close);
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index e8c6c91..b982a17 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -185,7 +185,12 @@ struct tty_port;
+@@ -187,7 +187,12 @@ struct tty_port;
struct tty_port_operations {
/* Return 1 if the carrier is raised */
int (*carrier_raised)(struct tty_port *port);
@@ -108,7 +104,7 @@ index e8c6c91..b982a17 100644
};
struct tty_port {
-@@ -457,7 +462,8 @@ extern int tty_port_block_til_ready(struct tty_port *port,
+@@ -459,7 +464,8 @@ extern int tty_port_block_til_ready(stru
extern int tty_port_close_start(struct tty_port *port,
struct tty_struct *tty, struct file *filp);
extern void tty_port_close_end(struct tty_port *port, struct tty_struct *tty);
diff --git a/tty/tty-x86-termios-clean b/tty/tty-x86-termios-clean
deleted file mode 100644
index 67edf51d84b5ef..00000000000000
--- a/tty/tty-x86-termios-clean
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Jaswinder Singh Rajput <jaswinder@kernel.org>
-Subject: x86: asm/termios.h remove irrelevant comment for userspace
-
-From: Jaswinder Singh Rajput <jaswinder@kernel.org>
-
-following comment is irrelevant at usr/include/asm/termios.h :
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-Also fixed some alignment and space issues.
-
-Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
-Signed-off-by: Alan Cox <alan@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
-
- arch/x86/include/asm/termios.h | 25 ++++++++++++-------------
- 1 files changed, 12 insertions(+), 13 deletions(-)
-
-
-diff --git a/arch/x86/include/asm/termios.h b/arch/x86/include/asm/termios.h
-index c4ee805..ee6f0c8 100644
---- a/arch/x86/include/asm/termios.h
-+++ b/arch/x86/include/asm/termios.h
-@@ -5,20 +5,20 @@
- #include <asm/ioctls.h>
-
- struct winsize {
-- unsigned short ws_row;
-- unsigned short ws_col;
-- unsigned short ws_xpixel;
-- unsigned short ws_ypixel;
-+ unsigned short ws_row;
-+ unsigned short ws_col;
-+ unsigned short ws_xpixel;
-+ unsigned short ws_ypixel;
- };
-
- #define NCC 8
- struct termio {
-- unsigned short c_iflag; /* input mode flags */
-- unsigned short c_oflag; /* output mode flags */
-- unsigned short c_cflag; /* control mode flags */
-- unsigned short c_lflag; /* local mode flags */
-- unsigned char c_line; /* line discipline */
-- unsigned char c_cc[NCC]; /* control characters */
-+ unsigned short c_iflag; /* input mode flags */
-+ unsigned short c_oflag; /* output mode flags */
-+ unsigned short c_cflag; /* control mode flags */
-+ unsigned short c_lflag; /* local mode flags */
-+ unsigned char c_line; /* line discipline */
-+ unsigned char c_cc[NCC]; /* control characters */
- };
-
- /* modem lines */
-@@ -37,10 +37,10 @@ struct termio {
- #define TIOCM_OUT2 0x4000
- #define TIOCM_LOOP 0x8000
-
--/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
--
- #ifdef __KERNEL__
-
-+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-+
- #include <asm/uaccess.h>
-
- /* intr=^C quit=^\ erase=del kill=^U
-@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
- }
-
- #endif /* __KERNEL__ */
--
- #endif /* _ASM_X86_TERMIOS_H */
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:00:08 +0000