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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-i386
/
unistd.h
diff --git
a/include/asm-i386/unistd.h
b/include/asm-i386/unistd.h
index
8cd8a76
..
dc81a55
100644
(file)
--- a/
include/asm-i386/unistd.h
+++ b/
include/asm-i386/unistd.h
@@
-288,7
+288,7
@@
#define __NR_mq_timedreceive (__NR_mq_open+3)
#define __NR_mq_notify (__NR_mq_open+4)
#define __NR_mq_getsetattr (__NR_mq_open+5)
#define __NR_mq_timedreceive (__NR_mq_open+3)
#define __NR_mq_notify (__NR_mq_open+4)
#define __NR_mq_getsetattr (__NR_mq_open+5)
-#define __NR_
kexec_load
283
+#define __NR_
sys_kexec_load
283
#define __NR_waitid 284
/* #define __NR_sys_setaltroot 285 */
#define __NR_add_key 286
#define __NR_waitid 284
/* #define __NR_sys_setaltroot 285 */
#define __NR_add_key 286
@@
-316,19
+316,9
@@
#define __NR_pselect6 308
#define __NR_ppoll 309
#define __NR_unshare 310
#define __NR_pselect6 308
#define __NR_ppoll 309
#define __NR_unshare 310
-#define __NR_set_robust_list 311
-#define __NR_get_robust_list 312
-#define __NR_splice 313
-#define __NR_sync_file_range 314
-#define __NR_tee 315
-#define __NR_vmsplice 316
-#define __NR_move_pages 317
-#ifdef __KERNEL__
-
-#define NR_syscalls 318
+#define NR_syscalls 311
-#ifndef __KERNEL_SYSCALLS_NO_ERRNO__
/*
* user-visible error numbers are in the range -1 - -128: see
* <asm-i386/errno.h>
/*
* user-visible error numbers are in the range -1 - -128: see
* <asm-i386/errno.h>
@@
-342,10
+332,6
@@
do { \
return (type) (res); \
} while (0)
return (type) (res); \
} while (0)
-#else
-# define __syscall_return(type, res) return (type) (res)
-#endif
-
/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
#define _syscall0(type,name) \
type name(void) \
/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
#define _syscall0(type,name) \
type name(void) \
@@
-361,9
+347,9
@@
__syscall_return(type,__res); \
type name(type1 arg1) \
{ \
long __res; \
type name(type1 arg1) \
{ \
long __res; \
-__asm__ volatile ("
push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx
" \
+__asm__ volatile ("
int $0x80
" \
: "=a" (__res) \
: "=a" (__res) \
- : "0" (__NR_##name),"
ri
" ((long)(arg1)) : "memory"); \
+ : "0" (__NR_##name),"
b
" ((long)(arg1)) : "memory"); \
__syscall_return(type,__res); \
}
__syscall_return(type,__res); \
}
@@
-371,10
+357,9
@@
__syscall_return(type,__res); \
type name(type1 arg1,type2 arg2) \
{ \
long __res; \
type name(type1 arg1,type2 arg2) \
{ \
long __res; \
-__asm__ volatile ("
push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx
" \
+__asm__ volatile ("
int $0x80
" \
: "=a" (__res) \
: "=a" (__res) \
- : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
- : "memory"); \
+ : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)) : "memory"); \
__syscall_return(type,__res); \
}
__syscall_return(type,__res); \
}
@@
-382,9
+367,9
@@
__syscall_return(type,__res); \
type name(type1 arg1,type2 arg2,type3 arg3) \
{ \
long __res; \
type name(type1 arg1,type2 arg2,type3 arg3) \
{ \
long __res; \
-__asm__ volatile ("
push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx
" \
+__asm__ volatile ("
int $0x80
" \
: "=a" (__res) \
: "=a" (__res) \
- : "0" (__NR_##name),"
ri
" ((long)(arg1)),"c" ((long)(arg2)), \
+ : "0" (__NR_##name),"
b
" ((long)(arg1)),"c" ((long)(arg2)), \
"d" ((long)(arg3)) : "memory"); \
__syscall_return(type,__res); \
}
"d" ((long)(arg3)) : "memory"); \
__syscall_return(type,__res); \
}
@@
-393,9
+378,9
@@
__syscall_return(type,__res); \
type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
{ \
long __res; \
type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
{ \
long __res; \
-__asm__ volatile ("
push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx
" \
+__asm__ volatile ("
int $0x80
" \
: "=a" (__res) \
: "=a" (__res) \
- : "0" (__NR_##name),"
ri
" ((long)(arg1)),"c" ((long)(arg2)), \
+ : "0" (__NR_##name),"
b
" ((long)(arg1)),"c" ((long)(arg2)), \
"d" ((long)(arg3)),"S" ((long)(arg4)) : "memory"); \
__syscall_return(type,__res); \
}
"d" ((long)(arg3)),"S" ((long)(arg4)) : "memory"); \
__syscall_return(type,__res); \
}
@@
-405,12
+390,10
@@
__syscall_return(type,__res); \
type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
{ \
long __res; \
type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
{ \
long __res; \
-__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; movl %1,%%eax ; " \
- "int $0x80 ; pop %%ebx" \
+__asm__ volatile ("int $0x80" \
: "=a" (__res) \
: "=a" (__res) \
- : "i" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
- "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) \
- : "memory"); \
+ : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
+ "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) : "memory"); \
__syscall_return(type,__res); \
}
__syscall_return(type,__res); \
}
@@
-419,17
+402,15
@@
__syscall_return(type,__res); \
type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
{ \
long __res; \
type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
{ \
long __res; \
- struct { long __a1; long __a6; } __s = { (long)arg1, (long)arg6 }; \
-__asm__ volatile ("push %%ebp ; push %%ebx ; movl 4(%2),%%ebp ; " \
- "movl 0(%2),%%ebx ; movl %1,%%eax ; int $0x80 ; " \
- "pop %%ebx ; pop %%ebp" \
+__asm__ volatile ("push %%ebp ; movl %%eax,%%ebp ; movl %1,%%eax ; int $0x80 ; pop %%ebp" \
: "=a" (__res) \
: "=a" (__res) \
- : "i" (__NR_##name),"
0" ((long)(&__s
)),"c" ((long)(arg2)), \
- "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) \
- : "memory"); \
+ : "i" (__NR_##name),"
b" ((long)(arg1
)),"c" ((long)(arg2)), \
+ "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))
,
\
+
"0" ((long)(arg6))
: "memory"); \
__syscall_return(type,__res); \
}
__syscall_return(type,__res); \
}
+#ifdef __KERNEL__
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
@@
-453,6
+434,7
@@
__syscall_return(type,__res); \
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_RT_SIGACTION
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_RT_SIGACTION
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#endif
#ifdef __KERNEL_SYSCALLS__
#ifdef __KERNEL_SYSCALLS__
@@
-491,7
+473,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
@@
-503,5
+485,4
@@
asmlinkage long sys_rt_sigaction(int sig,
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
#endif
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
#endif
-#endif /* __KERNEL__ */
#endif /* _ASM_I386_UNISTD_H_ */
#endif /* _ASM_I386_UNISTD_H_ */