Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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 sendmmsg() syscall for Itanium
This commit is contained in:
Linus Torvalds 2011-06-01 06:44:10 +09:00
commit 850761b2b1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,11 +320,12 @@
#define __NR_clock_adjtime 1328 #define __NR_clock_adjtime 1328
#define __NR_syncfs 1329 #define __NR_syncfs 1329
#define __NR_setns 1330 #define __NR_setns 1330
#define __NR_sendmmsg 1331
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_syscalls 307 /* length of syscall table */ #define NR_syscalls 308 /* length of syscall table */
/* /*
* The following defines stop scripts/checksyscalls.sh from complaining about * The following defines stop scripts/checksyscalls.sh from complaining about

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

@ -1776,6 +1776,7 @@ sys_call_table:
data8 sys_clock_adjtime data8 sys_clock_adjtime
data8 sys_syncfs data8 sys_syncfs
data8 sys_setns // 1330 data8 sys_setns // 1330
data8 sys_sendmmsg
.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 */