diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-20 17:40:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-20 17:40:45 -0700 |
| commit | f3e96492f6da63eba56f04f3c5cc2af524b5a925 (patch) | |
| tree | 94dcd9521bbd937cb9d5fc7b30a48ec20d2a6980 /arch/arm/kernel/calls.S | |
| parent | 8653b3f1d5bf2c7b09962a5747c74280758444ee (diff) | |
| parent | e9569c1511d2590a27b46b94bafb7acece034e5c (diff) | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h
ARM: Add new syscalls
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 5c26eccef99..7fbf28c35bb 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -379,6 +379,10 @@ CALL(sys_fanotify_init) CALL(sys_fanotify_mark) CALL(sys_prlimit64) +/* 370 */ CALL(sys_name_to_handle_at) + CALL(sys_open_by_handle_at) + CALL(sys_clock_adjtime) + CALL(sys_syncfs) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted |