diff options
| author | Andi Kleen <ak@suse.de> | 2007-05-02 19:27:18 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:18 +0200 |
| commit | 57a4f91ae5571edd7c0428285d8df16bb8bf5f40 (patch) | |
| tree | 9e0ec8bf06c8ec44b4fb6f6219f1cfeb8f605156 | |
| parent | 2f3c30e6a886ddaf65cb74df82c03245050ff0aa (diff) | |
| download | linux-3.10-57a4f91ae5571edd7c0428285d8df16bb8bf5f40.tar.gz linux-3.10-57a4f91ae5571edd7c0428285d8df16bb8bf5f40.tar.bz2 linux-3.10-57a4f91ae5571edd7c0428285d8df16bb8bf5f40.zip | |
[PATCH] x86-64: Auto compute __NR_syscall_max at compile time
No need to maintain it anymore
Signed-off-by: Andi Kleen <ak@suse.de>
| -rw-r--r-- | arch/x86_64/kernel/asm-offsets.c | 10 | ||||
| -rw-r--r-- | arch/x86_64/kernel/syscall.c | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/unistd.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86_64/kernel/asm-offsets.c index 96687e2beb2..778953bc636 100644 --- a/arch/x86_64/kernel/asm-offsets.c +++ b/arch/x86_64/kernel/asm-offsets.c @@ -21,6 +21,14 @@ #define BLANK() asm volatile("\n->" : : ) +#define __NO_STUBS 1 +#undef __SYSCALL +#undef _ASM_X86_64_UNISTD_H_ +#define __SYSCALL(nr, sym) [nr] = 1, +static char syscalls[] = { +#include <asm/unistd.h> +}; + int main(void) { #define ENTRY(entry) DEFINE(tsk_ ## entry, offsetof(struct task_struct, entry)) @@ -71,5 +79,7 @@ int main(void) DEFINE(TSS_ist, offsetof(struct tss_struct, ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); + BLANK(); + DEFINE(__NR_syscall_max, sizeof(syscalls) - 1); return 0; } diff --git a/arch/x86_64/kernel/syscall.c b/arch/x86_64/kernel/syscall.c index 213fd6ab789..63d592c276c 100644 --- a/arch/x86_64/kernel/syscall.c +++ b/arch/x86_64/kernel/syscall.c @@ -3,6 +3,7 @@ #include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> +#include <asm/asm-offsets.h> #define __NO_STUBS diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 576b29732d3..26e23e01c54 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h @@ -620,8 +620,6 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice) #define __NR_move_pages 279 __SYSCALL(__NR_move_pages, sys_move_pages) -#define __NR_syscall_max __NR_move_pages - #ifndef __NO_STUBS #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT |