diff options
-rw-r--r-- | arch/um/include/kern_util.h | 1 | ||||
-rw-r--r-- | arch/um/kernel/skas/syscall.c | 3 | ||||
-rw-r--r-- | arch/um/kernel/syscall.c | 3 | ||||
-rw-r--r-- | include/asm-um/processor-generic.h | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index 715ffb5b95c1..3c341222d252 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h | |||
@@ -13,7 +13,6 @@ extern int uml_exitcode; | |||
13 | 13 | ||
14 | extern int ncpus; | 14 | extern int ncpus; |
15 | extern int kmalloc_ok; | 15 | extern int kmalloc_ok; |
16 | extern int nsyscalls; | ||
17 | 16 | ||
18 | #define UML_ROUND_UP(addr) \ | 17 | #define UML_ROUND_UP(addr) \ |
19 | ((((unsigned long) addr) + PAGE_SIZE - 1) & PAGE_MASK) | 18 | ((((unsigned long) addr) + PAGE_SIZE - 1) & PAGE_MASK) |
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c index 50b476f2b38d..6450f024290f 100644 --- a/arch/um/kernel/skas/syscall.c +++ b/arch/um/kernel/skas/syscall.c | |||
@@ -17,9 +17,6 @@ void handle_syscall(struct uml_pt_regs *r) | |||
17 | 17 | ||
18 | syscall_trace(r, 0); | 18 | syscall_trace(r, 0); |
19 | 19 | ||
20 | current->thread.nsyscalls++; | ||
21 | nsyscalls++; | ||
22 | |||
23 | /* | 20 | /* |
24 | * This should go in the declaration of syscall, but when I do that, | 21 | * This should go in the declaration of syscall, but when I do that, |
25 | * strace -f -c bash -c 'ls ; ls' breaks, sometimes not tracing | 22 | * strace -f -c bash -c 'ls ; ls' breaks, sometimes not tracing |
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index b9d92b2089ae..9cffc628a37e 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c | |||
@@ -13,9 +13,6 @@ | |||
13 | #include "asm/uaccess.h" | 13 | #include "asm/uaccess.h" |
14 | #include "asm/unistd.h" | 14 | #include "asm/unistd.h" |
15 | 15 | ||
16 | /* Unlocked, I don't care if this is a bit off */ | ||
17 | int nsyscalls = 0; | ||
18 | |||
19 | long sys_fork(void) | 16 | long sys_fork(void) |
20 | { | 17 | { |
21 | long ret; | 18 | long ret; |
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h index ecf67069941a..b7d9a16a7451 100644 --- a/include/asm-um/processor-generic.h +++ b/include/asm-um/processor-generic.h | |||
@@ -27,7 +27,6 @@ struct thread_struct { | |||
27 | * as of 2.6.11). | 27 | * as of 2.6.11). |
28 | */ | 28 | */ |
29 | int forking; | 29 | int forking; |
30 | int nsyscalls; | ||
31 | struct pt_regs regs; | 30 | struct pt_regs regs; |
32 | int singlestep_syscall; | 31 | int singlestep_syscall; |
33 | void *fault_addr; | 32 | void *fault_addr; |
@@ -59,7 +58,6 @@ struct thread_struct { | |||
59 | #define INIT_THREAD \ | 58 | #define INIT_THREAD \ |
60 | { \ | 59 | { \ |
61 | .forking = 0, \ | 60 | .forking = 0, \ |
62 | .nsyscalls = 0, \ | ||
63 | .regs = EMPTY_REGS, \ | 61 | .regs = EMPTY_REGS, \ |
64 | .fault_addr = NULL, \ | 62 | .fault_addr = NULL, \ |
65 | .prev_sched = NULL, \ | 63 | .prev_sched = NULL, \ |