diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /arch/sh/kernel/syscalls_64.S | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/kernel/syscalls_64.S')
| -rw-r--r-- | arch/sh/kernel/syscalls_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index bf420b616ae0..af6fb7410c21 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S | |||
| @@ -143,7 +143,7 @@ sys_call_table: | |||
| 143 | .long sys_clone /* 120 */ | 143 | .long sys_clone /* 120 */ |
| 144 | .long sys_setdomainname | 144 | .long sys_setdomainname |
| 145 | .long sys_newuname | 145 | .long sys_newuname |
| 146 | .long sys_ni_syscall /* sys_modify_ldt */ | 146 | .long sys_cacheflush /* x86: sys_modify_ldt */ |
| 147 | .long sys_adjtimex | 147 | .long sys_adjtimex |
| 148 | .long sys_mprotect /* 125 */ | 148 | .long sys_mprotect /* 125 */ |
| 149 | .long sys_sigprocmask | 149 | .long sys_sigprocmask |