aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/tt/exec_kern.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-07-27 14:27:06 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-07-27 14:27:06 -0400
commit20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch)
treeb4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/um/kernel/tt/exec_kern.c
parentdd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff)
parent64821324ca49f24be1a66f2f432108f96a24e596 (diff)
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/um/kernel/tt/exec_kern.c')
-rw-r--r--arch/um/kernel/tt/exec_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
index 5c1e4cc1c049..ad66df17d9d7 100644
--- a/arch/um/kernel/tt/exec_kern.c
+++ b/arch/um/kernel/tt/exec_kern.c
@@ -21,7 +21,7 @@
21static int exec_tramp(void *sig_stack) 21static int exec_tramp(void *sig_stack)
22{ 22{
23 init_new_thread_stack(sig_stack, NULL); 23 init_new_thread_stack(sig_stack, NULL);
24 init_new_thread_signals(1); 24 init_new_thread_signals();
25 os_stop_process(os_getpid()); 25 os_stop_process(os_getpid());
26 return(0); 26 return(0);
27} 27}