diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-28 03:23:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-28 03:23:13 -0500 |
| commit | 605c1a187f3ce82fbc243e2163c5ca8d1926df8e (patch) | |
| tree | c8065a8c5606a66f81dc494ce22a5baa5e0dfe7e /arch/x86/ia32/ia32entry.S | |
| parent | 17a2a9b57a9a7d2fd8f97df951b5e63e0bd56ef5 (diff) | |
| parent | ce9277fb08e6e721482f7011ca28dcd0449b197c (diff) | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/x86/ia32/ia32entry.S')
| -rw-r--r-- | arch/x86/ia32/ia32entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 4eefdca9832b..53147ad85b96 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
| @@ -696,7 +696,7 @@ ia32_sys_call_table: | |||
| 696 | .quad quiet_ni_syscall /* streams2 */ | 696 | .quad quiet_ni_syscall /* streams2 */ |
| 697 | .quad stub32_vfork /* 190 */ | 697 | .quad stub32_vfork /* 190 */ |
| 698 | .quad compat_sys_getrlimit | 698 | .quad compat_sys_getrlimit |
| 699 | .quad sys32_mmap2 | 699 | .quad sys_mmap_pgoff |
| 700 | .quad sys32_truncate64 | 700 | .quad sys32_truncate64 |
| 701 | .quad sys32_ftruncate64 | 701 | .quad sys32_ftruncate64 |
| 702 | .quad sys32_stat64 /* 195 */ | 702 | .quad sys32_stat64 /* 195 */ |