renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse Source 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] wire up preadv/pwritev system calls
This commit is contained in:
Linus Torvalds 2009-04-08 15:36:42 -07:00
commit 72ae9e092c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/include/asm/unistd.h
View File

@ -308,11 +308,13 @@
#define __NR_dup3 1316 #define __NR_dup3 1316
#define __NR_pipe2 1317 #define __NR_pipe2 1317
#define __NR_inotify_init1 1318 #define __NR_inotify_init1 1318
#define __NR_preadv 1319
#define __NR_pwritev 1320
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_syscalls 295 /* length of syscall table */ #define NR_syscalls 297 /* length of syscall table */
/* /*
* The following defines stop scripts/checksyscalls.sh from complaining about * The following defines stop scripts/checksyscalls.sh from complaining about

2
arch/ia64/kernel/entry.S
View File

@ -1803,6 +1803,8 @@ sys_call_table:
data8 sys_dup3 data8 sys_dup3
data8 sys_pipe2 data8 sys_pipe2
data8 sys_inotify_init1 data8 sys_inotify_init1
data8 sys_preadv
data8 sys_pwritev // 1320
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */