diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/sh/kernel/syscalls_32.S | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/sh/kernel/syscalls_32.S')
| -rw-r--r-- | arch/sh/kernel/syscalls_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 0af693e65764..e67c1733e1b9 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S | |||
| @@ -58,7 +58,7 @@ ENTRY(sys_call_table) | |||
| 58 | .long sys_mkdir | 58 | .long sys_mkdir |
| 59 | .long sys_rmdir /* 40 */ | 59 | .long sys_rmdir /* 40 */ |
| 60 | .long sys_dup | 60 | .long sys_dup |
| 61 | .long sys_pipe | 61 | .long sys_sh_pipe |
| 62 | .long sys_times | 62 | .long sys_times |
| 63 | .long sys_ni_syscall /* old prof syscall holder */ | 63 | .long sys_ni_syscall /* old prof syscall holder */ |
| 64 | .long sys_brk /* 45 */ | 64 | .long sys_brk /* 45 */ |
| @@ -105,7 +105,7 @@ ENTRY(sys_call_table) | |||
| 105 | .long sys_uselib | 105 | .long sys_uselib |
| 106 | .long sys_swapon | 106 | .long sys_swapon |
| 107 | .long sys_reboot | 107 | .long sys_reboot |
| 108 | .long old_readdir | 108 | .long sys_old_readdir |
| 109 | .long old_mmap /* 90 */ | 109 | .long old_mmap /* 90 */ |
| 110 | .long sys_munmap | 110 | .long sys_munmap |
| 111 | .long sys_truncate | 111 | .long sys_truncate |