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/kernel/calls.S | |
| parent | 751e1f5099f1568444fe2485f2485ca541d4952e (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/arm/kernel/calls.S')
| -rw-r--r-- | arch/arm/kernel/calls.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 5c26eccef998..7fbf28c35bb2 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
| @@ -379,6 +379,10 @@ | |||
| 379 | CALL(sys_fanotify_init) | 379 | CALL(sys_fanotify_init) |
| 380 | CALL(sys_fanotify_mark) | 380 | CALL(sys_fanotify_mark) |
| 381 | CALL(sys_prlimit64) | 381 | CALL(sys_prlimit64) |
| 382 | /* 370 */ CALL(sys_name_to_handle_at) | ||
| 383 | CALL(sys_open_by_handle_at) | ||
| 384 | CALL(sys_clock_adjtime) | ||
| 385 | CALL(sys_syncfs) | ||
| 382 | #ifndef syscalls_counted | 386 | #ifndef syscalls_counted |
| 383 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls | 387 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
| 384 | #define syscalls_counted | 388 | #define syscalls_counted |