adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix uml-x86_64

Browse source 
__NR_syscall_max is done in x86_64 asm-offsets; do an equivalent in
uml kern_constants.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-05-15 20:36:00 +01:00 committed by Linus Torvalds
parent 327b9eebbf
commit ecec5ba681
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/um/include/sysdep-x86_64/kernel-offsets.h
View file

@ -17,7 +17,16 @@
#define OFFSET(sym, str, mem) \ #define OFFSET(sym, str, mem) \
DEFINE(sym, offsetof(struct str, mem)); DEFINE(sym, offsetof(struct str, mem));
#define __NO_STUBS 1
#undef __SYSCALL
#undef _ASM_X86_64_UNISTD_H_
#define __SYSCALL(nr, sym) [nr] = 1,
static char syscalls[] = {
#include <asm/arch/unistd.h>
};
void foo(void) void foo(void)
{ {
#include <common-offsets.h> #include <common-offsets.h>
DEFINE(UM_NR_syscall_max, sizeof(syscalls) - 1);
} }

3
arch/um/include/sysdep-x86_64/syscalls.h
View file

@ -9,6 +9,7 @@
#include <linux/msg.h> #include <linux/msg.h>
#include <linux/shm.h> #include <linux/shm.h>
#include <kern_constants.h>
typedef long syscall_handler_t(void); typedef long syscall_handler_t(void);
@ -29,6 +30,6 @@ extern long old_mmap(unsigned long addr, unsigned long len,
extern syscall_handler_t sys_modify_ldt; extern syscall_handler_t sys_modify_ldt;
extern syscall_handler_t sys_arch_prctl; extern syscall_handler_t sys_arch_prctl;
#define NR_syscalls (__NR_syscall_max + 1) #define NR_syscalls (UM_NR_syscall_max + 1)
#endif #endif

5
arch/um/sys-x86_64/syscall_table.c
View file

@ -4,6 +4,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/sys.h> #include <linux/sys.h>
#include <linux/cache.h> #include <linux/cache.h>
#include <kern_constants.h>
#define __NO_STUBS #define __NO_STUBS
@ -45,8 +46,8 @@ typedef void (*sys_call_ptr_t)(void);
extern void sys_ni_syscall(void); extern void sys_ni_syscall(void);
sys_call_ptr_t sys_call_table[__NR_syscall_max+1] __cacheline_aligned = { sys_call_ptr_t sys_call_table[UM_NR_syscall_max+1] __cacheline_aligned = {
/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */ /* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
[0 ... __NR_syscall_max] = &sys_ni_syscall, [0 ... UM_NR_syscall_max] = &sys_ni_syscall,
#include <asm-x86_64/unistd.h> #include <asm-x86_64/unistd.h>
}; };