diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/cris/arch-v10 | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/cris/arch-v10')
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index ed171d389e65..72f5cd319b97 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
| @@ -691,7 +691,7 @@ sys_call_table: | |||
| 691 | .long sys_uselib | 691 | .long sys_uselib |
| 692 | .long sys_swapon | 692 | .long sys_swapon |
| 693 | .long sys_reboot | 693 | .long sys_reboot |
| 694 | .long old_readdir | 694 | .long sys_old_readdir |
| 695 | .long old_mmap /* 90 */ | 695 | .long old_mmap /* 90 */ |
| 696 | .long sys_munmap | 696 | .long sys_munmap |
| 697 | .long sys_truncate | 697 | .long sys_truncate |