diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/mips/kernel/scall64-n32.S | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index da7f1b6ea0fb..324c5499dec2 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -219,7 +219,7 @@ EXPORT(sysn32_call_table) | |||
| 219 | PTR compat_sys_getrusage | 219 | PTR compat_sys_getrusage |
| 220 | PTR compat_sys_sysinfo | 220 | PTR compat_sys_sysinfo |
| 221 | PTR compat_sys_times | 221 | PTR compat_sys_times |
| 222 | PTR sys32_ptrace | 222 | PTR compat_sys_ptrace |
| 223 | PTR sys_getuid /* 6100 */ | 223 | PTR sys_getuid /* 6100 */ |
| 224 | PTR sys_syslog | 224 | PTR sys_syslog |
| 225 | PTR sys_getgid | 225 | PTR sys_getgid |