diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 16:50:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 16:50:27 +1100 |
| commit | fe13c9bbd1e997396117300c1310ee9f55808c3b (patch) | |
| tree | 241d1dd4e4c0690a12c1d6926635d19369d31d85 /init | |
| parent | e3fb63b2d663e3c73577dcb189bf51a3faf496d5 (diff) | |
| parent | 162308729bc6d196ae1d1b8225e407175785e931 (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
fs/afs/write.c
fs/cifs/dir.c
fs/ubifs/file.c
include/asm-generic/fcntl.h
net/socket.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 621b87b9f918..8872fc05161b 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -302,13 +302,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" |