Commit d14c946e authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://are.twiddle.net/axp-2.6/

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 48c43169 9f7d77d9
...@@ -447,6 +447,16 @@ sys_call_table: ...@@ -447,6 +447,16 @@ sys_call_table:
.quad sys_stat64 /* 425 */ .quad sys_stat64 /* 425 */
.quad sys_lstat64 .quad sys_lstat64
.quad sys_fstat64 .quad sys_fstat64
.quad sys_ni_syscall /* sys_vserver */
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
.quad sys_mq_open
.quad sys_mq_unlink
.quad sys_mq_timedsend
.quad sys_mq_timedreceive /* 435 */
.quad sys_mq_notify
.quad sys_mq_getsetattr
.size sys_call_table, . - sys_call_table .size sys_call_table, . - sys_call_table
.type sys_call_table, @object .type sys_call_table, @object
......
...@@ -363,7 +363,18 @@ ...@@ -363,7 +363,18 @@
#define __NR_stat64 425 #define __NR_stat64 425
#define __NR_lstat64 426 #define __NR_lstat64 426
#define __NR_fstat64 427 #define __NR_fstat64 427
#define NR_SYSCALLS 428 #define __NR_vserver 428
#define __NR_mbind 429
#define __NR_get_mempolicy 430
#define __NR_set_mempolicy 431
#define __NR_mq_open 432
#define __NR_mq_unlink 433
#define __NR_mq_timedsend 434
#define __NR_mq_timedreceive 435
#define __NR_mq_notify 436
#define __NR_mq_getsetattr 437
#define NR_SYSCALLS 438
#if defined(__GNUC__) #if defined(__GNUC__)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment