diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:21:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:21:00 -0400 |
| commit | f74b9444192c60603020c61d7915b72893137edc (patch) | |
| tree | 8b1d16d373234038c2b045c9ceb3c33b93059e8a /drivers/target | |
| parent | 7a6362800cb7d1d618a697a650c7aaed3eb39320 (diff) | |
| parent | 4ba8216cd90560bc402f52076f64d8546e8aefcb (diff) | |
Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
BKL: That's all, folks
fs/locks.c: Remove stale FIXME left over from BKL conversion
ipx: remove the BKL
appletalk: remove the BKL
x25: remove the BKL
ufs: remove the BKL
hpfs: remove the BKL
drivers: remove extraneous includes of smp_lock.h
tracing: don't trace the BKL
adfs: remove the big kernel lock
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_device.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_fabric_lib.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_file.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_hba.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_iblock.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_pscsi.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_rd.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_tpg.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_transport.c | 1 |
9 files changed, 0 insertions, 9 deletions
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index 5da051a07fa3..350ed401544e 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/timer.h> | 33 | #include <linux/timer.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/smp_lock.h> | ||
| 37 | #include <linux/kthread.h> | 36 | #include <linux/kthread.h> |
| 38 | #include <linux/in.h> | 37 | #include <linux/in.h> |
| 39 | #include <net/sock.h> | 38 | #include <net/sock.h> |
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c index 26285644e4de..a3c695adabec 100644 --- a/drivers/target/target_core_fabric_lib.c +++ b/drivers/target/target_core_fabric_lib.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 29 | #include <linux/ctype.h> | 29 | #include <linux/ctype.h> |
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | #include <linux/smp_lock.h> | ||
| 32 | #include <scsi/scsi.h> | 31 | #include <scsi/scsi.h> |
| 33 | #include <scsi/scsi_cmnd.h> | 32 | #include <scsi/scsi_cmnd.h> |
| 34 | 33 | ||
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index 0aaca885668f..190ca8ac2498 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/blkdev.h> | 33 | #include <linux/blkdev.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/smp_lock.h> | ||
| 37 | #include <scsi/scsi.h> | 36 | #include <scsi/scsi.h> |
| 38 | #include <scsi/scsi_host.h> | 37 | #include <scsi/scsi_host.h> |
| 39 | 38 | ||
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c index 4bbe8208b241..73f7d6d81b4c 100644 --- a/drivers/target/target_core_hba.c +++ b/drivers/target/target_core_hba.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
| 32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 33 | #include <linux/spinlock.h> | 33 | #include <linux/spinlock.h> |
| 34 | #include <linux/smp_lock.h> | ||
| 35 | #include <linux/in.h> | 34 | #include <linux/in.h> |
| 36 | #include <net/sock.h> | 35 | #include <net/sock.h> |
| 37 | #include <net/tcp.h> | 36 | #include <net/tcp.h> |
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 67f0c09983c8..3df570db0e4f 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/blkdev.h> | 35 | #include <linux/blkdev.h> |
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
| 38 | #include <linux/smp_lock.h> | ||
| 39 | #include <linux/bio.h> | 38 | #include <linux/bio.h> |
| 40 | #include <linux/genhd.h> | 39 | #include <linux/genhd.h> |
| 41 | #include <linux/file.h> | 40 | #include <linux/file.h> |
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index f2a08477a68c..5a9d2ba4b609 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/blk_types.h> | 34 | #include <linux/blk_types.h> |
| 35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
| 36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
| 37 | #include <linux/smp_lock.h> | ||
| 38 | #include <linux/genhd.h> | 37 | #include <linux/genhd.h> |
| 39 | #include <linux/cdrom.h> | 38 | #include <linux/cdrom.h> |
| 40 | #include <linux/file.h> | 39 | #include <linux/file.h> |
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index 979aebf20019..8dc6d74c1d40 100644 --- a/drivers/target/target_core_rd.c +++ b/drivers/target/target_core_rd.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/blkdev.h> | 34 | #include <linux/blkdev.h> |
| 35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
| 36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
| 37 | #include <linux/smp_lock.h> | ||
| 38 | #include <scsi/scsi.h> | 37 | #include <scsi/scsi.h> |
| 39 | #include <scsi/scsi_host.h> | 38 | #include <scsi/scsi_host.h> |
| 40 | 39 | ||
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c index c26f67467623..5ec745fed931 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
| 32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 33 | #include <linux/spinlock.h> | 33 | #include <linux/spinlock.h> |
| 34 | #include <linux/smp_lock.h> | ||
| 35 | #include <linux/in.h> | 34 | #include <linux/in.h> |
| 36 | #include <net/sock.h> | 35 | #include <net/sock.h> |
| 37 | #include <net/tcp.h> | 36 | #include <net/tcp.h> |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 4bbf6c147f89..ff9ace01e27a 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/blkdev.h> | 35 | #include <linux/blkdev.h> |
| 36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
| 37 | #include <linux/smp_lock.h> | ||
| 38 | #include <linux/kthread.h> | 37 | #include <linux/kthread.h> |
| 39 | #include <linux/in.h> | 38 | #include <linux/in.h> |
| 40 | #include <linux/cdrom.h> | 39 | #include <linux/cdrom.h> |