Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv23374/drivers/char
Modified Files:
tty_io.c
Removed Files:
serial_21285.c serial_amba.c
Log Message:
Merge with 2.5.29
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tty_io.c 9 Feb 2003 01:41:15 -0000 1.2
+++ tty_io.c 9 Feb 2003 02:57:39 -0000 1.3
@@ -545,6 +545,7 @@
#endif
do_tty_hangup((void *) tty);
}
+EXPORT_SYMBOL(tty_vhangup);
int tty_hung_up_p(struct file * filp)
{
@@ -1458,6 +1459,10 @@
if (!waitqueue_active(&tty->read_wait))
tty->minimum_to_wake = 1;
if (filp->f_owner.pid == 0) {
+ retval = security_ops->file_set_fowner(filp);
+ if (retval)
+ return retval;
+
filp->f_owner.pid = (-tty->pgrp) ? : current->pid;
filp->f_owner.uid = current->uid;
filp->f_owner.euid = current->euid;
--- serial_21285.c DELETED ---
--- serial_amba.c DELETED ---
|
