diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:48:16 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:48:16 (GMT) |
commit | 51e8703bdf12e2481b205096c973a3ab6a8ca18b (patch) | |
tree | ed6b4131b8a613e9492488fb2b31d16bc9991ce1 /arch/microblaze/include/asm/syscall.h | |
parent | 1fd06bb1571e2618ae392e2484925bf0dadd7857 (diff) | |
parent | 0b9b0200b0922c29dc251b99700f96dade92214a (diff) | |
download | linux-fsl-qoriq-51e8703bdf12e2481b205096c973a3ab6a8ca18b.tar.xz |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (33 commits)
microblaze: Do not copy reset vectors/manual reset vector setup
microblaze: Fix _reset function
microblaze: Fix microblaze init vectors
microblaze: Fix circular headers dependency when ftrace is enabled.
microblaze: Fix typo in Kconfig
microblaze: Add missing export symbols for lib functions
microblaze: Fix /dev/zero corruption from __clear_user()
microblaze: Convert irq_chip to new functions
microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED
microblaze: Remove stale irq_chip.end
microblaze: Fix sparse warnings - signal.c
microblaze: Fix sparse warning - fault.c
microblaze: Fix missing microblaze specific syscalls declaration
microblaze: Fix sparse warnings - cache.c
microblaze: Fix sparse warning - cpuinfo.h
microblaze: Fix sparse warning - unwind.c
microblaze: Fix sparse warning - consistent_alloc function
microblaze: Fix sparse warnings - ptrace
microblaze: Fix sparse warning - sw_exceptions
microblaze: Fix sparse warning - timer.c
...
Diffstat (limited to 'arch/microblaze/include/asm/syscall.h')
-rw-r--r-- | arch/microblaze/include/asm/syscall.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/include/asm/syscall.h index 048dfcd..9bc4317 100644 --- a/arch/microblaze/include/asm/syscall.h +++ b/arch/microblaze/include/asm/syscall.h @@ -96,4 +96,7 @@ static inline void syscall_set_arguments(struct task_struct *task, microblaze_set_syscall_arg(regs, i++, *args++); } +asmlinkage long do_syscall_trace_enter(struct pt_regs *regs); +asmlinkage void do_syscall_trace_leave(struct pt_regs *regs); + #endif /* __ASM_MICROBLAZE_SYSCALL_H */ |