summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-02-01 03:06:27 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 08:53:22 -0800
commite5cf888631af95c8022d659d77fb595e0c3ac778 (patch)
treee35d7093339e16d0ee0bb30888b59832c5ca42fb
parent3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6 (diff)
downloadop-kernel-dev-e5cf888631af95c8022d659d77fb595e0c3ac778.zip
op-kernel-dev-e5cf888631af95c8022d659d77fb595e0c3ac778.tar.gz
[PATCH] uml: TT - SYSCALL_DEBUG - fix buglet introduced in cleanup
Fixes a bug introduced in commit e32dacb9f481fd6decb41adb28e720c923d34f54 - index is initialized based on syscall before syscall is calculated. I'm bothering with this mainly because it gives a correct warning when the config option is enabled, even if the code is for a almost unused debugging option. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/um/kernel/tt/syscall_kern.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/um/kernel/tt/syscall_kern.c b/arch/um/kernel/tt/syscall_kern.c
index 3d29c90..3fda9a0 100644
--- a/arch/um/kernel/tt/syscall_kern.c
+++ b/arch/um/kernel/tt/syscall_kern.c
@@ -23,16 +23,20 @@ void syscall_handler_tt(int sig, struct pt_regs *regs)
int syscall;
#ifdef CONFIG_SYSCALL_DEBUG
int index;
- index = record_syscall_start(syscall);
#endif
sc = UPT_SC(&regs->regs);
SC_START_SYSCALL(sc);
+ syscall = UPT_SYSCALL_NR(&regs->regs);
+
+#ifdef CONFIG_SYSCALL_DEBUG
+ index = record_syscall_start(syscall);
+#endif
+
syscall_trace(&regs->regs, 0);
current->thread.nsyscalls++;
nsyscalls++;
- syscall = UPT_SYSCALL_NR(&regs->regs);
if((syscall >= NR_syscalls) || (syscall < 0))
result = -ENOSYS;
OpenPOWER on IntegriCloud