diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 12:44:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 12:44:51 -0400 |
| commit | 4aa2d56b2149e70a0b944b4f21e4aed33d9ab94e (patch) | |
| tree | 79cb2115c36799406fa477ca80adeab041c31509 /arch/microblaze/kernel/syscall_table.S | |
| parent | d46c7d9ab8289f23a5e161060b84fd7e63de7921 (diff) | |
| parent | 1fef7891755d99039592aa8d1ed02e981f38de15 (diff) | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Update Microblaze defconfigs
microblaze: Use klimit instead of _end for memory init
microblaze: Enable ppoll syscall
microblaze: Sane handling of missing timer/intc in device tree
microblaze: use the generic ack_bad_irq implementation
Diffstat (limited to 'arch/microblaze/kernel/syscall_table.S')
| -rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 216db817beb6..457216097dfd 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
| @@ -313,7 +313,7 @@ ENTRY(sys_call_table) | |||
| 313 | .long sys_fchmodat | 313 | .long sys_fchmodat |
| 314 | .long sys_faccessat | 314 | .long sys_faccessat |
| 315 | .long sys_ni_syscall /* pselect6 */ | 315 | .long sys_ni_syscall /* pselect6 */ |
| 316 | .long sys_ni_syscall /* sys_ppoll */ | 316 | .long sys_ppoll |
| 317 | .long sys_unshare /* 310 */ | 317 | .long sys_unshare /* 310 */ |
| 318 | .long sys_set_robust_list | 318 | .long sys_set_robust_list |
| 319 | .long sys_get_robust_list | 319 | .long sys_get_robust_list |