lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

um: take register_winch_irq() into the caller of is_skas_winch()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro
2011-08-18 20:08:19 +01:00
committed by Richard Weinberger
parent 0a9e70b1cd
commit 17e052093b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/um/drivers/chan_user.c
View File

@@ -281,7 +281,12 @@ void register_winch(int fd, struct tty_struct *tty)
return; return;
pid = tcgetpgrp(fd); 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); thread = winch_tramp(fd, tty, &thread_fd, &stack);
if (thread < 0) if (thread < 0)
return; return;

6
arch/um/os-Linux/skas/process.c
View File

@@ -26,11 +26,7 @@
int is_skas_winch(int pid, int fd, void *data) int is_skas_winch(int pid, int fd, void *data)
{ {
if (pid != getpgrp()) return pid == getpgrp();
return 0;
register_winch_irq(-1, fd, -1, data, 0);
return 1;
} }
static int ptrace_dump_regs(int pid) static int ptrace_dump_regs(int pid)