diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-09-26 06:53:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-26 06:54:28 -0400 |
| commit | ed3982cf3748b657ffb79d9d1c2e4a562661db2d (patch) | |
| tree | 6e3654f460e23aa1b1512896aa3f03886a69be1b /arch/m68k/kernel/syscalltable.S | |
| parent | cba9bd22a5f8f857534b9a7f3fb3cafa0ac5fb75 (diff) | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
Merge commit 'v3.1-rc7' into perf/core
Merge reason: Pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/kernel/syscalltable.S')
| -rw-r--r-- | arch/m68k/kernel/syscalltable.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index 00d1452f9571..c468f2edaa85 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S | |||
| @@ -189,7 +189,7 @@ ENTRY(sys_call_table) | |||
| 189 | .long sys_getpagesize | 189 | .long sys_getpagesize |
| 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 /* old 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 |