diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /kernel/sys_ni.c | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sys_ni.c')
| -rw-r--r-- | kernel/sys_ni.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index c782fe9924c..25cc41cd8f3 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
| @@ -186,3 +186,8 @@ cond_syscall(sys_perf_event_open); | |||
| 186 | /* fanotify! */ | 186 | /* fanotify! */ |
| 187 | cond_syscall(sys_fanotify_init); | 187 | cond_syscall(sys_fanotify_init); |
| 188 | cond_syscall(sys_fanotify_mark); | 188 | cond_syscall(sys_fanotify_mark); |
| 189 | |||
| 190 | /* open by handle */ | ||
| 191 | cond_syscall(sys_name_to_handle_at); | ||
| 192 | cond_syscall(sys_open_by_handle_at); | ||
| 193 | cond_syscall(compat_sys_open_by_handle_at); | ||