diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 17:54:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 17:54:46 -0700 |
| commit | bdfd6b7d761c7bb8bc93055dac5040ece7d58e10 (patch) | |
| tree | 657c9adff148b2cb0f064c5cff96eafd3910d2e3 /arch/microblaze/kernel/syscall_table.S | |
| parent | 6ad85239da45d035b2c786f73ec3c2798352c820 (diff) | |
| parent | 9e1491de519712c73ec621c4ef4872eca6f2bb57 (diff) | |
| download | op-kernel-dev-bdfd6b7d761c7bb8bc93055dac5040ece7d58e10.zip op-kernel-dev-bdfd6b7d761c7bb8bc93055dac5040ece7d58e10.tar.gz | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix ftrace
microblaze: Wire up new syscalls
microblaze: Fix level/edge irq sensibility
Diffstat (limited to 'arch/microblaze/kernel/syscall_table.S')
| -rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index e88a930..85cea81 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S @@ -375,3 +375,7 @@ ENTRY(sys_call_table) .long sys_fanotify_init .long sys_fanotify_mark .long sys_prlimit64 /* 370 */ + .long sys_name_to_handle_at + .long sys_open_by_handle_at + .long sys_clock_adjtime + .long sys_syncfs |
