diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /arch/microblaze/include/asm/unistd.h | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'arch/microblaze/include/asm/unistd.h')
| -rw-r--r-- | arch/microblaze/include/asm/unistd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index cb05a07e55e9..2b67e92a773c 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h | |||
| @@ -377,13 +377,14 @@ | |||
| 377 | #define __NR_shutdown 359 /* new */ | 377 | #define __NR_shutdown 359 /* new */ |
| 378 | #define __NR_sendmsg 360 /* new */ | 378 | #define __NR_sendmsg 360 /* new */ |
| 379 | #define __NR_recvmsg 361 /* new */ | 379 | #define __NR_recvmsg 361 /* new */ |
| 380 | #define __NR_accept04 362 /* new */ | 380 | #define __NR_accept4 362 /* new */ |
| 381 | #define __NR_preadv 363 /* new */ | 381 | #define __NR_preadv 363 /* new */ |
| 382 | #define __NR_pwritev 364 /* new */ | 382 | #define __NR_pwritev 364 /* new */ |
| 383 | #define __NR_rt_tgsigqueueinfo 365 /* new */ | 383 | #define __NR_rt_tgsigqueueinfo 365 /* new */ |
| 384 | #define __NR_perf_event_open 366 /* new */ | 384 | #define __NR_perf_event_open 366 /* new */ |
| 385 | #define __NR_recvmmsg 367 /* new */ | ||
| 385 | 386 | ||
| 386 | #define __NR_syscalls 367 | 387 | #define __NR_syscalls 368 |
| 387 | 388 | ||
| 388 | #ifdef __KERNEL__ | 389 | #ifdef __KERNEL__ |
| 389 | #ifndef __ASSEMBLY__ | 390 | #ifndef __ASSEMBLY__ |