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/ia64/kernel/entry.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/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index d435f4a7a96c..e5341e2c1175 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1442,7 +1442,7 @@ sys_call_table: | |||
| 1442 | data8 sys_mkdir // 1055 | 1442 | data8 sys_mkdir // 1055 |
| 1443 | data8 sys_rmdir | 1443 | data8 sys_rmdir |
| 1444 | data8 sys_dup | 1444 | data8 sys_dup |
| 1445 | data8 sys_pipe | 1445 | data8 sys_ia64_pipe |
| 1446 | data8 sys_times | 1446 | data8 sys_times |
| 1447 | data8 ia64_brk // 1060 | 1447 | data8 ia64_brk // 1060 |
| 1448 | data8 sys_setgid | 1448 | data8 sys_setgid |