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/ia64 | |
| parent | 4a0fd5bf0fd0795af8f1be3b261f5cf146a4cb9b (diff) | |
| download | op-kernel-dev-e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea.zip op-kernel-dev-e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea.tar.gz | |
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/ia64')
| -rw-r--r-- | arch/ia64/include/asm/linkage.h | 4 | ||||
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/arch/ia64/include/asm/linkage.h b/arch/ia64/include/asm/linkage.h index ef22a45..7875757 100644 --- a/arch/ia64/include/asm/linkage.h +++ b/arch/ia64/include/asm/linkage.h @@ -11,4 +11,8 @@ #endif +#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/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 0963738..afd45e0 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -46,15 +46,5 @@ asmlinkage unsigned long sys_mmap2( struct pt_regs; asmlinkage long sys_ia64_pipe(void); -/* - * "Conditional" syscalls - * - * Note, this macro can only be used in the file which defines sys_ni_syscall, i.e., in - * kernel/sys_ni.c. This version causes warnings because the declaration isn't a - * proper prototype, but we can't use __typeof__ either, because not all cond_syscall() - * declarations have prototypes at the moment. - */ -#define cond_syscall(x) asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall"))) - #endif /* !__ASSEMBLY__ */ #endif /* _ASM_IA64_UNISTD_H */ |
