diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /arch/ia64/ia32/ia32_entry.S | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/ia32/ia32_entry.S')
| -rw-r--r-- | arch/ia64/ia32/ia32_entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 95fe04400f6b..a32cd59b81ed 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
| @@ -334,7 +334,7 @@ ia32_syscall_table: | |||
| 334 | data8 sys_setdomainname | 334 | data8 sys_setdomainname |
| 335 | data8 sys32_newuname | 335 | data8 sys32_newuname |
| 336 | data8 sys32_modify_ldt | 336 | data8 sys32_modify_ldt |
| 337 | data8 sys_ni_syscall /* adjtimex */ | 337 | data8 compat_sys_adjtimex |
| 338 | data8 sys32_mprotect /* 125 */ | 338 | data8 sys32_mprotect /* 125 */ |
| 339 | data8 compat_sys_sigprocmask | 339 | data8 compat_sys_sigprocmask |
| 340 | data8 sys_ni_syscall /* create_module */ | 340 | data8 sys_ni_syscall /* create_module */ |