diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-04-14 08:50:37 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-14 08:51:07 +0200 |
commit | a4c98f8bbeafee12c979c90743f6fda94f7515c7 (patch) | |
tree | 3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501f /arch/m68k/kernel/entry_mm.S | |
parent | f4ad9bd208c98f32a6f9136618e0b8bebe3fb370 (diff) | |
parent | 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (diff) | |
download | kernel_samsung_smdk4412-a4c98f8bbeafee12c979c90743f6fda94f7515c7.tar.gz kernel_samsung_smdk4412-a4c98f8bbeafee12c979c90743f6fda94f7515c7.tar.bz2 kernel_samsung_smdk4412-a4c98f8bbeafee12c979c90743f6fda94f7515c7.zip |
Merge branch 'linus' into sched/locking
Merge reason: Pick up this upstream commit:
6631e635c65d: block: don't flush plugged IO on forced preemtion scheduling
As it modifies the scheduler and we'll queue up dependent patches.
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 1559dea36e5..1359ee65957 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 |