diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
| commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
| tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /arch/microblaze/kernel/syscall_table.S | |
| parent | 8b5a10fc6fd02289ea03480f93382b1a99006142 (diff) | |
| parent | c62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff) | |
Merge commit 'origin/x86/urgent' into x86/asm
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 31b32a6c5f4e..216db817beb6 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
| @@ -121,7 +121,7 @@ ENTRY(sys_call_table) | |||
| 121 | .long sys_wait4 | 121 | .long sys_wait4 |
| 122 | .long sys_swapoff /* 115 */ | 122 | .long sys_swapoff /* 115 */ |
| 123 | .long sys_sysinfo | 123 | .long sys_sysinfo |
| 124 | .long sys_ipc | 124 | .long sys_ni_syscall /* old sys_ipc */ |
| 125 | .long sys_fsync | 125 | .long sys_fsync |
| 126 | .long sys_ni_syscall /* sys_sigreturn_wrapper */ | 126 | .long sys_ni_syscall /* sys_sigreturn_wrapper */ |
| 127 | .long sys_clone /* 120 */ | 127 | .long sys_clone /* 120 */ |