diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /arch/ia64/kernel/entry.S | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
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 e0be92a6abb0..7e3382b06d56 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1542,7 +1542,7 @@ sys_call_table: | |||
| 1542 | data8 sys_mkdir // 1055 | 1542 | data8 sys_mkdir // 1055 |
| 1543 | data8 sys_rmdir | 1543 | data8 sys_rmdir |
| 1544 | data8 sys_dup | 1544 | data8 sys_dup |
| 1545 | data8 sys_pipe | 1545 | data8 sys_ia64_pipe |
| 1546 | data8 sys_times | 1546 | data8 sys_times |
| 1547 | data8 ia64_brk // 1060 | 1547 | data8 ia64_brk // 1060 |
| 1548 | data8 sys_setgid | 1548 | data8 sys_setgid |