Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5cf8886 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: TT - SYSCALL_DEBUG - fix buglet introduced in cleanup 



Fixes a bug introduced in commit e32dacb9 -
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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3dfd95b3

arch/um/kernel/tt/syscall_kern.c

+6 −2
Original line number Diff line number Diff line
@@ -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;