diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-10-15 22:03:09 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-10-15 22:03:09 +0200 |
| commit | fc3718918f13ad72827d62d36ea0f5fb55090644 (patch) | |
| tree | 4f9551256e02d08be37bab137f3d94182a67504c /arch/m68k/kernel/entry.S | |
| parent | ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIR... (diff) | |
| parent | ocfs2/cluster: Release debugfs file elapsed_time_in_ms (diff) | |
| download | linux-fc3718918f13ad72827d62d36ea0f5fb55090644.tar.xz linux-fc3718918f13ad72827d62d36ea0f5fb55090644.zip | |
Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ocfs2.h
Diffstat (limited to 'arch/m68k/kernel/entry.S')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 2391bdff0996..6360c437dcf5 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -765,4 +765,7 @@ sys_call_table: .long sys_set_thread_area .long sys_atomic_cmpxchg_32 /* 335 */ .long sys_atomic_barrier + .long sys_fanotify_init + .long sys_fanotify_mark + .long sys_prlimit64 |