diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /arch/um | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/skas/process.c | 6 | ||||
| -rw-r--r-- | arch/um/os-Linux/elf_aux.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 6dd9e5bf18e..f228f8b5419 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c @@ -61,7 +61,11 @@ void wait_stub_done(int pid, int sig, char * fname) CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED)); } while((n >= 0) && WIFSTOPPED(status) && - (WSTOPSIG(status) == SIGVTALRM)); + ((WSTOPSIG(status) == SIGVTALRM) || + /* running UML inside a detached screen can cause + * SIGWINCHes + */ + (WSTOPSIG(status) == SIGWINCH))); if((n < 0) || !WIFSTOPPED(status) || (WSTOPSIG(status) != SIGUSR1 && WSTOPSIG(status) != SIGTRAP)){ diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index 9416e1c2992..4cca3e9c23f 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -9,7 +9,6 @@ */ #include <elf.h> #include <stddef.h> -#include <asm/elf.h> #include "init.h" #include "elf_user.h" #include "mem_user.h" |