diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /kernel/sys_ni.c | |
| parent | 3c955b407a084810f57260d61548cc92c14bc627 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Diffstat (limited to 'kernel/sys_ni.c')
| -rw-r--r-- | kernel/sys_ni.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 70f2ea758ffe..bad369ec5403 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
| @@ -181,3 +181,7 @@ cond_syscall(sys_eventfd2); | |||
| 181 | 181 | ||
| 182 | /* performance counters: */ | 182 | /* performance counters: */ |
| 183 | cond_syscall(sys_perf_event_open); | 183 | cond_syscall(sys_perf_event_open); |
| 184 | |||
| 185 | /* fanotify! */ | ||
| 186 | cond_syscall(sys_fanotify_init); | ||
| 187 | cond_syscall(sys_fanotify_mark); | ||