diff options
Diffstat (limited to 'drivers/char/n_tty.c')
-rw-r--r-- | drivers/char/n_tty.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index c035c2f1f462..6ac3ca4c723c 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c | |||
@@ -579,8 +579,8 @@ static void eraser(unsigned char c, struct tty_struct *tty) | |||
579 | 579 | ||
580 | static inline void isig(int sig, struct tty_struct *tty, int flush) | 580 | static inline void isig(int sig, struct tty_struct *tty, int flush) |
581 | { | 581 | { |
582 | if (tty->pgrp > 0) | 582 | if (tty->pgrp) |
583 | kill_pg(tty->pgrp, sig, 1); | 583 | kill_pgrp(tty->pgrp, sig, 1); |
584 | if (flush || !L_NOFLSH(tty)) { | 584 | if (flush || !L_NOFLSH(tty)) { |
585 | n_tty_flush_buffer(tty); | 585 | n_tty_flush_buffer(tty); |
586 | if (tty->driver->flush_buffer) | 586 | if (tty->driver->flush_buffer) |
@@ -1184,13 +1184,13 @@ static int job_control(struct tty_struct *tty, struct file *file) | |||
1184 | /* don't stop on /dev/console */ | 1184 | /* don't stop on /dev/console */ |
1185 | if (file->f_op->write != redirected_tty_write && | 1185 | if (file->f_op->write != redirected_tty_write && |
1186 | current->signal->tty == tty) { | 1186 | current->signal->tty == tty) { |
1187 | if (tty->pgrp <= 0) | 1187 | if (!tty->pgrp) |
1188 | printk("read_chan: tty->pgrp <= 0!\n"); | 1188 | printk("read_chan: no tty->pgrp!\n"); |
1189 | else if (process_group(current) != tty->pgrp) { | 1189 | else if (task_pgrp(current) != tty->pgrp) { |
1190 | if (is_ignored(SIGTTIN) || | 1190 | if (is_ignored(SIGTTIN) || |
1191 | is_current_pgrp_orphaned()) | 1191 | is_current_pgrp_orphaned()) |
1192 | return -EIO; | 1192 | return -EIO; |
1193 | kill_pg(process_group(current), SIGTTIN, 1); | 1193 | kill_pgrp(task_pgrp(current), SIGTTIN, 1); |
1194 | return -ERESTARTSYS; | 1194 | return -ERESTARTSYS; |
1195 | } | 1195 | } |
1196 | } | 1196 | } |