diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /arch/x86/kernel/syscall_table_32.S | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'arch/x86/kernel/syscall_table_32.S')
| -rw-r--r-- | arch/x86/kernel/syscall_table_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index 496726ddcea1..0c4d601bc853 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
| @@ -88,7 +88,7 @@ ENTRY(sys_call_table) | |||
| 88 | .long sys_uselib | 88 | .long sys_uselib |
| 89 | .long sys_swapon | 89 | .long sys_swapon |
| 90 | .long sys_reboot | 90 | .long sys_reboot |
| 91 | .long old_readdir | 91 | .long sys_old_readdir |
| 92 | .long old_mmap /* 90 */ | 92 | .long old_mmap /* 90 */ |
| 93 | .long sys_munmap | 93 | .long sys_munmap |
| 94 | .long sys_truncate | 94 | .long sys_truncate |