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/mn10300 | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index 62fba8aa9b6e..ceeaaaa359e2 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S | |||
| @@ -478,7 +478,7 @@ ENTRY(sys_call_table) | |||
| 478 | .long sys_uselib | 478 | .long sys_uselib |
| 479 | .long sys_swapon | 479 | .long sys_swapon |
| 480 | .long sys_reboot | 480 | .long sys_reboot |
| 481 | .long old_readdir | 481 | .long sys_old_readdir |
| 482 | .long old_mmap /* 90 */ | 482 | .long old_mmap /* 90 */ |
| 483 | .long sys_munmap | 483 | .long sys_munmap |
| 484 | .long sys_truncate | 484 | .long sys_truncate |