![Jan Kiszka](/assets/img/avatar_default.png)
The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name. CC arch/um/kernel/skas/syscall.o/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning: "NR_syscalls" redefined In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3, from /data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6, from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10: /data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
41 lines
1.1 KiB
C
41 lines
1.1 KiB
C
/*
|
|
* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include "linux/kernel.h"
|
|
#include "linux/ptrace.h"
|
|
#include "kern_util.h"
|
|
#include "sysdep/ptrace.h"
|
|
#include "sysdep/syscalls.h"
|
|
|
|
extern int syscall_table_size;
|
|
#define NR_SYSCALLS (syscall_table_size / sizeof(void *))
|
|
|
|
void handle_syscall(struct uml_pt_regs *r)
|
|
{
|
|
struct pt_regs *regs = container_of(r, struct pt_regs, regs);
|
|
long result;
|
|
int syscall;
|
|
|
|
syscall_trace(r, 0);
|
|
|
|
/*
|
|
* This should go in the declaration of syscall, but when I do that,
|
|
* strace -f -c bash -c 'ls ; ls' breaks, sometimes not tracing
|
|
* children at all, sometimes hanging when bash doesn't see the first
|
|
* ls exit.
|
|
* The assembly looks functionally the same to me. This is
|
|
* gcc version 4.0.1 20050727 (Red Hat 4.0.1-5)
|
|
* in case it's a compiler bug.
|
|
*/
|
|
syscall = UPT_SYSCALL_NR(r);
|
|
if ((syscall >= NR_SYSCALLS) || (syscall < 0))
|
|
result = -ENOSYS;
|
|
else result = EXECUTE_SYSCALL(syscall, regs);
|
|
|
|
REGS_SET_SYSCALL_RETURN(r->gp, result);
|
|
|
|
syscall_trace(r, 1);
|
|
}
|