aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-09-11 18:00:57 +0200
committerArnd Bergmann <arnd@arndb.de>2010-10-21 15:44:13 +0200
commit6de5bd128d381ad88ac6d419a5e597048eb468cf (patch)
tree7b3a0440f645c6e98367a87b1ca0ed1e0df204dd /net
parent7ff52efdca367d4bfe2449bd3d4a1f8172c5953a (diff)
downloadmrst-s0i3-test-6de5bd128d381ad88ac6d419a5e597048eb468cf.tar.gz
mrst-s0i3-test-6de5bd128d381ad88ac6d419a5e597048eb468cf.tar.xz
mrst-s0i3-test-6de5bd128d381ad88ac6d419a5e597048eb468cf.zip
BKL: introduce CONFIG_BKL.
With all the patches we have queued in the BKL removal tree, only a few dozen modules are left that actually rely on the BKL, and even there are lots of low-hanging fruit. We need to decide what to do about them, this patch illustrates one of the options: Every user of the BKL is marked as 'depends on BKL' in Kconfig, and the CONFIG_BKL becomes a user-visible option. If it gets disabled, no BKL using module can be built any more and the BKL code itself is compiled out. The one exception is file locking, which is practically always enabled and does a 'select BKL' instead. This effectively forces CONFIG_BKL to be enabled until we have solved the fs/lockd mess and can apply the patch that removes the BKL from fs/locks.c. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net')
-rw-r--r--net/ipx/Kconfig1
-rw-r--r--net/x25/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipx/Kconfig b/net/ipx/Kconfig
index e9ad0062fbb..02549cb2c32 100644
--- a/net/ipx/Kconfig
+++ b/net/ipx/Kconfig
@@ -3,6 +3,7 @@
#
config IPX
tristate "The IPX protocol"
+ depends on BKL # should be fixable
select LLC
---help---
This is support for the Novell networking protocol, IPX, commonly
diff --git a/net/x25/Kconfig b/net/x25/Kconfig
index e6759c9660b..2196e55e4f6 100644
--- a/net/x25/Kconfig
+++ b/net/x25/Kconfig
@@ -5,6 +5,7 @@
config X25
tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)"
depends on EXPERIMENTAL
+ depends on BKL # should be fixable
---help---
X.25 is a set of standardized network protocols, similar in scope to
frame relay; the one physical line from your box to the X.25 network