diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-22 16:32:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-22 16:32:40 -0700 |
| commit | 7ce42ae14e32016ac8e83003db5811a33e3b16e3 (patch) | |
| tree | 95acfb1109af48f73688ad18522f79221e1d560f /include | |
| parent | 1ed73535789d5558f91d214e089a659ab59ae80f (diff) | |
| parent | 400da241ed7c0ebdc44b2b19863a8512b9536ded (diff) | |
Merge http://lia64.bkbits.net/to-linus-2.5
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/ia32.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/siginfo.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/unistd.h | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index afabca920514..75dd0d334b99 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h @@ -6,7 +6,7 @@ #include <asm/ptrace.h> #include <asm/signal.h> -#define IA32_NR_syscalls 275 /* length of syscall table */ +#define IA32_NR_syscalls 283 /* length of syscall table */ #ifndef __ASSEMBLY__ diff --git a/include/asm-ia64/siginfo.h b/include/asm-ia64/siginfo.h index 4759e19c3cb1..52cce1d3dad8 100644 --- a/include/asm-ia64/siginfo.h +++ b/include/asm-ia64/siginfo.h @@ -136,8 +136,6 @@ copy_siginfo (siginfo_t *to, siginfo_t *from) memcpy(to, from, 4*sizeof(int) + sizeof(from->_sifields._sigchld)); } -extern int copy_siginfo_from_user(siginfo_t *to, siginfo_t *from); - #endif /* __KERNEL__ */ #endif /* _ASM_IA64_SIGINFO_H */ diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 2409c7182bcf..284c40afec1b 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -251,6 +251,12 @@ #define __NR_reserved1 1259 /* reserved for NUMA interface */ #define __NR_reserved2 1260 /* reserved for NUMA interface */ #define __NR_reserved3 1261 /* reserved for NUMA interface */ +#define __NR_mq_open 1262 +#define __NR_mq_unlink 1263 +#define __NR_mq_timedsend 1264 +#define __NR_mq_timedreceive 1265 +#define __NR_mq_notify 1266 +#define __NR_mq_getsetattr 1267 #ifdef __KERNEL__ |