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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/staging/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index fc751e3f7e7a..aea13d8486f5 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -41,6 +41,17 @@ config STAGING_EXCLUDE_BUILD if !STAGING_EXCLUDE_BUILD +config BKL + bool "Include drivers that depend on the Big Kernel Lock" if (SMP || PREEMPT) + default !(SMP || PREEMPT) + 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. + A small number of drivers still require this. All drivers that + use the BKL should be changed to a better serialisation method + or they will be removed in 2.6.39. + source "drivers/staging/tty/Kconfig" source "drivers/staging/generic_serial/Kconfig" diff --git a/drivers/staging/cx25821/cx25821.h b/drivers/staging/cx25821/cx25821.h index 55115235f7f6..8417a735d3e0 100644 --- a/drivers/staging/cx25821/cx25821.h +++ b/drivers/staging/cx25821/cx25821.h @@ -31,7 +31,6 @@ #include <linux/delay.h> #include <linux/sched.h> #include <linux/kdev_t.h> -#include <linux/smp_lock.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h> |