diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-21 23:16:07 +0100 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-04 04:55:19 +0100 |
commit | e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea (patch) | |
tree | 2431edf19caecce6aad82b4ee4ed2abe45e542e3 /arch/mips | |
parent | teach SYSCALL_DEFINE<n> how to deal with long long/unsigned long long (diff) | |
download | linux-e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea.tar.xz linux-e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea.zip |
consolidate cond_syscall and SYSCALL_ALIAS declarations
take them to asm/linkage.h, with default in linux/linkage.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/linkage.h | 3 | ||||
-rw-r--r-- | arch/mips/include/asm/unistd.h | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h index e9a940d1b0c6..2767dda9e309 100644 --- a/arch/mips/include/asm/linkage.h +++ b/arch/mips/include/asm/linkage.h @@ -6,5 +6,8 @@ #endif #define __weak __attribute__((weak)) +#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall") +#define SYSCALL_ALIAS(alias, name) \ + asm ( #alias " = " #name "\n\t.globl " #alias) #endif diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h index 64f661e32879..63c9c886173a 100644 --- a/arch/mips/include/asm/unistd.h +++ b/arch/mips/include/asm/unistd.h @@ -63,12 +63,4 @@ #endif /* !__ASSEMBLY__ */ -/* - * "Conditional" syscalls - * - * What we want is __attribute__((weak,alias("sys_ni_syscall"))), - * but it doesn't work on all toolchains, so we just do it by hand - */ -#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall") - #endif /* _ASM_UNISTD_H */ |