diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 15:42:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 15:42:21 +1100 |
| commit | c7afe2d9eb78c75403e6ed1882f4e02ee90f6c6d (patch) | |
| tree | 4a6bcc103baff97173041c345321e187949c11e9 /init | |
| parent | 49f5c1795af2823fdfa0a6d4ec8b66bfbd0cff23 (diff) | |
| parent | 48db02f1d87c626f274766edd6aef311aff1f93b (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
fs/notify/inotify/inotify_user.c
include/linux/fsnotify.h
kernel/audit_tree.c
kernel/sysctl.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 320b0517fe27..cb6069ec6f5f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -320,13 +320,17 @@ config AUDITSYSCALL help Enable low-overhead system-call auditing infrastructure that can be used independently or with another kernel subsystem, - such as SELinux. To use audit's filesystem watch feature, please - ensure that INOTIFY is configured. + such as SELinux. + +config AUDIT_WATCH + def_bool y + depends on AUDITSYSCALL + select FSNOTIFY config AUDIT_TREE def_bool y depends on AUDITSYSCALL - select INOTIFY + select FSNOTIFY menu "RCU Subsystem" |