diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:17:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:17:42 +1100 |
| commit | b3eab1d6a437c6332f90c039a75287cbef02ecf1 (patch) | |
| tree | d13aeeee23bf7b57e8be4d049e31dc0ad52f0c81 /lib | |
| parent | 709e09ab4a8cb7569d1e248b39980fdb0dc8d4a5 (diff) | |
| parent | a3ba01b63468c925518da2da0ac3be11358f60cb (diff) | |
Merge remote-tracking branch 'bkl-config/config'
Conflicts:
arch/powerpc/kernel/setup_64.c
drivers/scsi/pm8001/pm8001_sas.h
drivers/staging/Kconfig
drivers/staging/stradis/Kconfig
fs/nfsd/nfs4state.c
include/linux/hardirq.h
include/linux/smp_lock.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 0f77ed13368d..689f31191f81 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -466,15 +466,6 @@ config DEBUG_MUTEXES This feature allows mutex semantics violations to be detected and reported. -config BKL - bool "Big Kernel Lock" if (SMP || PREEMPT) - default y - help - This is the traditional lock that is used in old code instead - of proper locking. All drivers that use the BKL should depend - on this symbol. - Say Y here unless you are working on removing the BKL. - config DEBUG_LOCK_ALLOC bool "Lock debugging: detect incorrect freeing of live locks" depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |