diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-03 14:06:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-03 14:06:42 +1100 |
| commit | ffe2eaf1ed061447e6bd2d419e0ae0204448fce7 (patch) | |
| tree | 6085ce68d1a63877814bef273a9989911c6df4b5 /init | |
| parent | a952b780b2ad98107316764936fd36cdffbb71a2 (diff) | |
| parent | 9ec95a50f4d31fe58fd8fae9f86627eea4582ccb (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
fs/notify/inotify/inotify_fsnotify.c
fs/notify/inotify/inotify_user.c
include/linux/fs.h
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 cad90bd71669..79d375d92728 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" |