aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 21:34:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 21:34:59 -0400
commit0b2d8d9e562de3ee2476f549549e4fefbb7a4213 (patch)
tree20e025254b430efc647e7403a4168e4487619b92 /drivers/pci
parent22cdbd1d5789cc16c37102eb6f62c3ae377b849e (diff)
proc_bus_pci_ioctl: remove pointless BKL usage
The BKL was pushed into this function when it was converted to use the unlocked_ioctl interface, but nothing that the function touches is actually protected by the BKL. So just remove the BKL entirely, so that we finally can get a realistic system build without the BKL being enabled at all. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/proc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 01f0306525a5..895136f13edc 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -212,8 +212,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
212#endif /* HAVE_PCI_MMAP */ 212#endif /* HAVE_PCI_MMAP */
213 int ret = 0; 213 int ret = 0;
214 214
215 lock_kernel();
216
217 switch (cmd) { 215 switch (cmd) {
218 case PCIIOC_CONTROLLER: 216 case PCIIOC_CONTROLLER:
219 ret = pci_domain_nr(dev->bus); 217 ret = pci_domain_nr(dev->bus);
@@ -242,7 +240,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
242 break; 240 break;
243 }; 241 };
244 242
245 unlock_kernel();
246 return ret; 243 return ret;
247} 244}
248 245