diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-11 14:16:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-11 14:16:13 +1100 |
| commit | 569b1aa3cd747df1f76e7eb16c9afe297ed223bc (patch) | |
| tree | 94c97318cc5abf5fcdf280853070e305d4aad3a4 /init | |
| parent | e5c8000da7653cafc747bdaa90e0888ff38b54af (diff) | |
| parent | 8c0f910e8dd2cf7b50809daee2a316c8b095da1b (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
fs/notify/inotify/inotify_user.c
include/linux/fsnotify.h
kernel/audit_tree.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 061a700d7865..1838ac9cd9e1 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" |