git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
[pandora-kernel.git]
/
arch
/
um
/
os-Linux
/
start_up.c
diff --git
a/arch/um/os-Linux/start_up.c
b/arch/um/os-Linux/start_up.c
index
29a9e3f
..
829d6b0
100644
(file)
--- a/
arch/um/os-Linux/start_up.c
+++ b/
arch/um/os-Linux/start_up.c
@@
-24,13
+24,11
@@
#include "kern_util.h"
#include "user.h"
#include "signal_kern.h"
#include "kern_util.h"
#include "user.h"
#include "signal_kern.h"
-#include "signal_user.h"
#include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h"
#include "irq_user.h"
#include "ptrace_user.h"
#include "mem_user.h"
#include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h"
#include "irq_user.h"
#include "ptrace_user.h"
#include "mem_user.h"
-#include "time_user.h"
#include "init.h"
#include "os.h"
#include "uml-config.h"
#include "init.h"
#include "os.h"
#include "uml-config.h"
@@
-51,6
+49,7
@@
static int ptrace_child(void *arg)
int pid = os_getpid(), ppid = getppid();
int sc_result;
int pid = os_getpid(), ppid = getppid();
int sc_result;
+ change_sig(SIGWINCH, 0);
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
perror("ptrace");
os_kill_process(pid, 0);
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
perror("ptrace");
os_kill_process(pid, 0);