diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:54:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:54:30 -0400 |
commit | 9f5a691253924fd033a58c6b1fed57bb0a4eccf4 (patch) | |
tree | a30083700699ddfd89b72fa3e42e635e5e6f38c3 /arch/microblaze/kernel/syscall_table.S | |
parent | ef54b1bb2e4de212a89a2692a7b2efd70b5fb559 (diff) | |
parent | f57f2fe2a39338c47b67fbd564a9d3b7587bcbee (diff) |
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: add parameter to microblaze_read()
microblaze: Use CFLAGS_KERNEL instead of CFLAGS
microblaze: Add STATE_SAVE_ARG_SPACE for noMMU kernel too
microblaze: Do not check use_dcache
microblaze: Do not use PVR configuration for broken MB version
microblaze: Fix USR1/2 pvr printing message
microblaze: iowrite upon timeout
microblaze: Correspond CONFIG...PCMP in Makefile/Kconfig
microblaze: Remove redundant variable
microblaze: Move start_thread to process.c
microblaze: Add missing preadv and pwritev syscalls
microblaze: Add missing declaration for die and _exception func
microblaze: Remove sparse error in traps.c
microblaze: Move task_pt_regs up
microblaze: Rename kernel_mode to pt_mode in pt_regs
microblaze: Remove uncache shadow condition
microblaze: Remove while(1) loop from show_regs function
microblaze: Remove unneded per cpu SYSCALL_SAVE variable
Diffstat (limited to 'arch/microblaze/kernel/syscall_table.S')
-rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 529b0dbf4fe9..3bb42ec924c2 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
@@ -363,3 +363,5 @@ ENTRY(sys_call_table) | |||
363 | .long sys_sendmsg /* 360 */ | 363 | .long sys_sendmsg /* 360 */ |
364 | .long sys_recvmsg | 364 | .long sys_recvmsg |
365 | .long sys_ni_syscall | 365 | .long sys_ni_syscall |
366 | .long sys_ni_syscall | ||
367 | .long sys_ni_syscall | ||