diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-01 06:44:10 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-01 06:44:10 +0900 |
| commit | 850761b2b13aec5d4f9935199e917f9a4ae00cce (patch) | |
| tree | 0b45332cc3f1c7eda037c0e60d4a4415754c6c31 | |
| parent | af0d6a0a3a30946f7df69c764791f1b0643f7cd6 (diff) | |
| parent | 83caba8436b28bd9081013fd840424983127d4ca (diff) | |
| download | op-kernel-dev-850761b2b13aec5d4f9935199e917f9a4ae00cce.zip op-kernel-dev-850761b2b13aec5d4f9935199e917f9a4ae00cce.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] wire up sendmmsg() syscall for Itanium
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 1cf0f49..7c928da 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -320,11 +320,12 @@ #define __NR_clock_adjtime 1328 #define __NR_syncfs 1329 #define __NR_setns 1330 +#define __NR_sendmmsg 1331 #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 diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 9ca8019..97dd2ab 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1776,6 +1776,7 @@ sys_call_table: data8 sys_clock_adjtime data8 sys_syncfs data8 sys_setns // 1330 + data8 sys_sendmmsg .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |
