aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/Kconfig
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-01-28 17:19:50 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2007-02-05 13:38:08 -0500
commit001172778543c6997d3339f43085e43460e5883a (patch)
tree73795627b092435cd9f254e5e12439ee16e31340 /fs/gfs2/Kconfig
parent[GFS2/DLM] use sysfs (diff)
downloadlinux-dev-001172778543c6997d3339f43085e43460e5883a.tar.xz
linux-dev-001172778543c6997d3339f43085e43460e5883a.zip
[GFS2/DLM] fix GFS2 circular dependency
On Sun, Jan 28, 2007 at 11:08:18AM +0100, Jiri Slaby wrote: > Andrew Morton napsal(a): > >Temporarily at > > > > http://userweb.kernel.org/~akpm/2.6.20-rc6-mm1/ > > Unable to select IPV6. Menuconfig doesn't offer it when INET is selected. > When it's not it appears in the menu, but after state change it gets away. > The same behaviour in xconfig, gconfig. > > $ mkdir ../a/tst > $ make O=../a/tst menuconfig > HOSTCC scripts/basic/fixdep > [...] > HOSTLD scripts/kconfig/mconf > scripts/kconfig/mconf arch/i386/Kconfig > Warning! Found recursive dependency: INET GFS2_FS_LOCKING_DLM SYSFS > OCFS2_FS INET > > Maybe this is the problem? Yes, patch below. > regards, cu Adrian <-- snip --> This patch fixes a circular dependency by letting GFS2_FS_LOCKING_DLM and DLM depend on instead of select SYSFS. Since SYSFS depends on EMBEDDED this change shouldn't cause any problems for users. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to '')
-rw-r--r--fs/gfs2/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 2c184a97cb12..cbd5f3319321 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -34,11 +34,10 @@ config GFS2_FS_LOCKING_NOLOCK
config GFS2_FS_LOCKING_DLM
tristate "GFS2 DLM locking module"
- depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
+ depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n)
select IP_SCTP if DLM_SCTP
select CONFIGFS_FS
select DLM
- select SYSFS
help
Multiple node locking module for GFS2