diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-05-15 15:36:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 21:56:37 -0400 |
commit | ecec5ba681a0bf1165899f8b1889f06fcd8e901a (patch) | |
tree | bacc286b05900e6a3f8dfc96386efc5dc85d660d /arch/um/include | |
parent | 327b9eebbf2b7ce632e93a9c1386d944af0dadf4 (diff) |
fix uml-x86_64
__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>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/sysdep-x86_64/kernel-offsets.h | 9 | ||||
-rw-r--r-- | arch/um/include/sysdep-x86_64/syscalls.h | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/um/include/sysdep-x86_64/kernel-offsets.h b/arch/um/include/sysdep-x86_64/kernel-offsets.h index a307237b7964..c978b589df41 100644 --- a/arch/um/include/sysdep-x86_64/kernel-offsets.h +++ b/arch/um/include/sysdep-x86_64/kernel-offsets.h | |||
@@ -17,7 +17,16 @@ | |||
17 | #define OFFSET(sym, str, mem) \ | 17 | #define OFFSET(sym, str, mem) \ |
18 | DEFINE(sym, offsetof(struct str, mem)); | 18 | DEFINE(sym, offsetof(struct str, mem)); |
19 | 19 | ||
20 | #define __NO_STUBS 1 | ||
21 | #undef __SYSCALL | ||
22 | #undef _ASM_X86_64_UNISTD_H_ | ||
23 | #define __SYSCALL(nr, sym) [nr] = 1, | ||
24 | static char syscalls[] = { | ||
25 | #include <asm/arch/unistd.h> | ||
26 | }; | ||
27 | |||
20 | void foo(void) | 28 | void foo(void) |
21 | { | 29 | { |
22 | #include <common-offsets.h> | 30 | #include <common-offsets.h> |
31 | DEFINE(UM_NR_syscall_max, sizeof(syscalls) - 1); | ||
23 | } | 32 | } |
diff --git a/arch/um/include/sysdep-x86_64/syscalls.h b/arch/um/include/sysdep-x86_64/syscalls.h index 5e86aa047b2b..cf72256609e4 100644 --- a/arch/um/include/sysdep-x86_64/syscalls.h +++ b/arch/um/include/sysdep-x86_64/syscalls.h | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include <linux/msg.h> | 10 | #include <linux/msg.h> |
11 | #include <linux/shm.h> | 11 | #include <linux/shm.h> |
12 | #include <kern_constants.h> | ||
12 | 13 | ||
13 | typedef long syscall_handler_t(void); | 14 | typedef long syscall_handler_t(void); |
14 | 15 | ||
@@ -29,6 +30,6 @@ extern long old_mmap(unsigned long addr, unsigned long len, | |||
29 | extern syscall_handler_t sys_modify_ldt; | 30 | extern syscall_handler_t sys_modify_ldt; |
30 | extern syscall_handler_t sys_arch_prctl; | 31 | extern syscall_handler_t sys_arch_prctl; |
31 | 32 | ||
32 | #define NR_syscalls (__NR_syscall_max + 1) | 33 | #define NR_syscalls (UM_NR_syscall_max + 1) |
33 | 34 | ||
34 | #endif | 35 | #endif |