Commit 69050eee authored by Tomas Szepe's avatar Tomas Szepe Committed by Linus Torvalds

CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK

CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK.

This makes it possible to run complete systems out of a CONFIG_BLOCK=n
initramfs on current kernels again (this last worked on 2.6.27.*).

Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55e331cf
...@@ -39,6 +39,13 @@ config FS_POSIX_ACL ...@@ -39,6 +39,13 @@ config FS_POSIX_ACL
bool bool
default n default n
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
source "fs/ocfs2/Kconfig"
source "fs/btrfs/Kconfig"
endif # BLOCK
config FILE_LOCKING config FILE_LOCKING
bool "Enable POSIX file locking API" if EMBEDDED bool "Enable POSIX file locking API" if EMBEDDED
default y default y
...@@ -47,13 +54,6 @@ config FILE_LOCKING ...@@ -47,13 +54,6 @@ config FILE_LOCKING
for filesystems like NFS and for the flock() system for filesystems like NFS and for the flock() system
call. Disabling this option saves about 11k. call. Disabling this option saves about 11k.
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
source "fs/ocfs2/Kconfig"
source "fs/btrfs/Kconfig"
endif # BLOCK
source "fs/notify/Kconfig" source "fs/notify/Kconfig"
source "fs/quota/Kconfig" source "fs/quota/Kconfig"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment