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/cris/arch-v32 | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'arch/cris/arch-v32')
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index 7f6f93e6b70e..5e674c8f7c51 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
| @@ -614,7 +614,7 @@ sys_call_table: | |||
| 614 | .long sys_uselib | 614 | .long sys_uselib |
| 615 | .long sys_swapon | 615 | .long sys_swapon |
| 616 | .long sys_reboot | 616 | .long sys_reboot |
| 617 | .long old_readdir | 617 | .long sys_old_readdir |
| 618 | .long old_mmap /* 90 */ | 618 | .long old_mmap /* 90 */ |
| 619 | .long sys_munmap | 619 | .long sys_munmap |
| 620 | .long sys_truncate | 620 | .long sys_truncate |