diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/ia64/include/asm/unistd.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/ia64/include/asm/unistd.h')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 5a5347f5c4e4..9c72e36c5281 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h | |||
| @@ -311,11 +311,12 @@ | |||
| 311 | #define __NR_preadv 1319 | 311 | #define __NR_preadv 1319 |
| 312 | #define __NR_pwritev 1320 | 312 | #define __NR_pwritev 1320 |
| 313 | #define __NR_rt_tgsigqueueinfo 1321 | 313 | #define __NR_rt_tgsigqueueinfo 1321 |
| 314 | #define __NR_rt_recvmmsg 1322 | ||
| 314 | 315 | ||
| 315 | #ifdef __KERNEL__ | 316 | #ifdef __KERNEL__ |
| 316 | 317 | ||
| 317 | 318 | ||
| 318 | #define NR_syscalls 298 /* length of syscall table */ | 319 | #define NR_syscalls 299 /* length of syscall table */ |
| 319 | 320 | ||
| 320 | /* | 321 | /* |
| 321 | * The following defines stop scripts/checksyscalls.sh from complaining about | 322 | * The following defines stop scripts/checksyscalls.sh from complaining about |