Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ config FS_POSIX_ACL 
	bool

	default n



source "fs/xfs/Kconfig"

source "fs/gfs2/Kconfig"

source "fs/ocfs2/Kconfig"

source "fs/btrfs/Kconfig"



endif # BLOCK



config FILE_LOCKING

	bool "Enable POSIX file locking API" if EMBEDDED

	default y
@@ -47,13 +54,6 @@ config FILE_LOCKING 
          for filesystems like NFS and for the flock() system

          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/quota/Kconfig"