git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
asm-s390
/
unistd.h
diff --git
a/include/asm-s390/unistd.h
b/include/asm-s390/unistd.h
index
e15cf98
..
78e34a8
100644
(file)
--- a/
include/asm-s390/unistd.h
+++ b/
include/asm-s390/unistd.h
@@
-392,11
+392,11
@@
#endif
#endif
-#ifdef __KERNEL__
+/* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */
#define __syscall_return(type, res) \
do { \
#define __syscall_return(type, res) \
do { \
- if ((unsigned long)(res) >= (unsigned long)(-
4095)) {
\
+ if ((unsigned long)(res) >= (unsigned long)(-
125)) {
\
errno = -(res); \
res = -1; \
} \
errno = -(res); \
res = -1; \
} \
@@
-546,6
+546,7
@@
type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
__syscall_return(type,__res); \
}
__syscall_return(type,__res); \
}
+#ifdef __KERNEL__
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_SYS_ALARM
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_SYS_ALARM
@@
-572,9
+573,11
@@
type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
# define __ARCH_WANT_COMPAT_SYS_TIME
# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
# endif
# define __ARCH_WANT_COMPAT_SYS_TIME
# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
# endif
+#endif
#ifdef __KERNEL_SYSCALLS__
#ifdef __KERNEL_SYSCALLS__
+#include <linux/config.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/ptrace.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/ptrace.h>
@@
-622,7
+625,7
@@
asmlinkage long sys_rt_sigaction(int sig,
struct sigaction __user *oact,
size_t sigsetsize);
struct sigaction __user *oact,
size_t sigsetsize);
-#endif
/* __KERNEL_SYSCALLS__ */
+#endif
/*
* "Conditional" syscalls
/*
* "Conditional" syscalls
@@
-632,5
+635,4
@@
asmlinkage long sys_rt_sigaction(int sig,
*/
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
*/
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#endif /* __KERNEL__ */
#endif /* _ASM_S390_UNISTD_H_ */
#endif /* _ASM_S390_UNISTD_H_ */