diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:30:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:25 -0500 |
commit | ee56314b79039b669396ee04aac3e342cd2e5a1f (patch) | |
tree | 444ef052c3ba1a6bb400d0909d505f40d7bbfbf0 /arch/um/kernel | |
parent | acb2cf34cf624b9b3ab20c2c83543146128a4dad (diff) |
uml: clone.c tidying
clone.c needed some style attention -
updated copyright
include trimming
coding style
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/skas/clone.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c index 8d07a7acb909..2c8583c1a344 100644 --- a/arch/um/kernel/skas/clone.c +++ b/arch/um/kernel/skas/clone.c | |||
@@ -1,17 +1,20 @@ | |||
1 | #include <sched.h> | 1 | /* |
2 | * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
2 | #include <signal.h> | 6 | #include <signal.h> |
3 | #include <sys/mman.h> | 7 | #include <sched.h> |
4 | #include <sys/time.h> | ||
5 | #include <asm/unistd.h> | 8 | #include <asm/unistd.h> |
9 | #include <sys/time.h> | ||
6 | #include "as-layout.h" | 10 | #include "as-layout.h" |
11 | #include "kern_constants.h" | ||
7 | #include "ptrace_user.h" | 12 | #include "ptrace_user.h" |
8 | #include "skas.h" | ||
9 | #include "stub-data.h" | 13 | #include "stub-data.h" |
10 | #include "uml-config.h" | ||
11 | #include "sysdep/stub.h" | 14 | #include "sysdep/stub.h" |
12 | #include "kern_constants.h" | ||
13 | 15 | ||
14 | /* This is in a separate file because it needs to be compiled with any | 16 | /* |
17 | * This is in a separate file because it needs to be compiled with any | ||
15 | * extraneous gcc flags (-pg, -fprofile-arcs, -ftest-coverage) disabled | 18 | * extraneous gcc flags (-pg, -fprofile-arcs, -ftest-coverage) disabled |
16 | * | 19 | * |
17 | * Use UM_KERN_PAGE_SIZE instead of PAGE_SIZE because that calls getpagesize | 20 | * Use UM_KERN_PAGE_SIZE instead of PAGE_SIZE because that calls getpagesize |
@@ -26,25 +29,26 @@ stub_clone_handler(void) | |||
26 | 29 | ||
27 | err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD, | 30 | err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD, |
28 | STUB_DATA + UM_KERN_PAGE_SIZE / 2 - sizeof(void *)); | 31 | STUB_DATA + UM_KERN_PAGE_SIZE / 2 - sizeof(void *)); |
29 | if(err != 0) | 32 | if (err != 0) |
30 | goto out; | 33 | goto out; |
31 | 34 | ||
32 | err = stub_syscall4(__NR_ptrace, PTRACE_TRACEME, 0, 0, 0); | 35 | err = stub_syscall4(__NR_ptrace, PTRACE_TRACEME, 0, 0, 0); |
33 | if(err) | 36 | if (err) |
34 | goto out; | 37 | goto out; |
35 | 38 | ||
36 | err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, | 39 | err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, |
37 | (long) &data->timer, 0); | 40 | (long) &data->timer, 0); |
38 | if(err) | 41 | if (err) |
39 | goto out; | 42 | goto out; |
40 | 43 | ||
41 | remap_stack(data->fd, data->offset); | 44 | remap_stack(data->fd, data->offset); |
42 | goto done; | 45 | goto done; |
43 | 46 | ||
44 | out: | 47 | out: |
45 | /* save current result. | 48 | /* |
46 | * Parent: pid; | 49 | * save current result. |
47 | * child: retcode of mmap already saved and it jumps around this | 50 | * Parent: pid; |
51 | * child: retcode of mmap already saved and it jumps around this | ||
48 | * assignment | 52 | * assignment |
49 | */ | 53 | */ |
50 | data->err = err; | 54 | data->err = err; |