diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-21 17:16:07 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 22:55:19 -0500 |
| commit | e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea (patch) | |
| tree | 2431edf19caecce6aad82b4ee4ed2abe45e542e3 /arch/alpha | |
| parent | 4a0fd5bf0fd0795af8f1be3b261f5cf146a4cb9b (diff) | |
| download | linux-stable-e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea.tar.gz linux-stable-e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea.tar.bz2 linux-stable-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/alpha')
| -rw-r--r-- | arch/alpha/include/asm/linkage.h | 4 | ||||
| -rw-r--r-- | arch/alpha/include/asm/unistd.h | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/arch/alpha/include/asm/linkage.h b/arch/alpha/include/asm/linkage.h index 291c2d01c44f..7cfd06e8c935 100644 --- a/arch/alpha/include/asm/linkage.h +++ b/arch/alpha/include/asm/linkage.h @@ -1,6 +1,8 @@ #ifndef __ASM_LINKAGE_H #define __ASM_LINKAGE_H -/* Nothing to see here... */ +#define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall") +#define SYSCALL_ALIAS(alias, name) \ + asm ( #alias " = " #name "\n\t.globl " #alias) #endif diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 6d6fe7ab5473..43baee17acdf 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -18,16 +18,4 @@ #define __ARCH_WANT_SYS_VFORK #define __ARCH_WANT_SYS_CLONE -/* "Conditional" syscalls. What we want is - - __attribute__((weak,alias("sys_ni_syscall"))) - - but that raises the problem of what type to give the symbol. If we use - a prototype, it'll conflict with the definition given in this file and - others. If we use __typeof, we discover that not all symbols actually - have declarations. If we use no prototype, then we get warnings from - -Wstrict-prototypes. Ho hum. */ - -#define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall") - #endif /* _ALPHA_UNISTD_H */ |