diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
| commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
| tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /arch/arm/include/asm/unistd.h | |
| parent | 6ccbe607132bd823abbad8d32b13af89161707da (diff) | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
| -rw-r--r-- | arch/arm/include/asm/unistd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index 0cab47d4a83..2fde5fd1acc 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
| @@ -404,6 +404,7 @@ | |||
| 404 | #define __NR_setns (__NR_SYSCALL_BASE+375) | 404 | #define __NR_setns (__NR_SYSCALL_BASE+375) |
| 405 | #define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) | 405 | #define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) |
| 406 | #define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) | 406 | #define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) |
| 407 | /* 378 for kcmp */ | ||
| 407 | 408 | ||
| 408 | /* | 409 | /* |
| 409 | * The following SWIs are ARM private. | 410 | * The following SWIs are ARM private. |
| @@ -483,6 +484,7 @@ | |||
| 483 | */ | 484 | */ |
| 484 | #define __IGNORE_fadvise64_64 | 485 | #define __IGNORE_fadvise64_64 |
| 485 | #define __IGNORE_migrate_pages | 486 | #define __IGNORE_migrate_pages |
| 487 | #define __IGNORE_kcmp | ||
| 486 | 488 | ||
| 487 | #endif /* __KERNEL__ */ | 489 | #endif /* __KERNEL__ */ |
| 488 | #endif /* __ASM_ARM_UNISTD_H */ | 490 | #endif /* __ASM_ARM_UNISTD_H */ |