diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /kernel/sys_ni.c | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
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); | ||