diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 10:10:05 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 10:10:05 +0200 |
| commit | 8bf6e1bcf49dfef23d3a4187be7d9c6bdbfd8210 (patch) | |
| tree | 60d958e4dfc02276974c2efb1800ea10df3eba10 /arch/sh/include/asm/unistd.h | |
| parent | sh: ecovec: switch SDHI controllers to card polling (diff) | |
| download | linux-8bf6e1bcf49dfef23d3a4187be7d9c6bdbfd8210.tar.xz linux-8bf6e1bcf49dfef23d3a4187be7d9c6bdbfd8210.zip | |
sh: Consolidate duplicate _32/_64 unistd definitions.
This does some more tidying and converging of the header split, following
the x86 example.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/unistd.h')
| -rw-r--r-- | arch/sh/include/asm/unistd.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h index 65be656ead7d..a42a5610a36a 100644 --- a/arch/sh/include/asm/unistd.h +++ b/arch/sh/include/asm/unistd.h @@ -1,9 +1,46 @@ #ifdef __KERNEL__ # ifdef CONFIG_SUPERH32 + # include "unistd_32.h" +# define __ARCH_WANT_SYS_RT_SIGSUSPEND + # else # include "unistd_64.h" # endif + +# define __ARCH_WANT_IPC_PARSE_VERSION +# define __ARCH_WANT_OLD_READDIR +# define __ARCH_WANT_OLD_STAT +# define __ARCH_WANT_STAT64 +# define __ARCH_WANT_SYS_ALARM +# define __ARCH_WANT_SYS_GETHOSTNAME +# define __ARCH_WANT_SYS_IPC +# define __ARCH_WANT_SYS_PAUSE +# define __ARCH_WANT_SYS_SGETMASK +# define __ARCH_WANT_SYS_SIGNAL +# define __ARCH_WANT_SYS_TIME +# define __ARCH_WANT_SYS_UTIME +# define __ARCH_WANT_SYS_WAITPID +# define __ARCH_WANT_SYS_SOCKETCALL +# define __ARCH_WANT_SYS_FADVISE64 +# define __ARCH_WANT_SYS_GETPGRP +# define __ARCH_WANT_SYS_LLSEEK +# define __ARCH_WANT_SYS_NICE +# define __ARCH_WANT_SYS_OLD_GETRLIMIT +# define __ARCH_WANT_SYS_OLD_UNAME +# define __ARCH_WANT_SYS_OLDUMOUNT +# define __ARCH_WANT_SYS_SIGPENDING +# define __ARCH_WANT_SYS_SIGPROCMASK +# define __ARCH_WANT_SYS_RT_SIGACTION + +/* + * "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\t.set\t" #x ",sys_ni_syscall") + #else # ifdef __SH5__ # include "unistd_64.h" |