diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
| commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
| tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /arch/arm/include/asm/unistd.h | |
| parent | 751e1f5099f1568444fe2485f2485ca541d4952e (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
| -rw-r--r-- | arch/arm/include/asm/unistd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index c891eb76c0e3..87dbe3e21970 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
| @@ -396,6 +396,10 @@ | |||
| 396 | #define __NR_fanotify_init (__NR_SYSCALL_BASE+367) | 396 | #define __NR_fanotify_init (__NR_SYSCALL_BASE+367) |
| 397 | #define __NR_fanotify_mark (__NR_SYSCALL_BASE+368) | 397 | #define __NR_fanotify_mark (__NR_SYSCALL_BASE+368) |
| 398 | #define __NR_prlimit64 (__NR_SYSCALL_BASE+369) | 398 | #define __NR_prlimit64 (__NR_SYSCALL_BASE+369) |
| 399 | #define __NR_name_to_handle_at (__NR_SYSCALL_BASE+370) | ||
| 400 | #define __NR_open_by_handle_at (__NR_SYSCALL_BASE+371) | ||
| 401 | #define __NR_clock_adjtime (__NR_SYSCALL_BASE+372) | ||
| 402 | #define __NR_syncfs (__NR_SYSCALL_BASE+373) | ||
| 399 | 403 | ||
| 400 | /* | 404 | /* |
| 401 | * The following SWIs are ARM private. | 405 | * The following SWIs are ARM private. |