From a88015e273859fc404e08192ecf658733b9c8524 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:08:19 +0100 Subject: [PATCH] --- yaml --- r: 273028 b: refs/heads/master c: 17e052093bcd21eaf9eb6e792cd76fdc4f0e3505 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/chan_user.c | 7 ++++++- trunk/arch/um/os-Linux/skas/process.c | 6 +----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6cbf5ce82873..4bb84c418e1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a9e70b1cd0f7ee82a65d19edfcd31664ef65f69 +refs/heads/master: 17e052093bcd21eaf9eb6e792cd76fdc4f0e3505 diff --git a/trunk/arch/um/drivers/chan_user.c b/trunk/arch/um/drivers/chan_user.c index 7ed06a7399d5..f180813ce2c7 100644 --- a/trunk/arch/um/drivers/chan_user.c +++ b/trunk/arch/um/drivers/chan_user.c @@ -281,7 +281,12 @@ void register_winch(int fd, struct tty_struct *tty) return; pid = tcgetpgrp(fd); - if (!is_skas_winch(pid, fd, tty) && (pid == -1)) { + if (is_skas_winch(pid, fd, tty)) { + register_winch_irq(-1, fd, -1, tty, 0); + return; + } + + if (pid == -1) { thread = winch_tramp(fd, tty, &thread_fd, &stack); if (thread < 0) return; diff --git a/trunk/arch/um/os-Linux/skas/process.c b/trunk/arch/um/os-Linux/skas/process.c index 30f1bb43a230..29e4ab7eb369 100644 --- a/trunk/arch/um/os-Linux/skas/process.c +++ b/trunk/arch/um/os-Linux/skas/process.c @@ -26,11 +26,7 @@ int is_skas_winch(int pid, int fd, void *data) { - if (pid != getpgrp()) - return 0; - - register_winch_irq(-1, fd, -1, data, 0); - return 1; + return pid == getpgrp(); } static int ptrace_dump_regs(int pid)