aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390/unistd.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2006-04-28 20:51:47 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-28 20:51:47 -0400
commit56142536868a2be34f261ed8fdca1610f8a73fbd (patch)
tree0bd66166b318d8403b1881285f6813ece2acced1 /include/asm-s390/unistd.h
parent34c278d3913a15b64943e8c40a16b4f732cc7c59 (diff)
Remove unneeded _syscallX macros from user view in asm-*/unistd.h
These aren't needed by glibc or klibc, and they're broken in some cases anyway. The uClibc folks are apparently switching over to stop using them too (now that we agreed that they should be dropped, at least). Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-s390/unistd.h')
-rw-r--r--include/asm-s390/unistd.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index ac790bf44559..40efbe84221d 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -386,6 +386,8 @@
386 386
387#endif 387#endif
388 388
389#ifdef __KERNEL__
390
389/* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */ 391/* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */
390 392
391#define __syscall_return(type, res) \ 393#define __syscall_return(type, res) \
@@ -540,7 +542,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
540 __syscall_return(type,__res); \ 542 __syscall_return(type,__res); \
541} 543}
542 544
543#ifdef __KERNEL__
544#define __ARCH_WANT_IPC_PARSE_VERSION 545#define __ARCH_WANT_IPC_PARSE_VERSION
545#define __ARCH_WANT_OLD_READDIR 546#define __ARCH_WANT_OLD_READDIR
546#define __ARCH_WANT_SYS_ALARM 547#define __ARCH_WANT_SYS_ALARM
@@ -567,7 +568,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
567# define __ARCH_WANT_COMPAT_SYS_TIME 568# define __ARCH_WANT_COMPAT_SYS_TIME
568# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND 569# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
569# endif 570# endif
570#endif
571 571
572#ifdef __KERNEL_SYSCALLS__ 572#ifdef __KERNEL_SYSCALLS__
573 573
@@ -618,7 +618,7 @@ asmlinkage long sys_rt_sigaction(int sig,
618 struct sigaction __user *oact, 618 struct sigaction __user *oact,
619 size_t sigsetsize); 619 size_t sigsetsize);
620 620
621#endif 621#endif /* __KERNEL_SYSCALLS__ */
622 622
623/* 623/*
624 * "Conditional" syscalls 624 * "Conditional" syscalls
@@ -628,4 +628,5 @@ asmlinkage long sys_rt_sigaction(int sig,
628 */ 628 */
629#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") 629#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
630 630
631#endif /* __KERNEL__ */
631#endif /* _ASM_S390_UNISTD_H_ */ 632#endif /* _ASM_S390_UNISTD_H_ */