diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-09-04 23:52:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-04 23:52:08 -0400 |
| commit | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (patch) | |
| tree | 9189ffc9fa735e5297ed8c3678a9463e8dbb1561 /arch/sh | |
| parent | b9a3acf46afdafc601947136f63e9dd228cd86e8 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/syscalls_32.S | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/syscalls_64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 39b051de4c7c..293e39c59c00 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S | |||
| @@ -185,7 +185,7 @@ ENTRY(sys_call_table) | |||
| 185 | .long sys_ni_syscall /* vm86 */ | 185 | .long sys_ni_syscall /* vm86 */ |
| 186 | .long sys_ni_syscall /* old "query_module" */ | 186 | .long sys_ni_syscall /* old "query_module" */ |
| 187 | .long sys_poll | 187 | .long sys_poll |
| 188 | .long sys_nfsservctl | 188 | .long sys_ni_syscall /* was nfsservctl */ |
| 189 | .long sys_setresgid16 /* 170 */ | 189 | .long sys_setresgid16 /* 170 */ |
| 190 | .long sys_getresgid16 | 190 | .long sys_getresgid16 |
| 191 | .long sys_prctl | 191 | .long sys_prctl |
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index 089c4d825d08..ceb34b94afa9 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S | |||
| @@ -189,7 +189,7 @@ sys_call_table: | |||
| 189 | .long sys_ni_syscall /* vm86 */ | 189 | .long sys_ni_syscall /* vm86 */ |
| 190 | .long sys_ni_syscall /* old "query_module" */ | 190 | .long sys_ni_syscall /* old "query_module" */ |
| 191 | .long sys_poll | 191 | .long sys_poll |
| 192 | .long sys_nfsservctl | 192 | .long sys_ni_syscall /* was nfsservctl */ |
| 193 | .long sys_setresgid16 /* 170 */ | 193 | .long sys_setresgid16 /* 170 */ |
| 194 | .long sys_getresgid16 | 194 | .long sys_getresgid16 |
| 195 | .long sys_prctl | 195 | .long sys_prctl |