diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-09-11 18:00:57 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-09-14 21:15:24 +0200 |
commit | f97d62f504228bbd4039c9b50118dbd6f7f3d30d (patch) | |
tree | 2bb0ff65f49a5a93b3e8171290003b95396c3ce2 /net | |
parent | a9e19885dc5fa3a4f456e0626587f0803a5e6a37 (diff) |
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/Kconfig | 1 | ||||
-rw-r--r-- | net/irda/Kconfig | 1 | ||||
-rw-r--r-- | net/irda/irnet/Kconfig | 1 | ||||
-rw-r--r-- | net/x25/Kconfig | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/net/ipx/Kconfig b/net/ipx/Kconfig index e9ad0062fbb6..02549cb2c328 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/irda/Kconfig b/net/irda/Kconfig index c8671a7ffb3c..073243f8177b 100644 --- a/net/irda/Kconfig +++ b/net/irda/Kconfig @@ -4,6 +4,7 @@ menuconfig IRDA depends on NET && !S390 + depends on BKL # should be fixable tristate "IrDA (infrared) subsystem support" select CRC_CCITT ---help--- diff --git a/net/irda/irnet/Kconfig b/net/irda/irnet/Kconfig index 28c557f0fdd2..b1e68c1f483b 100644 --- a/net/irda/irnet/Kconfig +++ b/net/irda/irnet/Kconfig @@ -1,6 +1,7 @@ config IRNET tristate "IrNET protocol" depends on IRDA && PPP + depends on BKL # might need to lock against AF_IRDA help Say Y here if you want to build support for the IrNET protocol. To compile it as a module, choose M here: the module will be diff --git a/net/x25/Kconfig b/net/x25/Kconfig index e6759c9660bb..2196e55e4f61 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 |