Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv26756/drivers/char
Modified Files:
Makefile dz.c tty_io.c
Log Message:
Merge with 2.5.35
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile 14 Feb 2003 01:52:04 -0000 1.22
+++ Makefile 16 Feb 2003 01:05:23 -0000 1.23
@@ -13,7 +13,7 @@
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
export-objs := busmouse.o console.o generic_serial.o ip2main.o \
- ite_gpio.o misc.o nvram.o pty.o random.o rtc.o \
+ ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \
selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dz.c 23 Jan 2003 23:30:01 -0000 1.4
+++ dz.c 16 Feb 2003 01:05:23 -0000 1.5
@@ -58,6 +58,7 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
+
#include <asm/uaccess.h>
#include <asm/irq.h>
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tty_io.c 14 Feb 2003 01:52:22 -0000 1.5
+++ tty_io.c 16 Feb 2003 01:05:23 -0000 1.6
@@ -204,6 +204,8 @@
return _tty_make_name(tty, (tty)?tty->driver.name:NULL, buf);
}
+EXPORT_SYMBOL(tty_name);
+
inline int tty_paranoia_check(struct tty_struct *tty, kdev_t device,
const char *routine)
{
@@ -494,7 +496,7 @@
}
read_lock(&tasklist_lock);
- for_each_task(p) {
+ for_each_process(p) {
if ((tty->session > 0) && (p->session == tty->session) &&
p->leader) {
send_sig(SIGHUP,p,1);
@@ -596,7 +598,7 @@
tty->pgrp = -1;
read_lock(&tasklist_lock);
- for_each_task(p)
+ for_each_process(p)
if (p->session == current->session)
p->tty = NULL;
read_unlock(&tasklist_lock);
@@ -1221,7 +1223,7 @@
struct task_struct *p;
read_lock(&tasklist_lock);
- for_each_task(p) {
+ for_each_process(p) {
if (p->tty == tty || (o_tty && p->tty == o_tty))
p->tty = NULL;
}
@@ -1559,7 +1561,7 @@
struct task_struct *p;
read_lock(&tasklist_lock);
- for_each_task(p)
+ for_each_process(p)
if (p->tty == tty)
p->tty = NULL;
read_unlock(&tasklist_lock);
@@ -1832,7 +1834,7 @@
if (tty->driver.flush_buffer)
tty->driver.flush_buffer(tty);
read_lock(&tasklist_lock);
- for_each_task(p) {
+ for_each_process(p) {
if ((p->tty == tty) ||
((session > 0) && (p->session == session))) {
printk(KERN_NOTICE "SAK: killed process %d"
|
