aboutsummaryrefslogtreecommitdiff
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:13:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:13:34 -0700
commit7420a8c0de8d99b201aeeab6fed16ca95ebf55a5 (patch)
tree0787800f490f98ffd41b958e52ab15732335744e /fs/Kconfig
parent12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff)
parent72f98e72551fad573c6cace8e8551ef094f482dd (diff)
downloadvexpress-lsk-7420a8c0de8d99b201aeeab6fed16ca95ebf55a5.tar.gz
Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: locks: turn lock_flocks into a spinlock fasync: re-organize fasync entry insertion to allow it under a spinlock locks/nfsd: allocate file lock outside of spinlock lockd: fix nlmsvc_notify_blocked locking lockd: push lock_flocks down
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index b5e582bd769..97673c95548 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -53,7 +53,6 @@ config EXPORTFS
config FILE_LOCKING
bool "Enable POSIX file locking API" if EMBEDDED
default y
- select BKL # while lockd still uses it.
help
This option enables standard file locking support, required
for filesystems like NFS and for the flock() system