diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-18 14:53:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-18 14:53:33 +0200 |
| commit | 6ddafdaab3f809b110ada253d2f2d4910ebd3ac5 (patch) | |
| tree | 366bb7513511a05b6e11ab89bfe3b2dbd1d62a03 /arch/m68k/kernel/entry_mm.S | |
| parent | sched, sparc64: Turn cpu_coregroup_mask() into a real function (diff) | |
| parent | sched: Remove need_migrate_task() (diff) | |
| download | linux-6ddafdaab3f809b110ada253d2f2d4910ebd3ac5.tar.xz linux-6ddafdaab3f809b110ada253d2f2d4910ebd3ac5.zip | |
Merge branch 'sched/locking' into sched/core
Merge reason: the rq locking changes are stable,
propagate them into the .40 queue.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/kernel/entry_mm.S')
| -rw-r--r-- | arch/m68k/kernel/entry_mm.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S index 1559dea36e55..1359ee659574 100644 --- a/arch/m68k/kernel/entry_mm.S +++ b/arch/m68k/kernel/entry_mm.S @@ -750,4 +750,8 @@ sys_call_table: .long sys_fanotify_init .long sys_fanotify_mark .long sys_prlimit64 + .long sys_name_to_handle_at /* 340 */ + .long sys_open_by_handle_at + .long sys_clock_adjtime + .long sys_syncfs |